添加展示页

gis_application/src/main/resources/application-dev.properties

@@ -7,21 +7,21 @@ spring.datasource.druid.username=root
 spring.datasource.druid.password=root
 
 
-# \u521D\u59CB\u8FDE\u63A5\u6570
+# 初始连接数
 spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
+# 最小连接池数量
 spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+# 最大连接池数量
 spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+# 配置获取连接等待超时的时间
 spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
 spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+# 配置一个连接在池中最小生存的时间，单位是毫秒
 spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+# 配置一个连接在池中最大生存的时间，单位是毫秒
 spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
+# 配置检测连接是否有效
 spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-on-borrow=false
@@ -30,34 +30,33 @@ spring.datasource.druid.web-stat-filter.enabled=true
 spring.datasource.druid.stat-view-servlet.enabled=true
 
 
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+# Redis数据库索引（默认为0）
 spring.redis.database=0
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.password=
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
+# 连接超时时间 单位 ms（毫秒）
 spring.redis.timeout=3000ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
+# 连接池中的最大空闲连接，默认值也是8。
 spring.redis.jedis.pool.max-idle=8
-#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
+#连接池中的最小空闲连接，默认值也是0。
 spring.redis.jedis.pool.min-idle=0
-# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
+# 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
 spring.redis.jedis.pool.max-active=8
-# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
+# 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 
 
 #log
 logging.path=E:/javaProject/army_cms_log
 logging.config=classpath:logback-spring.xml
-logging.level.com.fdkanfang=debug
+logging.level.com.gis=debug
 
-## \u672C\u5730\u4FDD\u5B58\u8DEF\u5F84
-#file.path=F:\\test\\army\\images
+、
 
-# \u4E0A\u4F20\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84
+# 上传文件保存路径
 output.file.path=F:\\test\\cms_celebrity_sc\\
 # oss info
 oss.file.path=sc_celebrity/
-oss.domain=http://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/
+oss.domain=http://ossxiaoan.4dage.com/
 

gis_application/src/main/resources/application-sit.properties

@@ -7,21 +7,21 @@ spring.datasource.druid.username=root
 spring.datasource.druid.password=4dkk2020test%
 
 
-# \u521D\u59CB\u8FDE\u63A5\u6570
+# 初始连接数
 spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
+# 最小连接池数量
 spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+# 最大连接池数量
 spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+# 配置获取连接等待超时的时间
 spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
 spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+# 配置一个连接在池中最小生存的时间，单位是毫秒
 spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+# 配置一个连接在池中最大生存的时间，单位是毫秒
 spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
+# 配置检测连接是否有效
 spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-on-borrow=false
@@ -30,20 +30,20 @@ spring.datasource.druid.web-stat-filter.enabled=true
 spring.datasource.druid.stat-view-servlet.enabled=true
 
 
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+# Redis数据库索引（默认为0）
 spring.redis.database=0
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.password=
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
+# 连接超时时间 单位 ms（毫秒）
 spring.redis.timeout=3000ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
+# 连接池中的最大空闲连接，默认值也是8。
 spring.redis.jedis.pool.max-idle=8
-#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
+#连接池中的最小空闲连接，默认值也是0。
 spring.redis.jedis.pool.min-idle=0
-# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
+# 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
 spring.redis.jedis.pool.max-active=8
-# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
+# 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 
 
@@ -53,9 +53,9 @@ logging.config=classpath:logback-spring.xml
 logging.level.com.gis=debug
 
 
-# \u4E0A\u4F20\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84
+# 上传文件保存路径
 output.file.path=/root/user/cms_celebrity_data/
 # oss info
 oss.file.path=sc_celebrity/
-oss.domain=http://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/
+oss.domain=http://ossxiaoan.4dage.com/
 

gis_application/src/main/resources/application.properties

@@ -1,4 +1,5 @@
-server.port=8102
+#server.port=8102
+server.port=2000
 
 spring.profiles.active=dev
 

gis_common/pom.xml

@@ -146,6 +146,11 @@
             <!--<artifactId>poi-ooxml</artifactId>-->
         <!--</dependency>-->
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+
 
     </dependencies>
 

gis_domain/src/main/java/com/gis/domain/request/AnswerRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/CelebrityPageRequest.java

@@ -1,12 +1,8 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
 @Data
 public class CelebrityPageRequest extends PageRequest{
 

gis_domain/src/main/java/com/gis/domain/request/CelebrityRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/CommentPageRequest.java

@@ -1,10 +1,9 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/6/10 0010 17:39

gis_domain/src/main/java/com/gis/domain/request/DeptRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/LoginRequest.java

@@ -1,10 +1,9 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/5/9 0009 12:20

gis_domain/src/main/java/com/gis/domain/request/PageDateRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/PageRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/PasswordRequest.java

@@ -1,10 +1,9 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/5/9 0009 12:20

gis_domain/src/main/java/com/gis/domain/request/QuestionPageRequest.java

@@ -1,11 +1,8 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 /**
  * Created by owen on 2020/6/10 0010 17:39
  */

gis_domain/src/main/java/com/gis/domain/request/QuestionRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/RoleAccreditRequest.java

@@ -1,9 +1,8 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Set;
 

gis_domain/src/main/java/com/gis/domain/request/RoleRequest.java

@@ -1,10 +1,9 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/5/9 0009 12:20

gis_domain/src/main/java/com/gis/domain/request/UserPageRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/UserRequest.java

@@ -1,9 +1,8 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**

gis_domain/src/main/java/com/gis/domain/entity/GoodsEntity.java

@@ -1,55 +0,0 @@
-package com.gis.domain.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * 藏品信息表
- */
-@Data
-@Table(name = "tb_goods")
-public class GoodsEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = -8093446477843493946L;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "朝代Id")
-    private Long dynastyId;
-
-
-    @ApiModelProperty(value = "文物类别Id")
-    private Long categoryId;
-
-
-    @ApiModelProperty(value = "文件级别，0:未定级，1：一级, 2：二级， 3：三级")
-    private Integer level;
-
-    @ApiModelProperty(value = "文物介绍")
-    private String description;
-
-    @ApiModelProperty(value = "缩略图url")
-    private String thumb;
-
-    @ApiModelProperty(value = "高清图url")
-    private String img;
-
-    @ApiModelProperty(value = "模型url")
-    private String webSite;
-
-    @ApiModelProperty(value = "浏览量")
-    private Integer countTrack;
-
-    @ApiModelProperty(value = "评论量")
-    private Integer countComment;
-
-    @ApiModelProperty(value = "点赞量")
-    private Integer countStar;
-
-
-}

gis_domain/src/main/java/com/gis/domain/entity/WxCollectEntity.java

@@ -1,27 +0,0 @@
-package com.gis.domain.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * 微信收藏表
- * wxId、goodsId够成联合主键，确定唯一值
- */
-@Data
-@Table(name = "tb_wx_collect")
-public class WxCollectEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = -5191917184688236778L;
-
-    @JSONField(serialize = false)
-    @ApiModelProperty(value = "微信id")
-    private String wxId;
-
-    @ApiModelProperty(value = "藏品id")
-    private Long goodsId;
-
-}

gis_domain/src/main/java/com/gis/domain/entity/WxCommentEntity.java

@@ -1,47 +0,0 @@
-package com.gis.domain.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * 微信评论表
- */
-@Data
-@Table(name = "tb_wx_comment")
-public class WxCommentEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = -5191917184688236778L;
-
-    @ApiModelProperty(value = "微信id")
-    private String wxId;
-
-    @ApiModelProperty(value = "藏品id")
-    private Long goodsId;
-
-    @ApiModelProperty(value = "评论")
-    private String comment;
-
-    @ApiModelProperty(value = "点赞数量")
-    private Integer star;
-
-    @ApiModelProperty(value = "wx用户昵称")
-    private String nickName ;
-
-    @ApiModelProperty(value = "wx头像")
-    private String avatarUrl ;
-
-    @Transient
-    @ApiModelProperty(value = "自己是否点赞")
-    private Boolean isStar = false;
-
-
-
-
-
-
-}

gis_domain/src/main/java/com/gis/domain/entity/WxStarEntity.java

@@ -1,27 +0,0 @@
-package com.gis.domain.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * 微信点赞表
- *
- */
-@Data
-@Table(name = "tb_wx_star")
-public class WxStarEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = -5191917184688236778L;
-
-    @JSONField(serialize = false)
-    @ApiModelProperty(value = "微信id")
-    private String wxId;
-
-    @ApiModelProperty(value = "藏品id")
-    private Long goodsId;
-
-}

gis_domain/src/main/java/com/gis/domain/entity/WxTrackEntity.java

@@ -1,25 +0,0 @@
-package com.gis.domain.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * 微信足迹表
- */
-@Data
-@Table(name = "tb_wx_track")
-public class WxTrackEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = -5191917184688236778L;
-
-    @ApiModelProperty(value = "微信id")
-    private String wxId;
-
-    @ApiModelProperty(value = "藏品id")
-    private Long goodsId;
-
-
-}

gis_domain/src/main/java/com/gis/domain/entity/AnswerEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/entity/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;

gis_domain/src/main/java/com/gis/domain/entity/CelebrityEntity.java

@@ -1,9 +1,8 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
 

gis_domain/src/main/java/com/gis/domain/entity/FileEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import lombok.Data;
 

gis_domain/src/main/java/com/gis/domain/entity/LogEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/entity/QuestionEntity.java

@@ -1,10 +1,12 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 问题表
@@ -32,4 +34,8 @@ public class QuestionEntity extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "相关知识点")
     private String related;
+
+    @Transient
+    @ApiModelProperty(value = "答案")
+    private List<AnswerEntity> answers;
 }

gis_domain/src/main/java/com/gis/domain/entity/SysDeptEntity.java

@@ -1,10 +1,8 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**

gis_domain/src/main/java/com/gis/domain/entity/SysResourceEntity.java

@@ -1,12 +1,10 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
 

gis_domain/src/main/java/com/gis/domain/entity/SysRoleEntity.java

@@ -1,11 +1,8 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 @Data

gis_domain/src/main/java/com/gis/domain/entity/SysUserEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;

gis_domain/src/main/java/com/gis/domain/request/GoodsPageRequest.java

@@ -1,27 +0,0 @@
-package com.gis.domain.request;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-@Data
-public class GoodsPageRequest extends PageRequest{
-
-
-
-    @ApiModelProperty(value = "朝代")
-    private Long dynastyId;
-
-    @ApiModelProperty(value = "等级")
-    private Integer level;
-
-    @ApiModelProperty(value = "文物类别Id")
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "排序：热度：track、点赞:star、评论:comment")
-    private String orderBy;
-
-}

gis_domain/src/main/java/com/gis/domain/request/GoodsRequest.java

@@ -1,52 +0,0 @@
-package com.gis.domain.request;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-@Data
-public class GoodsRequest implements Serializable {
-
-    private static final long serialVersionUID = -8093426577843493946L;
-
-    @ApiModelProperty(value = "id, 修改时必须传，新增忽略")
-    private Long id;
-
-    @NotBlank(message = "名称不能为空")
-    @ApiModelProperty(value = "名称", required = true)
-    private String name;
-
-    @NotNull(message = "朝代不能为空")
-    @ApiModelProperty(value = "朝代", required = true)
-    private Long dynastyId;
-
-    @NotNull(message = "文物类别不能为空")
-    @ApiModelProperty(value = "文物类别Id")
-    private Long categoryId;
-
-    @NotNull(message = "文件级别不能为空")
-    @ApiModelProperty(value = "文件级别，1,2")
-    private Integer level;
-
-
-    @NotBlank(message = "文物介绍不能为空")
-    @ApiModelProperty(value = "文物介绍")
-    private String description;
-
-    @NotBlank(message = "缩略图url不能为空")
-    @ApiModelProperty(value = "缩略图url")
-    private String thumb;
-
-    @NotBlank(message = "高清图url不能为空")
-    @ApiModelProperty(value = "高清图url")
-    private String img;
-
-    @NotBlank(message = "模型url不能为空")
-    @ApiModelProperty(value = "模型url")
-    private String webSite;
-
-
-}

gis_domain/src/main/java/com/gis/domain/request/WxCollectStarRequest.java

@@ -1,28 +0,0 @@
-package com.gis.domain.request;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-@Data
-public class WxCollectStarRequest implements Serializable {
-
-    private static final long serialVersionUID = -8093426577843493946L;
-
-
-    @NotBlank(message = "微信id不能为空")
-    @ApiModelProperty(value = "微信id", required = true)
-    private String wxId;
-
-    @NotNull(message = "藏品id不能为空")
-    @ApiModelProperty(value = "藏品id", required = true)
-    private Long goodsId;
-
-    @NotNull(message = "类型不能为空")
-    @ApiModelProperty(value = "类型, 1：点赞，2：收藏", required = true)
-    private Integer type;
-
-}

gis_domain/src/main/java/com/gis/domain/request/WxCommentRequest.java

@@ -1,33 +0,0 @@
-package com.gis.domain.request;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-@Data
-public class WxCommentRequest implements Serializable {
-
-    private static final long serialVersionUID = -8093426577843493946L;
-
-
-    @NotNull(message = "藏品id不能为空")
-    @ApiModelProperty(value = "藏品id", required = true)
-    private Long goodsId;
-
-    @ApiModelProperty(value = "评论")
-    private String comment;
-
-    @NotNull(message = "wx用户昵称不能为空")
-    @ApiModelProperty(value = "wx用户昵称", required = true)
-    private String nickName ;
-
-    @NotNull(message = "wx头像不能为空")
-    @ApiModelProperty(value = "wx头像", required = true)
-    private String avatarUrl ;
-
-
-
-}

gis_domain/src/main/java/com/gis/domain/request/WxGoodsRequest.java

@@ -1,24 +0,0 @@
-package com.gis.domain.request;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-@Data
-public class WxGoodsRequest implements Serializable {
-
-    private static final long serialVersionUID = -8093426577843493946L;
-
-
-    @NotBlank(message = "微信id不能为空")
-    @ApiModelProperty(value = "微信id", required = true)
-    private String wxId;
-
-    @NotNull(message = "藏品id不能为空")
-    @ApiModelProperty(value = "藏品id", required = true)
-    private Long goodsId;
-
-}

gis_domain/src/main/java/com/gis/domain/request/WxTrackCommentPageRequest.java

@@ -1,29 +0,0 @@
-//package com.gis.domain.request;
-//
-//import io.swagger.annotations.ApiModelProperty;
-//import lombok.Data;
-//
-//import javax.validation.constraints.NotBlank;
-//import javax.validation.constraints.NotNull;
-//
-///**
-// * Created by owen on 2020/6/10 0010 17:39
-// */
-//@Data
-//public class WxTrackCommentPageRequest extends PageRequest {
-//
-//    @NotBlank(message = "微信id不能为空")
-//    @ApiModelProperty(value = "微信id", required = true)
-//    private String wxId;
-//
-//    @NotNull(message = "类型不能为空")
-//    @ApiModelProperty(value = "类型, 1：足迹，2：评论", required = true)
-//    private Integer type;
-//
-//
-//
-//
-//
-//
-//
-//}

gis_domain/src/main/java/com/gis/domain/request/WxTrackCommentRequest.java

@@ -1,33 +0,0 @@
-//package com.gis.domain.request;
-//
-//import io.swagger.annotations.ApiModelProperty;
-//import lombok.Data;
-//
-//import javax.validation.constraints.NotBlank;
-//import javax.validation.constraints.NotNull;
-//import java.io.Serializable;
-//
-//@Data
-//public class WxTrackCommentRequest implements Serializable {
-//
-//    private static final long serialVersionUID = -8093426577843493946L;
-//
-//    @NotBlank(message = "微信id不能为空")
-//    @ApiModelProperty(value = "微信id", required = true)
-//    private String wxId;
-//
-//    @NotNull(message = "藏品id不能为空")
-//    @ApiModelProperty(value = "藏品id", required = true)
-//    private Long goodsId;
-//
-//    @NotNull(message = "类型不能为空")
-//    @ApiModelProperty(value = "类型, 1：足迹，2：评论", required = true)
-//    private Integer type;
-//
-//    @ApiModelProperty(value = "评论")
-//    private String comment;
-//
-//
-//
-//
-//}

gis_domain/src/main/java/com/gis/domain/response/GoodsResponse.java

@@ -1,60 +0,0 @@
-package com.gis.domain.response;
-
-import com.gis.domain.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-
-@Data
-public class GoodsResponse extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = -8093446577843493946L;
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "朝代id")
-    private Long dynastyId;
-
-    @ApiModelProperty(value = "朝代名称")
-    private String dynastyName;
-
-
-    @ApiModelProperty(value = "文物类别Id")
-    private Long categoryId;
-
-    @ApiModelProperty(value = "文物类别")
-    private String categoryName;
-
-
-    @ApiModelProperty(value = "文物介绍")
-    private String description;
-
-    @ApiModelProperty(value = "文件级别，0:未定级，1：一级, 2：二级， 3：三级")
-    private Integer level;
-
-    @ApiModelProperty(value = "浏览量")
-    private Integer countTrack;
-
-    @ApiModelProperty(value = "评论量")
-    private Integer countComment;
-
-    @ApiModelProperty(value = "点赞量")
-    private Integer countStar;
-
-    @ApiModelProperty(value = "缩略图url")
-    private String thumb;
-
-    @ApiModelProperty(value = "高清图url")
-    private String img;
-
-    @ApiModelProperty(value = "模型url")
-    private String webSite;
-
-    @ApiModelProperty(value = "微信登录用户是否点赞, 默认false")
-    private Boolean isStart = false;
-
-
-}

gis_domain/src/main/java/com/gis/domain/response/WxCollectStarResponse.java

@@ -1,41 +0,0 @@
-package com.gis.domain.response;
-
-import com.gis.domain.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * 微信用户藏品表，记录点赞、评论、收藏、流量量表
- */
-@Data
-public class WxCollectStarResponse extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = -5191917184688236778L;
-
-//    @ApiModelProperty(value = "微信id")
-//    private String wxId;
-
-    @ApiModelProperty(value = "藏品id")
-    private String goodsId;
-
-    @ApiModelProperty(value = "藏品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "文物介绍")
-    private String description;
-
-    @ApiModelProperty(value = "缩略图url")
-    private String thumb;
-
-    @ApiModelProperty(value = "模型url")
-    private String webSite;
-
-
-
-
-
-
-}

gis_domain/src/main/java/com/gis/domain/response/WxTrackCommentResponse.java

@@ -1,66 +0,0 @@
-package com.gis.domain.response;
-
-import com.gis.domain.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-
-@Data
-public class WxTrackCommentResponse extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = -5191917184688236778L;
-
-//    @ApiModelProperty(value = "微信id")
-//    private String wxId;
-
-    @ApiModelProperty(value = "藏品id")
-    private String goodsId;
-
-    @ApiModelProperty(value = "类型, 1:足迹，2：评论")
-    private Integer type;
-
-    @ApiModelProperty(value = "评论")
-    private String comment;
-
-    @ApiModelProperty(value = "点赞数量")
-    private Integer star;
-
-
-    @ApiModelProperty(value = "藏品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "朝代Id")
-    private Long dynastyId;
-
-    @ApiModelProperty(value = "朝代名称")
-    private String dynastyName;
-
-
-    @ApiModelProperty(value = "文物介绍")
-    private String description;
-
-    @ApiModelProperty(value = "缩略图url")
-    private String thumb;
-
-    @ApiModelProperty(value = "模型url")
-    private String webSite;
-
-    @ApiModelProperty(value = "wx用户昵称")
-    private String nickName ;
-
-    @ApiModelProperty(value = "wx头像")
-    private String avatarUrl ;
-
-    @ApiModelProperty(value = "wx用户点赞")
-    private Boolean isStar = false ;
-
-
-
-
-
-
-}

gis_domain/src/main/java/com/gis/domain/response/CelebrityResponse.java

@@ -1,10 +1,9 @@
-package com.gis.domain.response;
+package com.gis.domain.vo;
 
-import com.gis.domain.entity.BaseEntity;
+import com.gis.domain.po.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Table;
 import java.io.Serializable;
 
 @Data

gis_domain/src/main/java/com/gis/domain/response/LogResponse.java

@@ -1,6 +1,6 @@
-package com.gis.domain.response;
+package com.gis.domain.vo;
 
-import com.gis.domain.entity.BaseEntity;
+import com.gis.domain.po.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

gis_domain/src/main/java/com/gis/domain/vo/QuestionVo.java

@@ -0,0 +1,37 @@
+package com.gis.domain.vo;
+
+import com.gis.domain.po.AnswerEntity;
+import com.gis.domain.po.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 问题表
+ */
+@Data
+public class QuestionVo extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5291918184688236778L;
+
+    @ApiModelProperty(value = "题目")
+    private String title;
+
+    @ApiModelProperty(value = "诗人")
+    private String poet;
+
+    @ApiModelProperty(value = "题目类型，1：单选，2：多选")
+    private Integer type;
+
+    @ApiModelProperty(value = "题目难度，1：简单，2：困难")
+    private Integer level;
+
+    @ApiModelProperty(value = "相关知识点")
+    private String related;
+
+    @ApiModelProperty(value = "答案")
+    private List<AnswerEntity> answers;
+}

gis_mapper/src/main/java/com/gis/mapper/AnswerMapper.java

@@ -1,13 +1,11 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.AnswerEntity;
+import com.gis.domain.po.AnswerEntity;
 import com.gis.mapper.provider.AnswerProvider;
-import com.gis.mapper.provider.UserProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

gis_mapper/src/main/java/com/gis/mapper/CelebrityMapper.java

@@ -1,10 +1,9 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.CelebrityEntity;
-import com.gis.domain.request.CelebrityPageRequest;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.CelebrityResponse;
+import com.gis.domain.po.CelebrityEntity;
+import com.gis.domain.dto.CelebrityPageRequest;
+import com.gis.domain.vo.CelebrityResponse;
 import com.gis.mapper.provider.CelebrityProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

gis_mapper/src/main/java/com/gis/mapper/FileMapper.java

@@ -1,12 +1,10 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.FileEntity;
+import com.gis.domain.po.FileEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 
 @Component
 @Mapper

gis_mapper/src/main/java/com/gis/mapper/IBaseMapper.java

@@ -1,6 +1,6 @@
 package com.gis.mapper;
 
-import com.gis.domain.entity.BaseEntity;
+import com.gis.domain.po.BaseEntity;
 import tk.mybatis.mapper.common.BaseMapper;
 import tk.mybatis.mapper.common.ConditionMapper;
 import tk.mybatis.mapper.common.IdsMapper;

gis_mapper/src/main/java/com/gis/mapper/LogMapper.java

@@ -1,9 +1,9 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.LogEntity;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.LogResponse;
+import com.gis.domain.po.LogEntity;
+import com.gis.domain.dto.PageRequest;
+import com.gis.domain.vo.LogResponse;
 import com.gis.mapper.provider.LogProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;

gis_mapper/src/main/java/com/gis/mapper/QuestionMapper.java

@@ -1,11 +1,12 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.QuestionEntity;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.request.QuestionPageRequest;
+import com.gis.domain.po.QuestionEntity;
+import com.gis.domain.dto.QuestionPageRequest;
+import com.gis.domain.vo.QuestionVo;
 import com.gis.mapper.provider.QuestionProvider;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
@@ -17,4 +18,10 @@ public interface QuestionMapper extends IBaseMapper<QuestionEntity, Long> {
 
     @SelectProvider(type = QuestionProvider.class, method = "findBySearchKey")
     List<QuestionEntity> search(QuestionPageRequest param);
+
+    @Select("select id from tb_question where rec_status = 'A' ")
+    List<Integer> findAllIds();
+
+//    @SelectProvider(type = QuestionProvider.class, method = "vFindById")
+//    List<QuestionVo> vFindById(Long id);
 }

gis_mapper/src/main/java/com/gis/mapper/SysDeptMapper.java

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SysDeptEntity;
+import com.gis.domain.po.SysDeptEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;

gis_mapper/src/main/java/com/gis/mapper/SysResourceMapper.java

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.SysResourceEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;

gis_mapper/src/main/java/com/gis/mapper/SysRoleMapper.java

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SysRoleEntity;
+import com.gis.domain.po.SysRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;

gis_mapper/src/main/java/com/gis/mapper/SysUserMapper.java

@@ -1,8 +1,8 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SysUserEntity;
-import com.gis.domain.request.UserPageRequest;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.domain.dto.UserPageRequest;
 import com.gis.mapper.provider.UserProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

gis_mapper/src/main/java/com/gis/mapper/provider/CelebrityProvider.java

@@ -1,7 +1,6 @@
 package com.gis.mapper.provider;
 
-import com.gis.domain.request.CelebrityPageRequest;
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.dto.CelebrityPageRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 

gis_mapper/src/main/java/com/gis/mapper/provider/LogProvider.java

@@ -1,6 +1,6 @@
 package com.gis.mapper.provider;
 
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.dto.PageRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 

gis_mapper/src/main/java/com/gis/mapper/provider/QuestionProvider.java

@@ -1,7 +1,6 @@
 package com.gis.mapper.provider;
 
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.request.QuestionPageRequest;
+import com.gis.domain.dto.QuestionPageRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 
@@ -33,4 +32,26 @@ public class QuestionProvider {
         log.info("sql: {}", sql.toString());
         return sql.toString();
     }
+
+
+//    public String vFindById(Long id){
+//        StringBuffer sql = new StringBuffer(
+//                "select id, type, level from tb_question where rec_status = 'A' ");
+//
+//        String searchKey = param.getSearchKey();
+//        if(!StringUtils.isAllBlank(searchKey)){
+//            sql.append(" and (( poet like '%").append(searchKey).append("%' )");
+////            sql.append(" or ( type like '%").append(searchKey).append("%' )");
+//            sql.append(" or ( related like '%").append(searchKey).append("%' ))");
+//        }
+//
+//        Integer type = param.getType();
+//        if (type != null) {
+//            sql.append(" and type = ").append(type);
+//        }
+//
+//        sql.append(" order by create_time desc");
+//        log.info("sql: {}", sql.toString());
+//        return sql.toString();
+//    }
 }

gis_mapper/src/main/java/com/gis/mapper/provider/UserProvider.java

@@ -1,7 +1,7 @@
 package com.gis.mapper.provider;
 
 import cn.hutool.core.util.StrUtil;
-import com.gis.domain.request.UserPageRequest;
+import com.gis.domain.dto.UserPageRequest;
 import lombok.extern.log4j.Log4j2;
 
 /**

gis_service/src/main/java/com/gis/service/AnswerService.java

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.AnswerEntity;
+import com.gis.domain.po.AnswerEntity;
 
 import java.util.List;
 

gis_service/src/main/java/com/gis/service/CelebrityService.java

@@ -1,10 +1,9 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.CelebrityEntity;
-import com.gis.domain.request.CelebrityPageRequest;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.CelebrityResponse;
+import com.gis.domain.po.CelebrityEntity;
+import com.gis.domain.dto.CelebrityPageRequest;
+import com.gis.domain.vo.CelebrityResponse;
 
 import java.util.List;
 import java.util.Map;

gis_service/src/main/java/com/gis/service/FileService.java

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.FileEntity;
+import com.gis.domain.po.FileEntity;
 
 /**
  * Created by owen on 2020/5/11 0011 16:14

gis_service/src/main/java/com/gis/service/LogService.java

@@ -1,9 +1,9 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.LogEntity;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.LogResponse;
+import com.gis.domain.po.LogEntity;
+import com.gis.domain.dto.PageRequest;
+import com.gis.domain.vo.LogResponse;
 
 import java.util.List;
 

gis_service/src/main/java/com/gis/service/QuestionService.java

@@ -1,9 +1,8 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.QuestionEntity;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.request.QuestionPageRequest;
+import com.gis.domain.po.QuestionEntity;
+import com.gis.domain.dto.QuestionPageRequest;
 
 import java.util.List;
 

gis_service/src/main/java/com/gis/service/SysDeptService.java

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SysDeptEntity;
+import com.gis.domain.po.SysDeptEntity;
 
 
 /**

gis_service/src/main/java/com/gis/service/SysResourceService.java

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.SysResourceEntity;
 import com.gis.service.util.ResourceTree;
 
 import java.util.List;

gis_service/src/main/java/com/gis/service/SysRoleService.java

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SysRoleEntity;
+import com.gis.domain.po.SysRoleEntity;
 
 
 /**

gis_service/src/main/java/com/gis/service/SysUserService.java

@@ -1,8 +1,8 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SysUserEntity;
-import com.gis.domain.request.UserPageRequest;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.domain.dto.UserPageRequest;
 
 import java.util.List;
 

gis_service/src/main/java/com/gis/service/impl/AnswerServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.AnswerEntity;
+import com.gis.domain.po.AnswerEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.AnswerMapper;
 import com.gis.service.AnswerService;

gis_service/src/main/java/com/gis/service/impl/CelebrityServiceImpl.java

@@ -1,9 +1,8 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.CelebrityEntity;
-import com.gis.domain.request.CelebrityPageRequest;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.CelebrityResponse;
+import com.gis.domain.po.CelebrityEntity;
+import com.gis.domain.dto.CelebrityPageRequest;
+import com.gis.domain.vo.CelebrityResponse;
 import com.gis.mapper.CelebrityMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.CelebrityService;

gis_service/src/main/java/com/gis/service/impl/FileServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.FileEntity;
+import com.gis.domain.po.FileEntity;
 import com.gis.mapper.FileMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.FileService;

gis_service/src/main/java/com/gis/service/impl/IBaseServiceImpl.java

@@ -3,7 +3,7 @@ package com.gis.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gis.mapper.IBaseMapper;
-import com.gis.domain.entity.BaseEntity;
+import com.gis.domain.po.BaseEntity;
 import com.gis.service.IBaseService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;

gis_service/src/main/java/com/gis/service/impl/LogServiceImpl.java

@@ -1,8 +1,8 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.LogEntity;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.LogResponse;
+import com.gis.domain.po.LogEntity;
+import com.gis.domain.dto.PageRequest;
+import com.gis.domain.vo.LogResponse;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.LogMapper;
 import com.gis.service.LogService;

gis_service/src/main/java/com/gis/service/impl/QuestionServiceImpl.java

@@ -1,8 +1,7 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.QuestionEntity;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.request.QuestionPageRequest;
+import com.gis.domain.po.QuestionEntity;
+import com.gis.domain.dto.QuestionPageRequest;
 import com.gis.mapper.QuestionMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.QuestionService;

gis_service/src/main/java/com/gis/service/impl/SysDeptServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SysDeptEntity;
+import com.gis.domain.po.SysDeptEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysDeptMapper;
 import com.gis.service.SysDeptService;

gis_service/src/main/java/com/gis/service/impl/SysResourceServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.SysResourceEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysResourceMapper;
 import com.gis.service.SysResourceService;

gis_service/src/main/java/com/gis/service/impl/SysRoleServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SysRoleEntity;
+import com.gis.domain.po.SysRoleEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysRoleMapper;
 import com.gis.service.SysRoleService;

gis_service/src/main/java/com/gis/service/impl/SysUserServiceImpl.java

@@ -1,7 +1,7 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SysUserEntity;
-import com.gis.domain.request.UserPageRequest;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.domain.dto.UserPageRequest;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysUserMapper;
 import com.gis.service.SysUserService;

gis_service/src/main/java/com/gis/service/util/ResourceTreeUtil.java

@@ -1,6 +1,6 @@
 package com.gis.service.util;
 
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.SysResourceEntity;
 
 import java.util.ArrayList;
 import java.util.List;

gis_web/src/main/java/com/gis/web/aop/WebLogAspect.java

@@ -1,6 +1,6 @@
 package com.gis.web.aop;
 
-import com.gis.domain.entity.LogEntity;
+import com.gis.domain.po.LogEntity;
 import com.gis.service.LogService;
 import com.gis.web.shiro.JwtUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -40,23 +40,26 @@ public class WebLogAspect {
     @Before("controllerLog()") //在切入点的方法run之前要干的
     public void logBeforeController(JoinPoint joinPoint) throws Exception {
 
-        // 获取token
-        String token = request.getHeader("token");
-        Long userId = null;
-        if (StringUtils.isNotBlank(token)) {
-            userId = JwtUtil.getUserId(token);
-        }
-
         // 记录下请求内容
         log.warn("start : {}" , request.getRequestURI());
         log.info("request Method : {}" , request.getMethod());
         log.info("request IP : {}" , request.getRemoteAddr());
         log.info("request Args : {}" , Arrays.toString(joinPoint.getArgs()));
 
-//        Object[] args = joinPoint.getArgs();
-//        if (args.length > 0) {
-//            log.info("request Args : {}" , Arrays.toString(args));
-//        }
+        // 获取token
+        String token = request.getHeader("token");
+//        log.info( request.getRequestURI());
+        // 排查登录接口
+        boolean contains = request.getRequestURI().contains("/admin/login");
+        if (contains) {
+            return;
+        }
+
+        Long userId = null;
+        if (token != null) {
+            userId = JwtUtil.getUserId(token);
+        }
+
 
         String description = getControllerLogDescription(joinPoint);
 

gis_web/src/main/java/com/gis/web/controller/BaseController.java

@@ -1,7 +1,7 @@
 package com.gis.web.controller;
 
-import com.gis.domain.entity.LogEntity;
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.po.LogEntity;
+import com.gis.domain.dto.PageRequest;
 import com.gis.service.LogService;
 import com.gis.web.shiro.JwtUtil;
 import com.github.pagehelper.PageHelper;

gis_web/src/main/java/com/gis/web/controller/CelebrityController.java

@@ -1,11 +1,10 @@
 package com.gis.web.controller;
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.CelebrityEntity;
-import com.gis.domain.request.CelebrityPageRequest;
-import com.gis.domain.request.CelebrityRequest;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.CelebrityResponse;
+import com.gis.domain.po.CelebrityEntity;
+import com.gis.domain.dto.CelebrityPageRequest;
+import com.gis.domain.dto.CelebrityRequest;
+import com.gis.domain.vo.CelebrityResponse;
 import com.gis.service.CelebrityService;
 import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;

gis_web/src/main/java/com/gis/web/controller/FileController.java

@@ -5,7 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import com.gis.common.util.AliyunOssUtil;
 import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.entity.FileEntity;
+import com.gis.domain.po.FileEntity;
 import com.gis.service.FileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,7 +33,7 @@ public class FileController extends BaseController {
     private FileService fileService;
 
 
-    @ApiOperation("上传, 可以接收多个文件")
+    @ApiOperation(value = "上传, 可以接收多个文件",notes = "上传多媒体资料，返回oss url, 会重命名文件")
     @PostMapping(value = "upload", consumes = {"multipart/form-data"})
     public Result upload(MultipartFile [] file ) throws IOException {
 

gis_web/src/main/java/com/gis/web/controller/IndexController.java

@@ -3,9 +3,9 @@ package com.gis.web.controller;
 import com.gis.common.constant.TypeCode;
 import com.gis.common.util.PasswordUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.entity.LogEntity;
-import com.gis.domain.entity.SysUserEntity;
-import com.gis.domain.request.LoginRequest;
+import com.gis.domain.po.LogEntity;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.domain.dto.LoginRequest;
 import com.gis.service.SysUserService;
 import com.gis.web.shiro.JwtUtil;
 import io.swagger.annotations.Api;

gis_web/src/main/java/com/gis/web/controller/LogController.java

@@ -2,8 +2,8 @@ package com.gis.web.controller;
 
 
 import com.gis.common.util.Result;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.LogResponse;
+import com.gis.domain.dto.PageRequest;
+import com.gis.domain.vo.LogResponse;
 import com.gis.service.LogService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;

gis_web/src/main/java/com/gis/web/controller/QuestionController.java

@@ -1,29 +1,22 @@
 package com.gis.web.controller;
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.AnswerEntity;
-import com.gis.domain.entity.CelebrityEntity;
-import com.gis.domain.entity.QuestionEntity;
-import com.gis.domain.request.*;
-import com.gis.domain.response.CelebrityResponse;
+import com.gis.domain.po.AnswerEntity;
+import com.gis.domain.po.QuestionEntity;
+import com.gis.domain.dto.*;
 import com.gis.service.AnswerService;
-import com.gis.service.CelebrityService;
 import com.gis.service.QuestionService;
 import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.transaction.Transactional;
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;

gis_web/src/main/java/com/gis/web/controller/SysDeptController.java

@@ -2,19 +2,16 @@ package com.gis.web.controller;
 
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SysDeptEntity;
-import com.gis.domain.request.DeptRequest;
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.po.SysDeptEntity;
+import com.gis.domain.dto.DeptRequest;
+import com.gis.domain.dto.PageRequest;
 import com.gis.service.SysDeptService;
-import com.gis.service.SysUserService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 

gis_web/src/main/java/com/gis/web/controller/SysRoleController.java

@@ -2,16 +2,10 @@ package com.gis.web.controller;
 
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SysResourceEntity;
-import com.gis.domain.entity.SysRoleEntity;
-import com.gis.domain.request.RoleAccreditRequest;
-import com.gis.domain.request.RoleRequest;
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.po.SysRoleEntity;
+import com.gis.domain.dto.RoleRequest;
 import com.gis.service.SysResourceService;
 import com.gis.service.SysRoleService;
-import com.gis.service.util.ResourceTree;
-import com.gis.service.util.ResourceTreeUtil;
-import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
@@ -19,16 +13,11 @@ import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 
 
 /**

gis_web/src/main/java/com/gis/web/controller/SysUserController.java

@@ -3,10 +3,10 @@ package com.gis.web.controller;
 
 import com.gis.common.util.PasswordUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SysUserEntity;
-import com.gis.domain.request.PasswordRequest;
-import com.gis.domain.request.UserPageRequest;
-import com.gis.domain.request.UserRequest;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.domain.dto.PasswordRequest;
+import com.gis.domain.dto.UserPageRequest;
+import com.gis.domain.dto.UserRequest;
 import com.gis.service.SysUserService;
 import com.gis.web.aop.WebControllerLog;
 import com.gis.web.shiro.JwtUtil;

gis_web/src/main/java/com/gis/web/controller/WebController.java

@@ -0,0 +1,88 @@
+package com.gis.web.controller;
+
+import com.gis.common.util.Result;
+import com.gis.domain.po.AnswerEntity;
+import com.gis.domain.po.QuestionEntity;
+import com.gis.mapper.QuestionMapper;
+import com.gis.service.AnswerService;
+import com.gis.service.QuestionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.transaction.Transactional;
+import java.util.*;
+
+
+/**
+ * Created by owen on 2020/6/29 0029 15:42
+ */
+@Transactional
+@Log4j2
+@Api(tags = "展示页")
+@RestController
+@RequestMapping("manage/web")
+public class WebController extends BaseController {
+
+    @Autowired
+    private QuestionService questionService;
+
+    @Autowired
+    private AnswerService answerService;
+
+    @Autowired
+    private QuestionMapper questionMapper;
+
+
+    /**
+     * 每次随机10条题目，可以重复
+     * @param
+     * @return
+     */
+    @ApiOperation("答题")
+    @PostMapping("list")
+    public Result<List<QuestionEntity>> list() {
+        // 获取所有题目id
+        List<Integer> allIds = questionMapper.findAllIds();
+
+        //要随机取的元素个数
+        Random random = new Random();
+        int size = 10;
+
+        // 定义一个跟all一样长的数字，默认为false， 用来防重的
+        boolean r[]=new boolean[allIds.size()];
+
+        int n = 0;
+
+        List<QuestionEntity> result = new ArrayList<>();
+
+        while (true) {
+                int temp = random.nextInt(allIds.size());
+                if(!r[temp]){
+                    if (n == size) {
+                        break;
+                    }
+                    QuestionEntity entity = questionService.findById(Long.valueOf(allIds.get(temp)));
+                    List<AnswerEntity> answers = answerService.findByQuestionId(entity.getId());
+                    entity.setAnswers(answers);
+                    result.add(entity);
+                    System.out.println("得到的第" + n +"个随du机数为：" + temp + " rtemp:"+r[temp] );
+                    n ++;
+                    // 修改下标值
+                    r[temp] = true;
+                }
+            }
+        return Result.success(result);
+    }
+
+
+
+
+
+
+
+
+
+}

gis_web/src/main/java/com/gis/web/shiro/MyRealm.java

@@ -1,8 +1,7 @@
 package com.gis.web.shiro;
 
 import com.gis.common.exception.JwtAuthenticationException;
-import com.gis.domain.entity.SysRoleEntity;
-import com.gis.domain.entity.SysUserEntity;
+import com.gis.domain.po.SysUserEntity;
 import com.gis.service.SysRoleService;
 import com.gis.service.SysUserService;
 import lombok.extern.log4j.Log4j2;
@@ -18,7 +17,6 @@ import org.apache.shiro.subject.PrincipalCollection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
 
 /**
  * 配置不校验的话，是不会走这个方法的

gis_web/src/test/java/com/gis/web/controller/WebControllerTest.java

@@ -0,0 +1,82 @@
+package com.gis.web.controller;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by owen on 2020/8/3 0003 15:13
+ */
+public class WebControllerTest {
+
+    /**
+     * 随机获取10个数据
+     */
+    @Test
+    public void test1(){
+
+
+        int a[]={1,2,3,4,5,6,7,8,9,0};
+        boolean r[]=new boolean[a.length];
+        Random random = new Random();
+        int m = 5; //要随机取的元素bai个数
+        if(m > a.length ){
+
+            return;
+        }
+        int n = 0;
+        while(true)
+        {
+            int temp = random.nextInt(10);
+            if(!r[temp])
+            {
+                if(n == m) //取到足量随机数后退出循环
+                    break;
+                n ++;
+                System.out.println("得到的第" + n +"个随du机数为：" + temp);
+                r[temp ] = true; //这里zhi将temp赋值给数组，就不用我贴出代码来了啊
+            }
+        }
+
+
+    }
+
+
+    @Test
+    public void test2(){
+
+        // 新建数组
+        String[] all = {"1","3","5","7","9","10","11","22","4","6","8","10","12","14"};
+
+        // 转list
+        List<String> list = Arrays.asList(all);
+
+        // 定数组的长度
+        Random random = new Random();
+        int m = 10; //要随机取的元素个数
+
+        // 定义一个跟all一样长的数字，默认为false， 用来防重的
+        boolean r[]=new boolean[all.length];
+
+        // 从长度中获取随机数，用来做list下标
+        int n = 0;
+        while (true) {
+            int temp = random.nextInt(all.length);
+            if(!r[temp]){
+
+                if (n == m) {
+                    break;
+                }
+                System.out.println("得到的第" + n +"个随du机数为：" + temp + " rtemp:"+r[temp] );
+                n ++;
+                // 修改下标值
+                r[temp] = true;
+            }
+        }
+    }
+
+}