From d27d4a0808ff4ae4b962c37409b17f6cfbf94838 Mon Sep 17 00:00:00 2001
From: haotianmingyue <2421912570@qq.com>
Date: Fri, 25 Oct 2024 15:31:05 +0800
Subject: [PATCH] =?UTF-8?q?user=5Finfo=E8=A1=A8=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20calculation=5Ftime=20=E4=B8=8A=E4=B8=80=E6=AC=A1=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/app/baidu/TestBaidu.java  | 14 +++++++++++---
 .../framework/web/service/SysRegisterService.java  |  4 ++++
 .../java/com/ruoyi/system/domain/UserInfo.java     | 11 +++++++++++
 .../resources/mapper/system/UserInfoMapper.xml     |  7 ++++++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/baidu/TestBaidu.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/baidu/TestBaidu.java
index 71f7c499..263954fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/baidu/TestBaidu.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/baidu/TestBaidu.java
@@ -1,11 +1,19 @@
 package com.ruoyi.web.controller.app.baidu;
 
+import java.util.Date;
+
 public class TestBaidu {
 
     public static void main(String[] args) throws Exception
     {
-        OcrIdCardBAI ocrIdCardBAI = new OcrIdCardBAI();
-        String result = ocrIdCardBAI.idcard("D:/ruoyi/uploadPath/id_card/18321826195_card_front.jpg", "front", "true", "true", "true", "false");
-        System.out.println(result);
+//        OcrIdCardBAI ocrIdCardBAI = new OcrIdCardBAI();
+//        String result = ocrIdCardBAI.idcard("D:/ruoyi/uploadPath/id_card/18321826195_card_front.jpg", "front", "true", "true", "true", "false");
+//        System.out.println(result);
+        long currentTimeMillis = System.currentTimeMillis();
+        // 利用毫秒值构造Date对象
+        Date calculationTime = new Date(currentTimeMillis-1000000000);
+
+        System.out.println(calculationTime);
+
     }
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
index 7074708c..5e8dce37 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
@@ -201,6 +201,10 @@ public class SysRegisterService
                 Date currentDate = new Date(currentTimeMillis);
                 userInfo.setUpdateTime(currentDate);
 
+                //设置上一次计算时间大约为10天前
+                Date calculationTime = new Date(currentTimeMillis-1000000000);
+                userInfo.setCalculationTime(calculationTime);
+
                 int infoFlag = userInfoService.insertUserInfo(userInfo);
                 if (infoFlag == 0) {
                     msg = "个人信息注册失败,请联系系统管理人员";
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserInfo.java
index bfc3390a..f2685179 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserInfo.java
@@ -112,6 +112,9 @@ public class UserInfo extends BaseEntity
     @Excel(name = "背景图地址")
     private String backGround;
 
+    @Excel(name = "上一次计算时间")
+    private Date calculationTime;
+
 
 
     public void setUserId(Long userId) 
@@ -339,6 +342,12 @@ public class UserInfo extends BaseEntity
         this.backGround = backGround;
     }
 
+    public Date getCalculationTime()
+    {
+        return calculationTime;
+    }
+    public void setCalculationTime(Date calculationTime){this.calculationTime = calculationTime;}
+
 
 
     @Override
@@ -368,6 +377,8 @@ public class UserInfo extends BaseEntity
             .append("tConsumption", gettConsumption())
             .append("updateTime", getUpdateTime())
             .append("birth", getBirth())
+                .append("backGround", getBackGround())
+                .append("calculationTime", getCalculationTime())
             .toString();
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml
index faacb375..414160a6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml
@@ -30,10 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time" />
         <result property="birth" column="date_of_birth"/>
         <result property="backGround" column="back_ground"/>
+        <result property="calculationTime" column="calculation_time"/>
     </resultMap>
 
     <sql id="selectUserInfoVo">
-        select user_id, authentication_status, real_name, id_card, sex, signature, avatar, card_front, card_back, email, receive_rockets, send_rockets, shares, followers, s_online_time, s_mr_time, s_consumption, th_consumption, phonenumber, t_mr_time, t_online_time, t_consumption, update_time, date_of_birth, back_ground  from user_info
+        select user_id, authentication_status, real_name, id_card, sex, signature, avatar, card_front, card_back, email, receive_rockets, send_rockets, shares, followers, s_online_time, s_mr_time, s_consumption, th_consumption, phonenumber, t_mr_time, t_online_time, t_consumption, update_time, date_of_birth, back_ground, calculation_time  from user_info
     </sql>
 
     <select id="selectUserInfoList" parameterType="UserInfo" resultMap="UserInfoResult">
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null"> and update_time = #{updateTime}</if>
             <if test="birth != null"> and date_of_birth = #{birth}</if>
             <if test="backGround != null"> and back_ground = #{backGround}</if>
+            <if test="calculationTime != null"> and calculation_time = #{calculationTime}</if>
         </where>
     </select>
     
@@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time</if>
             <if test="birth != null">date_of_birth</if>
             <if test="backGround != null">back_ground</if>
+            <if test="calculationTime != null">calculation_time</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -126,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="birth != null">#{birth},</if>
             <if test="backGround != null">#{backGround},</if>
+            <if test="calculationTime != null">#{calculationTime},</if>
          </trim>
     </insert>
 
@@ -156,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="birth != null">date_of_birth = #{birth},</if>
             <if test="backGround != null">back_ground = #{backGround},</if>
+            <if test="calculationTime != null">calculation_time = #{calculationTime},</if>
         </trim>
         where user_id = #{userId}
     </update>