基础平台模块bug修改

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java

@@ -8,16 +8,22 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.io.Resources;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.encrypt.annotation.EncryptField;
+import org.dromara.common.encrypt.properties.EncryptorProperties;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.core.type.ClassMetadata;
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+import org.springframework.stereotype.Service;
 import org.springframework.util.ClassUtils;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -30,7 +36,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @NoArgsConstructor
 public class EncryptorManager {
-
+    private EncryptorProperties defaultProperties;
     /**
      * 缓存加密器
      */

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java

@@ -108,6 +108,16 @@ public class MybatisDecryptInterceptor implements Interceptor {
         return this.encryptorManager.decrypt(value, encryptContext);
     }
 
+    public String decrypt(String value) {
+        EncryptContext encryptContext = new EncryptContext();
+        encryptContext.setAlgorithm(defaultProperties.getAlgorithm());
+        encryptContext.setEncode(defaultProperties.getEncode());
+        encryptContext.setPassword(defaultProperties.getPassword());
+        encryptContext.setPrivateKey(defaultProperties.getPrivateKey());
+        encryptContext.setPublicKey(defaultProperties.getPublicKey());
+        return this.encryptorManager.decrypt(value, encryptContext);
+    }
+
     @Override
     public Object plugin(Object target) {
         return Plugin.wrap(target, this);

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java

@@ -14,6 +14,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.encrypt.annotation.EncryptField;
 import org.dromara.common.encrypt.core.EncryptContext;
 import org.dromara.common.encrypt.core.EncryptorManager;
+import org.dromara.common.encrypt.core.IEncryptor;
 import org.dromara.common.encrypt.enumd.AlgorithmType;
 import org.dromara.common.encrypt.enumd.EncodeType;
 import org.dromara.common.encrypt.properties.EncryptorProperties;
@@ -117,6 +118,15 @@ public class MybatisEncryptInterceptor implements Interceptor {
         return this.encryptorManager.encrypt(value, encryptContext);
     }
 
+    public String encrypt(String value) {
+        EncryptContext encryptContext = new EncryptContext();
+        encryptContext.setAlgorithm(defaultProperties.getAlgorithm());
+        encryptContext.setEncode(defaultProperties.getEncode());
+        encryptContext.setPassword(defaultProperties.getPassword());
+        encryptContext.setPrivateKey(defaultProperties.getPrivateKey());
+        encryptContext.setPublicKey(defaultProperties.getPublicKey());
+        return this.encryptorManager.encrypt(value, encryptContext);
+    }
 
     @Override
     public void setProperties(Properties properties) {

ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.sensitive.annotation.Sensitive;
 import org.dromara.common.sensitive.core.SensitiveService;

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtSubsidyitemController.java

@@ -55,7 +55,9 @@ public class PtSubsidyitemController extends BaseController {
     @Log(title = "补助明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(PtSubsidyitemBo bo, HttpServletResponse response) {
-        List<PtSubsidyitemVo> list = ptSubsidyitemService.queryList(bo);
+        PageQuery pageQuery = new PageQuery();
+        pageQuery.setPageSize(Integer.MAX_VALUE);
+        List<PtSubsidyitemVo> list = ptSubsidyitemService.queryPageList(bo, pageQuery).getRows();
         ExcelUtil.exportExcel(list, "补助明细", PtSubsidyitemVo.class, response);
     }
 

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/vo/PtSubsidyitemVo.java

@@ -33,7 +33,7 @@ public class PtSubsidyitemVo implements Serializable {
     /**
      * 明细Id,主键
      */
-    @ExcelProperty(value = "明细Id,主键")
+    @ExcelProperty(value = "Id")
     private Long itemId;
 
     /**
@@ -69,7 +69,8 @@ public class PtSubsidyitemVo implements Serializable {
     /**
      * 领取状态
      */
-    @ExcelProperty(value = "领取状态")
+    @ExcelProperty(value = "领取状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
     private String fillStatus;
 
     /**
@@ -93,7 +94,7 @@ public class PtSubsidyitemVo implements Serializable {
     /**
      * 原始记录Id,一般是指写入的充值备份表主键
      */
-    @ExcelProperty(value = "原始记录Id,一般是指写入的充值备份表主键")
+//    @ExcelProperty(value = "原始记录Id,一般是指写入的充值备份表主键")
     private String originalId;
 
     /**
@@ -126,4 +127,7 @@ public class PtSubsidyitemVo implements Serializable {
 
     @ExcelProperty(value = "创建时间")
     private Date createTime;
+
+    @ExcelProperty(value = "补助名称")
+    private String subsidyName;
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/mapper/PtSubsidyitemMapper.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import org.dromara.backstage.basics.domain.PtOperator;
 import org.dromara.backstage.cardCenter.domain.PtSubsidyitem;
 import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyReportBo;
+import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyitemBo;
 import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyReportVo;
 import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyitemVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -18,6 +19,8 @@ import java.util.List;
  * @date 2024-08-14
  */
 public interface PtSubsidyitemMapper extends BaseMapperPlus<PtSubsidyitem, PtSubsidyitemVo> {
+    Page<PtSubsidyitemVo> customPageList(Page<PtSubsidyitem> page, PtSubsidyitemBo bo
+        , @Param("beginFillDate") String beginFillDate, @Param("endFillDate") String endFillDate);
 
     List<PtSubsidyReportVo> queryReportList(@Param("bo")PtSubsidyReportBo bo);
     Page<PtSubsidyReportVo> queryReportPageList(@Param("page") Page<PtSubsidyReportVo> page, @Param("bo")PtSubsidyReportBo bo);

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/service/impl/PtSubsidyServiceImpl.java

@@ -55,6 +55,7 @@ public class PtSubsidyServiceImpl implements IPtSubsidyService {
     @Override
     public TableDataInfo<PtSubsidyVo> queryPageList(PtSubsidyBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<PtSubsidy> lqw = buildQueryWrapper(bo);
+        lqw.orderByDesc(PtSubsidy::getCreateTime);
         Page<PtSubsidyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/service/impl/PtSubsidyitemServiceImpl.java

@@ -24,10 +24,7 @@ import org.dromara.backstage.cardCenter.domain.PtSubsidyitem;
 import org.dromara.backstage.cardCenter.mapper.PtSubsidyitemMapper;
 import org.dromara.backstage.cardCenter.service.IPtSubsidyitemService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toMap;
@@ -76,8 +73,12 @@ public class PtSubsidyitemServiceImpl implements IPtSubsidyitemService {
      */
     @Override
     public TableDataInfo<PtSubsidyitemVo> queryPageList(PtSubsidyitemBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<PtSubsidyitem> lqw = buildQueryWrapper(bo);
-        Page<PtSubsidyitemVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        LambdaQueryWrapper<PtSubsidyitem> lqw = buildQueryWrapper(bo);
+        Map<String, Object> parms = bo.getParams();
+        String beginFillDate = Optional.ofNullable(parms.get("beginFillDate")).orElse("").toString();
+        String endFillDate = Optional.ofNullable(parms.get("endFillDate")).orElse("").toString();
+        Page<PtSubsidyitemVo> result = baseMapper.customPageList(pageQuery.build(), bo,
+            beginFillDate, endFillDate);
         addUserInfo(result.getRecords());
         return TableDataInfo.build(result);
     }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PtBagController.java

@@ -15,6 +15,7 @@ import org.dromara.backstage.payment.domain.vo.PtBagVo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
 import org.dromara.backstage.payment.service.IPtBagService;
 import org.dromara.backstage.payment.service.IPtUserAccountService;
+import org.dromara.backstage.payment.service.impl.PtBagServiceImpl;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.enums.CreditTypeEnum;
@@ -36,6 +37,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.MessageFormat;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 账户钱包
@@ -55,6 +57,7 @@ public class PtBagController extends BaseController {
     private final IPtUserAccountService accountService;
     private final PaymentsStrategyContent paymentsStrategyContent;
     private final ErrFillBusiness errFillBusiness;
+    private final IPtBagService bagService;
 
     //根据userId查询账户余额
 //    @SaCheckPermission("payment:ptBag:query")
@@ -156,6 +159,11 @@ public class PtBagController extends BaseController {
     @RepeatSubmit()
     @PostMapping("/refund")
     public R<PtBagVo> refund(@Validated(EditGroup.class) @RequestBody PtBagBo bo) {
+        //校验钱包余额是否充足
+        PtBagVo bagVo = bagService.queryByUserBagCode(bo.getUserId(), bo.getBagCode());
+        if (bagVo.getBalance().compareTo(bo.getReceiptMoney()) < 0) {
+            return R.fail(MessageFormat.format("账户余额不足，当前余额为：{0}", bagVo.getBalance()));
+        }
         bo.setUseType(SystemUseTypeEnum.CONSUME);
         //退款是记支出，所以金额设置为负数
         bo.setReceiptMoney(bo.getReceiptMoney().negate());

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PtUserAccountServiceImpl.java

@@ -19,9 +19,11 @@ import org.dromara.backstage.payment.domain.vo.PtUserAccount4SelectVo;
 import org.dromara.backstage.payment.service.IPtBagService;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.FileUtils;
 import org.dromara.common.core.utils.file.MimeTypeUtils;
+import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -131,6 +133,10 @@ public class PtUserAccountServiceImpl implements IPtUserAccountService {
     }
 
     private LambdaQueryWrapper<PtUserAccount> buildQueryWrapper(PtUserAccountBo bo) {
+
+        //手机号加密处理
+        MybatisEncryptInterceptor encryptInterceptor = SpringUtils.getBean(MybatisEncryptInterceptor.class);
+        bo.setPhone(encryptInterceptor.encrypt(bo.getPhone()));
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PtUserAccount> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getPostId() != null, PtUserAccount::getPostId, bo.getPostId());

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/cardCenter/cardOperation/PtSubsidyitemMapper.xml

@@ -29,6 +29,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <select id="customPageList" resultType="org.dromara.backstage.cardCenter.domain.vo.PtSubsidyitemVo">
+        SELECT
+            b.subsidy_name,a.item_id,a.user_id, a.subsidy_type, a.fill_money, a.fill_date, a.fill_status, a.get_date
+             , a.before_money, a.after_money, a.original_id, a.user_numb, a.real_name, a.dept_name, a.remark, a.del_flag
+             , a.create_dept, a.create_by, a.create_time, a.update_by
+        FROM
+            t_pt_subsidyItem a
+                left join t_pt_subsidy b on a.main_id = b.main_id
+        <where>
+            <if test="bo.mainId == null or bo.mainId == ''">
+                and b.audit_status = 'Y'
+            </if>
+            <if test="bo.realName != null and bo.realName != ''">
+                and a.real_name like concat('%', #{bo.realName}, '%')
+            </if>
+            <if test="beginFillDate != '' and endFillDate != ''">
+                and a.fill_date between #{beginFillDate} and #{endFillDate}
+            </if>
+            <if test="bo.fillStatus != null and bo.fillStatus != ''">
+                and a.fill_status = #{bo.fillStatus}
+            </if>
+            <if test="bo.deptName != null and bo.deptName != ''">
+                and a.dept_name like concat('%', #{bo.deptName}, '%')
+            </if>
+            <if test="bo.mainId != null and bo.mainId != ''">
+                and a.main_id = #{bo.mainId}
+            </if>
+        </where>
+    </select>
+
     <select id="queryReportList" resultType="org.dromara.backstage.cardCenter.domain.vo.PtSubsidyReportVo">
         select (case  #{bo.countType} when '0' then to_char(i.fill_date, '%Y') when '1' then to_char(i.fill_date, '%Y-%m') else to_char(i.fill_date, '%Y-%m-%d') end) fillDate,
                (case when #{bo.subsidyType} is not null and #{bo.subsidyType} != '' then i.subsidy_type else '所有' end) subsidyType,

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java

@@ -12,6 +12,8 @@ import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.core.xss.Xss;
+import org.dromara.common.encrypt.annotation.EncryptField;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.sensitive.annotation.Sensitive;
 import org.dromara.common.sensitive.core.SensitiveStrategy;
@@ -87,7 +89,8 @@ public class SysUserBo extends BaseEntity {
     /**
      * 手机号码
      */
-    @Sensitive(strategy = SensitiveStrategy.PHONE)
+//    @Sensitive(strategy = SensitiveStrategy.PHONE)
+    @EncryptField(algorithm = AlgorithmType.BASE64)
     private String phone;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -54,7 +56,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
         @DataColumn(key = "deptName", value = "d.dept_id"),
         @DataColumn(key = "userName", value = "u.user_id")
     })
-    Page<SysUserVo> selectAllocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+    Page<SysUserVo> selectAllocatedList(@Param("page") Page<SysUser> page,
+                                       @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
 
     /**
      * 根据条件分页查询未分配用户角色列表

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -28,6 +28,8 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor;
+import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
@@ -93,6 +95,10 @@ public class SysUserServiceImpl implements ISysUserService {
     }
 
     private Wrapper<SysUser> buildQueryWrapper(SysUserBo user) {
+        //手机号加密处理
+        MybatisEncryptInterceptor encryptInterceptor = SpringUtils.getBean(MybatisEncryptInterceptor.class);
+        user.setPhone(encryptInterceptor.encrypt(user.getPhone()));
+
         Map<String, Object> params = user.getParams();
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("del_flag", UserConstants.USER_NORMAL)
@@ -126,6 +132,9 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery) {
+        //查询条件加密
+        MybatisEncryptInterceptor encrypt = SpringUtils.getBean(MybatisEncryptInterceptor.class);
+        user.setPhone(encrypt.encrypt(user.getPhone()));
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
             .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
@@ -134,6 +143,11 @@ public class SysUserServiceImpl implements ISysUserService {
             .like(StringUtils.isNotBlank(user.getPhone()), "u.phone", user.getPhone())
             .orderByAsc("u.user_id");
         Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
+        //返回数据解密
+        MybatisDecryptInterceptor dencrypt = SpringUtils.getBean(MybatisDecryptInterceptor.class);
+        page.getRecords().stream().forEach(item -> {
+            item.setPhone(dencrypt.decrypt(item.getPhone()));
+        });
         return TableDataInfo.build(page);
     }
 
@@ -146,6 +160,9 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     public TableDataInfo<SysUserVo> selectUnallocatedList(SysUserBo user, PageQuery pageQuery) {
         List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
+        //查询条件加密
+        MybatisEncryptInterceptor encrypt = SpringUtils.getBean(MybatisEncryptInterceptor.class);
+        user.setPhone(encrypt.encrypt(user.getPhone()));
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
             .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
@@ -154,6 +171,11 @@ public class SysUserServiceImpl implements ISysUserService {
             .like(StringUtils.isNotBlank(user.getPhone()), "u.phone", user.getPhone())
             .orderByAsc("u.user_id");
         Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
+        //返回数据解密
+        MybatisDecryptInterceptor dencrypt = SpringUtils.getBean(MybatisDecryptInterceptor.class);
+        page.getRecords().stream().forEach(item -> {
+            item.setPhone(dencrypt.decrypt(item.getPhone()));
+        });
         return TableDataInfo.build(page);
     }