feature: 在记录列表中增加剩余时间

server/pom.xml

@@ -138,7 +138,7 @@
         <dependency>
             <groupId>com.pica.cloud.online.exam</groupId>
             <artifactId>pica-cloud-analysis-common</artifactId>
-            <version>1.0.6</version>
+            <version>1.0.7</version>
             <scope>compile</scope>
         </dependency>
 

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AnalysisController.java

@@ -16,6 +16,7 @@ import com.pica.cloud.online.exam.analysis.server.service.AntiSpamService;
 import com.pica.cloud.online.exam.analysis.server.service.CHCAnalysisService;
 import com.pica.cloud.online.exam.analysis.server.service.CHCRankingListService;
 import com.pica.cloud.online.exam.analysis.server.service.DoctorService;
+import com.pica.cloud.online.exam.analysis.server.utils.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javassist.bytecode.ExceptionsAttribute;
@@ -656,11 +657,11 @@ public class AnalysisController {
             myStarDto.setRoundList(roundDtoList);
         }
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM:dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy.M.d");
         AnalysisRound analysisRound = analysisService.getRoundInfoById(roundId);
         myStarDto.setStartTime(sdf.format(analysisRound.getStartTime()));
         myStarDto.setEndTime(sdf.format(analysisRound.getEndTime()));
-
+        myStarDto.setRemainingTime(DateUtils.remainingTime(analysisRound.getEndTime()));
         /**
          * 设置结束状态
          */

server/src/main/java/com/pica/cloud/online/exam/analysis/server/utils/DateUtils.java

@@ -36,4 +36,25 @@ public class DateUtils {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         return sdf.format(date);
     }
+
+    public static String remainingTime(Date date) {
+        long time = date.getTime() / 1000;
+        long now = (new Date()).getTime() / 1000;
+        long interval = now - time;
+
+        if (interval < 0)
+            return "";
+
+        if (interval <= ONE_MINITE) {
+            return "1分钟";
+        } else if (interval <= ONE_HOUR) {
+            return interval / ONE_MINITE + "分钟";
+        } else if (interval <= ONE_DAY) {
+            return interval / ONE_HOUR + "小时" + interval % ONE_HOUR + "分钟";
+        } else {
+            return interval / ONE_DAY + "天" +
+                    (interval % ONE_DAY) / ONE_HOUR + "小时" +
+                    (interval % ONE_DAY) % ONE_HOUR + "分钟";
+        }
+    }
 }