till há 5 anos atrás
pai
commit
1834ba9e88
51 ficheiros alterados com 969 adições e 1044 exclusões
  1. 8 0
      LICENSE
  2. 11 0
      README.md
  3. 2 2
      sourcecode/server/README.md
  4. 143 143
      sourcecode/server/logs/log-2019-04-02.log
  5. 105 105
      sourcecode/server/logs/log-2019-04-05.log
  6. 106 0
      sourcecode/server/src/main/java/smart/gift/controller/SmartNurseryPuzzleAnswerController.java
  7. 27 28
      sourcecode/server/src/main/java/smart/gift/controller/SmartNurseryPuzzleGroupController.java
  8. 54 53
      sourcecode/server/src/main/java/smart/gift/controller/SmartNurseryPuzzlesController.java
  9. 45 48
      sourcecode/server/src/main/java/smart/gift/controller/SmartNurseryTrialController.java
  10. 0 107
      sourcecode/server/src/main/java/smart/gift/controller/SmartQuizPuzzleAnswerController.java
  11. 3 3
      sourcecode/server/src/main/java/smart/gift/controller/WxMaUserController.java
  12. 3 3
      sourcecode/server/src/main/java/smart/gift/dao/SmartNurseryPuzzleAnswerDao.java
  13. 19 0
      sourcecode/server/src/main/java/smart/gift/dao/SmartNurseryPuzzleGroupDao.java
  14. 0 24
      sourcecode/server/src/main/java/smart/gift/dao/SmartQuizPuzzleGroupDao.java
  15. 8 8
      sourcecode/server/src/main/java/smart/gift/domain/dto/SmartNurseryPuzzlesDTO.java
  16. 3 3
      sourcecode/server/src/main/java/smart/gift/domain/dto/SmartNurseryUserDTO.java
  17. 19 41
      sourcecode/server/src/main/java/smart/gift/domain/entity/SmartNurseryPuzzleAnswerDO.java
  18. 18 38
      sourcecode/server/src/main/java/smart/gift/domain/entity/SmartNurseryPuzzleGroupDO.java
  19. 20 44
      sourcecode/server/src/main/java/smart/gift/domain/entity/SmartNurseryPuzzlesDO.java
  20. 16 32
      sourcecode/server/src/main/java/smart/gift/domain/entity/SmartNurseryTrialDO.java
  21. 12 12
      sourcecode/server/src/main/java/smart/gift/excel/ExcelBankImport.java
  22. 4 4
      sourcecode/server/src/main/java/smart/gift/framework/CommonHandlerInterceptor.java
  23. 5 6
      sourcecode/server/src/main/java/smart/gift/service/SmartNurseryPuzzleAnswerService.java
  24. 19 0
      sourcecode/server/src/main/java/smart/gift/service/SmartNurseryPuzzleGroupService.java
  25. 32 0
      sourcecode/server/src/main/java/smart/gift/service/SmartNurseryPuzzlesService.java
  26. 7 7
      sourcecode/server/src/main/java/smart/gift/service/SmartNurseryTrialService.java
  27. 0 19
      sourcecode/server/src/main/java/smart/gift/service/SmartQuizPuzzleGroupService.java
  28. 0 32
      sourcecode/server/src/main/java/smart/gift/service/SmartQuizPuzzlesService.java
  29. 30 31
      sourcecode/server/src/main/java/smart/gift/service/impl/SmartNurseryPuzzleAnswerServiceImpl.java
  30. 80 0
      sourcecode/server/src/main/java/smart/gift/service/impl/SmartNurseryPuzzleGroupServiceImpl.java
  31. 60 58
      sourcecode/server/src/main/java/smart/gift/service/impl/SmartNurseryPuzzlesServiceImpl.java
  32. 33 33
      sourcecode/server/src/main/java/smart/gift/service/impl/SmartNurseryTrialServiceImpl.java
  33. 0 83
      sourcecode/server/src/main/java/smart/gift/service/impl/SmartQuizPuzzleGroupServiceImpl.java
  34. 3 3
      sourcecode/server/src/main/java/smart/gift/service/impl/SmartUsersServiceImpl.java
  35. 15 15
      sourcecode/server/src/main/resources/mapper/SmartNurseryPuzzleAnswerMapper.xml
  36. 15 15
      sourcecode/server/src/main/resources/mapper/SmartNurseryPuzzleGroupMapper.xml
  37. 15 15
      sourcecode/server/src/main/resources/mapper/SmartNurseryPuzzlesMapper.xml
  38. 15 15
      sourcecode/server/src/main/resources/mapper/SmartNurseryTrialMapper.xml
  39. 1 1
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzleAnswer/list.ftl
  40. 0 0
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzleAnswer/save.ftl
  41. 0 0
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzleAnswer/update.ftl
  42. 1 1
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzleGroup/list.ftl
  43. 0 0
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzleGroup/save.ftl
  44. 0 0
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzleGroup/update.ftl
  45. 1 1
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzles/list.ftl
  46. 0 0
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzles/save.ftl
  47. 0 0
      sourcecode/server/src/main/resources/templates/smartNurseryPuzzles/update.ftl
  48. 1 1
      sourcecode/server/src/main/resources/templates/smartNurseryTrial/list.ftl
  49. 0 0
      sourcecode/server/src/main/resources/templates/smartNurseryTrial/save.ftl
  50. 0 0
      sourcecode/server/src/main/resources/templates/smartNurseryTrial/update.ftl
  51. 10 10
      sourcecode/server/src/test/java/smart/gift/ServerApplicationTest.java

+ 8 - 0
LICENSE

@@ -0,0 +1,8 @@
+MIT License
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ 11 - 0
README.md

@@ -0,0 +1,11 @@
+# Quiz App Back End Server
+Travis-CI : [![Build Status](https://travis-ci.com/lugt/quizapp-be-mirror.svg?token=64pqKLxUmu4gLrrosp1R&branch=master)](https://travis-ci.com/lugt/quizapp-be-mirror)
+
+答题小程序后台部分
+
+参数参见 application.properties.example
+
+部署用的脚本在 deploy 目录里面
+
+参阅 .travis.yml 查看 CI 脚本
+

+ 2 - 2
sourcecode/server/README.md

@@ -13,8 +13,8 @@ smart.gift
 |   ├── SmartMemberInfoController // "/smartMemberInfo/list"
 |   |   ├── "/smartMemberInfo/me" // 获取memberInfo
 |   |   ├── "/smartMemberInfo/fill" // 设置memberInfo @param (List<SmartMemberInfoDO>) info
-|   ├── SmartQuizTrialController // "/smartQuizTrial"
-|   |   ├── "/judging" // 用户作答上传 @param (int) type 答题模式 @param (List<SmartQuizTrialDO>) answers 用户上传答案
+|   ├── SmartNurseryTrialController // "/smartQuizTrial"
+|   |   ├── "/judging" // 用户作答上传 @param (int) type 答题模式 @param (List<SmartNurseryTrialDO>) answers 用户上传答案
 ```
 ## Return Model
 

Diff do ficheiro suprimidas por serem muito extensas
+ 143 - 143
sourcecode/server/logs/log-2019-04-02.log


+ 105 - 105
sourcecode/server/logs/log-2019-04-05.log

@@ -260,44 +260,44 @@
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartPaymentController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartPaymentDO>)
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartPaymentController.updateBatch(java.util.List<smart.gift.domain.entity.SmartPaymentDO>)
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartPaymentController.getByKey(smart.gift.domain.entity.SmartPaymentDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.list(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.savePage(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.updatePage(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.getByKey(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/handin]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.handInAnswer(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.list(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.savePage(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/handin]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.handInAnswer(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/generateExample]}" onto public smart.gift.framework.RetResult<java.lang.String> smart.gift.controller.SmartQuizPuzzleAnswerController.generateQuest(java.lang.Integer,java.lang.Integer)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.list(smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.savePage(smart.gift.domain.entity.SmartQuizPuzzleGroupDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.updatePage(smart.gift.domain.entity.SmartQuizPuzzleGroupDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.getByKey(smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.list(smart.gift.domain.entity.SmartQuizPuzzlesDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.list(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.savePage(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.list(smart.gift.domain.entity.SmartNurseryPuzzlesDO)
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/autoImport]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.autoImport(int,int,java.lang.String)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzlesDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.savePage(smart.gift.domain.entity.SmartQuizPuzzlesDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.updatePage(smart.gift.domain.entity.SmartQuizPuzzlesDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.getByKey(smart.gift.domain.entity.SmartQuizPuzzlesDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzlesDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.savePage(smart.gift.domain.entity.SmartNurseryPuzzlesDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzlesDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzlesDO)
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/pick]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.puzzlesPicking(java.lang.Integer,javax.servlet.http.HttpSession)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.list(smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.savePage(smart.gift.domain.entity.SmartQuizTrialDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.updatePage(smart.gift.domain.entity.SmartQuizTrialDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.getByKey(smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/judging]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.judge(java.lang.Integer,java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>,javax.servlet.http.HttpSession)
-[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/ranking]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.rank(java.lang.Integer,java.lang.Integer,javax.servlet.http.HttpSession)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.list(smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/listPage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/savePage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.savePage(smart.gift.domain.entity.SmartNurseryTrialDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updatePage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.updatePage(smart.gift.domain.entity.SmartNurseryTrialDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.getByKey(smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/judging]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.judge(java.lang.Integer,java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>,javax.servlet.http.HttpSession)
+[ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/ranking]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.rank(java.lang.Integer,java.lang.Integer,javax.servlet.http.HttpSession)
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartSchoolsController.list(smart.gift.domain.entity.SmartSchoolsDO)
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/autoImport]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartSchoolsController.autoImport(int,java.lang.String)
 [ INFO ] [2019-04-05 17:59:59][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/listPage]}" onto public java.lang.String smart.gift.controller.SmartSchoolsController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartSchoolsDO)
@@ -710,44 +710,44 @@
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartPaymentController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartPaymentDO>)
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartPaymentController.updateBatch(java.util.List<smart.gift.domain.entity.SmartPaymentDO>)
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartPaymentController.getByKey(smart.gift.domain.entity.SmartPaymentDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.list(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.savePage(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.updatePage(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.getByKey(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/handin]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.handInAnswer(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.list(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.savePage(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/handin]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.handInAnswer(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/generateExample]}" onto public smart.gift.framework.RetResult<java.lang.String> smart.gift.controller.SmartQuizPuzzleAnswerController.generateQuest(java.lang.Integer,java.lang.Integer)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.list(smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.savePage(smart.gift.domain.entity.SmartQuizPuzzleGroupDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.updatePage(smart.gift.domain.entity.SmartQuizPuzzleGroupDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.getByKey(smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.list(smart.gift.domain.entity.SmartQuizPuzzlesDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzlesDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.savePage(smart.gift.domain.entity.SmartQuizPuzzlesDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.updatePage(smart.gift.domain.entity.SmartQuizPuzzlesDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.getByKey(smart.gift.domain.entity.SmartQuizPuzzlesDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.list(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.savePage(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.list(smart.gift.domain.entity.SmartNurseryPuzzlesDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzlesDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.savePage(smart.gift.domain.entity.SmartNurseryPuzzlesDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzlesDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzlesDO)
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/pick]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.puzzlesPicking(java.lang.Integer,javax.servlet.http.HttpSession)
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/autoImport]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.autoImport(int,int,java.lang.String)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.list(smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.savePage(smart.gift.domain.entity.SmartQuizTrialDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.updatePage(smart.gift.domain.entity.SmartQuizTrialDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.getByKey(smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/judging]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.judge(java.lang.Integer,java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>,javax.servlet.http.HttpSession)
-[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/ranking]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.rank(java.lang.Integer,java.lang.Integer,javax.servlet.http.HttpSession)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.list(smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/listPage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/savePage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.savePage(smart.gift.domain.entity.SmartNurseryTrialDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updatePage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.updatePage(smart.gift.domain.entity.SmartNurseryTrialDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.getByKey(smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/judging]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.judge(java.lang.Integer,java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>,javax.servlet.http.HttpSession)
+[ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/ranking]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.rank(java.lang.Integer,java.lang.Integer,javax.servlet.http.HttpSession)
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartSchoolsController.list(smart.gift.domain.entity.SmartSchoolsDO)
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/listPage]}" onto public java.lang.String smart.gift.controller.SmartSchoolsController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartSchoolsDO)
 [ INFO ] [2019-04-05 18:16:37][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/savePage]}" onto public java.lang.String smart.gift.controller.SmartSchoolsController.savePage(smart.gift.domain.entity.SmartSchoolsDO,org.springframework.ui.Model)
@@ -1160,44 +1160,44 @@
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartPaymentController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartPaymentDO>)
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartPaymentController.updateBatch(java.util.List<smart.gift.domain.entity.SmartPaymentDO>)
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartPayment/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartPaymentController.getByKey(smart.gift.domain.entity.SmartPaymentDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.list(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.savePage(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.updatePage(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleAnswerDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.getByKey(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/handin]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.handInAnswer(smart.gift.domain.entity.SmartQuizPuzzleAnswerDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.list(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.savePage(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleAnswerController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleAnswerController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/handin]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleAnswerController.handInAnswer(smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO)
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleAnswer/generateExample]}" onto public smart.gift.framework.RetResult<java.lang.String> smart.gift.controller.SmartQuizPuzzleAnswerController.generateQuest(java.lang.Integer,java.lang.Integer)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.list(smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.savePage(smart.gift.domain.entity.SmartQuizPuzzleGroupDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.updatePage(smart.gift.domain.entity.SmartQuizPuzzleGroupDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzleGroupDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.getByKey(smart.gift.domain.entity.SmartQuizPuzzleGroupDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.list(smart.gift.domain.entity.SmartQuizPuzzlesDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizPuzzlesDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.savePage(smart.gift.domain.entity.SmartQuizPuzzlesDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.updatePage(smart.gift.domain.entity.SmartQuizPuzzlesDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizPuzzlesDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.getByKey(smart.gift.domain.entity.SmartQuizPuzzlesDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.list(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.savePage(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzleGroupController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzleGroupController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzleGroupDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzleGroup/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzleGroupController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzleGroupDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.list(smart.gift.domain.entity.SmartNurseryPuzzlesDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryPuzzlesDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.savePage(smart.gift.domain.entity.SmartNurseryPuzzlesDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizPuzzlesController.updatePage(smart.gift.domain.entity.SmartNurseryPuzzlesDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizPuzzlesController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryPuzzlesDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.getByKey(smart.gift.domain.entity.SmartNurseryPuzzlesDO)
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/pick]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.puzzlesPicking(java.lang.Integer,javax.servlet.http.HttpSession)
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizPuzzles/autoImport]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizPuzzlesController.autoImport(int,int,java.lang.String)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.list(smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/listPage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/savePage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.savePage(smart.gift.domain.entity.SmartQuizTrialDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updatePage]}" onto public java.lang.String smart.gift.controller.SmartQuizTrialController.updatePage(smart.gift.domain.entity.SmartQuizTrialDO,org.springframework.ui.Model)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.saveBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.updateBatch(java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.getByKey(smart.gift.domain.entity.SmartQuizTrialDO)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/judging]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartQuizTrialController.judge(java.lang.Integer,java.util.List<smart.gift.domain.entity.SmartQuizTrialDO>,javax.servlet.http.HttpSession)
-[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/ranking]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartQuizTrialController.rank(java.lang.Integer,java.lang.Integer,javax.servlet.http.HttpSession)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.list(smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/listPage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/savePage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.savePage(smart.gift.domain.entity.SmartNurseryTrialDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updatePage]}" onto public java.lang.String smart.gift.controller.SmartNurseryTrialController.updatePage(smart.gift.domain.entity.SmartNurseryTrialDO,org.springframework.ui.Model)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/saveBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.saveBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/deleteBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.deleteBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/updateBatch]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.updateBatch(java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/getByKey]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.getByKey(smart.gift.domain.entity.SmartNurseryTrialDO)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/judging]}" onto public smart.gift.framework.RetResult<java.lang.Integer> smart.gift.controller.SmartNurseryTrialController.judge(java.lang.Integer,java.util.List<smart.gift.domain.entity.SmartNurseryTrialDO>,javax.servlet.http.HttpSession)
+[ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartQuizTrial/ranking]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartNurseryTrialController.rank(java.lang.Integer,java.lang.Integer,javax.servlet.http.HttpSession)
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/list]}" onto public smart.gift.framework.RetResult smart.gift.controller.SmartSchoolsController.list(smart.gift.domain.entity.SmartSchoolsDO)
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/listPage]}" onto public java.lang.String smart.gift.controller.SmartSchoolsController.listPage(org.springframework.ui.Model,smart.gift.domain.entity.SmartSchoolsDO)
 [ INFO ] [2019-04-05 18:28:16][restartedMain]s.w.s.m.m.a.RequestMappingHandlerMapping [547] - Mapped "{[/server/smartSchools/savePage]}" onto public java.lang.String smart.gift.controller.SmartSchoolsController.savePage(smart.gift.domain.entity.SmartSchoolsDO,org.springframework.ui.Model)

+ 106 - 0
sourcecode/server/src/main/java/smart/gift/controller/SmartNurseryPuzzleAnswerController.java

@@ -0,0 +1,106 @@
+package smart.gift.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO;
+import smart.gift.framework.BaseController;
+import smart.gift.framework.BaseService;
+import smart.gift.framework.RetResult;
+import smart.gift.service.SmartNurseryPuzzleAnswerService;
+import smart.gift.service.SmartNurseryPuzzlesService;
+
+import java.util.List;
+
+/**
+ * 答题答案(smart_quiz_puzzle_answer) 的后台维护控制类 
+ * 
+ * author: Code-gen @ Szu-star
+ */ 
+@Controller
+public class SmartNurseryPuzzleAnswerController extends BaseController<SmartNurseryPuzzleAnswerDO> {
+
+    @Autowired
+    private SmartNurseryPuzzleAnswerService smartNurseryPuzzleAnswerService;
+
+    @Autowired
+    SmartNurseryPuzzlesService smartNurseryPuzzlesService;
+
+    public SmartNurseryPuzzleAnswerController(BaseService<SmartNurseryPuzzleAnswerDO> baseService) {
+        super(baseService);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/list")
+    @ResponseBody
+    @Override
+    @SuppressWarnings("rawtypes")
+    public RetResult list(SmartNurseryPuzzleAnswerDO example) {
+        return super.list(example);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/listPage")
+    @Override
+    public String listPage(Model model, SmartNurseryPuzzleAnswerDO example) {
+        return super.listPage(model, example);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/savePage")
+    @Override
+    public String savePage(SmartNurseryPuzzleAnswerDO t, Model model) {
+        return super.savePage(t, model);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/updatePage")
+    @Override
+    public String updatePage(SmartNurseryPuzzleAnswerDO t, Model model) {
+        return super.updatePage(t, model);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/saveBatch")
+    @ResponseBody
+    @Override
+    public RetResult<Integer> saveBatch(@RequestBody List<SmartNurseryPuzzleAnswerDO> list) {
+        return super.saveBatch(list);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/deleteBatch")
+    @ResponseBody
+    @Override
+    public RetResult<Integer> deleteBatch(@RequestBody List<SmartNurseryPuzzleAnswerDO> list) {
+        return super.deleteBatch(list);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/updateBatch")
+    @ResponseBody
+    @Override
+    public RetResult<Integer> updateBatch(@RequestBody List<SmartNurseryPuzzleAnswerDO> list) {
+        return super.updateBatch(list);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/getByKey")
+    @ResponseBody
+    @SuppressWarnings("rawtypes")
+    public RetResult getByKey(SmartNurseryPuzzleAnswerDO key) {
+        return super.getByKey(key);
+    }
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/handin")
+    @ResponseBody
+    @SuppressWarnings("rawtypes")
+    public RetResult handInAnswer(SmartNurseryPuzzleAnswerDO key) {
+        return super.getByKey(key);
+    }
+
+
+    @RequestMapping("/smartNurseryPuzzleAnswer/generateExample")
+    @ResponseBody
+    public RetResult<String> generateQuest(Integer groupId, Integer total) {
+        smartNurseryPuzzleAnswerService.generateMathQuestions(groupId, total);
+        return new RetResult<>("OK");
+    }
+
+}
+

+ 27 - 28
sourcecode/server/src/main/java/smart/gift/controller/SmartQuizPuzzleGroupController.java → sourcecode/server/src/main/java/smart/gift/controller/SmartNurseryPuzzleGroupController.java

@@ -1,86 +1,85 @@
 package smart.gift.controller;
 
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-
-import smart.gift.domain.entity.SmartQuizPuzzleGroupDO;
-import smart.gift.framework.RetResult;
+import smart.gift.domain.entity.SmartNurseryPuzzleGroupDO;
 import smart.gift.framework.BaseController;
 import smart.gift.framework.BaseService;
-import smart.gift.service.SmartQuizPuzzleGroupService;
+import smart.gift.framework.RetResult;
+import smart.gift.service.SmartNurseryPuzzleGroupService;
+
+import java.util.List;
 
 /**
- * 答题题库(smart_quiz_puzzle_group) 的后台维护控制类
- * <p>
+ * 答题题库(smart_quiz_puzzle_group) 的后台维护控制类 
+ * 
  * author: Code-gen @ Szu-star
- */
+ */ 
 @Controller
-public class SmartQuizPuzzleGroupController extends BaseController<SmartQuizPuzzleGroupDO> {
+public class SmartNurseryPuzzleGroupController extends BaseController<SmartNurseryPuzzleGroupDO> {
 
     @Autowired
-    private SmartQuizPuzzleGroupService smartQuizPuzzleGroupService;
+    private SmartNurseryPuzzleGroupService smartNurseryPuzzleGroupService;
 
-    public SmartQuizPuzzleGroupController(BaseService<SmartQuizPuzzleGroupDO> baseService) {
+    public SmartNurseryPuzzleGroupController(BaseService<SmartNurseryPuzzleGroupDO> baseService) {
         super(baseService);
     }
 
-    @RequestMapping("/smartQuizPuzzleGroup/list")
+    @RequestMapping("/smartNurseryPuzzleGroup/list")
     @ResponseBody
     @Override
     @SuppressWarnings("rawtypes")
-    public RetResult list(SmartQuizPuzzleGroupDO example) {
+    public RetResult list(SmartNurseryPuzzleGroupDO example) {
         return super.list(example);
     }
 
-    @RequestMapping("/smartQuizPuzzleGroup/listPage")
+    @RequestMapping("/smartNurseryPuzzleGroup/listPage")
     @Override
-    public String listPage(Model model, SmartQuizPuzzleGroupDO example) {
+    public String listPage(Model model, SmartNurseryPuzzleGroupDO example) {
         return super.listPage(model, example);
     }
 
-    @RequestMapping("/smartQuizPuzzleGroup/savePage")
+    @RequestMapping("/smartNurseryPuzzleGroup/savePage")
     @Override
-    public String savePage(SmartQuizPuzzleGroupDO t, Model model) {
+    public String savePage(SmartNurseryPuzzleGroupDO t, Model model) {
         return super.savePage(t, model);
     }
 
-    @RequestMapping("/smartQuizPuzzleGroup/updatePage")
+    @RequestMapping("/smartNurseryPuzzleGroup/updatePage")
     @Override
-    public String updatePage(SmartQuizPuzzleGroupDO t, Model model) {
+    public String updatePage(SmartNurseryPuzzleGroupDO t, Model model) {
         return super.updatePage(t, model);
     }
 
-    @RequestMapping("/smartQuizPuzzleGroup/saveBatch")
+    @RequestMapping("/smartNurseryPuzzleGroup/saveBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> saveBatch(@RequestBody List<SmartQuizPuzzleGroupDO> list) {
+    public RetResult<Integer> saveBatch(@RequestBody List<SmartNurseryPuzzleGroupDO> list) {
         return super.saveBatch(list);
     }
 
-    @RequestMapping("/smartQuizPuzzleGroup/deleteBatch")
+    @RequestMapping("/smartNurseryPuzzleGroup/deleteBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> deleteBatch(@RequestBody List<SmartQuizPuzzleGroupDO> list) {
+    public RetResult<Integer> deleteBatch(@RequestBody List<SmartNurseryPuzzleGroupDO> list) {
         return super.deleteBatch(list);
     }
 
-    @RequestMapping("/smartQuizPuzzleGroup/updateBatch")
+    @RequestMapping("/smartNurseryPuzzleGroup/updateBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> updateBatch(@RequestBody List<SmartQuizPuzzleGroupDO> list) {
+    public RetResult<Integer> updateBatch(@RequestBody List<SmartNurseryPuzzleGroupDO> list) {
         return super.updateBatch(list);
     }
 
-    @RequestMapping("/smartQuizPuzzleGroup/getByKey")
+    @RequestMapping("/smartNurseryPuzzleGroup/getByKey")
     @ResponseBody
     @SuppressWarnings("rawtypes")
-    public RetResult getByKey(SmartQuizPuzzleGroupDO key) {
+    public RetResult getByKey(SmartNurseryPuzzleGroupDO key) {
         return super.getByKey(key);
     }
 

+ 54 - 53
sourcecode/server/src/main/java/smart/gift/controller/SmartQuizPuzzlesController.java → sourcecode/server/src/main/java/smart/gift/controller/SmartNurseryPuzzlesController.java

@@ -1,46 +1,45 @@
 package smart.gift.controller;
 
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import com.csvreader.CsvReader;
 import io.opentracing.Span;
 import io.opentracing.util.GlobalTracer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockHttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-
-import smart.gift.domain.dto.SmartQuizPuzzlesDTO;
-import smart.gift.domain.entity.SmartQuizPuzzleAnswerDO;
-import smart.gift.domain.entity.SmartQuizPuzzlesDO;
+import smart.gift.domain.dto.SmartNurseryPuzzlesDTO;
+import smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO;
+import smart.gift.domain.entity.SmartNurseryPuzzlesDO;
 import smart.gift.domain.entity.SmartUsersDO;
-import smart.gift.framework.Ret;
-import smart.gift.framework.RetResult;
 import smart.gift.framework.BaseController;
 import smart.gift.framework.BaseService;
-import smart.gift.service.*;
-import smart.gift.service.impl.SmartQuizPuzzlesServiceImpl;
+import smart.gift.framework.RetResult;
+import smart.gift.service.SmartMemberInfoService;
+import smart.gift.service.SmartNurseryPuzzleAnswerService;
+import smart.gift.service.SmartNurseryPuzzlesService;
+import smart.gift.service.SmartUsersService;
+import smart.gift.service.impl.SmartNurseryPuzzlesServiceImpl;
 
 import javax.servlet.http.HttpSession;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
- * 答题题目(smart_quiz_puzzles) 的后台维护控制类
- * <p>
+ * 答题题目(smart_quiz_puzzles) 的后台维护控制类 
+ * 
  * author: Code-gen @ Szu-star
- */
+ */ 
 @Controller
-public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesDO> {
+public class SmartNurseryPuzzlesController extends BaseController<SmartNurseryPuzzlesDO> {
 
     @Autowired
-    private SmartQuizPuzzlesService smartQuizPuzzlesService;
+    private SmartNurseryPuzzlesService smartNurseryPuzzlesService;
 
     @Autowired
     private SmartUsersService smartUsersService;
@@ -49,72 +48,73 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
     private SmartMemberInfoService smartMemberInfoService;
 
     @Autowired
-    private SmartQuizPuzzleAnswerService smartQuizPuzzleAnswerService;
+    private SmartNurseryPuzzleAnswerService smartNurseryPuzzleAnswerService;
 
-    public SmartQuizPuzzlesController(BaseService<SmartQuizPuzzlesDO> baseService) {
+    public SmartNurseryPuzzlesController(BaseService<SmartNurseryPuzzlesDO> baseService) {
         super(baseService);
     }
 
-    @RequestMapping("/smartQuizPuzzles/list")
+    @RequestMapping("/smartNurseryPuzzles/list")
     @ResponseBody
     @Override
     @SuppressWarnings("rawtypes")
-    public RetResult list(SmartQuizPuzzlesDO example) {
+    public RetResult list(SmartNurseryPuzzlesDO example) {
         return super.list(example);
     }
 
-    @RequestMapping("/smartQuizPuzzles/listPage")
+    @RequestMapping("/smartNurseryPuzzles/listPage")
     @Override
-    public String listPage(Model model, SmartQuizPuzzlesDO example) {
+    public String listPage(Model model, SmartNurseryPuzzlesDO example) {
         return super.listPage(model, example);
     }
 
-    @RequestMapping("/smartQuizPuzzles/savePage")
+    @RequestMapping("/smartNurseryPuzzles/savePage")
     @Override
-    public String savePage(SmartQuizPuzzlesDO t, Model model) {
+    public String savePage(SmartNurseryPuzzlesDO t, Model model) {
         return super.savePage(t, model);
     }
 
-    @RequestMapping("/smartQuizPuzzles/updatePage")
+    @RequestMapping("/smartNurseryPuzzles/updatePage")
     @Override
-    public String updatePage(SmartQuizPuzzlesDO t, Model model) {
+    public String updatePage(SmartNurseryPuzzlesDO t, Model model) {
         return super.updatePage(t, model);
     }
 
-    @RequestMapping("/smartQuizPuzzles/saveBatch")
+    @RequestMapping("/smartNurseryPuzzles/saveBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> saveBatch(@RequestBody List<SmartQuizPuzzlesDO> list) {
+    public RetResult<Integer> saveBatch(@RequestBody List<SmartNurseryPuzzlesDO> list) {
         return super.saveBatch(list);
     }
 
-    @RequestMapping("/smartQuizPuzzles/deleteBatch")
+    @RequestMapping("/smartNurseryPuzzles/deleteBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> deleteBatch(@RequestBody List<SmartQuizPuzzlesDO> list) {
+    public RetResult<Integer> deleteBatch(@RequestBody List<SmartNurseryPuzzlesDO> list) {
         return super.deleteBatch(list);
     }
 
-    @RequestMapping("/smartQuizPuzzles/updateBatch")
+    @RequestMapping("/smartNurseryPuzzles/updateBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> updateBatch(@RequestBody List<SmartQuizPuzzlesDO> list) {
+    public RetResult<Integer> updateBatch(@RequestBody List<SmartNurseryPuzzlesDO> list) {
         return super.updateBatch(list);
     }
 
-    @RequestMapping("/smartQuizPuzzles/getByKey")
+    @RequestMapping("/smartNurseryPuzzles/getByKey")
     @ResponseBody
     @SuppressWarnings("rawtypes")
-    public RetResult getByKey(SmartQuizPuzzlesDO key) {
+    public RetResult getByKey(SmartNurseryPuzzlesDO key) {
         return super.getByKey(key);
     }
 
 
     /**
+     *
      * @param type 答题类型 (赛季(可能2次)= 1,每日 = 2,练题(不记分,随机抽题目)= 3,错题回顾(不记分)= 4, 错题本 = 5)
      * @return
      */
-    @RequestMapping("/smartQuizPuzzles/pick")
+    @RequestMapping("/smartNurseryPuzzles/pick")
     @ResponseBody
     @SuppressWarnings("rawtypes")
     public RetResult puzzlesPicking(Integer type, HttpSession session) {
@@ -156,16 +156,16 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
         //TODO: use user info to choose puzzle group
         //TODO: transmit getPage() and getPageSize()
         //TODO: 将grade计算成分数写进grade
-        List<SmartQuizPuzzlesDTO> puzzles = smartQuizPuzzlesService.pickByType(type, difficulty, session);
+        List<SmartNurseryPuzzlesDTO> puzzles = smartNurseryPuzzlesService.pickByType(type, difficulty, session);
 
         if (type < 4) {
-            if (puzzles.size() != SmartQuizPuzzlesServiceImpl.PUZZLESSIZE) {
+            if (puzzles.size() != SmartNurseryPuzzlesServiceImpl.PUZZLESSIZE) {
                 span.log("INADEQUATE_PUZZLES");
                 return RetResult.errorRet("INADEQUATE_PUZZLES");
             }
         } else {
             if (puzzles == null || puzzles.size() == 0) {
-                RetResult<List<SmartQuizPuzzlesDTO>> res = new RetResult<>();
+                RetResult<List<SmartNurseryPuzzlesDTO>> res = new RetResult<>();
                 res.setRet("9000");
                 res.setModel(puzzles);
                 res.setDetail("[NO_WRONG_PUZZLES]");
@@ -176,7 +176,7 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
         }
 
 
-        RetResult<List<SmartQuizPuzzlesDTO>> res = new RetResult<>();
+        RetResult<List<SmartNurseryPuzzlesDTO>> res = new RetResult<>();
         res.setRet("10000");
         res.setModel(puzzles);
         span.log("SUCCESS");
@@ -185,20 +185,21 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
     }
 
     /**
+     *
      * @param type type = 1 单选 type = 2 多选
      * @param uri  [文件地址] 格式要求:编号 | 题目 | A | B | C | 答案
-     *             x    题干   A   B   C    A | B | C
+     *                                x    题干   A   B   C    A | B | C
      * @return
      */
-    @RequestMapping("/smartQuizPuzzles/autoImport")
+    @RequestMapping("/smartNurseryPuzzles/autoImport")
     @ResponseBody
     public RetResult autoImport(int groupid, int type, String uri) {
         CsvReader reader = null;
 
         Logger logger = LoggerFactory.getLogger("[PuzzleAutoImport]");
 
-        List<SmartQuizPuzzlesDO> puzzles = new ArrayList<>();
-        List<SmartQuizPuzzleAnswerDO> answers = new ArrayList<>();
+        List<SmartNurseryPuzzlesDO> puzzles = new ArrayList<>();
+        List<SmartNurseryPuzzleAnswerDO> answers = new ArrayList<>();
 
         int diff = 0;
 
@@ -215,7 +216,7 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
                 String correct_option = reader.get("答案");
 
 
-                SmartQuizPuzzlesDO one_puzzle = new SmartQuizPuzzlesDO();
+                SmartNurseryPuzzlesDO one_puzzle = new SmartNurseryPuzzlesDO();
                 one_puzzle.setGroupId(groupid);
                 one_puzzle.setPuzzleType(type);
                 one_puzzle.setProbability(1000);
@@ -232,12 +233,12 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
 
                 logger.info("[ONE PUZZLE] " + one_puzzle);
 
-                smartQuizPuzzlesService.save(one_puzzle);
-                int puzzle_id = smartQuizPuzzlesService.listByExample(1, 10, one_puzzle).get(0).getPuzzleId();
+                smartNurseryPuzzlesService.save(one_puzzle);
+                int puzzle_id = smartNurseryPuzzlesService.listByExample(1, 10, one_puzzle).get(0).getPuzzleId();
 
                 logger.info("[PUZZLE ID] " + puzzle_id);
 
-                SmartQuizPuzzleAnswerDO answer_A = new SmartQuizPuzzleAnswerDO();
+                SmartNurseryPuzzleAnswerDO answer_A = new SmartNurseryPuzzleAnswerDO();
                 answer_A.setPuzzleId(puzzle_id);
                 answer_A.setAnswerKind(1);
                 answer_A.setContent(optionA);
@@ -254,7 +255,7 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
                 }
                 answers.add(answer_A);
 
-                SmartQuizPuzzleAnswerDO answer_B = new SmartQuizPuzzleAnswerDO();
+                SmartNurseryPuzzleAnswerDO answer_B = new SmartNurseryPuzzleAnswerDO();
                 answer_B.setPuzzleId(puzzle_id);
                 answer_B.setAnswerKind(1);
                 answer_B.setContent(optionB);
@@ -271,7 +272,7 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
                 }
                 answers.add(answer_B);
 
-                SmartQuizPuzzleAnswerDO answer_C = new SmartQuizPuzzleAnswerDO();
+                SmartNurseryPuzzleAnswerDO answer_C = new SmartNurseryPuzzleAnswerDO();
                 answer_C.setPuzzleId(puzzle_id);
                 answer_C.setAnswerKind(1);
                 answer_C.setContent(optionC);
@@ -289,7 +290,7 @@ public class SmartQuizPuzzlesController extends BaseController<SmartQuizPuzzlesD
                 answers.add(answer_C);
 
             }
-            smartQuizPuzzleAnswerService.saveBatch(answers);
+            smartNurseryPuzzleAnswerService.saveBatch(answers);
 
         } catch (Exception e) {
             e.printStackTrace();

+ 45 - 48
sourcecode/server/src/main/java/smart/gift/controller/SmartQuizTrialController.java → sourcecode/server/src/main/java/smart/gift/controller/SmartNurseryTrialController.java

@@ -1,10 +1,5 @@
 package smart.gift.controller;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,29 +9,31 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-
-import smart.gift.ServerApplication;
-import smart.gift.domain.dto.*;
-import smart.gift.domain.entity.*;
-import smart.gift.framework.RetResult;
+import smart.gift.domain.dto.SmartRankedDTOWrapper;
+import smart.gift.domain.dto.SmartRankedUsersDTOWrapper;
+import smart.gift.domain.entity.SmartNurseryTrialDO;
+import smart.gift.domain.entity.SmartUsersDO;
 import smart.gift.framework.BaseController;
 import smart.gift.framework.BaseService;
-import smart.gift.service.*;
+import smart.gift.framework.RetResult;
+import smart.gift.service.SmartMemberInfoService;
+import smart.gift.service.SmartNurseryPuzzlesService;
+import smart.gift.service.SmartNurseryTrialService;
+import smart.gift.service.SmartUsersService;
 
 import javax.servlet.http.HttpSession;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import java.util.List;
 
 /**
- * 答题结果(smart_quiz_trial) 的后台维护控制类
- * <p>
+ * 答题结果(smart_quiz_trial) 的后台维护控制类 
+ * 
  * author: Code-gen @ Szu-star
- */
+ */ 
 @Controller
-public class SmartQuizTrialController extends BaseController<SmartQuizTrialDO> {
+public class SmartNurseryTrialController extends BaseController<SmartNurseryTrialDO> {
 
     @Autowired
-    private SmartQuizTrialService smartQuizTrialService;
+    private SmartNurseryTrialService smartNurseryTrialService;
 
     @Autowired
     private SmartUsersService smartUsersService;
@@ -45,79 +42,80 @@ public class SmartQuizTrialController extends BaseController<SmartQuizTrialDO> {
     private SmartMemberInfoService smartMemberInfoService;
 
     @Autowired
-    private SmartQuizPuzzlesService smartQuizPuzzlesService;
+    private SmartNurseryPuzzlesService smartNurseryPuzzlesService;
 
-    static Logger logger = LoggerFactory.getLogger(SmartQuizTrialController.class);
+    static Logger logger = LoggerFactory.getLogger(SmartNurseryTrialController.class);
 
 
-    public SmartQuizTrialController(BaseService<SmartQuizTrialDO> baseService) {
+    public SmartNurseryTrialController(BaseService<SmartNurseryTrialDO> baseService) {
         super(baseService);
     }
 
-    @RequestMapping("/smartQuizTrial/list")
+    @RequestMapping("/smartNurseryTrial/list")
     @ResponseBody
     @Override
     @SuppressWarnings("rawtypes")
-    public RetResult list(SmartQuizTrialDO example) {
+    public RetResult list(SmartNurseryTrialDO example) {
         return super.list(example);
     }
 
-    @RequestMapping("/smartQuizTrial/listPage")
+    @RequestMapping("/smartNurseryTrial/listPage")
     @Override
-    public String listPage(Model model, SmartQuizTrialDO example) {
+    public String listPage(Model model, SmartNurseryTrialDO example) {
         return super.listPage(model, example);
     }
 
-    @RequestMapping("/smartQuizTrial/savePage")
+    @RequestMapping("/smartNurseryTrial/savePage")
     @Override
-    public String savePage(SmartQuizTrialDO t, Model model) {
+    public String savePage(SmartNurseryTrialDO t, Model model) {
         return super.savePage(t, model);
     }
 
-    @RequestMapping("/smartQuizTrial/updatePage")
+    @RequestMapping("/smartNurseryTrial/updatePage")
     @Override
-    public String updatePage(SmartQuizTrialDO t, Model model) {
+    public String updatePage(SmartNurseryTrialDO t, Model model) {
         return super.updatePage(t, model);
     }
 
-    @RequestMapping("/smartQuizTrial/saveBatch")
+    @RequestMapping("/smartNurseryTrial/saveBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> saveBatch(@RequestBody List<SmartQuizTrialDO> list) {
+    public RetResult<Integer> saveBatch(@RequestBody List<SmartNurseryTrialDO> list) {
         return super.saveBatch(list);
     }
 
-    @RequestMapping("/smartQuizTrial/deleteBatch")
+    @RequestMapping("/smartNurseryTrial/deleteBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> deleteBatch(@RequestBody List<SmartQuizTrialDO> list) {
+    public RetResult<Integer> deleteBatch(@RequestBody List<SmartNurseryTrialDO> list) {
         return super.deleteBatch(list);
     }
 
-    @RequestMapping("/smartQuizTrial/updateBatch")
+    @RequestMapping("/smartNurseryTrial/updateBatch")
     @ResponseBody
     @Override
-    public RetResult<Integer> updateBatch(@RequestBody List<SmartQuizTrialDO> list) {
+    public RetResult<Integer> updateBatch(@RequestBody List<SmartNurseryTrialDO> list) {
         return super.updateBatch(list);
     }
 
-    @RequestMapping("/smartQuizTrial/getByKey")
+    @RequestMapping("/smartNurseryTrial/getByKey")
     @ResponseBody
     @SuppressWarnings("rawtypes")
-    public RetResult getByKey(SmartQuizTrialDO key) {
+    public RetResult getByKey(SmartNurseryTrialDO key) {
         return super.getByKey(key);
     }
 
 
     /**
-     * @param type    答题模式
+     *
+     * @param type 答题模式
      * @param answers 用户上传答案
      * @param session 用户会话
      * @return 答对数目
      */
-    @RequestMapping("/smartQuizTrial/judging")
+    @RequestMapping("/smartNurseryTrial/judging")
     @ResponseBody
-    public RetResult<Integer> judge(@RequestParam Integer type, @RequestBody List<SmartQuizTrialDO> answers, HttpSession session) {
+    public RetResult<Integer> judge(@RequestParam Integer type, @RequestBody List<SmartNurseryTrialDO> answers, HttpSession session) {
 
         //对答案做批对
         if (type < 1 || type > 4) {
@@ -137,19 +135,18 @@ public class SmartQuizTrialController extends BaseController<SmartQuizTrialDO> {
             }
         }
 
-        return smartQuizTrialService.judge(type, answers, user);
+        return smartNurseryTrialService.judge(type, answers, user);
     }
 
 
     /**
      * TODO: Need to discuss
-     *
      * @param individual 排行主体 1 = 个人,2 = 学校,3 = 区
      * @param gross      排行总体 1 = 学校,2 = 区/县,3 = 市
      * @param session    会话
      * @return
      */
-    @RequestMapping("/smartQuizTrial/ranking")
+    @RequestMapping("/smartNurseryTrial/ranking")
     @ResponseBody
     public RetResult rank(@RequestParam Integer individual, @RequestParam Integer gross, HttpSession session) {
         if (session == null) {
@@ -182,7 +179,7 @@ public class SmartQuizTrialController extends BaseController<SmartQuizTrialDO> {
             if (school == null) {
                 return RetResult.errorRet("EMPTY_SCHOOL");
             }
-            SmartRankedUsersDTOWrapper ranked = smartQuizTrialService
+            SmartRankedUsersDTOWrapper ranked = smartNurseryTrialService
                     .individualRanking(user.getUid(), grossKind, school, getPage(), getPageSize());
             if (ranked != null) {
                 return new RetResult<>(ranked);
@@ -206,7 +203,7 @@ public class SmartQuizTrialController extends BaseController<SmartQuizTrialDO> {
             if (district == null) {
                 return RetResult.errorRet("EMPTY_DISTRICT");
             }
-            SmartRankedDTOWrapper ranked = smartQuizTrialService.aggregateRanking(6000, school, infoKind, district, getPage(), getPageSize());
+            SmartRankedDTOWrapper ranked = smartNurseryTrialService.aggregateRanking(6000, school, infoKind, district, getPage(), getPageSize());
             if (ranked != null) {
                 return new RetResult<>(ranked);
             }
@@ -220,7 +217,7 @@ public class SmartQuizTrialController extends BaseController<SmartQuizTrialDO> {
             if (city == null) {
                 return RetResult.errorRet("EMPTY_CITY");
             }
-            SmartRankedDTOWrapper ranked = smartQuizTrialService.aggregateRanking(5000, district, 4000, city, getPage(), getPageSize());
+            SmartRankedDTOWrapper ranked = smartNurseryTrialService.aggregateRanking(5000, district, 4000, city, getPage(), getPageSize());
             if (ranked != null) {
                 RetResult result = new RetResult();
                 result.setRet("10000");
@@ -232,7 +229,7 @@ public class SmartQuizTrialController extends BaseController<SmartQuizTrialDO> {
         return RetResult.errorRet("RANK_FAIL");
     }
 
-//    @RequestMapping("/smartQuizTrial/")
+//    @RequestMapping("/smartNurseryTrial/")
 //    @ResponseBody
 //    @SuppressWarnings("unchecked")
 //    public RetResult AllPuzzles(HttpSession session) {
@@ -242,7 +239,7 @@ public class SmartQuizTrialController extends BaseController<SmartQuizTrialDO> {
 //
 //        SmartUsersDO user = smartUsersService.getBySession(session);
 //
-//        List<SmartQuizPuzzlesDTO> puzzles = smartQuizTrialService.reviewPuzzles(user);
+//        List<SmartNurseryPuzzlesDTO> puzzles = SmartNurseryTrialService.reviewPuzzles(user);
 //
 //        return new RetResult<>(puzzles);
 //    }

+ 0 - 107
sourcecode/server/src/main/java/smart/gift/controller/SmartQuizPuzzleAnswerController.java

@@ -1,107 +0,0 @@
-package smart.gift.controller;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import smart.gift.domain.entity.SmartQuizPuzzleAnswerDO;
-import smart.gift.framework.RetResult;
-import smart.gift.framework.BaseController;
-import smart.gift.framework.BaseService;
-import smart.gift.service.SmartQuizPuzzleAnswerService;
-import smart.gift.service.SmartQuizPuzzlesService;
-
-/**
- * 答题答案(smart_quiz_puzzle_answer) 的后台维护控制类
- * <p>
- * author: Code-gen @ Szu-star
- */
-@Controller
-public class SmartQuizPuzzleAnswerController extends BaseController<SmartQuizPuzzleAnswerDO> {
-
-    @Autowired
-    private SmartQuizPuzzleAnswerService smartQuizPuzzleAnswerService;
-
-    @Autowired
-    SmartQuizPuzzlesService smartQuizPuzzlesService;
-
-    public SmartQuizPuzzleAnswerController(BaseService<SmartQuizPuzzleAnswerDO> baseService) {
-        super(baseService);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/list")
-    @ResponseBody
-    @Override
-    @SuppressWarnings("rawtypes")
-    public RetResult list(SmartQuizPuzzleAnswerDO example) {
-        return super.list(example);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/listPage")
-    @Override
-    public String listPage(Model model, SmartQuizPuzzleAnswerDO example) {
-        return super.listPage(model, example);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/savePage")
-    @Override
-    public String savePage(SmartQuizPuzzleAnswerDO t, Model model) {
-        return super.savePage(t, model);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/updatePage")
-    @Override
-    public String updatePage(SmartQuizPuzzleAnswerDO t, Model model) {
-        return super.updatePage(t, model);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/saveBatch")
-    @ResponseBody
-    @Override
-    public RetResult<Integer> saveBatch(@RequestBody List<SmartQuizPuzzleAnswerDO> list) {
-        return super.saveBatch(list);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/deleteBatch")
-    @ResponseBody
-    @Override
-    public RetResult<Integer> deleteBatch(@RequestBody List<SmartQuizPuzzleAnswerDO> list) {
-        return super.deleteBatch(list);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/updateBatch")
-    @ResponseBody
-    @Override
-    public RetResult<Integer> updateBatch(@RequestBody List<SmartQuizPuzzleAnswerDO> list) {
-        return super.updateBatch(list);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/getByKey")
-    @ResponseBody
-    @SuppressWarnings("rawtypes")
-    public RetResult getByKey(SmartQuizPuzzleAnswerDO key) {
-        return super.getByKey(key);
-    }
-
-    @RequestMapping("/smartQuizPuzzleAnswer/handin")
-    @ResponseBody
-    @SuppressWarnings("rawtypes")
-    public RetResult handInAnswer(SmartQuizPuzzleAnswerDO key) {
-        return super.getByKey(key);
-    }
-
-
-    @RequestMapping("/smartQuizPuzzleAnswer/generateExample")
-    @ResponseBody
-    public RetResult<String> generateQuest(Integer groupId, Integer total) {
-        smartQuizPuzzleAnswerService.generateMathQuestions(groupId, total);
-        return new RetResult<>("OK");
-    }
-
-}
-

+ 3 - 3
sourcecode/server/src/main/java/smart/gift/controller/WxMaUserController.java

@@ -22,7 +22,7 @@ import smart.gift.framework.RetResult;
 import smart.gift.handler.WxMaConfiguration;
 import smart.gift.listener.UserCounter;
 import smart.gift.service.SmartMemberInfoService;
-import smart.gift.service.SmartQuizTrialService;
+import smart.gift.service.SmartNurseryTrialService;
 import smart.gift.service.SmartUsersService;
 import smart.gift.utils.DateUtils;
 import smart.gift.utils.JsonUtils;
@@ -54,7 +54,7 @@ public class WxMaUserController {
     private SmartMemberInfoService smartMemberInfoService;
 
     @Autowired
-    private SmartQuizTrialService smartQuizTrialService;
+    private SmartNurseryTrialService smartNurseryTrialService;
 
     private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -176,7 +176,7 @@ public class WxMaUserController {
                 RetResult addADay = smartMemberInfoService.addADay(user); // 登陆天数加1
                 logger.info("[AddADay] " + addADay);
 
-                RetResult refresh = smartQuizTrialService.refreshTimes(user);
+                RetResult refresh = smartNurseryTrialService.refreshTimes(user);
                 logger.info(refresh.toString());
 
                 user.setLastLoginTime(format.parse(now));

+ 3 - 3
sourcecode/server/src/main/java/smart/gift/dao/SmartQuizPuzzleAnswerDao.java → sourcecode/server/src/main/java/smart/gift/dao/SmartNurseryPuzzleAnswerDao.java

@@ -2,16 +2,16 @@ package smart.gift.dao;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import smart.gift.domain.entity.SmartQuizPuzzleAnswerDO;
+import smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO;
 import smart.gift.framework.BaseDao;
 
 /**
- * 答题答案(smart_quiz_puzzle_answer) 实体类的Dao
+ * 答题答案(smart_nursery_puzzle_answer) 实体类的Dao
  * <p>
  * author: Code-gen @ Szu-star
  */
 @Mapper
-public interface SmartQuizPuzzleAnswerDao extends BaseDao<SmartQuizPuzzleAnswerDO> {
+public interface SmartNurseryPuzzleAnswerDao extends BaseDao<SmartNurseryPuzzleAnswerDO> {
 
     // 非常规sql写这里--- xml 自动生成,不再手动在xml中写sql !! 
 

+ 19 - 0
sourcecode/server/src/main/java/smart/gift/dao/SmartNurseryPuzzleGroupDao.java

@@ -0,0 +1,19 @@
+package smart.gift.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import smart.gift.domain.entity.SmartNurseryPuzzleGroupDO;
+import smart.gift.framework.BaseDao;
+
+/**
+ * 答题题库(smart_nursery_puzzle_group) 实体类的Dao 
+ * 
+ * author: Code-gen @ Szu-star
+ */
+@Mapper
+public interface SmartNurseryPuzzleGroupDao extends BaseDao<SmartNurseryPuzzleGroupDO> {
+
+    // 非常规sql写这里--- xml 自动生成,不再手动在xml中写sql !! 
+
+}
+

+ 0 - 24
sourcecode/server/src/main/java/smart/gift/dao/SmartQuizPuzzleGroupDao.java

@@ -1,24 +0,0 @@
-package smart.gift.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import org.apache.poi.ss.formula.functions.T;
-import smart.gift.domain.entity.SmartQuizPuzzleGroupDO;
-import smart.gift.domain.entity.SmartQuizPuzzlesDO;
-import smart.gift.framework.BaseDao;
-
-import java.util.List;
-
-/**
- * 答题题库(smart_quiz_puzzle_group) 实体类的Dao
- * <p>
- * author: Code-gen @ Szu-star
- */
-@Mapper
-public interface SmartQuizPuzzleGroupDao extends BaseDao<SmartQuizPuzzleGroupDO> {
-
-    // 非常规sql写这里--- xml 自动生成,不再手动在xml中写sql !!
-
-
-}
-

+ 8 - 8
sourcecode/server/src/main/java/smart/gift/domain/dto/SmartQuizPuzzlesDTO.java → sourcecode/server/src/main/java/smart/gift/domain/dto/SmartNurseryPuzzlesDTO.java

@@ -1,18 +1,18 @@
 package smart.gift.domain.dto;
 
-import smart.gift.domain.entity.SmartQuizPuzzleAnswerDO;
-import smart.gift.domain.entity.SmartQuizPuzzlesDO;
+import smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO;
+import smart.gift.domain.entity.SmartNurseryPuzzlesDO;
 
 import java.util.List;
 
-public class SmartQuizPuzzlesDTO extends SmartQuizPuzzlesDO {
-    private List<SmartQuizPuzzleAnswerDO> answers;
+public class SmartNurseryPuzzlesDTO extends SmartNurseryPuzzlesDO {
+    private List<SmartNurseryPuzzleAnswerDO> answers;
 
-    public SmartQuizPuzzlesDTO() {
+    public SmartNurseryPuzzlesDTO() {
 
     }
 
-    public SmartQuizPuzzlesDTO(SmartQuizPuzzlesDO sqpd) {
+    public SmartNurseryPuzzlesDTO(SmartNurseryPuzzlesDO sqpd) {
         setContent(sqpd.getContent());
         setCreateTime(sqpd.getCreateTime());
         setCreateUser(sqpd.getCreateUser());
@@ -27,7 +27,7 @@ public class SmartQuizPuzzlesDTO extends SmartQuizPuzzlesDO {
         setTrials(sqpd.getTrials());
     }
 
-    public List<SmartQuizPuzzleAnswerDO> getAnswers() {
+    public List<SmartNurseryPuzzleAnswerDO> getAnswers() {
         return answers;
     }
 
@@ -35,7 +35,7 @@ public class SmartQuizPuzzlesDTO extends SmartQuizPuzzlesDO {
 
     }
 
-    public void setAnswers(List<SmartQuizPuzzleAnswerDO> answers) {
+    public void setAnswers(List<SmartNurseryPuzzleAnswerDO> answers) {
         this.answers = answers;
     }
 }

+ 3 - 3
sourcecode/server/src/main/java/smart/gift/domain/dto/SmartQuizUserDTO.java → sourcecode/server/src/main/java/smart/gift/domain/dto/SmartNurseryUserDTO.java

@@ -2,15 +2,15 @@ package smart.gift.domain.dto;
 
 import smart.gift.domain.entity.SmartUsersDO;
 
-public class SmartQuizUserDTO {
+public class SmartNurseryUserDTO {
     private SmartUsersDO user;
     private String openid;
 
-    public SmartQuizUserDTO() {
+    public SmartNurseryUserDTO() {
         super();
     }
 
-    public SmartQuizUserDTO(SmartUsersDO user, String openid) {
+    public SmartNurseryUserDTO(SmartUsersDO user, String openid) {
         this.user = user;
         this.openid = openid;
     }

+ 19 - 41
sourcecode/server/src/main/java/smart/gift/domain/entity/SmartQuizPuzzleAnswerDO.java → sourcecode/server/src/main/java/smart/gift/domain/entity/SmartNurseryPuzzleAnswerDO.java

@@ -5,11 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 
 /**
- * 答题答案(smart_quiz_puzzle_answer) 实体类
- * <p>
+ * 答题答案(smart_quiz_puzzle_answer) 实体类 
+ * 
  * author: Code-gen @ Szu-star
  */
-public class SmartQuizPuzzleAnswerDO {
+public class SmartNurseryPuzzleAnswerDO {
     /** 答案ID */
     ;
     private Integer answerId;
@@ -58,161 +58,139 @@ public class SmartQuizPuzzleAnswerDO {
 
     /** setter: 答案ID */
     ;
-
     public void setAnswerId(Integer answerId) {
         this.answerId = answerId;
     }
 
     /** getter: 答案ID */
     ;
-
     public Integer getAnswerId() {
         return answerId;
     }
 
     /** setter: 题目ID */
     ;
-
     public void setPuzzleId(Integer puzzleId) {
         this.puzzleId = puzzleId;
     }
 
     /** getter: 题目ID */
     ;
-
     public Integer getPuzzleId() {
         return puzzleId;
     }
 
     /** setter: 正答 */
     ;
-
     public void setIsCorrect(Integer isCorrect) {
         this.isCorrect = isCorrect;
     }
 
     /** getter: 正答 */
     ;
-
     public Integer getIsCorrect() {
         return isCorrect;
     }
 
     /** setter: 类型(必/可选) */
     ;
-
     public void setAnswerKind(Integer answerKind) {
         this.answerKind = answerKind;
     }
 
     /** getter: 类型(必/可选) */
     ;
-
     public Integer getAnswerKind() {
         return answerKind;
     }
 
     /** setter: 解析 */
     ;
-
     public void setExplanation(Integer explanation) {
         this.explanation = explanation;
     }
 
     /** getter: 解析 */
     ;
-
     public Integer getExplanation() {
         return explanation;
     }
 
     /** setter: 出现频率 */
     ;
-
     public void setProbability(Integer probability) {
         this.probability = probability;
     }
 
     /** getter: 出现频率 */
     ;
-
     public Integer getProbability() {
         return probability;
     }
 
     /** setter: 状态 */
     ;
-
     public void setStatus(Integer status) {
         this.status = status;
     }
 
     /** getter: 状态 */
     ;
-
     public Integer getStatus() {
         return status;
     }
 
     /** setter: 上传者 */
     ;
-
     public void setEditBy(Integer editBy) {
         this.editBy = editBy;
     }
 
     /** getter: 上传者 */
     ;
-
     public Integer getEditBy() {
         return editBy;
     }
 
     /** setter: 修改时间 */
     ;
-
     public void setEditTime(Date editTime) {
         this.editTime = editTime;
     }
 
     /** getter: 修改时间 */
     ;
-
     public Date getEditTime() {
         return editTime;
     }
 
     /** setter: 选项名 */
     ;
-
     public void setPrefix(String prefix) {
         this.prefix = prefix;
     }
 
     /** getter: 选项名 */
     ;
-
     public String getPrefix() {
         return prefix;
     }
 
     /** setter: 答案内容 */
     ;
-
     public void setContent(String content) {
         this.content = content;
     }
 
     /** getter: 答案内容 */
     ;
-
     public String getContent() {
         return content;
     }
 
 
     @Override
-    public int hashCode() {
+    public int hashCode() { 
         final int prime = 31;
 
         int resultHashCode = 1;
@@ -233,7 +211,7 @@ public class SmartQuizPuzzleAnswerDO {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(Object obj) { 
         if (this == obj) {
             return true;
         }
@@ -244,14 +222,14 @@ public class SmartQuizPuzzleAnswerDO {
             return false;
         }
 
-        SmartQuizPuzzleAnswerDO other = (SmartQuizPuzzleAnswerDO) obj;
+        SmartNurseryPuzzleAnswerDO other = (SmartNurseryPuzzleAnswerDO) obj;
 
         if (answerId == null) {
             if (other.answerId != null) {
                 return false;
             }
         } else if (!answerId.equals(other.answerId)) {
-            return false;
+            return false; 
         }
 
         if (puzzleId == null) {
@@ -259,7 +237,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!puzzleId.equals(other.puzzleId)) {
-            return false;
+            return false; 
         }
 
         if (isCorrect == null) {
@@ -267,7 +245,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!isCorrect.equals(other.isCorrect)) {
-            return false;
+            return false; 
         }
 
         if (answerKind == null) {
@@ -275,7 +253,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!answerKind.equals(other.answerKind)) {
-            return false;
+            return false; 
         }
 
         if (explanation == null) {
@@ -283,7 +261,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!explanation.equals(other.explanation)) {
-            return false;
+            return false; 
         }
 
         if (probability == null) {
@@ -291,7 +269,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!probability.equals(other.probability)) {
-            return false;
+            return false; 
         }
 
         if (status == null) {
@@ -299,7 +277,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!status.equals(other.status)) {
-            return false;
+            return false; 
         }
 
         if (editBy == null) {
@@ -307,7 +285,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!editBy.equals(other.editBy)) {
-            return false;
+            return false; 
         }
 
         if (editTime == null) {
@@ -315,7 +293,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!editTime.equals(other.editTime)) {
-            return false;
+            return false; 
         }
 
         if (prefix == null) {
@@ -323,7 +301,7 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!prefix.equals(other.prefix)) {
-            return false;
+            return false; 
         }
 
         if (content == null) {
@@ -331,17 +309,17 @@ public class SmartQuizPuzzleAnswerDO {
                 return false;
             }
         } else if (!content.equals(other.content)) {
-            return false;
+            return false; 
         }
 
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString() { 
         StringBuffer sb = new StringBuffer();
 
-        sb.append("SmartQuizPuzzleAnswerDO [");
+        sb.append("SmartNurseryPuzzleAnswerDO [");
         sb.append("answerId=").append(answerId).append(",");
         sb.append("puzzleId=").append(puzzleId).append(",");
         sb.append("isCorrect=").append(isCorrect).append(",");

+ 18 - 38
sourcecode/server/src/main/java/smart/gift/domain/entity/SmartQuizPuzzleGroupDO.java → sourcecode/server/src/main/java/smart/gift/domain/entity/SmartNurseryPuzzleGroupDO.java

@@ -5,11 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 
 /**
- * 答题题库(smart_quiz_puzzle_group) 实体类
- * <p>
+ * 答题题库(smart_quiz_puzzle_group) 实体类 
+ * 
  * author: Code-gen @ Szu-star
  */
-public class SmartQuizPuzzleGroupDO {
+public class SmartNurseryPuzzleGroupDO {
     /** 题库ID */
     ;
     private Integer puzzelGroupId;
@@ -54,147 +54,127 @@ public class SmartQuizPuzzleGroupDO {
 
     /** setter: 题库ID */
     ;
-
     public void setPuzzelGroupId(Integer puzzelGroupId) {
         this.puzzelGroupId = puzzelGroupId;
     }
 
     /** getter: 题库ID */
     ;
-
     public Integer getPuzzelGroupId() {
         return puzzelGroupId;
     }
 
     /** setter: 题库难度(0最小) */
     ;
-
     public void setDifficulty(Integer difficulty) {
         this.difficulty = difficulty;
     }
 
     /** getter: 题库难度(0最小) */
     ;
-
     public Integer getDifficulty() {
         return difficulty;
     }
 
     /** setter: 出现概率 */
     ;
-
     public void setProbability(Integer probability) {
         this.probability = probability;
     }
 
     /** getter: 出现概率 */
     ;
-
     public Integer getProbability() {
         return probability;
     }
 
     /** setter: 题库类型 */
     ;
-
     public void setGroupKind(Integer groupKind) {
         this.groupKind = groupKind;
     }
 
     /** getter: 题库类型 */
     ;
-
     public Integer getGroupKind() {
         return groupKind;
     }
 
     /** setter: 状态 */
     ;
-
     public void setStatus(Integer status) {
         this.status = status;
     }
 
     /** getter: 状态 */
     ;
-
     public Integer getStatus() {
         return status;
     }
 
     /** setter: 编辑者 */
     ;
-
     public void setEditBy(Integer editBy) {
         this.editBy = editBy;
     }
 
     /** getter: 编辑者 */
     ;
-
     public Integer getEditBy() {
         return editBy;
     }
 
     /** setter: 编辑时间 */
     ;
-
     public void setEditOn(Date editOn) {
         this.editOn = editOn;
     }
 
     /** getter: 编辑时间 */
     ;
-
     public Date getEditOn() {
         return editOn;
     }
 
     /** setter: 题库名称 */
     ;
-
     public void setName(String name) {
         this.name = name;
     }
 
     /** getter: 题库名称 */
     ;
-
     public String getName() {
         return name;
     }
 
     /** setter: 其他 */
     ;
-
     public void setMisc(String misc) {
         this.misc = misc;
     }
 
     /** getter: 其他 */
     ;
-
     public String getMisc() {
         return misc;
     }
 
     /** setter: 题库说明 */
     ;
-
     public void setDescription(String description) {
         this.description = description;
     }
 
     /** getter: 题库说明 */
     ;
-
     public String getDescription() {
         return description;
     }
 
 
     @Override
-    public int hashCode() {
+    public int hashCode() { 
         final int prime = 31;
 
         int resultHashCode = 1;
@@ -214,7 +194,7 @@ public class SmartQuizPuzzleGroupDO {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(Object obj) { 
         if (this == obj) {
             return true;
         }
@@ -225,14 +205,14 @@ public class SmartQuizPuzzleGroupDO {
             return false;
         }
 
-        SmartQuizPuzzleGroupDO other = (SmartQuizPuzzleGroupDO) obj;
+        SmartNurseryPuzzleGroupDO other = (SmartNurseryPuzzleGroupDO) obj;
 
         if (puzzelGroupId == null) {
             if (other.puzzelGroupId != null) {
                 return false;
             }
         } else if (!puzzelGroupId.equals(other.puzzelGroupId)) {
-            return false;
+            return false; 
         }
 
         if (difficulty == null) {
@@ -240,7 +220,7 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!difficulty.equals(other.difficulty)) {
-            return false;
+            return false; 
         }
 
         if (probability == null) {
@@ -248,7 +228,7 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!probability.equals(other.probability)) {
-            return false;
+            return false; 
         }
 
         if (groupKind == null) {
@@ -256,7 +236,7 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!groupKind.equals(other.groupKind)) {
-            return false;
+            return false; 
         }
 
         if (status == null) {
@@ -264,7 +244,7 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!status.equals(other.status)) {
-            return false;
+            return false; 
         }
 
         if (editBy == null) {
@@ -272,7 +252,7 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!editBy.equals(other.editBy)) {
-            return false;
+            return false; 
         }
 
         if (editOn == null) {
@@ -280,7 +260,7 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!editOn.equals(other.editOn)) {
-            return false;
+            return false; 
         }
 
         if (name == null) {
@@ -288,7 +268,7 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!name.equals(other.name)) {
-            return false;
+            return false; 
         }
 
         if (misc == null) {
@@ -296,7 +276,7 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!misc.equals(other.misc)) {
-            return false;
+            return false; 
         }
 
         if (description == null) {
@@ -304,17 +284,17 @@ public class SmartQuizPuzzleGroupDO {
                 return false;
             }
         } else if (!description.equals(other.description)) {
-            return false;
+            return false; 
         }
 
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString() { 
         StringBuffer sb = new StringBuffer();
 
-        sb.append("SmartQuizPuzzleGroupDO [");
+        sb.append("SmartNurseryPuzzleGroupDO [");
         sb.append("puzzelGroupId=").append(puzzelGroupId).append(",");
         sb.append("difficulty=").append(difficulty).append(",");
         sb.append("probability=").append(probability).append(",");

+ 20 - 44
sourcecode/server/src/main/java/smart/gift/domain/entity/SmartQuizPuzzlesDO.java → sourcecode/server/src/main/java/smart/gift/domain/entity/SmartNurseryPuzzlesDO.java

@@ -5,11 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 
 /**
- * 答题题目(smart_quiz_puzzles) 实体类
- * <p>
+ * 答题题目(smart_quiz_puzzles) 实体类 
+ * 
  * author: Code-gen @ Szu-star
  */
-public class SmartQuizPuzzlesDO {
+public class SmartNurseryPuzzlesDO {
     /** 题目ID */
     ;
     private Integer puzzleId;
@@ -62,175 +62,151 @@ public class SmartQuizPuzzlesDO {
 
     /** setter: 题目ID */
     ;
-
     public void setPuzzleId(Integer puzzleId) {
         this.puzzleId = puzzleId;
     }
 
     /** getter: 题目ID */
     ;
-
     public Integer getPuzzleId() {
         return puzzleId;
     }
 
     /** setter: 题库ID */
     ;
-
     public void setGroupId(Integer groupId) {
         this.groupId = groupId;
     }
 
     /** getter: 题库ID */
     ;
-
     public Integer getGroupId() {
         return groupId;
     }
 
     /** setter: 题目类型 */
     ;
-
     public void setPuzzleType(Integer puzzleType) {
         this.puzzleType = puzzleType;
     }
 
     /** getter: 题目类型 */
     ;
-
     public Integer getPuzzleType() {
         return puzzleType;
     }
 
     /** setter: 出题概率 */
     ;
-
     public void setProbability(Integer probability) {
         this.probability = probability;
     }
 
     /** getter: 出题概率 */
     ;
-
     public Integer getProbability() {
         return probability;
     }
 
     /** setter: 状态 */
     ;
-
     public void setPuzzleStatus(Integer puzzleStatus) {
         this.puzzleStatus = puzzleStatus;
     }
 
     /** getter: 状态 */
     ;
-
     public Integer getPuzzleStatus() {
         return puzzleStatus;
     }
 
     /** setter: 创建管理员 */
     ;
-
     public void setCreateUser(Integer createUser) {
         this.createUser = createUser;
     }
 
     /** getter: 创建管理员 */
     ;
-
     public Integer getCreateUser() {
         return createUser;
     }
 
     /** setter: 答题次数 */
     ;
-
     public void setTrials(Integer trials) {
         this.trials = trials;
     }
 
     /** getter: 答题次数 */
     ;
-
     public Integer getTrials() {
         return trials;
     }
 
     /** setter: 答题成功数 */
     ;
-
     public void setSuccessTrials(Integer successTrials) {
         this.successTrials = successTrials;
     }
 
     /** getter: 答题成功数 */
     ;
-
     public Integer getSuccessTrials() {
         return successTrials;
     }
 
     /** setter: 创建时间 */
     ;
-
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
     /** getter: 创建时间 */
     ;
-
     public Date getCreateTime() {
         return createTime;
     }
 
     /** setter: 名称 */
     ;
-
     public void setName(String name) {
         this.name = name;
     }
 
     /** getter: 名称 */
     ;
-
     public String getName() {
         return name;
     }
 
     /** setter: 题干内容 */
     ;
-
     public void setContent(String content) {
         this.content = content;
     }
 
     /** getter: 题干内容 */
     ;
-
     public String getContent() {
         return content;
     }
 
     /** setter: 解析 */
     ;
-
     public void setExplaination(String explaination) {
         this.explaination = explaination;
     }
 
     /** getter: 解析 */
     ;
-
     public String getExplaination() {
         return explaination;
     }
 
 
     @Override
-    public int hashCode() {
+    public int hashCode() { 
         final int prime = 31;
 
         int resultHashCode = 1;
@@ -252,7 +228,7 @@ public class SmartQuizPuzzlesDO {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(Object obj) { 
         if (this == obj) {
             return true;
         }
@@ -263,14 +239,14 @@ public class SmartQuizPuzzlesDO {
             return false;
         }
 
-        SmartQuizPuzzlesDO other = (SmartQuizPuzzlesDO) obj;
+        SmartNurseryPuzzlesDO other = (SmartNurseryPuzzlesDO) obj;
 
         if (puzzleId == null) {
             if (other.puzzleId != null) {
                 return false;
             }
         } else if (!puzzleId.equals(other.puzzleId)) {
-            return false;
+            return false; 
         }
 
         if (groupId == null) {
@@ -278,7 +254,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!groupId.equals(other.groupId)) {
-            return false;
+            return false; 
         }
 
         if (puzzleType == null) {
@@ -286,7 +262,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!puzzleType.equals(other.puzzleType)) {
-            return false;
+            return false; 
         }
 
         if (probability == null) {
@@ -294,7 +270,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!probability.equals(other.probability)) {
-            return false;
+            return false; 
         }
 
         if (puzzleStatus == null) {
@@ -302,7 +278,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!puzzleStatus.equals(other.puzzleStatus)) {
-            return false;
+            return false; 
         }
 
         if (createUser == null) {
@@ -310,7 +286,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!createUser.equals(other.createUser)) {
-            return false;
+            return false; 
         }
 
         if (trials == null) {
@@ -318,7 +294,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!trials.equals(other.trials)) {
-            return false;
+            return false; 
         }
 
         if (successTrials == null) {
@@ -326,7 +302,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!successTrials.equals(other.successTrials)) {
-            return false;
+            return false; 
         }
 
         if (createTime == null) {
@@ -334,7 +310,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!createTime.equals(other.createTime)) {
-            return false;
+            return false; 
         }
 
         if (name == null) {
@@ -342,7 +318,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!name.equals(other.name)) {
-            return false;
+            return false; 
         }
 
         if (content == null) {
@@ -350,7 +326,7 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!content.equals(other.content)) {
-            return false;
+            return false; 
         }
 
         if (explaination == null) {
@@ -358,17 +334,17 @@ public class SmartQuizPuzzlesDO {
                 return false;
             }
         } else if (!explaination.equals(other.explaination)) {
-            return false;
+            return false; 
         }
 
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString() { 
         StringBuffer sb = new StringBuffer();
 
-        sb.append("SmartQuizPuzzlesDO [");
+        sb.append("SmartNurseryPuzzlesDO [");
         sb.append("puzzleId=").append(puzzleId).append(",");
         sb.append("groupId=").append(groupId).append(",");
         sb.append("puzzleType=").append(puzzleType).append(",");

+ 16 - 32
sourcecode/server/src/main/java/smart/gift/domain/entity/SmartQuizTrialDO.java → sourcecode/server/src/main/java/smart/gift/domain/entity/SmartNurseryTrialDO.java

@@ -5,11 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 
 /**
- * 答题结果(smart_quiz_trial) 实体类
- * <p>
+ * 答题结果(smart_quiz_trial) 实体类 
+ * 
  * author: Code-gen @ Szu-star
  */
-public class SmartQuizTrialDO {
+public class SmartNurseryTrialDO {
     /** 选择ID */
     ;
     private Integer trialId;
@@ -46,119 +46,103 @@ public class SmartQuizTrialDO {
 
     /** setter: 选择ID */
     ;
-
     public void setTrialId(Integer trialId) {
         this.trialId = trialId;
     }
 
     /** getter: 选择ID */
     ;
-
     public Integer getTrialId() {
         return trialId;
     }
 
     /** setter: 用户ID */
     ;
-
     public void setUserId(Integer userId) {
         this.userId = userId;
     }
 
     /** getter: 用户ID */
     ;
-
     public Integer getUserId() {
         return userId;
     }
 
     /** setter: 题目ID */
     ;
-
     public void setQuestionId(Integer questionId) {
         this.questionId = questionId;
     }
 
     /** getter: 题目ID */
     ;
-
     public Integer getQuestionId() {
         return questionId;
     }
 
     /** setter: 选项 */
     ;
-
     public void setChosen(String chosen) {
         this.chosen = chosen;
     }
 
     /** getter: 选项 */
     ;
-
     public String getChosen() {
         return chosen;
     }
 
     /** setter: 得分 */
     ;
-
     public void setGrade(Integer grade) {
         this.grade = grade;
     }
 
     /** getter: 得分 */
     ;
-
     public Integer getGrade() {
         return grade;
     }
 
     /** setter: 复习题目 */
     ;
-
     public void setIsReview(Integer isReview) {
         this.isReview = isReview;
     }
 
     /** getter: 复习题目 */
     ;
-
     public Integer getIsReview() {
         return isReview;
     }
 
     /** setter: 正答 */
     ;
-
     public void setIsCorrect(Integer isCorrect) {
         this.isCorrect = isCorrect;
     }
 
     /** getter: 正答 */
     ;
-
     public Integer getIsCorrect() {
         return isCorrect;
     }
 
     /** setter: 答题时间 */
     ;
-
     public void setTrialTime(Date trialTime) {
         this.trialTime = trialTime;
     }
 
     /** getter: 答题时间 */
     ;
-
     public Date getTrialTime() {
         return trialTime;
     }
 
 
     @Override
-    public int hashCode() {
+    public int hashCode() { 
         final int prime = 31;
 
         int resultHashCode = 1;
@@ -176,7 +160,7 @@ public class SmartQuizTrialDO {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(Object obj) { 
         if (this == obj) {
             return true;
         }
@@ -187,14 +171,14 @@ public class SmartQuizTrialDO {
             return false;
         }
 
-        SmartQuizTrialDO other = (SmartQuizTrialDO) obj;
+        SmartNurseryTrialDO other = (SmartNurseryTrialDO) obj;
 
         if (trialId == null) {
             if (other.trialId != null) {
                 return false;
             }
         } else if (!trialId.equals(other.trialId)) {
-            return false;
+            return false; 
         }
 
         if (userId == null) {
@@ -202,7 +186,7 @@ public class SmartQuizTrialDO {
                 return false;
             }
         } else if (!userId.equals(other.userId)) {
-            return false;
+            return false; 
         }
 
         if (questionId == null) {
@@ -210,7 +194,7 @@ public class SmartQuizTrialDO {
                 return false;
             }
         } else if (!questionId.equals(other.questionId)) {
-            return false;
+            return false; 
         }
 
         if (chosen == null) {
@@ -218,7 +202,7 @@ public class SmartQuizTrialDO {
                 return false;
             }
         } else if (!chosen.equals(other.chosen)) {
-            return false;
+            return false; 
         }
 
         if (grade == null) {
@@ -226,7 +210,7 @@ public class SmartQuizTrialDO {
                 return false;
             }
         } else if (!grade.equals(other.grade)) {
-            return false;
+            return false; 
         }
 
         if (isReview == null) {
@@ -234,7 +218,7 @@ public class SmartQuizTrialDO {
                 return false;
             }
         } else if (!isReview.equals(other.isReview)) {
-            return false;
+            return false; 
         }
 
         if (isCorrect == null) {
@@ -242,7 +226,7 @@ public class SmartQuizTrialDO {
                 return false;
             }
         } else if (!isCorrect.equals(other.isCorrect)) {
-            return false;
+            return false; 
         }
 
         if (trialTime == null) {
@@ -250,17 +234,17 @@ public class SmartQuizTrialDO {
                 return false;
             }
         } else if (!trialTime.equals(other.trialTime)) {
-            return false;
+            return false; 
         }
 
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString() { 
         StringBuffer sb = new StringBuffer();
 
-        sb.append("SmartQuizTrialDO [");
+        sb.append("SmartNurseryTrialDO [");
         sb.append("trialId=").append(trialId).append(",");
         sb.append("userId=").append(userId).append(",");
         sb.append("questionId=").append(questionId).append(",");

+ 12 - 12
sourcecode/server/src/main/java/smart/gift/excel/ExcelBankImport.java

@@ -13,8 +13,8 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import smart.gift.domain.entity.SmartQuizPuzzleAnswerDO;
-import smart.gift.domain.entity.SmartQuizPuzzlesDO;
+import smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO;
+import smart.gift.domain.entity.SmartNurseryPuzzlesDO;
 import smart.gift.domain.dto.ExcelPuzzleVO;
 
 /**
@@ -71,7 +71,7 @@ public class ExcelBankImport {
      * @return
      */
     public static Integer readFromExcel(Integer bankId, String excelFile,
-                                        Map<SmartQuizPuzzlesDO, List<SmartQuizPuzzleAnswerDO>> resMap) {
+                                        Map<SmartNurseryPuzzlesDO, List<SmartNurseryPuzzleAnswerDO>> resMap) {
         if (excelFile == null || "".equals(excelFile.trim())) {
             throw new IllegalArgumentException("'path' must be given");
         }
@@ -100,13 +100,13 @@ public class ExcelBankImport {
     }
 
     public static Integer readFromExcel(Integer bankId, InputStream excelInputStream,
-                                        String fileName, Map<SmartQuizPuzzlesDO, List<SmartQuizPuzzleAnswerDO>> resMap) {
+                                        String fileName, Map<SmartNurseryPuzzlesDO, List<SmartNurseryPuzzleAnswerDO>> resMap) {
         return inner_readFromExcel(bankId, excelInputStream, fileName, resMap);
     }
 
     public static Integer inner_readFromExcel(Integer bankId,
                                               InputStream excelInputStream, String fileName,
-                                              Map<SmartQuizPuzzlesDO, List<SmartQuizPuzzleAnswerDO>> resMap) {
+                                              Map<SmartNurseryPuzzlesDO, List<SmartNurseryPuzzleAnswerDO>> resMap) {
         ExcelUtil excelUtil = new ExcelUtil();
         try {
             List<Object> dataList = excelUtil.importDataFromExcel(new ExcelPuzzleVO(), excelInputStream, fileName);
@@ -125,7 +125,7 @@ public class ExcelBankImport {
     }
 
     private static Integer processExcelData(Integer bankId, List<Object> dataList,
-                                            Map<SmartQuizPuzzlesDO, List<SmartQuizPuzzleAnswerDO>> resMap) {
+                                            Map<SmartNurseryPuzzlesDO, List<SmartNurseryPuzzleAnswerDO>> resMap) {
         // dataList 的第一行是标题行,数据从第二行开始
         // 序号   题目类型   题目内容   选项A 选项B 选项C 选项D 选项E 选项F A正确否  B正确否  C正确否  D正确否  E正确否  F正确否
         // 如果 题目内容 为空,则认为这个是无效题
@@ -149,7 +149,7 @@ public class ExcelBankImport {
                 continue;
             }
 
-            SmartQuizPuzzlesDO question = new SmartQuizPuzzlesDO();
+            SmartNurseryPuzzlesDO question = new SmartNurseryPuzzlesDO();
             question.setTrials(0);
             question.setSuccessTrials(0);
             question.setName("name"/*name*/);
@@ -161,7 +161,7 @@ public class ExcelBankImport {
             question.setGroupId(bankId);
             question.setExplaination("explain");
 
-            List<SmartQuizPuzzleAnswerDO> options = loadOptions(vo);
+            List<SmartNurseryPuzzleAnswerDO> options = loadOptions(vo);
 
             resMap.put(question, options);
 
@@ -172,8 +172,8 @@ public class ExcelBankImport {
         return READ_OK;
     }
 
-    private static List<SmartQuizPuzzleAnswerDO> loadOptions(ExcelPuzzleVO vo) {
-        List<SmartQuizPuzzleAnswerDO> items = new ArrayList<SmartQuizPuzzleAnswerDO>();
+    private static List<SmartNurseryPuzzleAnswerDO> loadOptions(ExcelPuzzleVO vo) {
+        List<SmartNurseryPuzzleAnswerDO> items = new ArrayList<SmartNurseryPuzzleAnswerDO>();
 
 //    addOptionToList(items, "A", vo.getOptionA(), vo.getAnswerA());
 //    addOptionToList(items, "B", vo.getOptionB(), vo.getAnswerB());
@@ -185,9 +185,9 @@ public class ExcelBankImport {
         return items;
     }
 
-    private static void addOptionToList(List<SmartQuizPuzzleAnswerDO> items, String optNum, String optionsContent, String answer) {
+    private static void addOptionToList(List<SmartNurseryPuzzleAnswerDO> items, String optNum, String optionsContent, String answer) {
         if (optionsContent != null && !optionsContent.trim().isEmpty()) {
-            SmartQuizPuzzleAnswerDO option = new SmartQuizPuzzleAnswerDO();
+            SmartNurseryPuzzleAnswerDO option = new SmartNurseryPuzzleAnswerDO();
             option.setContent(optionsContent);
             //option.setOptNumber(optNum);
             //option.setIsRightKey(getIsRightByName(answer));

+ 4 - 4
sourcecode/server/src/main/java/smart/gift/framework/CommonHandlerInterceptor.java

@@ -41,16 +41,16 @@ public class CommonHandlerInterceptor implements HandlerInterceptor {
             "/server/smartUsers/getUsers",
             "/server/smartUsers/getRUsers",
             "/server/fileserver",
-            "/server/smartQuizPuzzles/pick",
+            "/server/smartNurseryPuzzles/pick",
             "/server/smartMemberInfo/fill",
             "/server/smartMemberInfo/me",
             "/wx/miniapp",
-            "/server/smartQuizTrial/judging",
-            "/server/smartQuizTrial/ranking",
+            "/server/smartNurseryTrial/judging",
+            "/server/smartNurseryTrial/ranking",
             "/server/smartSchools/getSchoolInfo",
             "/server/fcSystemEvent/event",
             "/server/fcSystemEvent/errorReport",
-            "/server/smartQuizPuzzleAnswer/generateExample",
+            "/server/smartNurseryPuzzleAnswer/generateExample",
             "/server/smartAds",
 
             //"/server/smartQuizPuzzles/autoImport",

+ 5 - 6
sourcecode/server/src/main/java/smart/gift/service/SmartQuizPuzzleAnswerService.java → sourcecode/server/src/main/java/smart/gift/service/SmartNurseryPuzzleAnswerService.java

@@ -1,19 +1,18 @@
 package smart.gift.service;
 
-import smart.gift.domain.entity.SmartQuizPuzzleAnswerDO;
+import smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO;
 import smart.gift.framework.BaseService;
 import smart.gift.framework.RetResult;
 
 /**
- * 答题答案(smart_quiz_puzzle_answer) 实体类的数据服务类
- * <p>
+ * 答题答案(smart_quiz_puzzle_answer) 实体类的数据服务类 
+ * 
  * author: Code-gen @ Szu-star
  */
-public interface SmartQuizPuzzleAnswerService extends BaseService<SmartQuizPuzzleAnswerDO> {
+public interface SmartNurseryPuzzleAnswerService extends BaseService<SmartNurseryPuzzleAnswerDO> {
     RetResult getCorrectAnswerByPuzzleId(Integer puzzle_id);
 
-    SmartQuizPuzzleAnswerDO createAnswer(int pzId, int isCorrect, String token, String desc);
-
+    SmartNurseryPuzzleAnswerDO createAnswer(int pzId, int isCorrect, String token, String desc);
     void generateMathQuestions(Integer groupId, Integer total);
 }
 

+ 19 - 0
sourcecode/server/src/main/java/smart/gift/service/SmartNurseryPuzzleGroupService.java

@@ -0,0 +1,19 @@
+package smart.gift.service;
+
+import smart.gift.domain.entity.SmartNurseryPuzzleGroupDO;
+import smart.gift.domain.entity.SmartNurseryPuzzlesDO;
+import smart.gift.framework.BaseService;
+
+import java.util.List;
+
+/**
+ * 答题题库(smart_quiz_puzzle_group) 实体类的数据服务类 
+ * 
+ * author: Code-gen @ Szu-star
+ */
+public interface SmartNurseryPuzzleGroupService extends BaseService<SmartNurseryPuzzleGroupDO> {
+
+    List<SmartNurseryPuzzlesDO> listByDifficulty(Integer page, Integer pageSize, Integer difficulty);
+
+}
+

+ 32 - 0
sourcecode/server/src/main/java/smart/gift/service/SmartNurseryPuzzlesService.java

@@ -0,0 +1,32 @@
+package smart.gift.service;
+
+import smart.gift.domain.dto.SmartNurseryPuzzlesDTO;
+import smart.gift.domain.entity.SmartNurseryPuzzlesDO;
+import smart.gift.framework.BaseService;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+
+/**
+ * 答题题目(smart_quiz_puzzles) 实体类的数据服务类 
+ * 
+ * author: Code-gen @ Szu-star
+ */
+public interface SmartNurseryPuzzlesService extends BaseService<SmartNurseryPuzzlesDO> {
+
+    List<SmartNurseryPuzzlesDTO> pickByType(Integer type, Integer difficulty, HttpSession session);
+
+    SmartNurseryPuzzlesDO getFromGroup(List<SmartNurseryPuzzlesDO> groups, int max_length);
+
+    /***
+     * Creating a question
+     * @param bankId
+     * @param name
+     * @param desc
+     * @param probability
+     * @return the question's id
+     */
+    int createQuestion(int bankId, String name, String desc,
+                       int probability);
+}
+

+ 7 - 7
sourcecode/server/src/main/java/smart/gift/service/SmartQuizTrialService.java → sourcecode/server/src/main/java/smart/gift/service/SmartNurseryTrialService.java

@@ -1,9 +1,9 @@
 package smart.gift.service;
 
-import smart.gift.domain.dto.SmartQuizPuzzlesDTO;
+import smart.gift.domain.dto.SmartNurseryPuzzlesDTO;
 import smart.gift.domain.dto.SmartRankedDTOWrapper;
 import smart.gift.domain.dto.SmartRankedUsersDTOWrapper;
-import smart.gift.domain.entity.SmartQuizTrialDO;
+import smart.gift.domain.entity.SmartNurseryTrialDO;
 import smart.gift.domain.entity.SmartUsersDO;
 import smart.gift.framework.BaseService;
 import smart.gift.framework.RetResult;
@@ -11,15 +11,15 @@ import smart.gift.framework.RetResult;
 import java.util.List;
 
 /**
- * 答题结果(smart_quiz_trial) 实体类的数据服务类
- * <p>
+ * 答题结果(smart_quiz_trial) 实体类的数据服务类 
+ * 
  * author: Code-gen @ Szu-star
  */
-public interface SmartQuizTrialService extends BaseService<SmartQuizTrialDO> {
+public interface SmartNurseryTrialService extends BaseService<SmartNurseryTrialDO> {
 
-    List<SmartQuizPuzzlesDTO> reviewPuzzles(SmartUsersDO user);
+    List<SmartNurseryPuzzlesDTO> reviewPuzzles(SmartUsersDO user);
 
-    RetResult<Integer> judge(Integer type, List<SmartQuizTrialDO> answers, SmartUsersDO user);
+    RetResult<Integer> judge(Integer type, List<SmartNurseryTrialDO> answers, SmartUsersDO user);
 
     RetResult alterPoints(SmartUsersDO user, Integer points);
 

+ 0 - 19
sourcecode/server/src/main/java/smart/gift/service/SmartQuizPuzzleGroupService.java

@@ -1,19 +0,0 @@
-package smart.gift.service;
-
-import smart.gift.domain.entity.SmartQuizPuzzleGroupDO;
-import smart.gift.domain.entity.SmartQuizPuzzlesDO;
-import smart.gift.framework.BaseService;
-
-import java.util.List;
-
-/**
- * 答题题库(smart_quiz_puzzle_group) 实体类的数据服务类
- * <p>
- * author: Code-gen @ Szu-star
- */
-public interface SmartQuizPuzzleGroupService extends BaseService<SmartQuizPuzzleGroupDO> {
-
-    List<SmartQuizPuzzlesDO> listByDifficulty(Integer page, Integer pageSize, Integer difficulty);
-
-}
-

+ 0 - 32
sourcecode/server/src/main/java/smart/gift/service/SmartQuizPuzzlesService.java

@@ -1,32 +0,0 @@
-package smart.gift.service;
-
-import smart.gift.domain.dto.SmartQuizPuzzlesDTO;
-import smart.gift.domain.entity.SmartQuizPuzzlesDO;
-import smart.gift.framework.BaseService;
-
-import javax.servlet.http.HttpSession;
-import java.util.List;
-
-/**
- * 答题题目(smart_quiz_puzzles) 实体类的数据服务类
- * <p>
- * author: Code-gen @ Szu-star
- */
-public interface SmartQuizPuzzlesService extends BaseService<SmartQuizPuzzlesDO> {
-
-    List<SmartQuizPuzzlesDTO> pickByType(Integer type, Integer difficulty, HttpSession session);
-
-    SmartQuizPuzzlesDO getFromGroup(List<SmartQuizPuzzlesDO> groups, int max_length);
-
-    /***
-     * Creating a question
-     * @param bankId
-     * @param name
-     * @param desc
-     * @param probability
-     * @return the question's id
-     */
-    int createQuestion(int bankId, String name, String desc,
-                       int probability);
-}
-

+ 30 - 31
sourcecode/server/src/main/java/smart/gift/service/impl/SmartQuizPuzzleAnswerServiceImpl.java → sourcecode/server/src/main/java/smart/gift/service/impl/SmartNurseryPuzzleAnswerServiceImpl.java

@@ -2,14 +2,13 @@ package smart.gift.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import smart.gift.framework.BaseServiceImpl;
+import smart.gift.dao.SmartNurseryPuzzleAnswerDao;
+import smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO;
 import smart.gift.framework.BaseDao;
-import smart.gift.dao.SmartQuizPuzzleAnswerDao;
+import smart.gift.framework.BaseServiceImpl;
 import smart.gift.framework.RetResult;
-import smart.gift.service.SmartQuizPuzzleAnswerService;
-import smart.gift.domain.entity.SmartQuizPuzzleAnswerDO;
-import smart.gift.service.SmartQuizPuzzlesService;
+import smart.gift.service.SmartNurseryPuzzleAnswerService;
+import smart.gift.service.SmartNurseryPuzzlesService;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -17,25 +16,25 @@ import java.util.List;
 import java.util.Random;
 
 /**
- * 答题答案(smart_quiz_puzzle_answer) 实体类的数据服务类实现
- * <p>
+ * 答题答案(smart_quiz_puzzle_answer) 实体类的数据服务类实现 
+ * 
  * author: Code-gen @ Szu-star
- */
+ */ 
 @Service
-public class SmartQuizPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartQuizPuzzleAnswerDO>
-        implements SmartQuizPuzzleAnswerService {
+public class SmartNurseryPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartNurseryPuzzleAnswerDO>
+        implements SmartNurseryPuzzleAnswerService {
 
     @Autowired
-    private SmartQuizPuzzleAnswerDao smartQuizPuzzleAnswerDao;
+    private SmartNurseryPuzzleAnswerDao smartNurseryPuzzleAnswerDao;
 
     @Autowired
-    private SmartQuizPuzzleAnswerService smartQuizPuzzleAnswerService;
+    private SmartNurseryPuzzleAnswerService smartNurseryPuzzleAnswerService;
 
     @Autowired
-    private SmartQuizPuzzlesService smartQuizPuzzlesService;
+    private SmartNurseryPuzzlesService smartNurseryPuzzlesService;
 
-    public SmartQuizPuzzleAnswerServiceImpl(BaseDao<SmartQuizPuzzleAnswerDO> baseDao) {
-        super(baseDao);
+    public SmartNurseryPuzzleAnswerServiceImpl(BaseDao<SmartNurseryPuzzleAnswerDO> baseDao) {
+        super(baseDao); 
     }
 
     @Override
@@ -44,14 +43,14 @@ public class SmartQuizPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartQuizP
             return RetResult.errorRet("EMPTY_PUZZLE_ID");
         }
 
-        SmartQuizPuzzleAnswerDO pattern = new SmartQuizPuzzleAnswerDO();
+        SmartNurseryPuzzleAnswerDO pattern = new SmartNurseryPuzzleAnswerDO();
         pattern.setPuzzleId(puzzle_id);
 
-        List<SmartQuizPuzzleAnswerDO> correct_answers_do = smartQuizPuzzleAnswerService.listByExample(1, 100, pattern, "answer_id asc");
+        List<SmartNurseryPuzzleAnswerDO> correct_answers_do = smartNurseryPuzzleAnswerService.listByExample(1, 100, pattern, "answer_id asc");
 
 
         StringBuffer answers = new StringBuffer();
-        for (SmartQuizPuzzleAnswerDO one : correct_answers_do) {
+        for (SmartNurseryPuzzleAnswerDO one : correct_answers_do) {
             if (one.getIsCorrect() == 1) {
                 answers.append(one.getPrefix());
             }
@@ -65,8 +64,8 @@ public class SmartQuizPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartQuizP
     }
 
     @Override
-    public SmartQuizPuzzleAnswerDO createAnswer(int pzId, int isCorrect, String token, String desc) {
-        SmartQuizPuzzleAnswerDO answer = new SmartQuizPuzzleAnswerDO();
+    public SmartNurseryPuzzleAnswerDO createAnswer(int pzId, int isCorrect, String token, String desc) {
+        SmartNurseryPuzzleAnswerDO answer = new SmartNurseryPuzzleAnswerDO();
         answer.setPuzzleId(pzId);
         answer.setContent(desc);
         answer.setEditBy(1);
@@ -83,23 +82,23 @@ public class SmartQuizPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartQuizP
 
     @Override
     public void generateMathQuestions(Integer bankId, Integer total) {
-        List<SmartQuizPuzzleAnswerDO> list = new ArrayList<>();
+        List<SmartNurseryPuzzleAnswerDO> list = new ArrayList<>();
         for (int i = 0; i < total; i++) {
             // Create a new random question
             String name = "math-" + System.currentTimeMillis();
             Operation op = new Operation();
             String desc = op.asString() + " = ?";
-            int pzId = smartQuizPuzzlesService.createQuestion(bankId, name, desc, 1000);
+            int pzId = smartNurseryPuzzlesService.createQuestion(bankId, name, desc, 1000);
             Random rd = new Random();
             String[] all = new String[]{"A", "B", "C", "D"};
             String chosen = all[rd.nextInt(4)];
             for (int j = 0, q = 0; j < 3; j++, q++) {
                 if (all[q].equals(chosen)) {
-                    SmartQuizPuzzleAnswerDO ans = smartQuizPuzzleAnswerService.createAnswer(pzId, 1, all[q], "" + op.result);
+                    SmartNurseryPuzzleAnswerDO ans = smartNurseryPuzzleAnswerService.createAnswer(pzId, 1, all[q], "" + op.result);
                     list.add(ans);
                     q++;
                 }
-                SmartQuizPuzzleAnswerDO ans = smartQuizPuzzleAnswerService.createAnswer(pzId, 0, all[q], "" + op.fakes[j]);
+                SmartNurseryPuzzleAnswerDO ans = smartNurseryPuzzleAnswerService.createAnswer(pzId, 0, all[q], "" + op.fakes[j]);
                 list.add(ans);
             }
         }
@@ -142,13 +141,13 @@ public class SmartQuizPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartQuizP
         Operation() {
             Random rd = new Random();
             int out = rd.nextInt(4);
-            switch (out) {
+            switch (out){
                 case 1:
                     op = opcode.ADD;
                     gen2(2000, 4000);
                     result = left + right;
                     for (int i = 0; i < 3; i++) {
-                        while ((fakes[i] = rd.nextInt(4000)) == result) {
+                        while ((fakes[i] = rd.nextInt(4000)) == result){
                             // nothing
                         }
                     }
@@ -159,7 +158,7 @@ public class SmartQuizPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartQuizP
                     right = rd.nextInt(700);
                     left = result + right;
                     for (int i = 0; i < 3; i++) {
-                        while ((fakes[i] = rd.nextInt(800)) == result) {
+                        while ((fakes[i] = rd.nextInt(800)) == result){
                             // nothing
                         }
                     }
@@ -169,7 +168,7 @@ public class SmartQuizPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartQuizP
                     gen2(15, 226);
                     result = left * right;
                     for (int i = 0; i < 3; i++) {
-                        while ((fakes[i] = rd.nextInt(256)) == result) {
+                        while ((fakes[i] = rd.nextInt(256)) == result){
                             // nothing
                         }
                     }
@@ -177,10 +176,10 @@ public class SmartQuizPuzzleAnswerServiceImpl extends BaseServiceImpl<SmartQuizP
                 default:
                     op = opcode.DIVIDE;
                     result = 1 + rd.nextInt(100);
-                    right = 1 + rd.nextInt(20);
+                    right = 1+rd.nextInt(20);
                     left = result * right;
                     for (int i = 0; i < 3; i++) {
-                        while ((fakes[i] = rd.nextInt(100)) == result) {
+                        while ((fakes[i] = rd.nextInt(100)) == result){
                             // nothing
                         }
                     }

+ 80 - 0
sourcecode/server/src/main/java/smart/gift/service/impl/SmartNurseryPuzzleGroupServiceImpl.java

@@ -0,0 +1,80 @@
+package smart.gift.service.impl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import smart.gift.dao.SmartNurseryPuzzleGroupDao;
+import smart.gift.dao.SmartNurseryPuzzlesDao;
+import smart.gift.domain.entity.SmartNurseryPuzzleGroupDO;
+import smart.gift.domain.entity.SmartNurseryPuzzlesDO;
+import smart.gift.framework.BaseDao;
+import smart.gift.framework.BaseServiceImpl;
+import smart.gift.service.SmartNurseryPuzzleGroupService;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 答题题库(smart_quiz_puzzle_group) 实体类的数据服务类实现 
+ * 
+ * author: Code-gen @ Szu-star
+ */ 
+@Service
+public class SmartNurseryPuzzleGroupServiceImpl extends BaseServiceImpl<SmartNurseryPuzzleGroupDO>
+        implements SmartNurseryPuzzleGroupService {
+
+    private static final Logger logger = LoggerFactory.getLogger(SmartNurseryPuzzleGroupServiceImpl.class);
+
+    @Autowired
+    private SmartNurseryPuzzleGroupDao smartNurseryPuzzleGroupDao;
+
+    @Autowired
+    private SmartNurseryPuzzlesDao smartNurseryPuzzlesDao;
+
+    @Override
+    public List<SmartNurseryPuzzlesDO> listByDifficulty(Integer page, Integer pageSize, Integer difficulty) {
+        List<List<SmartNurseryPuzzlesDO>> container = new ArrayList<>();
+
+        List<SmartNurseryPuzzlesDO> res = new ArrayList<>();
+        SmartNurseryPuzzleGroupDO pattern = new SmartNurseryPuzzleGroupDO();
+        int i, j;
+
+        logger.info("=====Given Difficulty Is " + difficulty);
+
+        for (i = 0; i <= difficulty; i++) {
+            pattern.setDifficulty(i);
+
+            List<SmartNurseryPuzzleGroupDO> list = smartNurseryPuzzleGroupDao.listByExample(1, 1000, pattern, null);
+
+            logger.info("====Puzzles Group Obtained Size Is " + list.size());
+
+            //logger.info("=====Puzzles Group Obtained Are" + );
+
+            for (j = 0; j < list.size(); j++) {
+                SmartNurseryPuzzlesDO puzzle_pattern = new SmartNurseryPuzzlesDO();
+                puzzle_pattern.setGroupId(list.get(j).getPuzzelGroupId());
+
+                container.add(smartNurseryPuzzlesDao.listByExample(1, 1000, puzzle_pattern, null));
+            }
+
+        }
+
+
+        for (List<SmartNurseryPuzzlesDO> one_list : container) {
+            for (SmartNurseryPuzzlesDO one_puzzle : one_list) {
+                //logger.info("====One Puzzle Is" + one_puzzle.toString());
+                res.add(one_puzzle);
+            }
+        }
+
+
+        return res;
+
+    }
+
+    public SmartNurseryPuzzleGroupServiceImpl(BaseDao<SmartNurseryPuzzleGroupDO> baseDao) {
+        super(baseDao); 
+    }
+}
+

+ 60 - 58
sourcecode/server/src/main/java/smart/gift/service/impl/SmartQuizPuzzlesServiceImpl.java → sourcecode/server/src/main/java/smart/gift/service/impl/SmartNurseryPuzzlesServiceImpl.java

@@ -4,62 +4,63 @@ import io.opentracing.Span;
 import io.opentracing.util.GlobalTracer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import smart.gift.dao.SmartQuizPuzzleAnswerDao;
-import smart.gift.dao.SmartQuizPuzzleGroupDao;
-import smart.gift.domain.dto.SmartQuizPuzzlesDTO;
-import smart.gift.domain.entity.SmartQuizPuzzleAnswerDO;
+import smart.gift.dao.SmartNurseryPuzzleAnswerDao;
+import smart.gift.dao.SmartNurseryPuzzlesDao;
+import smart.gift.domain.dto.SmartNurseryPuzzlesDTO;
+import smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO;
+import smart.gift.domain.entity.SmartNurseryPuzzlesDO;
 import smart.gift.domain.entity.SmartUsersDO;
-import smart.gift.framework.BaseServiceImpl;
 import smart.gift.framework.BaseDao;
-import smart.gift.dao.SmartQuizPuzzlesDao;
-import smart.gift.service.*;
-import smart.gift.domain.entity.SmartQuizPuzzlesDO;
+import smart.gift.framework.BaseServiceImpl;
+import smart.gift.service.SmartNurseryPuzzleGroupService;
+import smart.gift.service.SmartNurseryPuzzlesService;
+import smart.gift.service.SmartNurseryTrialService;
+import smart.gift.service.SmartUsersService;
 
 import javax.servlet.http.HttpSession;
 import java.util.*;
 
 /**
- * 答题题目(smart_quiz_puzzles) 实体类的数据服务类实现
- * <p>
+ * 答题题目(smart_quiz_puzzles) 实体类的数据服务类实现 
+ * 
  * author: Code-gen @ Szu-star
- */
+ */ 
 @Service
-public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzlesDO>
-        implements SmartQuizPuzzlesService {
+public class SmartNurseryPuzzlesServiceImpl extends BaseServiceImpl<SmartNurseryPuzzlesDO>
+        implements SmartNurseryPuzzlesService {
 
     @Autowired
-    private SmartQuizPuzzlesDao smartQuizPuzzlesDao;
+    private SmartNurseryPuzzlesDao smartNurseryPuzzlesDao;
 
     @Autowired
-    private SmartQuizPuzzleAnswerDao smartQuizPuzzleAnswerDao;
+    private SmartNurseryPuzzleAnswerDao smartNurseryPuzzleAnswerDao;
 
     @Autowired
-    private SmartQuizPuzzleGroupService smartQuizPuzzleGroupService;
+    private SmartNurseryPuzzleGroupService smartNurseryPuzzleGroupService;
 
     @Autowired
-    private SmartQuizTrialService smartQuizTrialService;
+    private SmartNurseryTrialService smartNurseryTrialService;
 
     @Autowired
     private SmartUsersService smartUsersService;
 
     @Autowired
-    private SmartQuizPuzzlesService smartQuizPuzzlesService;
+    private SmartNurseryPuzzlesService smartNurseryPuzzlesService;
 
     public static final int PUZZLESSIZE = 5;
 
-    public SmartQuizPuzzlesServiceImpl(BaseDao<SmartQuizPuzzlesDO> baseDao) {
-        super(baseDao);
+    public SmartNurseryPuzzlesServiceImpl(BaseDao<SmartNurseryPuzzlesDO> baseDao) {
+        super(baseDao); 
     }
 
     @Override
-    public List<SmartQuizPuzzlesDTO> pickByType(Integer type, Integer difficulty, HttpSession session) {
+    public List<SmartNurseryPuzzlesDTO> pickByType(Integer type, Integer difficulty, HttpSession session) {
         Span span = GlobalTracer.get()
                 .buildSpan("pickByType")
                 .asChildOf(GlobalTracer.get().activeSpan())
                 .start();
 
-        List<SmartQuizPuzzlesDTO> res = null;
+        List<SmartNurseryPuzzlesDTO> res = null;
 
         // Remember to check NPD (Null Pointer Dereference)
 
@@ -67,31 +68,31 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
         switch (type) {
             case 1: {  // seasonal mode
                 span.log("type=1,seasonal");
-                SmartQuizPuzzlesDTO sqpd = new SmartQuizPuzzlesDTO();
-                ArrayList<SmartQuizPuzzlesDTO> list = new ArrayList<>();
-                List<SmartQuizPuzzlesDO> groups = smartQuizPuzzleGroupService.listByDifficulty(1, 10000, difficulty);
+                SmartNurseryPuzzlesDTO sqpd = new SmartNurseryPuzzlesDTO();
+                ArrayList<SmartNurseryPuzzlesDTO> list = new ArrayList<>();
+                List<SmartNurseryPuzzlesDO> groups = smartNurseryPuzzleGroupService.listByDifficulty(1, 10000, difficulty);
                 int max_length = 0;
-                for (SmartQuizPuzzlesDO one : groups) {
+                for (SmartNurseryPuzzlesDO one : groups) {
                     max_length += one.getProbability();
                 }
 
                 span.log("maxlength : " + max_length);
                 while (list.size() < PUZZLESSIZE) {
-                    SmartQuizPuzzlesDO one = smartQuizPuzzlesService.getFromGroup(groups, max_length);
+                    SmartNurseryPuzzlesDO one = smartNurseryPuzzlesService.getFromGroup(groups, max_length);
                     while (one == null) {
-                        one = smartQuizPuzzlesService.getFromGroup(groups, max_length);
+                        one = smartNurseryPuzzlesService.getFromGroup(groups, max_length);
                     }
 
 
-                    SmartQuizPuzzlesDTO one_puzzle = new SmartQuizPuzzlesDTO(one);
+                    SmartNurseryPuzzlesDTO one_puzzle = new SmartNurseryPuzzlesDTO(one);
                     groups.remove(one);
                     max_length -= one.getProbability();
                     span.log("puzzlePicked : " + list.size() + " , " + one_puzzle.getPuzzleId());
                     span.log("next_maxlength : " + max_length);
-                    SmartQuizPuzzleAnswerDO pattern = new SmartQuizPuzzleAnswerDO();
+                    SmartNurseryPuzzleAnswerDO pattern = new SmartNurseryPuzzleAnswerDO();
                     pattern.setPuzzleId(one_puzzle.getPuzzleId());
 
-                    List<SmartQuizPuzzleAnswerDO> answers = smartQuizPuzzleAnswerDao.listByExample(1, 100, pattern, null);
+                    List<SmartNurseryPuzzleAnswerDO> answers = smartNurseryPuzzleAnswerDao.listByExample(1, 100, pattern, null);
                     one_puzzle.setAnswers(answers);
 
                     if (!list.contains(one_puzzle)) {
@@ -106,32 +107,32 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
             }
             case 2: { // daily mode
                 span.log("type=2,daily");
-                SmartQuizPuzzlesDTO sqpd = new SmartQuizPuzzlesDTO();
-                ArrayList<SmartQuizPuzzlesDTO> list = new ArrayList<>();
-                List<SmartQuizPuzzlesDO> groups = smartQuizPuzzleGroupService.listByDifficulty(1, 10000, difficulty);
+                SmartNurseryPuzzlesDTO sqpd = new SmartNurseryPuzzlesDTO();
+                ArrayList<SmartNurseryPuzzlesDTO> list = new ArrayList<>();
+                List<SmartNurseryPuzzlesDO> groups = smartNurseryPuzzleGroupService.listByDifficulty(1, 10000, difficulty);
                 int max_length = 0;
-                for (SmartQuizPuzzlesDO one : groups) {
+                for (SmartNurseryPuzzlesDO one : groups) {
                     max_length += one.getProbability();
                 }
                 span.log("maxlength : " + max_length);
 
                 while (list.size() < PUZZLESSIZE) {
-                    SmartQuizPuzzlesDO one = smartQuizPuzzlesService.getFromGroup(groups, max_length);
+                    SmartNurseryPuzzlesDO one = smartNurseryPuzzlesService.getFromGroup(groups, max_length);
                     while (one == null) {
-                        one = smartQuizPuzzlesService.getFromGroup(groups, max_length);
+                        one = smartNurseryPuzzlesService.getFromGroup(groups, max_length);
                     }
 
-                    SmartQuizPuzzlesDTO one_puzzle = new SmartQuizPuzzlesDTO(one);
+                    SmartNurseryPuzzlesDTO one_puzzle = new SmartNurseryPuzzlesDTO(one);
                     max_length -= one.getProbability();
                     groups.remove(one);
 
                     span.log("puzzlePicked : " + list.size() + " , " + one_puzzle.getPuzzleId());
                     span.log("next_maxlength : " + max_length);
 
-                    SmartQuizPuzzleAnswerDO pattern = new SmartQuizPuzzleAnswerDO();
+                    SmartNurseryPuzzleAnswerDO pattern = new SmartNurseryPuzzleAnswerDO();
                     pattern.setPuzzleId(one_puzzle.getPuzzleId());
 
-                    List<SmartQuizPuzzleAnswerDO> answers = smartQuizPuzzleAnswerDao.listByExample(1, 100, pattern, null);
+                    List<SmartNurseryPuzzleAnswerDO> answers = smartNurseryPuzzleAnswerDao.listByExample(1, 100, pattern, null);
                     one_puzzle.setAnswers(answers);
 
                     if (!list.contains(one_puzzle)) {
@@ -147,33 +148,33 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
             }
             case 3: { // random mode
                 span.log("type=3,random");
-                SmartQuizPuzzlesDTO sqpd = new SmartQuizPuzzlesDTO();
-                ArrayList<SmartQuizPuzzlesDTO> list = new ArrayList<>();
-                List<SmartQuizPuzzlesDO> groups = smartQuizPuzzleGroupService.listByDifficulty(1, 10000, difficulty);
+                SmartNurseryPuzzlesDTO sqpd = new SmartNurseryPuzzlesDTO();
+                ArrayList<SmartNurseryPuzzlesDTO> list = new ArrayList<>();
+                List<SmartNurseryPuzzlesDO> groups = smartNurseryPuzzleGroupService.listByDifficulty(1, 10000, difficulty);
                 int max_length = 0;
-                for (SmartQuizPuzzlesDO one : groups) {
+                for (SmartNurseryPuzzlesDO one : groups) {
                     max_length += one.getProbability();
                 }
                 span.log("maxlength : " + max_length);
 
                 while (list.size() < PUZZLESSIZE) {
-                    SmartQuizPuzzlesDO one = smartQuizPuzzlesService.getFromGroup(groups, max_length);
+                    SmartNurseryPuzzlesDO one = smartNurseryPuzzlesService.getFromGroup(groups, max_length);
 
                     while (one == null) {
-                        one = smartQuizPuzzlesService.getFromGroup(groups, max_length);
+                        one = smartNurseryPuzzlesService.getFromGroup(groups, max_length);
                     }
 
-                    SmartQuizPuzzlesDTO one_puzzle = new SmartQuizPuzzlesDTO(one);
+                    SmartNurseryPuzzlesDTO one_puzzle = new SmartNurseryPuzzlesDTO(one);
                     groups.remove(one);
                     max_length -= one.getProbability();
 
                     span.log("puzzlePicked : " + list.size() + " , " + one_puzzle.getPuzzleId());
                     span.log("next_maxlength : " + max_length);
 
-                    SmartQuizPuzzleAnswerDO pattern = new SmartQuizPuzzleAnswerDO();
+                    SmartNurseryPuzzleAnswerDO pattern = new SmartNurseryPuzzleAnswerDO();
                     pattern.setPuzzleId(one_puzzle.getPuzzleId());
 
-                    List<SmartQuizPuzzleAnswerDO> answers = smartQuizPuzzleAnswerDao.listByExample(1, 100, pattern, null);
+                    List<SmartNurseryPuzzleAnswerDO> answers = smartNurseryPuzzleAnswerDao.listByExample(1, 100, pattern, null);
                     one_puzzle.setAnswers(answers);
 
                     if (!list.contains(one_puzzle)) {
@@ -190,7 +191,7 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
                 span.log("type=4, review-mode");
                 SmartUsersDO user = smartUsersService.getBySession(session);
                 res = new ArrayList<>();
-                List<SmartQuizPuzzlesDTO> temp = smartQuizTrialService.reviewPuzzles(user);
+                List<SmartNurseryPuzzlesDTO> temp = smartNurseryTrialService.reviewPuzzles(user);
 
                 if (temp != null && temp.size() != 0) {
                     Collections.shuffle(temp);
@@ -213,9 +214,9 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
             case 5: {
                 span.log("type=5, list wrong");
                 SmartUsersDO user = smartUsersService.getBySession(session);
-                List<SmartQuizPuzzlesDTO> temp = smartQuizTrialService.reviewPuzzles(user);
+                List<SmartNurseryPuzzlesDTO> temp = smartNurseryTrialService.reviewPuzzles(user);
                 res = new ArrayList<>();
-                for (int i = 0; i < SmartQuizPuzzlesServiceImpl.PUZZLESSIZE; i++) {
+                for (int i = 0; i < SmartNurseryPuzzlesServiceImpl.PUZZLESSIZE; i++) {
                     res.add(temp.get(i));
                 }
 
@@ -230,10 +231,11 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
         }
 
 
+
     }
 
     @Override
-    public SmartQuizPuzzlesDO getFromGroup(List<SmartQuizPuzzlesDO> groups, int max_length) {
+    public SmartNurseryPuzzlesDO getFromGroup(List<SmartNurseryPuzzlesDO> groups, int max_length) {
         Span span = GlobalTracer.get()
                 .buildSpan("getFromGroup")
                 .asChildOf(GlobalTracer.get().activeSpan())
@@ -244,9 +246,9 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
 
         int target = random.nextInt(max_length);
 
-        SmartQuizPuzzlesDO res = null;   // check npd
+        SmartNurseryPuzzlesDO res = null;   // check npd
 
-        for (SmartQuizPuzzlesDO one : groups) {
+        for (SmartNurseryPuzzlesDO one : groups) {
             counter += one.getProbability();
             if (counter >= target) {
                 res = one;
@@ -263,7 +265,7 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
                               int probability) {
         Date cur = new Date();
         int v = ((Number) (Math.random() * 100000000)).intValue() % 3307 + 30;
-        SmartQuizPuzzlesDO question = new SmartQuizPuzzlesDO();
+        SmartNurseryPuzzlesDO question = new SmartNurseryPuzzlesDO();
         question.setTrials(0);
         question.setSuccessTrials(0);
         question.setName(name);
@@ -276,7 +278,7 @@ public class SmartQuizPuzzlesServiceImpl extends BaseServiceImpl<SmartQuizPuzzle
         question.setExplaination("explain");
         question.setPuzzleStatus(1);
         this.save(question);
-        SmartQuizPuzzlesDO xl = new SmartQuizPuzzlesDO();
+        SmartNurseryPuzzlesDO xl = new SmartNurseryPuzzlesDO();
         xl.setName(name);
         xl.setCreateTime(cur);
         xl.setCreateUser(v);

+ 33 - 33
sourcecode/server/src/main/java/smart/gift/service/impl/SmartQuizTrialServiceImpl.java → sourcecode/server/src/main/java/smart/gift/service/impl/SmartNurseryTrialServiceImpl.java

@@ -4,12 +4,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import smart.gift.controller.SmartQuizPuzzlesController;
 import smart.gift.domain.dto.*;
 import smart.gift.domain.entity.*;
-import smart.gift.framework.BaseServiceImpl;
 import smart.gift.framework.BaseDao;
+import smart.gift.framework.BaseServiceImpl;
 import smart.gift.framework.RetResult;
 import smart.gift.service.*;
 import smart.gift.utils.CityCodingUtlis;
@@ -17,22 +15,22 @@ import smart.gift.utils.CityCodingUtlis;
 import java.util.*;
 
 /**
- * 答题结果(smart_quiz_trial) 实体类的数据服务类实现
- * <p>
+ * 答题结果(smart_quiz_trial) 实体类的数据服务类实现 
+ * 
  * author: Code-gen @ Szu-star
- */
+ */ 
 @Service
-public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
-        implements SmartQuizTrialService {
+public class SmartNurseryTrialServiceImpl extends BaseServiceImpl<SmartNurseryTrialDO>
+        implements SmartNurseryTrialService {
 
     @Autowired
-    private SmartQuizTrialService smartQuizTrialService;
+    private SmartNurseryTrialService smartNurseryTrialService;
 
     @Autowired
-    private SmartQuizPuzzlesService smartQuizPuzzlesService;
+    private SmartNurseryPuzzlesService smartNurseryPuzzlesService;
 
     @Autowired
-    private SmartQuizPuzzleAnswerService smartQuizPuzzleAnswerService;
+    private SmartNurseryPuzzleAnswerService smartNurseryPuzzleAnswerService;
 
     @Autowired
     private SmartUsersService smartUsersService;
@@ -44,8 +42,8 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
 
     public static final int PUZZLEBATCH = 20; // points per puzzle
 
-    public SmartQuizTrialServiceImpl(BaseDao<SmartQuizTrialDO> baseDao) {
-        super(baseDao);
+    public SmartNurseryTrialServiceImpl(BaseDao<SmartNurseryTrialDO> baseDao) {
+        super(baseDao); 
     }
 
     private long pointsTolong(String points) {
@@ -55,7 +53,7 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
         return Long.valueOf(points);
     }
 
-    static Logger logger = LoggerFactory.getLogger(SmartQuizTrialServiceImpl.class);
+    static Logger logger = LoggerFactory.getLogger(SmartNurseryTrialServiceImpl.class);
 
     @Override
     public RetResult refreshTimes(SmartUsersDO user) {
@@ -129,39 +127,39 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
     }
 
     @Override
-    public List<SmartQuizPuzzlesDTO> reviewPuzzles(SmartUsersDO user) {
+    public List<SmartNurseryPuzzlesDTO> reviewPuzzles(SmartUsersDO user) {
         Logger logger = LoggerFactory.getLogger("[Review Puzzles Mode]");
 
         int userid = user.getUid();
 
         logger.info("[User ID in Review] " + userid);
 
-        List<SmartQuizPuzzlesDTO> temp = new ArrayList<>();
+        List<SmartNurseryPuzzlesDTO> temp = new ArrayList<>();
 
-        SmartQuizTrialDO pattern = new SmartQuizTrialDO();
+        SmartNurseryTrialDO pattern = new SmartNurseryTrialDO();
         pattern.setUserId(userid);
 
-        List<SmartQuizTrialDO> list = smartQuizTrialService.listByExample(1, 2000, pattern, null);
+        List<SmartNurseryTrialDO> list = smartNurseryTrialService.listByExample(1, 2000, pattern, null);
 
         logger.info("[Puzzles Size Of User Is] " + list.size());
 
-//        for (SmartQuizTrialDO o : list) {
+//        for (SmartNurseryTrialDO o : list) {
 //            logger.info("[Question One] " + o.toString());
 //        }
 
         Collections.reverse(list);
 
-        for (SmartQuizTrialDO one_trail : list) {
+        for (SmartNurseryTrialDO one_trail : list) {
             if (temp.size() <= PUZZLEBATCH) {
                 if (one_trail.getIsCorrect() == 0) {
-                    SmartQuizPuzzlesDO one_question = new SmartQuizPuzzlesDO(); // one_question means it contains just question
+                    SmartNurseryPuzzlesDO one_question = new SmartNurseryPuzzlesDO(); // one_question means it contains just question
                     one_question.setPuzzleId(one_trail.getQuestionId());
 
-                    SmartQuizPuzzlesDTO one_puzzle = new SmartQuizPuzzlesDTO(smartQuizPuzzlesService.getByKey(one_question));
-                    SmartQuizPuzzleAnswerDO answer_pattern = new SmartQuizPuzzleAnswerDO();
+                    SmartNurseryPuzzlesDTO one_puzzle = new SmartNurseryPuzzlesDTO(smartNurseryPuzzlesService.getByKey(one_question));
+                    SmartNurseryPuzzleAnswerDO answer_pattern = new SmartNurseryPuzzleAnswerDO();
                     answer_pattern.setPuzzleId(one_puzzle.getPuzzleId());
 
-                    one_puzzle.setAnswers(smartQuizPuzzleAnswerService.listByExample(1, 8000, answer_pattern, null));
+                    one_puzzle.setAnswers(smartNurseryPuzzleAnswerService.listByExample(1, 8000, answer_pattern, null));
                     if (!temp.contains(one_puzzle)) {
                         temp.add(one_puzzle);
                     }
@@ -181,7 +179,7 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
     }
 
     @Override
-    public RetResult<Integer> judge(Integer type, List<SmartQuizTrialDO> answers, SmartUsersDO user) {
+    public RetResult<Integer> judge(Integer type, List<SmartNurseryTrialDO> answers, SmartUsersDO user) {
 
         //TODO: Enable Wrong Puzzle Trailing in 2 days  --- 2019/1/28
         // Half Done
@@ -201,20 +199,20 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
         int i, j;
 
         for (i = 0; i < answers.size(); i++) {
-            SmartQuizTrialDO one = answers.get(i);
+            SmartNurseryTrialDO one = answers.get(i);
 
             //logger.info("[Answer " + i +" ] " + "Is " + one.toString());
 
-            //logger.info("[GetCorById Result] " + smartQuizPuzzleAnswerService.getCorrectAnswerByPuzzleId(
+            //logger.info("[GetCorById Result] " + SmartNurseryPuzzleAnswerService.getCorrectAnswerByPuzzleId(
             //        one.getQuestionId()).toString());
 
-            if (!smartQuizPuzzleAnswerService.getCorrectAnswerByPuzzleId(
+            if (!smartNurseryPuzzleAnswerService.getCorrectAnswerByPuzzleId(
                     one.getQuestionId()).getRet().equals("10000")) {
                 return RetResult.errorRet("EMPTY_ANSWER");
             }
 
             user_answers.add(one.getChosen());
-            correct_answers.add(smartQuizPuzzleAnswerService.getCorrectAnswerByPuzzleId(
+            correct_answers.add(smartNurseryPuzzleAnswerService.getCorrectAnswerByPuzzleId(
                     one.getQuestionId()).getModel().toString());
         }
 
@@ -234,7 +232,7 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
             if (j == correct_answers.get(i).length()) {
                 correct_counter++;
 
-                SmartQuizTrialDO record = new SmartQuizTrialDO();
+                SmartNurseryTrialDO record = new SmartNurseryTrialDO();
 
                 record.setChosen(user_answers.get(i));
                 record.setUserId(user.getUid());
@@ -244,10 +242,10 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
                 record.setIsReview(0);
                 record.setTrialTime(new Date());
 
-                smartQuizTrialService.save(record);
+                smartNurseryTrialService.save(record);
 
             } else {
-                SmartQuizTrialDO record = new SmartQuizTrialDO();
+                SmartNurseryTrialDO record = new SmartNurseryTrialDO();
 
                 record.setChosen(user_answers.get(i));
                 record.setUserId(user.getUid());
@@ -257,11 +255,12 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
                 record.setIsReview(0);
                 record.setTrialTime(new Date());
 
-                smartQuizTrialService.save(record);
+                smartNurseryTrialService.save(record);
             }
         }
 
 
+
         if (type == 1 || type == 2) {  // 计算积分
             RetResult res = alterPoints(user, correct_counter);
             smartMemberInfoService.addAnswerTimes(user); // 增加一次答题次数 (表示总答题次数少一次)
@@ -274,6 +273,7 @@ public class SmartQuizTrialServiceImpl extends BaseServiceImpl<SmartQuizTrialDO>
         }
 
 
+
         RetResult res = new RetResult();
         res.setRet("10000");
         res.setDetail("[Answers Judging Completed]");

+ 0 - 83
sourcecode/server/src/main/java/smart/gift/service/impl/SmartQuizPuzzleGroupServiceImpl.java

@@ -1,83 +0,0 @@
-package smart.gift.service.impl;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import smart.gift.dao.SmartQuizPuzzlesDao;
-import smart.gift.domain.entity.SmartQuizPuzzlesDO;
-import smart.gift.framework.BaseServiceImpl;
-import smart.gift.framework.BaseDao;
-import smart.gift.dao.SmartQuizPuzzleGroupDao;
-import smart.gift.service.SmartQuizPuzzleGroupService;
-import smart.gift.domain.entity.SmartQuizPuzzleGroupDO;
-import smart.gift.service.SmartQuizPuzzlesService;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * 答题题库(smart_quiz_puzzle_group) 实体类的数据服务类实现
- * <p>
- * author: Code-gen @ Szu-star
- */
-@Service
-public class SmartQuizPuzzleGroupServiceImpl extends BaseServiceImpl<SmartQuizPuzzleGroupDO>
-        implements SmartQuizPuzzleGroupService {
-
-    private static final Logger logger = LoggerFactory.getLogger(SmartQuizPuzzleGroupServiceImpl.class);
-
-    @Autowired
-    private SmartQuizPuzzleGroupDao smartQuizPuzzleGroupDao;
-
-    @Autowired
-    private SmartQuizPuzzlesDao smartQuizPuzzlesDao;
-
-    @Override
-    public List<SmartQuizPuzzlesDO> listByDifficulty(Integer page, Integer pageSize, Integer difficulty) {
-        List<List<SmartQuizPuzzlesDO>> container = new ArrayList<>();
-
-        List<SmartQuizPuzzlesDO> res = new ArrayList<>();
-        SmartQuizPuzzleGroupDO pattern = new SmartQuizPuzzleGroupDO();
-        int i, j;
-
-        logger.info("=====Given Difficulty Is " + difficulty);
-
-        for (i = 0; i <= difficulty; i++) {
-            pattern.setDifficulty(i);
-
-            List<SmartQuizPuzzleGroupDO> list = smartQuizPuzzleGroupDao.listByExample(1, 1000, pattern, null);
-
-            logger.info("====Puzzles Group Obtained Size Is " + list.size());
-
-            //logger.info("=====Puzzles Group Obtained Are" + );
-
-            for (j = 0; j < list.size(); j++) {
-                SmartQuizPuzzlesDO puzzle_pattern = new SmartQuizPuzzlesDO();
-                puzzle_pattern.setGroupId(list.get(j).getPuzzelGroupId());
-
-                container.add(smartQuizPuzzlesDao.listByExample(1, 1000, puzzle_pattern, null));
-            }
-
-        }
-
-
-        for (List<SmartQuizPuzzlesDO> one_list : container) {
-            for (SmartQuizPuzzlesDO one_puzzle : one_list) {
-                //logger.info("====One Puzzle Is" + one_puzzle.toString());
-                res.add(one_puzzle);
-            }
-        }
-
-
-        return res;
-
-    }
-
-    public SmartQuizPuzzleGroupServiceImpl(BaseDao<SmartQuizPuzzleGroupDO> baseDao) {
-        super(baseDao);
-    }
-}
-

+ 3 - 3
sourcecode/server/src/main/java/smart/gift/service/impl/SmartUsersServiceImpl.java

@@ -16,7 +16,7 @@ import smart.gift.framework.BaseServiceImpl;
 import smart.gift.framework.BaseDao;
 import smart.gift.dao.SmartUsersDao;
 import smart.gift.service.SmartMemberInfoService;
-import smart.gift.service.SmartQuizTrialService;
+import smart.gift.service.SmartNurseryTrialService;
 import smart.gift.service.SmartUsersService;
 import smart.gift.utils.SHA3Digest;
 
@@ -55,7 +55,7 @@ public class SmartUsersServiceImpl extends BaseServiceImpl<SmartUsersDO>
     private SmartUsersService smartUsersService;
 
     @Autowired
-    private SmartQuizTrialService smartQuizTrialService;
+    private SmartNurseryTrialService smartNurseryTrialService;
 
     public SmartUsersServiceImpl(BaseDao<SmartUsersDO> baseDao) {
         super(baseDao);
@@ -170,7 +170,7 @@ public class SmartUsersServiceImpl extends BaseServiceImpl<SmartUsersDO>
 
             SmartUsersDO user = new SmartUsersDO();
             user.setUid(userId);
-            smartQuizTrialService.refreshTimes(user);
+            smartNurseryTrialService.refreshTimes(user);
 
 
             SmartMemberInfoDO phone = new SmartMemberInfoDO();

+ 15 - 15
sourcecode/server/src/main/resources/mapper/SmartQuizPuzzleAnswerMapper.xml → sourcecode/server/src/main/resources/mapper/SmartNurseryPuzzleAnswerMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="smart.gift.dao.SmartQuizPuzzleAnswerDao">
+<mapper namespace="smart.gift.dao.SmartNurseryPuzzleAnswerDao">
 
-    <resultMap id="smartQuizPuzzleAnswerMap" type="smart.gift.domain.entity.SmartQuizPuzzleAnswerDO">
+    <resultMap id="smartNurseryPuzzleAnswerMap" type="smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO">
         <id column="answer_id" property="answerId"/>
         <result column="puzzle_id" property="puzzleId"/>
         <result column="is_correct" property="isCorrect"/>
@@ -21,8 +21,8 @@
     </sql>
 
     <insert id="save" useGeneratedKeys="false" keyProperty="answerId"
-            parameterType="smart.gift.domain.entity.SmartQuizPuzzleAnswerDO">
-        insert into smart_quiz_puzzle_answer
+            parameterType="smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO">
+        insert into smart_nursery_puzzle_answer
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="answerId != null">
                 answer_id,
@@ -95,8 +95,8 @@
         </trim>
     </insert>
 
-    <update id="update" parameterType="smart.gift.domain.entity.SmartQuizPuzzleAnswerDO">
-        update smart_quiz_puzzle_answer
+    <update id="update" parameterType="smart.gift.domain.entity.SmartNurseryPuzzleAnswerDO">
+        update smart_nursery_puzzle_answer
         <set>
             <if test="puzzleId != null">
                 puzzle_id = #{puzzleId},
@@ -133,7 +133,7 @@
     </update>
 
     <update id="updateByExample">
-        update smart_quiz_puzzle_answer
+        update smart_nursery_puzzle_answer
         <set>
             <if test="update.puzzleId != null">
                 puzzle_id = #{update.puzzleId},
@@ -203,17 +203,17 @@
     </update>
 
     <delete id="delete">
-        delete from smart_quiz_puzzle_answer
+        delete from smart_nursery_puzzle_answer
         where answer_id = #{key}
     </delete>
 
     <delete id="deleteByKey">
-        delete from smart_quiz_puzzle_answer
+        delete from smart_nursery_puzzle_answer
         where answer_id = #{delete.answerId}
     </delete>
 
     <delete id="deleteByExample">
-        delete from smart_quiz_puzzle_answer
+        delete from smart_nursery_puzzle_answer
         where 1 = 1
         <if test="example.answerId != null">
             and answer_id = #{example.answerId}
@@ -251,7 +251,7 @@
     </delete>
 
     <select id="countByExample" resultType="java.lang.Integer">
-        select count(*) from smart_quiz_puzzle_answer where 1 = 1
+        select count(*) from smart_nursery_puzzle_answer where 1 = 1
         <if test="example.answerId != null">
             and answer_id = #{example.answerId}
         </if>
@@ -287,10 +287,10 @@
         </if>
     </select>
 
-    <select id="listByExample" resultMap="smartQuizPuzzleAnswerMap">
+    <select id="listByExample" resultMap="smartNurseryPuzzleAnswerMap">
         select
         <include refid="allField"/>
-        from smart_quiz_puzzle_answer where 1 = 1
+        from smart_nursery_puzzle_answer where 1 = 1
         <if test="example.answerId != null">
             and answer_id = #{example.answerId}
         </if>
@@ -330,10 +330,10 @@
         limit ${pageSize} offset ${(page - 1) * pageSize}
     </select>
 
-    <select id="getByKey" resultMap="smartQuizPuzzleAnswerMap">
+    <select id="getByKey" resultMap="smartNurseryPuzzleAnswerMap">
         select
         <include refid="allField"/>
-        from smart_quiz_puzzle_answer where answer_id = #{key}
+        from smart_nursery_puzzle_answer where answer_id = #{key}
     </select>
 
 

+ 15 - 15
sourcecode/server/src/main/resources/mapper/SmartQuizPuzzleGroupMapper.xml → sourcecode/server/src/main/resources/mapper/SmartNurseryPuzzleGroupMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="smart.gift.dao.SmartQuizPuzzleGroupDao">
+<mapper namespace="smart.gift.dao.SmartNurseryPuzzleGroupDao">
 
-    <resultMap id="smartQuizPuzzleGroupMap" type="smart.gift.domain.entity.SmartQuizPuzzleGroupDO">
+    <resultMap id="smartNurseryPuzzleGroupMap" type="smart.gift.domain.entity.SmartNurseryPuzzleGroupDO">
         <id column="puzzel_group_id" property="puzzelGroupId"/>
         <result column="difficulty" property="difficulty"/>
         <result column="probability" property="probability"/>
@@ -20,8 +20,8 @@
     </sql>
 
     <insert id="save" useGeneratedKeys="false" keyProperty="puzzelGroupId"
-            parameterType="smart.gift.domain.entity.SmartQuizPuzzleGroupDO">
-        insert into smart_quiz_puzzle_group
+            parameterType="smart.gift.domain.entity.SmartNurseryPuzzleGroupDO">
+        insert into smart_nursery_puzzle_group
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="puzzelGroupId != null">
                 puzzel_group_id,
@@ -88,8 +88,8 @@
         </trim>
     </insert>
 
-    <update id="update" parameterType="smart.gift.domain.entity.SmartQuizPuzzleGroupDO">
-        update smart_quiz_puzzle_group
+    <update id="update" parameterType="smart.gift.domain.entity.SmartNurseryPuzzleGroupDO">
+        update smart_nursery_puzzle_group
         <set>
             <if test="difficulty != null">
                 difficulty = #{difficulty},
@@ -123,7 +123,7 @@
     </update>
 
     <update id="updateByExample">
-        update smart_quiz_puzzle_group
+        update smart_nursery_puzzle_group
         <set>
             <if test="update.difficulty != null">
                 difficulty = #{update.difficulty},
@@ -187,17 +187,17 @@
     </update>
 
     <delete id="delete">
-        delete from smart_quiz_puzzle_group
+        delete from smart_nursery_puzzle_group
         where puzzel_group_id = #{key}
     </delete>
 
     <delete id="deleteByKey">
-        delete from smart_quiz_puzzle_group
+        delete from smart_nursery_puzzle_group
         where puzzel_group_id = #{delete.puzzelGroupId}
     </delete>
 
     <delete id="deleteByExample">
-        delete from smart_quiz_puzzle_group
+        delete from smart_nursery_puzzle_group
         where 1 = 1
         <if test="example.puzzelGroupId != null">
             and puzzel_group_id = #{example.puzzelGroupId}
@@ -232,7 +232,7 @@
     </delete>
 
     <select id="countByExample" resultType="java.lang.Integer">
-        select count(*) from smart_quiz_puzzle_group where 1 = 1
+        select count(*) from smart_nursery_puzzle_group where 1 = 1
         <if test="example.puzzelGroupId != null">
             and puzzel_group_id = #{example.puzzelGroupId}
         </if>
@@ -265,10 +265,10 @@
         </if>
     </select>
 
-    <select id="listByExample" resultMap="smartQuizPuzzleGroupMap">
+    <select id="listByExample" resultMap="smartNurseryPuzzleGroupMap">
         select
         <include refid="allField"/>
-        from smart_quiz_puzzle_group where 1 = 1
+        from smart_nursery_puzzle_group where 1 = 1
         <if test="example.puzzelGroupId != null">
             and puzzel_group_id = #{example.puzzelGroupId}
         </if>
@@ -305,10 +305,10 @@
         limit ${pageSize} offset ${(page - 1) * pageSize}
     </select>
 
-    <select id="getByKey" resultMap="smartQuizPuzzleGroupMap">
+    <select id="getByKey" resultMap="smartNurseryPuzzleGroupMap">
         select
         <include refid="allField"/>
-        from smart_quiz_puzzle_group where puzzel_group_id = #{key}
+        from smart_nursery_puzzle_group where puzzel_group_id = #{key}
     </select>
 
 

+ 15 - 15
sourcecode/server/src/main/resources/mapper/SmartQuizPuzzlesMapper.xml → sourcecode/server/src/main/resources/mapper/SmartNurseryPuzzlesMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="smart.gift.dao.SmartQuizPuzzlesDao">
+<mapper namespace="smart.gift.dao.SmartNurseryPuzzlesDao">
 
-    <resultMap id="smartQuizPuzzlesMap" type="smart.gift.domain.entity.SmartQuizPuzzlesDO">
+    <resultMap id="smartNurseryPuzzlesMap" type="smart.gift.domain.entity.SmartNurseryPuzzlesDO">
         <id column="puzzle_id" property="puzzleId"/>
         <result column="group_id" property="groupId"/>
         <result column="puzzle_type" property="puzzleType"/>
@@ -22,8 +22,8 @@
     </sql>
 
     <insert id="save" useGeneratedKeys="false" keyProperty="puzzleId"
-            parameterType="smart.gift.domain.entity.SmartQuizPuzzlesDO">
-        insert into smart_quiz_puzzles
+            parameterType="smart.gift.domain.entity.SmartNurseryPuzzlesDO">
+        insert into smart_nursery_puzzles
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="puzzleId != null">
                 puzzle_id,
@@ -102,8 +102,8 @@
         </trim>
     </insert>
 
-    <update id="update" parameterType="smart.gift.domain.entity.SmartQuizPuzzlesDO">
-        update smart_quiz_puzzles
+    <update id="update" parameterType="smart.gift.domain.entity.SmartNurseryPuzzlesDO">
+        update smart_nursery_puzzles
         <set>
             <if test="groupId != null">
                 group_id = #{groupId},
@@ -143,7 +143,7 @@
     </update>
 
     <update id="updateByExample">
-        update smart_quiz_puzzles
+        update smart_nursery_puzzles
         <set>
             <if test="update.groupId != null">
                 group_id = #{update.groupId},
@@ -219,17 +219,17 @@
     </update>
 
     <delete id="delete">
-        delete from smart_quiz_puzzles
+        delete from smart_nursery_puzzles
         where puzzle_id = #{key}
     </delete>
 
     <delete id="deleteByKey">
-        delete from smart_quiz_puzzles
+        delete from smart_nursery_puzzles
         where puzzle_id = #{delete.puzzleId}
     </delete>
 
     <delete id="deleteByExample">
-        delete from smart_quiz_puzzles
+        delete from smart_nursery_puzzles
         where 1 = 1
         <if test="example.puzzleId != null">
             and puzzle_id = #{example.puzzleId}
@@ -270,7 +270,7 @@
     </delete>
 
     <select id="countByExample" resultType="java.lang.Integer">
-        select count(*) from smart_quiz_puzzles where 1 = 1
+        select count(*) from smart_nursery_puzzles where 1 = 1
         <if test="example.puzzleId != null">
             and puzzle_id = #{example.puzzleId}
         </if>
@@ -309,10 +309,10 @@
         </if>
     </select>
 
-    <select id="listByExample" resultMap="smartQuizPuzzlesMap">
+    <select id="listByExample" resultMap="smartNurseryPuzzlesMap">
         select
         <include refid="allField"/>
-        from smart_quiz_puzzles where 1 = 1
+        from smart_nursery_puzzles where 1 = 1
         <if test="example.puzzleId != null">
             and puzzle_id = #{example.puzzleId}
         </if>
@@ -355,10 +355,10 @@
         limit ${pageSize} offset ${(page - 1) * pageSize}
     </select>
 
-    <select id="getByKey" resultMap="smartQuizPuzzlesMap">
+    <select id="getByKey" resultMap="smartNurseryPuzzlesMap">
         select
         <include refid="allField"/>
-        from smart_quiz_puzzles where puzzle_id = #{key}
+        from smart_nursery_puzzles where puzzle_id = #{key}
     </select>
 
 

+ 15 - 15
sourcecode/server/src/main/resources/mapper/SmartQuizTrialMapper.xml → sourcecode/server/src/main/resources/mapper/SmartNurseryTrialMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="smart.gift.dao.SmartQuizTrialDao">
+<mapper namespace="smart.gift.dao.SmartNurseryTrialDao">
 
-    <resultMap id="smartQuizTrialMap" type="smart.gift.domain.entity.SmartQuizTrialDO">
+    <resultMap id="smartNurseryTrialMap" type="smart.gift.domain.entity.SmartNurseryTrialDO">
         <id column="trial_id" property="trialId"/>
         <result column="user_id" property="userId"/>
         <result column="question_id" property="questionId"/>
@@ -18,8 +18,8 @@
     </sql>
 
     <insert id="save" useGeneratedKeys="false" keyProperty="trialId"
-            parameterType="smart.gift.domain.entity.SmartQuizTrialDO">
-        insert into smart_quiz_trial
+            parameterType="smart.gift.domain.entity.SmartNurseryTrialDO">
+        insert into smart_nursery_trial
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="trialId != null">
                 trial_id,
@@ -74,8 +74,8 @@
         </trim>
     </insert>
 
-    <update id="update" parameterType="smart.gift.domain.entity.SmartQuizTrialDO">
-        update smart_quiz_trial
+    <update id="update" parameterType="smart.gift.domain.entity.SmartNurseryTrialDO">
+        update smart_nursery_trial
         <set>
             <if test="userId != null">
                 user_id = #{userId},
@@ -103,7 +103,7 @@
     </update>
 
     <update id="updateByExample">
-        update smart_quiz_trial
+        update smart_nursery_trial
         <set>
             <if test="update.userId != null">
                 user_id = #{update.userId},
@@ -155,17 +155,17 @@
     </update>
 
     <delete id="delete">
-        delete from smart_quiz_trial
+        delete from smart_nursery_trial
         where trial_id = #{key}
     </delete>
 
     <delete id="deleteByKey">
-        delete from smart_quiz_trial
+        delete from smart_nursery_trial
         where trial_id = #{delete.trialId}
     </delete>
 
     <delete id="deleteByExample">
-        delete from smart_quiz_trial
+        delete from smart_nursery_trial
         where 1 = 1
         <if test="example.trialId != null">
             and trial_id = #{example.trialId}
@@ -194,7 +194,7 @@
     </delete>
 
     <select id="countByExample" resultType="java.lang.Integer">
-        select count(*) from smart_quiz_trial where 1 = 1
+        select count(*) from smart_nursery_trial where 1 = 1
         <if test="example.trialId != null">
             and trial_id = #{example.trialId}
         </if>
@@ -221,10 +221,10 @@
         </if>
     </select>
 
-    <select id="listByExample" resultMap="smartQuizTrialMap">
+    <select id="listByExample" resultMap="smartNurseryTrialMap">
         select
         <include refid="allField"/>
-        from smart_quiz_trial where 1 = 1
+        from smart_nursery_trial where 1 = 1
         <if test="example.trialId != null">
             and trial_id = #{example.trialId}
         </if>
@@ -255,10 +255,10 @@
         limit ${pageSize} offset ${(page - 1) * pageSize}
     </select>
 
-    <select id="getByKey" resultMap="smartQuizTrialMap">
+    <select id="getByKey" resultMap="smartNurseryTrialMap">
         select
         <include refid="allField"/>
-        from smart_quiz_trial where trial_id = #{key}
+        from smart_nursery_trial where trial_id = #{key}
     </select>
 
 

+ 1 - 1
sourcecode/server/src/main/resources/templates/smartQuizPuzzleAnswer/list.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzleAnswer/list.ftl

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>知识产权大奖赛</title>
+    <title>深大换换</title>
     <!-- head  -->
     <#include "/common/head.ftl" />
 </head>

+ 0 - 0
sourcecode/server/src/main/resources/templates/smartQuizPuzzleAnswer/save.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzleAnswer/save.ftl


+ 0 - 0
sourcecode/server/src/main/resources/templates/smartQuizPuzzleAnswer/update.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzleAnswer/update.ftl


+ 1 - 1
sourcecode/server/src/main/resources/templates/smartQuizPuzzleGroup/list.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzleGroup/list.ftl

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>知识产权大奖赛</title>
+    <title>深大换换</title>
     <!-- head  -->
     <#include "/common/head.ftl" />
 </head>

+ 0 - 0
sourcecode/server/src/main/resources/templates/smartQuizPuzzleGroup/save.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzleGroup/save.ftl


+ 0 - 0
sourcecode/server/src/main/resources/templates/smartQuizPuzzleGroup/update.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzleGroup/update.ftl


+ 1 - 1
sourcecode/server/src/main/resources/templates/smartQuizPuzzles/list.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzles/list.ftl

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>知识产权大奖赛</title>
+    <title>深大换换</title>
     <!-- head  -->
     <#include "/common/head.ftl" />
 </head>

+ 0 - 0
sourcecode/server/src/main/resources/templates/smartQuizPuzzles/save.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzles/save.ftl


+ 0 - 0
sourcecode/server/src/main/resources/templates/smartQuizPuzzles/update.ftl → sourcecode/server/src/main/resources/templates/smartNurseryPuzzles/update.ftl


+ 1 - 1
sourcecode/server/src/main/resources/templates/smartQuizTrial/list.ftl → sourcecode/server/src/main/resources/templates/smartNurseryTrial/list.ftl

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>知识产权大奖赛</title>
+    <title>深大换换</title>
     <!-- head  -->
     <#include "/common/head.ftl" />
 </head>

+ 0 - 0
sourcecode/server/src/main/resources/templates/smartQuizTrial/save.ftl → sourcecode/server/src/main/resources/templates/smartNurseryTrial/save.ftl


+ 0 - 0
sourcecode/server/src/main/resources/templates/smartQuizTrial/update.ftl → sourcecode/server/src/main/resources/templates/smartNurseryTrial/update.ftl


+ 10 - 10
sourcecode/server/src/test/java/smart/gift/ServerApplicationTest.java

@@ -117,13 +117,13 @@ public class ServerApplicationTest {
     @Test
     public void testPick() throws Exception {
         logger.info("Start Picking Test");
-        String url = SERVER_ADDR + "/server/smartQuizPuzzles/pick";
+        String url = SERVER_ADDR + "/server/smartNurseryPuzzles/pick";
 
         // Verify User NOT login
         JSONObject jsonObject = new JSONObject(HttpUtil.postJson(url, null));
         assertThat(jsonObject.getString("detail")).isEqualToIgnoringCase("UX_NOT_FOUND");
 
-        url = SERVER_ADDR + "/server/smartQuizPuzzles/pick?fromjUnit=1";
+        url = SERVER_ADDR + "/server/smartNurseryPuzzles/pick?fromjUnit=1";
 
         // Verify 10000
         // Null Type Test
@@ -225,7 +225,7 @@ public class ServerApplicationTest {
     @Test
     public void testJudging() throws Exception {
         logger.info("Start Judging Test");
-        String url = SERVER_ADDR + "/server/smartQuizTrial/judging?fromjUnit=1";
+        String url = SERVER_ADDR + "/server/smartNurseryTrial/judging?fromjUnit=1";
 
 
         JSONArray answers = new JSONArray();
@@ -292,40 +292,40 @@ public class ServerApplicationTest {
     public void testRank() throws Exception {
         logger.info("Start Ranking Test");
 
-        String url1 = SERVER_ADDR + "/server/smartQuizTrial/ranking?fromjUnit=1&individual=1&gross=1";  // 个人在学校排名
+        String url1 = SERVER_ADDR + "/server/smartNurseryTrial/ranking?fromjUnit=1&individual=1&gross=1";  // 个人在学校排名
         logger.info("[Individual In School]");
         JSONObject jsonObject1 = new JSONObject(HttpUtil.postJson(url1, new JSONArray().toString()));
         logger.info(jsonObject1.toString());
         assertThat(jsonObject1.getString("ret")).isEqualToIgnoringCase("10000");
 
 
-        String url2 = SERVER_ADDR + "/server/smartQuizTrial/ranking?fromjUnit=1&individual=1&gross=2";  // 个人在区排名
+        String url2 = SERVER_ADDR + "/server/smartNurseryTrial/ranking?fromjUnit=1&individual=1&gross=2";  // 个人在区排名
         logger.info("[Individual In District]");
         JSONObject jsonObject2 = new JSONObject(HttpUtil.postJson(url2, new JSONArray().toString()));
         logger.info(jsonObject2.toString());
         assertThat(jsonObject2.getString("ret")).isEqualToIgnoringCase("10000");
 
 
-        String url3 = SERVER_ADDR + "/server/smartQuizTrial/ranking?fromjUnit=1&individual=1&gross=3";  // 个人在市排名
+        String url3 = SERVER_ADDR + "/server/smartNurseryTrial/ranking?fromjUnit=1&individual=1&gross=3";  // 个人在市排名
         logger.info("[Individual In City]");
         JSONObject jsonObject3 = new JSONObject(HttpUtil.postJson(url3, new JSONArray().toString()));
         logger.info(jsonObject3.toString());
         assertThat(jsonObject3.getString("ret")).isEqualToIgnoringCase("10000");
 
 //
-        String url4 = SERVER_ADDR + "/server/smartQuizTrial/ranking?fromjUnit=1&individual=2&gross=2";  // 学校在区排名
+        String url4 = SERVER_ADDR + "/server/smartNurseryTrial/ranking?fromjUnit=1&individual=2&gross=2";  // 学校在区排名
         logger.info("[School In District]");
         JSONObject jsonObject4 = new JSONObject(HttpUtil.postJson(url4, new JSONArray().toString()));
         logger.info(jsonObject4.toString());
         assertThat(jsonObject4.getString("ret")).isEqualToIgnoringCase("10000");
 
-        String url5 = SERVER_ADDR + "/server/smartQuizTrial/ranking?fromjUnit=1&individual=3&gross=3";  // 区在市排名
+        String url5 = SERVER_ADDR + "/server/smartNurseryTrial/ranking?fromjUnit=1&individual=3&gross=3";  // 区在市排名
         logger.info("[District In City]");
         JSONObject jsonObject5 = new JSONObject(HttpUtil.postJson(url5, new JSONArray().toString()));
         logger.info(jsonObject5.toString());
         assertThat(jsonObject5.getString("ret")).isEqualToIgnoringCase("10000");
 
-        String url6 = SERVER_ADDR + "/server/smartQuizTrial/ranking?fromjUnit=1&individual=3&gross=2";
+        String url6 = SERVER_ADDR + "/server/smartNurseryTrial/ranking?fromjUnit=1&individual=3&gross=2";
         logger.info("[Check Wrong Type]");
         JSONObject jsonObject6 = new JSONObject(HttpUtil.postJson(url6, new JSONArray().toString()));
         logger.info(jsonObject6.toString());
@@ -427,7 +427,7 @@ public class ServerApplicationTest {
 
     //@Test
     public void generateRandomMathQTest() throws Exception {
-        String url = SERVER_ADDR + "/server/smartQuizPuzzleAnswer/generateExample";
+        String url = SERVER_ADDR + "/server/smartNurseryPuzzleAnswer/generateExample";
         JSONObject jsonObject4 = new JSONObject(HttpUtil.postJson(url, new JSONArray().toString()));
         logger.info("[URL] " + url);
         logger.info(jsonObject4.toString());

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff