From 76954189fe1840b813a8825c59fa391ae4930852 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 5 Jan 2021 09:13:28 +0800
Subject: [PATCH] =?UTF-8?q?ht=E4=BA=8C=E6=9C=9F=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/ht/service/QuestionService.java    |  5 +--
 ht/src/main/resources/application.yml         |  4 +-
 .../java/com/ccsens/tall/bean/vo/UserVo.java  |  4 ++
 .../com/ccsens/tall/web/UserController.java   | 13 ++----
 .../test/java/com/ccsens/util/Base64Test.java | 44 ++++---------------
 5 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
index bbe37c8f..4d7f1bf5 100644
--- a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
+++ b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
@@ -87,13 +87,12 @@ public class QuestionService implements IQuestionService {
         //检查当前试题是否有答案，共享答案的试题是否有答案
         boolean f = false;
         HtPatientScoreExample scoreExample = new HtPatientScoreExample();
-        scoreExample.createCriteria().andPatientIdEqualTo(query.getPatientReportId()).andQuestionIdEqualTo(question.getId());
+        scoreExample.createCriteria().andPatientReportIdEqualTo(query.getPatientReportId()).andQuestionIdEqualTo(question.getId())
+        .andTypeBetween((byte)0,(byte)1);
         if(htPatientScoreDao.countByExample(scoreExample) > 0){
             f = true;
             questionVo.setShowShareAnswer((byte) 0);
         }
-//        //试题选项
-//        List<QuestionVo.Option> optionList = htQuestionOptionDao.queryOption(question.getId(), query.getPatientReportId());
 
         //查询可以共享答案的试题的id
         List<Long> shareAnswerIds = new ArrayList<>();
diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml
index 5889ff7f..d082c0ea 100644
--- a/ht/src/main/resources/application.yml
+++ b/ht/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
\ No newline at end of file
+    active: prod
+    include: common, util-prod
\ No newline at end of file
diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
index eff45bb8..31069431 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
@@ -61,6 +61,10 @@ public class UserVo {
     public static class TokenToUserId{
         @ApiModelProperty("用户id")
         private Long id;
+        @ApiModelProperty("用户名")
+        private String name;
+        @ApiModelProperty("用户头像")
+        private String avatarUrl;
     }
 
     @Data
diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java
index 26e49892..34e8f6ed 100644
--- a/tall/src/main/java/com/ccsens/tall/web/UserController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java
@@ -380,17 +380,10 @@ public class UserController {
         }catch(Exception e){
             return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
         }
-//        //验证用户存根
-//        if(userService.tokenNotExistInCache(Long.valueOf(claims.getSubject()))){
-//            return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
-//        }
-//        //验证用户是否禁用
-//        SysUser user = userService.getUserById(Long.valueOf(claims.getSubject()));
-//        if(user.getRecStatus() == WebConstant.REC_STATUS.Disabled.value){
-//            return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
-//        }
-
         tokenToUserId.setId(Long.valueOf(claims.getSubject()));
+        SysUser user = userService.getUserById(Long.valueOf(claims.getSubject()));
+        tokenToUserId.setName(user.getNickname());
+        tokenToUserId.setName(user.getAvatarUrl());
 
         return JsonResponse.newInstance().ok(tokenToUserId);
     }
diff --git a/util/src/test/java/com/ccsens/util/Base64Test.java b/util/src/test/java/com/ccsens/util/Base64Test.java
index ad07bff3..a09aaedd 100644
--- a/util/src/test/java/com/ccsens/util/Base64Test.java
+++ b/util/src/test/java/com/ccsens/util/Base64Test.java
@@ -38,45 +38,17 @@ public class Base64Test {
 
     @Test
     public void test02() throws Exception {
+
+
         List<Integer> listX = new ArrayList<>();
         List<Integer> listY = new ArrayList<>();
-        listX.add(724);
-        listX.add(724);
-        listX.add(723);
-        listX.add(719);
-        listX.add(716);
-        listX.add(713);
-        listX.add(710);
-        listX.add(707);
-        listX.add(704);
-        listX.add(696);
-        listX.add(696);
-        listX.add(696);
-        listX.add(696);
-        listX.add(696);
-        listX.add(696);
-        listX.add(696);
-        listX.add(696);
-        listX.add(696);
+        listX.add(22);
+        listY.add(33);
+
+        listX.add(889);
+        listY.add(1600);
+
 
-        listY.add(267);
-        listY.add(268);
-        listY.add(273);
-        listY.add(290);
-        listY.add(303);
-        listY.add(315);
-        listY.add(330);
-        listY.add(351);
-        listY.add(374);
-        listY.add(516);
-        listY.add(537);
-        listY.add(557);
-        listY.add(583);
-        listY.add(592);
-        listY.add(598);
-        listY.add(602);
-        listY.add(604);
-        listY.add(605);
 
         double a = 0;
         for (int i = 1; i < listX.size(); i++){