新增 签名

ruoyi-common/pom.xml

@@ -17,6 +17,17 @@
 
 
     <dependencies>
+        <!--二维码-->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.1.0</version>
+        </dependency>
         <!--word签名-->
         <dependency>
             <groupId>org.docx4j</groupId>

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -2,6 +2,7 @@ package com.ruoyi.framework.web.service;
 
 import javax.annotation.Resource;
 
+import com.ruoyi.common.utils.AesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -30,8 +31,7 @@ import com.ruoyi.framework.security.context.AuthenticationContextHolder;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 
-import static com.ruoyi.common.constant.CommonConstants.LOGIN_USER_SMS;
-import static com.ruoyi.common.constant.CommonConstants.TWO;
+import static com.ruoyi.common.constant.CommonConstants.*;
 
 /**
  * 登录校验方法
@@ -70,7 +70,7 @@ public class SysLoginService {
         //登录类型校验 如果是短信验证码登录，校验短信验证码是否正确
         String passwordResult = validateType(username, type, code);
         if (StringUtils.isNotEmpty(passwordResult)) {
-            password = passwordResult;
+            password = AesUtil.decryptCBC(passwordResult, LOGIN_PASSWORD_AES);
         }
         // 登录前置校验
         loginPreCheck(username, password);

ruoyi-system/src/main/java/com/ruoyi/system/service/loan/impl/LoanApplicationServiceImpl.java

@@ -13,6 +13,7 @@ import com.ruoyi.system.domain.loan.LoanApplication;
 import com.ruoyi.system.domain.loan.LoanApplicationFj;
 import com.ruoyi.system.domain.loan.LoanSchedule;
 import com.ruoyi.system.domain.loan.ShareholderFj;
+import com.ruoyi.system.domain.remind.WaitRemind;
 import com.ruoyi.system.domain.review.ReviewComments;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.loan.ILoanApplicationService;
@@ -31,6 +32,8 @@ import net.lingala.zip4j.exception.ZipException;
 import net.lingala.zip4j.model.ZipParameters;
 import net.lingala.zip4j.model.enums.EncryptionMethod;
 
+import javax.annotation.Resource;
+
 /**
  * 贷款申请主Service业务层处理
  *
@@ -53,6 +56,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
     private SysUserConferenceMapper sysUserConferenceMapper;
     @Autowired
     private ReviewCommentsMapper reviewCommentsMapper;
+    @Resource
+    private WaitRemindMapper waitRemindMapper;
 
     /**
      * 查询贷款申请主
@@ -390,12 +395,23 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         }
         //通过,进入到下一个步骤
         if (TWO.equals(auditType)) {
+            WaitRemind waitRemind = new WaitRemind();
+            waitRemind.setLoanApplicationId(loanApplicationId);
+            waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemind.setRemindTitle("您有一条审核信息待办");
+            waitRemind.setRemindTime(DateUtils.getNowDate());
+            waitRemind.setRemindType(TWO);
             if (auditSchedule.equals(ONE)) {
                 //设置AB角色id
                 loanApplication.setaUserId(reviewComments.getaUserId());
                 loanApplication.setaUserName(reviewComments.getaUserName());
                 loanApplication.setbUserId(reviewComments.getbUserId());
                 loanApplication.setbUserName(reviewComments.getbUserName());
+                //给A角色发送待办提醒
+                waitRemind.setReadUserId(reviewComments.getaUserId().toString());
+                String enterpriseName = loanApplication.getEnterpriseName();
+                waitRemind.setRemindContent(enterpriseName+"有一条贷款申请需及时处理");
+                waitRemindMapper.insertWaitRemind(waitRemind);
             }
             //保存参会人员数据
             if (sysUserConferenceList != null && sysUserConferenceList.size() > 0 && auditSchedule.equals(SEV)) {
@@ -406,6 +422,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 loanApplication.setLoanSchedule(THR);
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
                 loanApplication.setAuditType(ONE);
+                if (auditSchedule.equals(TWO)){
+                    //给B角色发送待办提醒
+                    waitRemind.setReadUserId(loanApplication.getbUserId().toString());
+                    String enterpriseName = loanApplication.getEnterpriseName();
+                    waitRemind.setRemindContent(enterpriseName+"有一条贷款申请需及时处理");
+                    waitRemindMapper.insertWaitRemind(waitRemind);
+                }
                 //审核流程结束
             } else if (auditSchedule.equals(SEV)) {
                 loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));

ruoyi-system/src/main/java/com/ruoyi/system/service/remind/impl/WaitRemindServiceImpl.java

@@ -33,13 +33,7 @@ public class WaitRemindServiceImpl implements IWaitRemindService
     public WaitRemind selectWaitRemindByRemindId(Integer remindId)
     {
         WaitRemind waitRemind = waitRemindMapper.selectWaitRemindByRemindId(remindId);
-        String readUserId = waitRemind.getReadUserId();
-        if (StringUtils.isNotEmpty(readUserId)) {
-            readUserId = readUserId + "," + SecurityUtils.getUserId();
-        } else {
-            readUserId = SecurityUtils.getUserId() + "";
-        }
-        waitRemind.setReadUserId(readUserId);
+        waitRemind.setIsRead("Y");
         waitRemindMapper.updateWaitRemind(waitRemind);
         return waitRemind;
     }
@@ -54,17 +48,8 @@ public class WaitRemindServiceImpl implements IWaitRemindService
     public List<WaitRemind> selectWaitRemindList(WaitRemind waitRemind)
     {
         Long userId = SecurityUtils.getUserId();
-        waitRemind.setIsRead(userId.toString());
+        waitRemind.setReadUserId(userId.toString());
         List<WaitRemind> waitReminds = waitRemindMapper.selectWaitRemindList(waitRemind);
-        if (waitReminds != null && waitReminds.size() > 0) {
-            for (WaitRemind waitRemindNew : waitReminds) {
-                String readUserId = waitRemindNew.getReadUserId();
-                //判断是否已读 = readUserId是否包含当前登录人的id
-                if (readUserId.contains(String.valueOf(userId))){
-                    waitRemindNew.setIsRead("Y");
-                }
-            }
-        }
         return waitReminds;
     }
 

ruoyi-system/src/main/resources/mapper/system/WaitRemindMapper.xml

@@ -38,12 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="readUserId != null  and readUserId != ''"> and read_user_id = #{readUserId}</if>
             <if test="isRead != null  and isRead != ''"> and is_read = #{isRead}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="isRead != null and isRead == 'Y'">
-                AND find_in_set(#{isRead}, read_user_id)
-            </if>
-            <if test="isRead != null and isRead == 'N'">
-                AND find_in_set(#{isRead}, read_user_id) = 0
-            </if>
         </where>
         order by create_time
     </select>