YeLuo 5 years ago
parent
commit
9a46ac580a

+ 17 - 0
src/main/java/com/yingying/tourist/business/BusinessConstant.java

@@ -28,6 +28,7 @@ public class BusinessConstant {
28 28
     }
29 29
 
30 30
     public static Map<Integer, String> describeMap = new HashMap<>(16,1);
31
+    public static Map<Integer, String> destinationMap = new HashMap<>(16,1);
31 32
     static {
32 33
         describeMap.put(1,"在山西挖煤挖到300000斤");
33 34
         describeMap.put(2,"做环卫工打扫400个公厕坑位");
@@ -45,5 +46,21 @@ public class BusinessConstant {
45 46
         describeMap.put(14,"去民政局门口卖唱500首分手快乐");
46 47
         describeMap.put(15,"去黑帮老大家催收到200万欠款");
47 48
         describeMap.put(16,"下乡给4000头公猪做绝育手术");
49
+        destinationMap.put(1,"随着脚蹼滑动我开始下潜,世界越来越静谧,一个庞大的珊瑚王国占据眼前所有视线,色彩斑斓的珊瑚宝宝们正在开演盛大的舞台剧。");
50
+        destinationMap.put(2,"我站在自由女神像前,摆出了一样的姿势拍照纪念,这座见证了美国历史的雕像,在自由、民主的口号下高举火炬照亮了最深沉的夜。");
51
+        destinationMap.put(3,"我迈步走近了佛塔,双手合十虔诚祈祷,心灵的一切杂念此刻都先放下,耳边只剩下风的私语和寺庙的诵经声,这是心灵的修行。");
52
+        destinationMap.put(4,"我被告知获得了超能力,可以瞬移到世界上任何一个景点旅行,于是兴致勃勃地打包了行李拿上了相机,然后,梦醒了。");
53
+        destinationMap.put(5,"我从新西兰皇后镇15000英尺的飞机上纵身跃下,云朵在身边穿行,身体在空中舒展,大地变换了新奇的角度,这就是高空速降。");
54
+        destinationMap.put(6,"我喘着气爬到了长白山腰处,回首望去,身后是苍茫的林海,远处的天池波光粼粼,山顶层层云雾缭绕,敢问山中可有仙人修炼长生。");
55
+        destinationMap.put(7,"我席地盘坐在蒙古大草原的篝火边,饮下一口马奶酒,在主人悠扬的马头琴声中悠悠哼着草原小调,草原的夜空繁星无际,雄伟辽阔。");
56
+        destinationMap.put(8,"我坐在小酒馆的窗边,拿起酒杯小酌一口,窗外街上的游人行色匆匆,手指轻敲桌面打着节奏,轻声慢和一首回忆纯真的童谣。");
57
+        destinationMap.put(9,"我站在北极的冰原上仰头望向夜空,极光在天边摇曳,仿佛火狐狸经过时,尾巴扫过白雪而激起的花火,代表了幸运和希望。");
58
+        destinationMap.put(10,"大不列颠的夕阳将大本钟染成金黄色,我站在钟楼下,看着远处广场上飞起的鸽子,耳边响起英伦古典建筑上空浑厚的钟声。");
59
+        destinationMap.put(11,"我斜躺在近海的水屋里,环顾四周皆是湛蓝的大海,打开窗,海浪的声音温柔地抚摸着耳膜,千奇百怪的热带鱼在身下梭巡起舞。");
60
+        destinationMap.put(12,"我踩着轻快的步子下楼散步,期间共被广场舞大妈挡道7次,被业主的狗狂追10次,被小区的熊孩子撞飞8次,最后狼狈不堪逃回家。");
61
+        destinationMap.put(13,"我艰难地踩着雪崖攀上了最后一米,立足在珠峰之巅,风雪仍在咆哮,缺氧让人窒息,但是征服生命禁区后的心灵感觉自由无比。");
62
+        destinationMap.put(14,"我把遮沙的面罩重新带好,抬头望向面前的胡夫金字塔,斑驳的石砖满是风沙的痕迹,狮身人面像在旁沉默守护着最古老的文明荣光。");
63
+        destinationMap.put(15,"我乘坐探险者一号飞船顺利着陆,跨出舱的第一步激起了飘扬的火星尘,这是整个太阳系最高的山脉,能看到远处蓝宝石般的地球。");
64
+        destinationMap.put(16,"我头上搭着白毛巾,泡在樱花树下的露天温泉中,水面热气蒸腾,远处富士山顶白雪皑皑,空中樱花瓣打着旋缓缓飘落在水面上。");
48 65
     }
49 66
 }

+ 1 - 0
src/main/java/com/yingying/tourist/domain/Question.java

@@ -6,6 +6,7 @@ import lombok.Data;
6 6
 public class Question {
7 7
     private Integer id;
8 8
     private String questionPath;
9
+    private Integer resultOrder;
9 10
     private String resultDestination;
10 11
     private String resultOutter;
11 12
     private String resultInner;

+ 1 - 0
src/main/java/com/yingying/tourist/vo/QuestionVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
6 6
 public class QuestionVo {
7 7
     private String nickname;
8 8
     private String resultDestination;
9
+    private String resultDestinationInfo;
9 10
     private String resultOutter;
10 11
     private String resultInner;
11 12
     private String resultIdentity;

+ 17 - 9
src/main/java/com/yingying/tourist/web/QuestionController.java

@@ -15,6 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired;
15 15
 import org.springframework.web.bind.annotation.GetMapping;
16 16
 import org.springframework.web.bind.annotation.RestController;
17 17
 
18
+import java.util.Arrays;
19
+import java.util.List;
20
+
18 21
 @RestController
19 22
 public class QuestionController {
20 23
 
@@ -25,22 +28,27 @@ public class QuestionController {
25 28
     private UserService userService;
26 29
 
27 30
     @GetMapping("question/pick")
28
-    public MessageResult<QuestionVo> question(String openid, String pickOne, String pickTwo, String pickThird, String pickFourth){
29
-        if (Util.isNull(openid) || Util.isNull(pickOne) || Util.isNull(pickTwo) || Util.isNull(pickThird) || Util.isNull(pickFourth)) {
31
+    public MessageResult<QuestionVo> question(String openid, String pick){
32
+        if (Util.isNull(pick)) {
30 33
             return new MessageResult<QuestionVo>().failure(ErrorCode.PARAMETERS_ERROR);
31 34
         }
32 35
         QuestionVo questionVo = new QuestionVo();
33
-        String pick = pickOne + pickTwo + pickThird;
36
+        String[] pickList = pick.split(",");
37
+        String pickLast = pickList[3];
38
+        String pickBegin = pickList[0] + pickList[1] + pickList[2];
34 39
         EntityWrapper<Question> questionWrapper = new EntityWrapper<>();
35
-        questionWrapper.eq("question_path", pick);
40
+        questionWrapper.eq("question_path", pickBegin);
36 41
         Question question = questionService.selectOne(questionWrapper);
37
-        EntityWrapper<User> userWrapper = new EntityWrapper<>();
38
-        userWrapper.eq("openid", openid);
39
-        User user = userService.selectOne(userWrapper);
40 42
         BeanUtils.copyProperties(question, questionVo);
43
+        questionVo.setResultDestinationInfo(BusinessConstant.destinationMap.get(question.getResultOrder()));
41 44
         questionVo.setResultDescribe(BusinessConstant.describeMap.get(Util.getRandomInt(1,16)));
42
-        questionVo.setResultIdentity(BusinessConstant.Identity.getValue(pickFourth));
43
-        questionVo.setNickname(user.getNickname());
45
+        questionVo.setResultIdentity(BusinessConstant.Identity.getValue(pickLast));
46
+        if (Util.isNotNull(openid)) {
47
+            EntityWrapper<User> userWrapper = new EntityWrapper<>();
48
+            userWrapper.eq("openid", openid);
49
+            User user = userService.selectOne(userWrapper);
50
+            questionVo.setNickname(user.getNickname());
51
+        }
44 52
         return new MessageResult<QuestionVo>().ok(questionVo);
45 53
     }
46 54
 }