瀏覽代碼

上海历史博物馆后台首次提交

wuweihao 5 年之前
父節點
當前提交
b7f578274f
共有 100 個文件被更改,包括 5402 次插入0 次删除
  1. 44 0
      museum_application/pom.xml
  2. 13 0
      museum_application/src/main/java/com/museum/MuseumApplication.java
  3. 13 0
      museum_application/src/main/java/com/museum/ServletInitializer.java
  4. 57 0
      museum_application/src/main/resources/application-dev.properties
  5. 26 0
      museum_application/src/main/resources/application.properties
  6. 156 0
      museum_application/src/main/resources/logback-spring.xml
  7. 144 0
      museum_common/pom.xml
  8. 62 0
      museum_common/src/main/java/com/museum/common/config/CommonInterceptor.java
  9. 86 0
      museum_common/src/main/java/com/museum/common/config/Swagger2.java
  10. 38 0
      museum_common/src/main/java/com/museum/common/config/WebMvcConfig.java
  11. 19 0
      museum_common/src/main/java/com/museum/common/constant/TypeCode.java
  12. 35 0
      museum_common/src/main/java/com/museum/common/exception/BaseRuntimeException.java
  13. 34 0
      museum_common/src/main/java/com/museum/common/exception/JwtAuthenticationException.java
  14. 233 0
      museum_common/src/main/java/com/museum/common/util/AliyunOssUtil.java
  15. 52 0
      museum_common/src/main/java/com/museum/common/util/FileUtils.java
  16. 194 0
      museum_common/src/main/java/com/museum/common/util/PasswordUtils.java
  17. 101 0
      museum_common/src/main/java/com/museum/common/util/Result.java
  18. 25 0
      museum_common/src/main/java/com/museum/common/util/Test123.java
  19. 22 0
      museum_dao/pom.xml
  20. 22 0
      museum_dao/src/main/java/com/museum/dao/BuildingMapper.java
  21. 21 0
      museum_dao/src/main/java/com/museum/dao/DownloadMapper.java
  22. 22 0
      museum_dao/src/main/java/com/museum/dao/FileMapper.java
  23. 18 0
      museum_dao/src/main/java/com/museum/dao/IBaseMapper.java
  24. 23 0
      museum_dao/src/main/java/com/museum/dao/LogMapper.java
  25. 25 0
      museum_dao/src/main/java/com/museum/dao/MessageMapper.java
  26. 24 0
      museum_dao/src/main/java/com/museum/dao/PartMapper.java
  27. 41 0
      museum_dao/src/main/java/com/museum/dao/Provide/DownloadProvider.java
  28. 39 0
      museum_dao/src/main/java/com/museum/dao/Provide/LogProvider.java
  29. 38 0
      museum_dao/src/main/java/com/museum/dao/Provide/MessageProvider.java
  30. 52 0
      museum_dao/src/main/java/com/museum/dao/Provide/PartProvider.java
  31. 50 0
      museum_dao/src/main/java/com/museum/dao/Provide/RoamProvider.java
  32. 26 0
      museum_dao/src/main/java/com/museum/dao/Provide/UserProvider.java
  33. 22 0
      museum_dao/src/main/java/com/museum/dao/RoamMapper.java
  34. 15 0
      museum_dao/src/main/java/com/museum/dao/TypeMapper.java
  35. 28 0
      museum_dao/src/main/java/com/museum/dao/UserMapper.java
  36. 23 0
      museum_domain/pom.xml
  37. 35 0
      museum_domain/src/main/java/com/museum/domain/entity/BaseEntity.java
  38. 33 0
      museum_domain/src/main/java/com/museum/domain/entity/BuildingEntity.java
  39. 43 0
      museum_domain/src/main/java/com/museum/domain/entity/DownloadEntity.java
  40. 30 0
      museum_domain/src/main/java/com/museum/domain/entity/FileEntity.java
  41. 46 0
      museum_domain/src/main/java/com/museum/domain/entity/LogEntity.java
  42. 34 0
      museum_domain/src/main/java/com/museum/domain/entity/MessageEntity.java
  43. 51 0
      museum_domain/src/main/java/com/museum/domain/entity/PartEntity.java
  44. 42 0
      museum_domain/src/main/java/com/museum/domain/entity/RoamEntity.java
  45. 25 0
      museum_domain/src/main/java/com/museum/domain/entity/TypeEntity.java
  46. 45 0
      museum_domain/src/main/java/com/museum/domain/entity/UserEntity.java
  47. 40 0
      museum_domain/src/main/java/com/museum/domain/request/BuildingRequest.java
  48. 33 0
      museum_domain/src/main/java/com/museum/domain/request/DownloadRequest.java
  49. 21 0
      museum_domain/src/main/java/com/museum/domain/request/LoginRequest.java
  50. 32 0
      museum_domain/src/main/java/com/museum/domain/request/MessageRequest.java
  51. 33 0
      museum_domain/src/main/java/com/museum/domain/request/NavRequest.java
  52. 27 0
      museum_domain/src/main/java/com/museum/domain/request/PageDateRequest.java
  53. 26 0
      museum_domain/src/main/java/com/museum/domain/request/PageRequest.java
  54. 58 0
      museum_domain/src/main/java/com/museum/domain/request/PartRequest.java
  55. 21 0
      museum_domain/src/main/java/com/museum/domain/request/PasswordRequest.java
  56. 50 0
      museum_domain/src/main/java/com/museum/domain/request/RoamRequest.java
  57. 50 0
      museum_domain/src/main/java/com/museum/domain/request/UserRequest.java
  58. 33 0
      museum_domain/src/main/java/com/museum/domain/response/DownloadResponse.java
  59. 26 0
      museum_domain/src/main/java/com/museum/domain/response/LogResponse.java
  60. 23 0
      museum_service/pom.xml
  61. 18 0
      museum_service/src/main/java/com/museum/service/BuildingService.java
  62. 20 0
      museum_service/src/main/java/com/museum/service/DownloadService.java
  63. 18 0
      museum_service/src/main/java/com/museum/service/FileService.java
  64. 47 0
      museum_service/src/main/java/com/museum/service/IBaseService.java
  65. 18 0
      museum_service/src/main/java/com/museum/service/LogService.java
  66. 19 0
      museum_service/src/main/java/com/museum/service/MessageService.java
  67. 18 0
      museum_service/src/main/java/com/museum/service/PartService.java
  68. 19 0
      museum_service/src/main/java/com/museum/service/RoamService.java
  69. 15 0
      museum_service/src/main/java/com/museum/service/TypeService.java
  70. 23 0
      museum_service/src/main/java/com/museum/service/UserService.java
  71. 43 0
      museum_service/src/main/java/com/museum/service/impl/BuildingServiceImpl.java
  72. 36 0
      museum_service/src/main/java/com/museum/service/impl/DownloadServiceImpl.java
  73. 37 0
      museum_service/src/main/java/com/museum/service/impl/FileServiceImpl.java
  74. 167 0
      museum_service/src/main/java/com/museum/service/impl/IBaseServiceImpl.java
  75. 34 0
      museum_service/src/main/java/com/museum/service/impl/LogServiceImpl.java
  76. 44 0
      museum_service/src/main/java/com/museum/service/impl/MessageServiceImpl.java
  77. 36 0
      museum_service/src/main/java/com/museum/service/impl/PartServiceImpl.java
  78. 36 0
      museum_service/src/main/java/com/museum/service/impl/RoamServiceImpl.java
  79. 31 0
      museum_service/src/main/java/com/museum/service/impl/TypeServiceImpl.java
  80. 50 0
      museum_service/src/main/java/com/museum/service/impl/UserServiceImpl.java
  81. 23 0
      museum_web/pom.xml
  82. 13 0
      museum_web/src/main/java/com/museum/web/aop/WebControllerLog.java
  83. 121 0
      museum_web/src/main/java/com/museum/web/aop/WebLogAspect.java
  84. 119 0
      museum_web/src/main/java/com/museum/web/controller/BaseController.java
  85. 133 0
      museum_web/src/main/java/com/museum/web/controller/BuildingController.java
  86. 53 0
      museum_web/src/main/java/com/museum/web/controller/CommonController.java
  87. 157 0
      museum_web/src/main/java/com/museum/web/controller/DownloadController.java
  88. 120 0
      museum_web/src/main/java/com/museum/web/controller/ExceptionController.java
  89. 120 0
      museum_web/src/main/java/com/museum/web/controller/IndexController.java
  90. 51 0
      museum_web/src/main/java/com/museum/web/controller/LogController.java
  91. 80 0
      museum_web/src/main/java/com/museum/web/controller/MessageController.java
  92. 149 0
      museum_web/src/main/java/com/museum/web/controller/PartController.java
  93. 102 0
      museum_web/src/main/java/com/museum/web/controller/RoamController.java
  94. 22 0
      museum_web/src/main/java/com/museum/web/controller/TestController.java
  95. 174 0
      museum_web/src/main/java/com/museum/web/controller/UserController.java
  96. 167 0
      museum_web/src/main/java/com/museum/web/shiro/JWTFilter.java
  97. 23 0
      museum_web/src/main/java/com/museum/web/shiro/JWTToken.java
  98. 235 0
      museum_web/src/main/java/com/museum/web/shiro/JwtUtil.java
  99. 111 0
      museum_web/src/main/java/com/museum/web/shiro/MyRealm.java
  100. 0 0
      museum_web/src/main/java/com/museum/web/shiro/ShiroConfig.java

+ 44 - 0
museum_application/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+
+
+
+    <groupId>com.museum</groupId>
+    <artifactId>museum_application</artifactId>
+    <version>1.0.0</version>
+    <packaging>war</packaging>
+    <name>museum_application</name>
+    <description>项目入口</description>
+
+    <parent>
+        <groupId>com.museum</groupId>
+        <artifactId>sh_museum_cms</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.museum</groupId>
+            <artifactId>museum_web</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <finalName>museumcms</finalName>
+    </build>
+
+</project>

+ 13 - 0
museum_application/src/main/java/com/museum/MuseumApplication.java

@@ -0,0 +1,13 @@
+package com.museum;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MuseumApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MuseumApplication.class, args);
+    }
+
+}

+ 13 - 0
museum_application/src/main/java/com/museum/ServletInitializer.java

@@ -0,0 +1,13 @@
+package com.museum;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+public class ServletInitializer extends SpringBootServletInitializer {
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(MuseumApplication.class);
+    }
+
+}

+ 57 - 0
museum_application/src/main/resources/application-dev.properties

@@ -0,0 +1,57 @@
+
+#DB
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.druid.url=jdbc:mysql://localhost:3306/sh_museum_cms?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+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
+spring.datasource.druid.test-on-return=false
+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
+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
+spring.redis.timeout=3000ms
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
+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
+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
+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
+spring.redis.jedis.pool.max-wait=-1ms
+
+
+#log
+logging.path=E:/javaProject/sh_museum_cms_log
+logging.config=classpath:logback-spring.xml
+logging.level.com.museum=debug
+
+# \u4E0A\u4F20\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84
+output.file.path=F:\\test\\sh_museum_cms\\
+

+ 26 - 0
museum_application/src/main/resources/application.properties

@@ -0,0 +1,26 @@
+server.port=8083
+
+spring.profiles.active=dev
+
+# \u8BBF\u95EE\u9759\u6001\u8D44\u6E90\u8BBE\u7F6E
+spring.resources.static-locations=classpath:templates/,classpath:static/,classpath:web/
+
+#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.max-file-size=256MB
+spring.servlet.multipart.max-request-size=256MB
+
+
+
+#\u914D\u7F6E\u81EA\u52A8\u8BC6\u522B\u5B57\u6BB5\u8F6C\u6362
+mybatis.configuration.mapUnderscoreToCamelCase=true
+mapper.identity=MYSQL
+mapper.mappers=tk.mybatis.mapper.common.Mapper
+#pager
+pagehelper.helper-dialect=mysql
+pagehelper.params=count=countSql
+pagehelper.reasonable=false
+pagehelper.support-methods-arguments=true
+
+
+

+ 156 - 0
museum_application/src/main/resources/logback-spring.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <property name="LOG_MAX_HISTORY" value="180"/>
+    <springProperty scope="context" name="LOG_PATH" source="logging.path"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符 -->
+            <pattern>${LOG_PATH}/%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+    </appender>
+    <!-- 按照每天生成日志文件:主项目日志 -->
+    <appender name="file.all" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 追加日志到原文件结尾 -->
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 -->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外,还配置了日志文件不能超过10M(默认),若超过10M,日志文件会以索引0开始, -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{500} - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+    </appender>
+
+    <!--info日志统一输出到这里-->
+    <appender name="file.info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 每小时生成日志文件 -->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info/console-info.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外,还配置了日志文件不能超过10M(默认),若超过10M,日志文件会以索引0开始, -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg:日志消息,%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--错误日志统一输出到这里-->
+    <appender name="file.error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/error/console-error.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外,还配置了日志文件不能超过10M(默认),若超过10M,日志文件会以索引0开始, -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg:日志消息,%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录error级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--warn日志统一输出到这里-->
+    <appender name="file.warn" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 按小时生成日志-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/warn/console-warn.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外,还配置了日志文件不能超过10M(默认),若超过10M,日志文件会以索引0开始, -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg:日志消息,%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--debug级别日志统一输出到这里-->
+    <appender name="file.debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 按小时生成日志-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/debug/console-debug.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <!-- 除按日志记录之外,还配置了日志文件不能超过5M,若超过5M,日志文件会以索引0开始,命名日志文件,例如console-debug.2018-08-24-09.1.log -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg:日志消息,%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY </onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+    <appender name="file.async" class="ch.qos.logback.classic.AsyncAppender">
+        <discardingThreshold>0</discardingThreshold>
+        <queueSize>256</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="file.all" />
+    </appender>
+
+    <!--  日志输出级别 -->
+    <!-- TRACE\DEBUG\INFO\WARN\ERROR\FATAL\OFF -->
+    <root level="INFO">
+        <appender-ref ref="console" />
+        <appender-ref ref="file.async"/>
+        <appender-ref ref="file.error" />
+        <appender-ref ref="file.info" />
+        <appender-ref ref="file.debug" />
+        <appender-ref ref="file.warn" />
+    </root>
+
+</configuration>

+ 144 - 0
museum_common/pom.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>sh_museum_cms</artifactId>
+        <groupId>com.museum</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>museum_common</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+
+        <!--springboot-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- JPA -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--springboot中的redis依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <!-- rabbit MQ-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-starter-amqp</artifactId>-->
+        <!--</dependency>-->
+
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- fastjson -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!--阿里数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
+
+        <!-- knife4j aip 包-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 工具类 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <!-- shiro -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring</artifactId>
+        </dependency>
+
+
+        <!-- jwt -->
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+
+        <!--aliyun sdk-->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+        </dependency>
+
+
+        <!--tk.mybatis 依赖-->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+        </dependency>
+
+
+        <!--分页插件-->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

+ 62 - 0
museum_common/src/main/java/com/museum/common/config/CommonInterceptor.java

@@ -0,0 +1,62 @@
+package com.museum.common.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 公共的拦截器
+ */
+@Slf4j
+@Component
+public class CommonInterceptor implements HandlerInterceptor {
+
+    @Value("${spring.profiles.active}")
+    private String active;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request,
+                             HttpServletResponse response, Object handler) throws Exception {
+        if(!request.getRequestURI().contains("/static/") && !request.getRequestURI().contains("/sendUserInfo")
+                && !request.getRequestURI().contains(".json") && !request.getRequestURI().contains(".png")
+                && !request.getRequestURI().contains(".html") && !request.getRequestURI().contains(".mp3")){
+//            log.warn("start : {}", request.getRequestURI());
+        }
+
+
+        // uat环境禁止访问api文档
+        if (active.equals("uat")) {
+//            log.info("访问api文档拦截");
+            return !request.getRequestURI().contains("doc.html");
+        }
+
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request,
+                           HttpServletResponse response, Object handler,
+                           ModelAndView modelAndView) throws Exception {
+        request.setAttribute("ctx", request.getContextPath());
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request,
+                                HttpServletResponse response, Object handler, Exception ex)
+            throws Exception {
+        if(!request.getRequestURI().contains("/static/") && !request.getRequestURI().contains("/sendUserInfo")
+                && !request.getRequestURI().contains(".json") && !request.getRequestURI().contains(".png")
+                && !request.getRequestURI().contains(".html") && !request.getRequestURI().contains(".mp3")){
+//            log.warn("end : {}", request.getRequestURI());
+        }
+    }
+
+
+
+
+}

+ 86 - 0
museum_common/src/main/java/com/museum/common/config/Swagger2.java

@@ -0,0 +1,86 @@
+package com.museum.common.config;
+
+import com.google.common.collect.Lists;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by owen on 2020/2/18
+ *
+ * 集成Swagger有3步:
+ * 1.pom.xml添加依赖
+ * 2.添加Swagger2.class
+ * 3.Application.class 加上注解@EnableSwagger2 表示开启Swagger
+ * 4.http://localhost:8080/doc.html#/
+ *
+ * 2.9.2 不需要字启动类配置注解
+ */
+@Configuration
+@EnableSwagger2
+public class Swagger2 {
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.museum.web.controller"))
+                .paths(PathSelectors.any())
+                .build()
+                //添加登录认证,可以使用token
+                .securityContexts(securityContexts())
+                .securitySchemes(securitySchemes())
+                ;
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("上历博 APIs")
+                .description("上历博Api接口文档")
+                .version("1.0")
+                .build();
+    }
+
+    private List<ApiKey> securitySchemes() {
+        //设置请求头信息
+        List<ApiKey> result = new ArrayList<>();
+//        ApiKey apiKey = new ApiKey("Authorization", "Authorization", "header");
+        ApiKey apiKey = new ApiKey("Authorization", "token", "header");
+        result.add(apiKey);
+        return result;
+
+    }
+
+
+    private List<SecurityContext> securityContexts() {
+
+        SecurityContext context = SecurityContext.builder()
+                .securityReferences(defaultAuth())
+                .build();
+
+        return Lists.newArrayList(context);
+
+    }
+
+    private List<SecurityReference> defaultAuth() {
+        List<SecurityReference> result = new ArrayList<>();
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        result.add(new SecurityReference("Authorization", authorizationScopes));
+        return result;
+    }
+}

+ 38 - 0
museum_common/src/main/java/com/museum/common/config/WebMvcConfig.java

@@ -0,0 +1,38 @@
+package com.museum.common.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * Created by owen on 2020/2/18 0018 12:01
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private CommonInterceptor commonInterceptor;
+
+    /**
+     * 配置全局跨域
+     */
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "DELETE", "PUT", "OPTIONS")
+                .maxAge(3600);
+    }
+
+
+    /**
+     * 添加拦截器
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(commonInterceptor).addPathPatterns("/**");
+    }
+}

+ 19 - 0
museum_common/src/main/java/com/museum/common/constant/TypeCode.java

@@ -0,0 +1,19 @@
+package com.museum.common.constant;
+
+/**
+ * Created by owen on 2020/5/14 0014 8:56
+ */
+public class TypeCode {
+
+    /**建筑物类型*/
+    public static final String MODEL_BUILDING = "building";
+
+    /**部件类型*/
+    public static final String MODEL_PART = "part";
+
+    /**漫游类型*/
+    public static final String MODEL_ROAM = "roam";
+
+    /**redis token 前缀*/
+    public static final String REDIS_TOKEN = "museum_token_";
+}

+ 35 - 0
museum_common/src/main/java/com/museum/common/exception/BaseRuntimeException.java

@@ -0,0 +1,35 @@
+package com.museum.common.exception;
+
+public class BaseRuntimeException extends RuntimeException{
+
+    private static final long serialVersionUID = -1518945670203783450L;
+    private Integer code;
+    private String msg;
+
+    public BaseRuntimeException(String msg){
+        super(msg);
+        this.msg = msg;
+    }
+
+    public BaseRuntimeException(Integer code, String msg){
+        super(msg);
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

+ 34 - 0
museum_common/src/main/java/com/museum/common/exception/JwtAuthenticationException.java

@@ -0,0 +1,34 @@
+package com.museum.common.exception;
+
+import org.apache.shiro.ShiroException;
+
+public class JwtAuthenticationException extends ShiroException {
+
+    private static final long serialVersionUID = 2899335020273674736L;
+
+    private int code;
+
+    private String msg;
+
+    public JwtAuthenticationException(int code, String msg){
+        super(msg);
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

+ 233 - 0
museum_common/src/main/java/com/museum/common/util/AliyunOssUtil.java

@@ -0,0 +1,233 @@
+package com.museum.common.util;
+
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.OSSObject;
+import com.aliyun.oss.model.OSSObjectSummary;
+import com.aliyun.oss.model.ObjectListing;
+import com.aliyun.oss.model.PutObjectResult;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+
+import java.io.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 阿里云oss工具类
+ */
+@Slf4j
+public class AliyunOssUtil {
+
+
+    private static final String END_POINT = "http://oss-cn-shenzhen.aliyuncs.com";
+	private static final String ACCESS_KEY_ID = "LTAIUrvuHqj8pvry";
+	private static final String ACCESS_KEY_SECREY = "JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4";
+	private static final String BUCKET_NAME = "4dkankan";
+
+	// 加载对象
+	private static OSSClient ossClient = new OSSClient(END_POINT, ACCESS_KEY_ID, ACCESS_KEY_SECREY);
+    
+
+    
+    public static void delete(String key) throws IOException{
+    	  try {
+    		  
+            // 2019-2-28 启动aliyun oss 空间
+          	ossClient.deleteObject(BUCKET_NAME, key);
+          } catch (Exception e) {
+              e.printStackTrace();
+          }
+    }
+    
+    //上传的数据是byte[],key是上传后的文件名
+    public void upload(byte[] data,String key) throws IOException{  
+    	try 
+    	{  
+    		// 2019-2-28 启动aliyun oss 空间
+        	ossClient.putObject(BUCKET_NAME, key, new ByteArrayInputStream(data));
+        } catch (Exception e) {
+        	log.error(e.toString()+key); 
+        }
+    }  
+    
+   
+	public static void upload(String filePath, String key) {
+		try {
+			File file = new File(filePath);
+			if (!file.exists()) {
+				log.error("要上传的文件不存在:" + filePath);
+			}
+			ossClient.putObject(BUCKET_NAME, key, new File(filePath));
+
+		} catch (Exception e) {
+			log.error(e.toString() + filePath);
+		}
+	}
+    
+	public static void upload2(String filePath, String key) {
+		try {
+			
+			// 2019-2-28 启动aliyun oss 空间
+			ossClient.putObject(BUCKET_NAME , key, new File(filePath));
+		} catch (Exception e) {
+			log.error(e.toString() + filePath);
+		}
+	}
+    
+
+	/**
+	 * 上传的数据是文件夹,参数是文件夹路径,key是上传后的文件名
+	 * @param filepaths
+	 * key : 原文件路径
+	 * value: oss路径, oss会自动创建目录
+	 */
+	public static void uploadMulFiles(Map<String, String> filepaths) {
+		if (filepaths == null) {
+			return;
+		}
+		log.info("开始批量上传到阿里云:" + new Date().toString());
+		if (filepaths.size() > 50) {
+			for (String filePath : filepaths.keySet()) {
+				upload2(filePath, filepaths.get(filePath));
+			}
+		} else {
+			for (String filePath : filepaths.keySet()) {
+				log.info("文件:" + filePath + "到阿里云:" + filepaths.get(filePath));
+				upload(filePath, filepaths.get(filePath));
+			}
+		}
+		log.info("批量上传阿里云完毕:" + new Date().toString());
+	}
+
+
+	/**
+	 * 可以删除目录
+	 * @param prefix 图片路径
+	 * @return
+	 */
+	public static int deleteFile(String prefix){
+
+		ObjectListing objectListing = ossClient.listObjects(BUCKET_NAME, prefix);
+		List<OSSObjectSummary> sums = objectListing.getObjectSummaries();
+		try {
+			for (OSSObjectSummary s : sums) {
+				delete(s.getKey());
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	    return sums.size();  
+	}
+	
+	public static void main(String[] args) throws IOException {
+
+		HashMap<String, String> map = new HashMap<>();
+//		map.put("F:\\test\\aa.jpg", "kanfang/test/aa.jpg");
+		map.put("F:\\test\\oss\\floor.json", "kanfang/test/faa.json");
+		uploadMulFiles(map);
+
+//		deleteFile("kanfang/test/aa.jpg");
+
+    }
+
+
+	public static String upload5(String filePath, String key) {
+		PutObjectResult result = null;
+		try {
+			File file = new File(filePath);
+			if (!file.exists()) {
+				log.error("要上传的文件不存在:" + filePath);
+			}
+
+
+			 result = ossClient.putObject(BUCKET_NAME, key, new File(filePath));
+
+		} catch (Exception e) {
+			log.error(e.toString() + filePath);
+		}
+
+		log.info(" getETag : " + result.getETag());
+		log.info("1 : " + result.toString());
+		log.info("2 : " + result.getRequestId());
+		log.info("3 : " + result.getClientCRC());
+		log.info("4 : " + result.getResponse());
+		log.info("5 : " + result.getServerCRC());
+		return result.getETag();
+	}
+
+
+    /**
+     * 通过文件名判断并获取OSS服务文件上传时文件的contentType
+     * @param fileName 文件名
+     * @return 文件的contentType
+     */
+    private static String getContentType(String fileName) {
+        log.info("getContentType:" + fileName);
+        // 文件的后缀名
+        String fileExtension = fileName.substring(fileName.lastIndexOf("."));
+        if (".bmp".equalsIgnoreCase(fileExtension)) {
+            return "image/bmp";
+        }
+        if (".gif".equalsIgnoreCase(fileExtension)) {
+            return "image/gif";
+        }
+        if (".jpeg".equalsIgnoreCase(fileExtension) || ".jpg".equalsIgnoreCase(fileExtension)
+                || ".png".equalsIgnoreCase(fileExtension)) {
+            return "image/jpeg";
+        }
+        if (".html".equalsIgnoreCase(fileExtension)) {
+            return "text/html";
+        }
+        if (".txt".equalsIgnoreCase(fileExtension)) {
+            return "text/plain";
+        }
+        if (".vsd".equalsIgnoreCase(fileExtension)) {
+            return "application/vnd.visio";
+        }
+        if (".ppt".equalsIgnoreCase(fileExtension) || "pptx".equalsIgnoreCase(fileExtension)) {
+            return "application/vnd.ms-powerpoint";
+        }
+        if (".doc".equalsIgnoreCase(fileExtension) || "docx".equalsIgnoreCase(fileExtension)) {
+            return "application/msword";
+        }
+        if (".xml".equalsIgnoreCase(fileExtension)) {
+            return "text/xml";
+        }
+        if (".pdf".equalsIgnoreCase(fileExtension)) {
+            return "application/pdf";
+        }
+        // 默认返回类型
+        return "image/jpeg";
+    }
+
+    /**
+     * 以流下载图片
+	 * @Title: getInputStreamByFileUrl
+     * @Description: 根据文件路径获取InputStream流
+     * @param
+     * @return
+     * @return: InputStream
+     */
+    public static InputStream getInputStreamByFileUrl(String filePath) {
+        // ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
+        OSSObject ossObject = ossClient.getObject(BUCKET_NAME, filePath);
+        return ossObject.getObjectContent();
+    }
+
+
+	/**
+	 * 生成图片
+	 * @param inputFilePath
+	 * @param savePath
+	 */
+//	public static void writeFile(String inputFilePath, String savePath){
+//		try {
+//			FileUtils.bigFileWrite(getInputStreamByFileUrl(inputFilePath), savePath);
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//		}
+//	}
+
+}

+ 52 - 0
museum_common/src/main/java/com/museum/common/util/FileUtils.java

@@ -0,0 +1,52 @@
+package com.museum.common.util;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * Created by owen on 2020/5/12 0012 17:21
+ */
+@Slf4j
+public class FileUtils {
+
+
+    /**
+     * 多文件上传
+     * savePath 路径(目录)
+     */
+    public static List<Map<String, String>> upload(MultipartFile[] files, String savePath) throws IOException {
+        if (files == null) {
+            log.error("文件不能为空");
+            return null;
+        }
+
+        String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+        savePath = savePath + time + File.separator;
+        FileUtil.mkdir(time);
+
+        ArrayList<Map<String, String>> list = new ArrayList<>();
+
+        String path;
+        for (MultipartFile file : files) {
+            String filename = file.getOriginalFilename();
+            path = savePath + filename;
+            FileUtil.writeFromStream(file.getInputStream(), path);
+
+            HashMap<String, String> fileInfo = new HashMap<>();
+            fileInfo.put("path", path);
+            fileInfo.put("name", filename);
+            fileInfo.put("dir", time);
+
+            list.add(fileInfo);
+        }
+
+        return list;
+
+    }
+}

+ 194 - 0
museum_common/src/main/java/com/museum/common/util/PasswordUtils.java

@@ -0,0 +1,194 @@
+package com.museum.common.util;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.PBEParameterSpec;
+import java.security.Key;
+import java.security.SecureRandom;
+
+public class PasswordUtils {
+
+
+    /**
+     * JAVA6支持以下任意一种算法 PBEWITHMD5ANDDES PBEWITHMD5ANDTRIPLEDES
+     * PBEWITHSHAANDDESEDE PBEWITHSHA1ANDRC2_40 PBKDF2WITHHMACSHA1
+     * */
+
+    /**
+     * 定义使用的算法为:PBEWITHMD5andDES算法
+     */
+    public static final String ALGORITHM = "PBEWithMD5AndDES";//加密算法
+    public static final String Salt = "63293188";//密钥
+
+    /**
+     * 定义迭代次数为1000次
+     */
+    private static final int ITERATIONCOUNT = 1000;
+
+    /**
+     * 获取加密算法中使用的盐值,解密中使用的盐值必须与加密中使用的相同才能完成操作. 盐长度必须为8字节
+     *
+     * @return byte[] 盐值
+     */
+    public static byte[] getSalt() throws Exception {
+        // 实例化安全随机数
+        SecureRandom random = new SecureRandom();
+        // 产出盐
+        return random.generateSeed(8);
+    }
+
+    public static byte[] getStaticSalt() {
+        // 产出盐
+        return Salt.getBytes();
+    }
+
+    /**
+     * 根据PBE密码生成一把密钥
+     *
+     * @param password 生成密钥时所使用的密码
+     * @return Key PBE算法密钥
+     */
+    private static Key getPBEKey(String password) {
+        // 实例化使用的算法
+        SecretKeyFactory keyFactory;
+        SecretKey secretKey = null;
+        try {
+            keyFactory = SecretKeyFactory.getInstance(ALGORITHM);
+            // 设置PBE密钥参数
+            PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray());
+            // 生成密钥
+            secretKey = keyFactory.generateSecret(keySpec);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        return secretKey;
+    }
+
+    /**
+     * 加密明文字符串
+     *
+     * @param plaintext 待加密的明文字符串
+     * @param password  生成密钥时所使用的密码
+     * @param salt      盐值
+     * @return 加密后的密文字符串
+     * @throws Exception
+     */
+    public static String encrypt(String plaintext, String password, byte[] salt) {
+
+        Key key = getPBEKey(password);
+        byte[] encipheredData = null;
+        PBEParameterSpec parameterSpec = new PBEParameterSpec(salt, ITERATIONCOUNT);
+        try {
+            Cipher cipher = Cipher.getInstance(ALGORITHM);
+
+            cipher.init(Cipher.ENCRYPT_MODE, key, parameterSpec);
+
+            encipheredData = cipher.doFinal(plaintext.getBytes());
+        } catch (Exception e) {
+        }
+        return bytesToHexString(encipheredData);
+    }
+
+    /**
+     * 解密密文字符串
+     *
+     * @param ciphertext 待解密的密文字符串
+     * @param password   生成密钥时所使用的密码(如需解密,该参数需要与加密时使用的一致)
+     * @param salt       盐值(如需解密,该参数需要与加密时使用的一致)
+     * @return 解密后的明文字符串
+     * @throws Exception
+     */
+    public static Boolean decrypt(String ciphertext, String password, byte[] salt) {
+
+        Key key = getPBEKey(password);
+        byte[] passDec = null;
+        PBEParameterSpec parameterSpec = new PBEParameterSpec(getStaticSalt(), ITERATIONCOUNT);
+        try {
+            Cipher cipher = Cipher.getInstance(ALGORITHM);
+
+            cipher.init(Cipher.DECRYPT_MODE, key, parameterSpec);
+
+            passDec = cipher.doFinal(hexStringToBytes(ciphertext));
+            return true;
+        } catch (Exception e) {
+            // TODO: handle exception
+            return false;
+        }
+//        return new String(passDec);
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param src 字节数组
+     * @return
+     */
+    public static String bytesToHexString(byte[] src) {
+        StringBuilder stringBuilder = new StringBuilder("");
+        if (src == null || src.length <= 0) {
+            return null;
+        }
+        for (int i = 0; i < src.length; i++) {
+            int v = src[i] & 0xFF;
+            String hv = Integer.toHexString(v);
+            if (hv.length() < 2) {
+                stringBuilder.append(0);
+            }
+            stringBuilder.append(hv);
+        }
+        return stringBuilder.toString();
+    }
+
+    /**
+     * 将十六进制字符串转换为字节数组
+     *
+     * @param hexString 十六进制字符串
+     * @return
+     */
+    public static byte[] hexStringToBytes(String hexString) {
+        if (hexString == null || hexString.equals("")) {
+            return null;
+        }
+        hexString = hexString.toUpperCase();
+        int length = hexString.length() / 2;
+        char[] hexChars = hexString.toCharArray();
+        byte[] d = new byte[length];
+        for (int i = 0; i < length; i++) {
+            int pos = i * 2;
+            d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
+        }
+        return d;
+    }
+
+    private static byte charToByte(char c) {
+        return (byte) "0123456789ABCDEF".indexOf(c);
+    }
+
+    public static void main(String[] args) {
+
+        String userName = "uedit";
+        String password = "123456";
+
+        try {
+            byte[] salt = PasswordUtils.getStaticSalt();
+            String ciphertext = PasswordUtils.encrypt(userName, password, salt);
+            System.out.println(ciphertext);
+            Boolean plaintext = PasswordUtils.decrypt(ciphertext, password, salt);
+            System.out.println(plaintext);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+
+
+
+
+    }
+
+
+}

+ 101 - 0
museum_common/src/main/java/com/museum/common/util/Result.java

@@ -0,0 +1,101 @@
+package com.museum.common.util;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 通用返回类
+ *
+ * @author
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Result<T> implements Serializable {
+    private static final long serialVersionUID = -1491499610244557029L;
+    public static final String SUCCESS_MSG = "操作成功";
+    public static int CODE_SUCCESS = 0;
+    public static int CODE_FAILURE = -1;
+    public static String[] NOOP = new String[]{};
+
+    /**
+     * 处理状态:0: 成功, -1: 失败
+     */
+    @ApiModelProperty(value = "处理状态:0: 成功, -1: 失败", name = "code")
+    private int code;
+    /**
+     * 消息
+     */
+    @ApiModelProperty(value = "消息", name = "msg")
+    private String msg;
+    /**
+     * 返回数据
+     */
+    @ApiModelProperty(value = "返回数据", name = "data")
+    private T data;
+    /**
+     * 处理成功,并返回数据
+     *
+     * @param data 数据对象
+     * @return data
+     */
+    public static Result success(Object data) {
+        return new Result(CODE_SUCCESS, SUCCESS_MSG, data);
+    }
+    /**
+     * 处理成功
+     *
+     * @return data
+     */
+    public static Result success() {
+        return new Result(CODE_SUCCESS, SUCCESS_MSG, NOOP);
+    }
+    /**
+     * 处理成功
+     *
+     * @param msg 消息
+     * @return data
+     */
+    public static Result success(String msg) {
+        return new Result(CODE_SUCCESS, msg, NOOP);
+    }
+    /**
+     * 处理成功
+     *
+     * @param msg  消息
+     * @param data 数据对象
+     * @return data
+     */
+    public static Result success(String msg, Object data) {
+        return new Result(CODE_SUCCESS, msg, data);
+    }
+    /**
+     * 处理失败,并返回数据(一般为错误信息)
+     *
+     * @param code 错误代码
+     * @param msg  消息
+     * @return data
+     */
+    public static Result failure(int code, String msg) {
+        return new Result(code, msg, NOOP);
+    }
+    /**
+     * 处理失败
+     *
+     * @param msg 消息
+     * @return data
+     */
+    public static Result failure(String msg) {
+        return failure(CODE_FAILURE, msg);
+    }
+
+    @Override
+    public String toString() {
+        return "JsonResult [code=" + code + ", msg=" + msg + ", data="
+                + data + "]";
+    }
+}

+ 25 - 0
museum_common/src/main/java/com/museum/common/util/Test123.java

@@ -0,0 +1,25 @@
+package com.museum.common.util;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by owen on 2020/5/8 0008 14:36
+ */
+public class Test123 {
+
+
+    @Test
+    public void map(){
+        Map<Integer, String> map = new HashMap<>();
+        map.put(101, "马化腾");
+        map.put(102, "刘强东");
+        map.put(103, "马云");
+        map.put(104, "张一鸣");
+
+        System.out.println(map);
+
+    }
+}

+ 22 - 0
museum_dao/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>sh_museum_cms</artifactId>
+        <groupId>com.museum</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>museum_dao</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.museum</groupId>
+            <artifactId>museum_domain</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

+ 22 - 0
museum_dao/src/main/java/com/museum/dao/BuildingMapper.java

@@ -0,0 +1,22 @@
+package com.museum.dao;
+
+
+import com.museum.dao.Provide.MessageProvider;
+import com.museum.domain.entity.BuildingEntity;
+import com.museum.domain.entity.MessageEntity;
+import com.museum.domain.request.PageRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface BuildingMapper extends IBaseMapper<BuildingEntity, Long> {
+
+//    @SelectProvider(type = MessageProvider.class, method = "findBySearchKey")
+//    List<MessageEntity> findBySearchKey(PageRequest param);
+
+
+}

+ 21 - 0
museum_dao/src/main/java/com/museum/dao/DownloadMapper.java

@@ -0,0 +1,21 @@
+package com.museum.dao;
+
+
+import com.museum.dao.Provide.DownloadProvider;
+import com.museum.domain.entity.DownloadEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.response.DownloadResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+@Component
+@Mapper
+public interface DownloadMapper extends IBaseMapper<DownloadEntity, Long> {
+
+    @SelectProvider(type = DownloadProvider.class, method = "findBySearchKey")
+    List<DownloadResponse> search(PageRequest param, Long applyId, Long auditId);
+}

+ 22 - 0
museum_dao/src/main/java/com/museum/dao/FileMapper.java

@@ -0,0 +1,22 @@
+package com.museum.dao;
+
+
+import com.museum.domain.entity.FileEntity;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+@Component
+@Mapper
+public interface FileMapper extends IBaseMapper<FileEntity, Long> {
+
+    @Select(value = "select * from tb_file where rec_status = 'A' AND fk_id = #{fkId} AND type = #{type}")
+    List<FileEntity> findByFkIdAndType(Long fkId, String type);
+
+    @Delete(value = "delete from tb_file where rec_status = 'A' AND fk_id = #{fkId} AND type = #{type}")
+    void deleteByFkIdAndType(Long fkId, String type);
+}

+ 18 - 0
museum_dao/src/main/java/com/museum/dao/IBaseMapper.java

@@ -0,0 +1,18 @@
+package com.museum.dao;
+
+import com.museum.domain.entity.BaseEntity;
+import tk.mybatis.mapper.common.BaseMapper;
+import tk.mybatis.mapper.common.ConditionMapper;
+import tk.mybatis.mapper.common.IdsMapper;
+import tk.mybatis.mapper.common.special.InsertListMapper;
+
+
+import java.io.Serializable;
+
+/**
+ * Created by owen on 2020/2/18 0018 11:27
+ */
+
+public interface IBaseMapper<T extends BaseEntity, ID extends Serializable> extends BaseMapper<T>,
+        ConditionMapper<T>, IdsMapper<T>, InsertListMapper<T> {
+}

+ 23 - 0
museum_dao/src/main/java/com/museum/dao/LogMapper.java

@@ -0,0 +1,23 @@
+package com.museum.dao;
+
+
+import com.museum.dao.Provide.LogProvider;
+import com.museum.domain.entity.LogEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.response.LogResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface LogMapper extends IBaseMapper<LogEntity, Long> {
+
+    /**
+     * 注意日期,需要传字符串类型
+     */
+    @SelectProvider(type = LogProvider.class, method = "findBySearchKey")
+    List<LogResponse> search(PageRequest param);
+}

+ 25 - 0
museum_dao/src/main/java/com/museum/dao/MessageMapper.java

@@ -0,0 +1,25 @@
+package com.museum.dao;
+
+
+import com.museum.dao.Provide.MessageProvider;
+import com.museum.dao.Provide.UserProvider;
+import com.museum.domain.entity.MessageEntity;
+import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.PageDateRequest;
+import com.museum.domain.request.PageRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface MessageMapper extends IBaseMapper<MessageEntity, Long> {
+
+    @SelectProvider(type = MessageProvider.class, method = "findBySearchKey")
+    List<MessageEntity> findBySearchKey(PageDateRequest param);
+
+
+}

+ 24 - 0
museum_dao/src/main/java/com/museum/dao/PartMapper.java

@@ -0,0 +1,24 @@
+package com.museum.dao;
+
+
+import com.museum.dao.Provide.PartProvider;
+import com.museum.domain.entity.PartEntity;
+import com.museum.domain.request.NavRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface PartMapper extends IBaseMapper<PartEntity, Long> {
+
+    @SelectProvider(type = PartProvider.class, method = "findByNav")
+    List<PartEntity> findByNav(NavRequest param);
+
+//    @SelectProvider(type = MessageProvider.class, method = "findBySearchKey")
+//    List<MessageEntity> findBySearchKey(PageRequest param);
+
+
+}

+ 41 - 0
museum_dao/src/main/java/com/museum/dao/Provide/DownloadProvider.java

@@ -0,0 +1,41 @@
+package com.museum.dao.Provide;
+
+import com.museum.domain.request.PageRequest;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+
+/**
+ * Created by owen on 2020/5/13.
+ */
+@Log4j2
+public class DownloadProvider {
+
+    public String findBySearchKey(PageRequest param, Long applyId, Long auditId){
+        StringBuffer sql = new StringBuffer(
+                "select z.name, z.reason, z.create_time, z.type, u.user_name, z.file_ids, z.status from tb_download z " +
+                        "left join tb_user u on z.apply_id = u.id " +
+                        "where z.rec_status = 'A' ");
+
+        if (applyId != null) {
+            sql.append("and apply_id = ").append(applyId);
+        }
+
+        if (auditId != null) {
+            sql.append("and audit_id = ").append(auditId);
+        }
+
+        String searchKey = param.getSearchKey();
+        if(!StringUtils.isAllBlank(searchKey)){
+            sql.append(" and (( u.user_name like '%").append(searchKey).append("%' )");
+            sql.append(" or ( z.name like '%").append(searchKey).append("%' ))");
+        }
+
+        sql.append(" order by z.create_time desc");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+
+
+
+}

+ 39 - 0
museum_dao/src/main/java/com/museum/dao/Provide/LogProvider.java

@@ -0,0 +1,39 @@
+package com.museum.dao.Provide;
+
+import com.museum.domain.request.PageRequest;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+
+/**
+ * Created by owen on 2020/5/13.
+ */
+@Log4j2
+public class LogProvider {
+
+    public String findBySearchKey(PageRequest param){
+        StringBuffer sql = new StringBuffer(
+                "select z.type, z.description, z.create_time, u.user_name, z.status from tb_log z left join tb_user u on z.user_id = u.id where z.rec_status = 'A' ");
+
+
+//        if(StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())){
+//
+//            sql.append(" and z.create_time >= ").append("'").append(param.getStartTime()).append("'");
+//            sql.append(" and z.create_time <= ").append("'").append(param.getEndTime()).append("'");
+//        }
+
+        String searchKey = param.getSearchKey();
+        if(!StringUtils.isAllBlank(searchKey)){
+            sql.append(" and (( u.user_name like '%").append(searchKey).append("%' )");
+            sql.append(" or ( z.description like '%").append(searchKey).append("%' )");
+            sql.append(" or ( z.type like '%").append(searchKey).append("%' ))");
+        }
+
+        sql.append(" order by z.create_time desc");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+
+
+
+}

+ 38 - 0
museum_dao/src/main/java/com/museum/dao/Provide/MessageProvider.java

@@ -0,0 +1,38 @@
+package com.museum.dao.Provide;
+
+import cn.hutool.core.util.StrUtil;
+import com.museum.domain.request.PageDateRequest;
+import com.museum.domain.request.PageRequest;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by owen on 2020/5/9 0009 15:23
+ */
+
+@Log4j2
+public class MessageProvider {
+
+    public String findBySearchKey(PageDateRequest param){
+        StringBuffer sql = new StringBuffer("" +
+                "SELECT * FROM tb_message where rec_status = 'A' ");
+
+        if(StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())){
+
+            sql.append(" and z.create_time >= ").append("'").append(param.getStartTime()).append("'");
+            sql.append(" and z.create_time <= ").append("'").append(param.getEndTime()).append("'");
+        }
+
+        String searchKey = param.getSearchKey();
+        if(StrUtil.isNotBlank(searchKey)){
+            sql.append(" and (");
+            sql.append(" message like '%").append(searchKey).append("%'");
+            sql.append(" or phone like '%").append(searchKey).append("%'");
+            sql.append( ")");
+        }
+
+        sql.append(" ORDER BY create_time DESC");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

+ 52 - 0
museum_dao/src/main/java/com/museum/dao/Provide/PartProvider.java

@@ -0,0 +1,52 @@
+package com.museum.dao.Provide;
+
+import com.museum.domain.request.NavRequest;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by owen on 2020/5/9 0009 15:23
+ */
+
+@Log4j2
+public class PartProvider {
+
+    public String findByNav(NavRequest param){
+        StringBuffer sql = new StringBuffer("" +
+                "SELECT * FROM tb_part where rec_status = 'A' ");
+
+
+        String searchKey = param.getSearchKey();
+        if(StringUtils.isNotBlank(searchKey)){
+            // 字符串要加'
+            sql.append(" and name ='").append(searchKey).append("'");
+        }
+
+
+        Integer block = param.getBlock();
+        if(block != null){
+            sql.append(" and block =").append(block);
+        }
+
+//        String modelType = param.getModelType();
+//        if(StringUtils.isNotBlank(modelType)){
+//            sql.append(" and model_type ='").append(modelType).append("'");
+//        }
+
+        String zone = param.getZone();
+        if(StringUtils.isNotBlank(zone)){
+            // 字符串要加'
+            sql.append(" and zone = '").append(zone).append("'");
+        }
+
+        Long typeId = param.getTypeId();
+        if(typeId != null){
+            sql.append(" and type_id =").append(typeId);
+        }
+
+        sql.append(" ORDER BY create_time DESC");
+
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

+ 50 - 0
museum_dao/src/main/java/com/museum/dao/Provide/RoamProvider.java

@@ -0,0 +1,50 @@
+package com.museum.dao.Provide;
+
+import com.museum.domain.request.NavRequest;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by owen on 2020/5/9 0009 15:23
+ */
+
+@Log4j2
+public class RoamProvider {
+
+    public String findByNav(NavRequest param){
+        StringBuffer sql = new StringBuffer("" +
+                "SELECT * FROM tb_roam where rec_status = 'A' ");
+
+
+        String searchKey = param.getSearchKey();
+        if(StringUtils.isNotBlank(searchKey)){
+            // 字符串要加'
+            sql.append(" and name ='").append(searchKey).append("'");
+        }
+
+        Integer block = param.getBlock();
+        if(block != null){
+            sql.append(" and block =").append(block);
+        }
+
+//        String modelType = param.getModelType();
+//        if(modelType != null){
+//            sql.append(" and model_type =").append(modelType);
+//        }
+
+        String zone = param.getZone();
+        if(StringUtils.isNotBlank(zone)){
+            // 字符串要加'
+            sql.append(" and zone ='").append(zone).append("'");
+        }
+
+        Long typeId = param.getTypeId();
+        if(typeId != null){
+            sql.append(" and type_id =").append(typeId);
+        }
+
+        sql.append(" ORDER BY create_time DESC");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

+ 26 - 0
museum_dao/src/main/java/com/museum/dao/Provide/UserProvider.java

@@ -0,0 +1,26 @@
+package com.museum.dao.Provide;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.log4j.Log4j2;
+
+/**
+ * Created by owen on 2020/5/9 0009 15:23
+ */
+
+@Log4j2
+public class UserProvider {
+
+    public String findBySearchKey(String searchKey){
+        StringBuffer sql = new StringBuffer("" +
+                "SELECT * FROM tb_user where rec_status = 'A' ");
+        if(StrUtil.isNotBlank(searchKey)){
+            sql.append(" and (");
+            sql.append(" user_name like '%").append(searchKey).append("%'");
+            sql.append(" or phone like '%").append(searchKey).append("%'");
+            sql.append( ")");
+        }
+        sql.append(" ORDER BY create_time DESC");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

+ 22 - 0
museum_dao/src/main/java/com/museum/dao/RoamMapper.java

@@ -0,0 +1,22 @@
+package com.museum.dao;
+
+
+import com.museum.dao.Provide.RoamProvider;
+import com.museum.domain.entity.RoamEntity;
+import com.museum.domain.request.NavRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface RoamMapper extends IBaseMapper<RoamEntity, Long> {
+
+    @SelectProvider(type = RoamProvider.class, method = "findByNav")
+    List<RoamEntity> findByNav(NavRequest param);
+
+
+
+}

+ 15 - 0
museum_dao/src/main/java/com/museum/dao/TypeMapper.java

@@ -0,0 +1,15 @@
+package com.museum.dao;
+
+
+import com.museum.domain.entity.TypeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+
+@Component
+@Mapper
+public interface TypeMapper extends IBaseMapper<TypeEntity, Long> {
+
+
+
+}

+ 28 - 0
museum_dao/src/main/java/com/museum/dao/UserMapper.java

@@ -0,0 +1,28 @@
+package com.museum.dao;
+
+
+import com.museum.dao.Provide.UserProvider;
+import com.museum.domain.entity.UserEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface UserMapper extends IBaseMapper<UserEntity, Long> {
+
+//    @SelectProvider(type = UserProvider.class, method = "findAllBySearchKey")
+//    List<UserResponse> findAllBySearchKey(String searchKey);
+
+    @Select(value = "select * from tb_user where rec_status = 'A' AND user_name= #{userName}")
+    UserEntity findByUserName(String userName);
+
+    @Select(value = "select * from tb_user where rec_status = 'A' AND phone = #{phone}")
+    UserEntity findByPhone(String phone);
+
+    @SelectProvider(type = UserProvider.class, method = "findBySearchKey")
+    List<UserEntity> findBySearchKey(String searchKey);
+}

+ 23 - 0
museum_domain/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>sh_museum_cms</artifactId>
+        <groupId>com.museum</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>museum_domain</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.museum</groupId>
+            <artifactId>museum_common</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

+ 35 - 0
museum_domain/src/main/java/com/museum/domain/entity/BaseEntity.java

@@ -0,0 +1,35 @@
+package com.museum.domain.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Data
+@MappedSuperclass
+public abstract class BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 用来批量操作的
+     * A: 激活  I:禁用
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private String recStatus;
+
+}

+ 33 - 0
museum_domain/src/main/java/com/museum/domain/entity/BuildingEntity.java

@@ -0,0 +1,33 @@
+package com.museum.domain.entity;
+
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 建筑信息
+ */
+@Data
+@Table(name = "tb_building")
+public class BuildingEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5191917184688236778L;
+
+    /** 建筑物名称 */
+    private String name;
+
+    /** 描述 */
+    private String description;
+
+    /** 模型链接 */
+    private String modelUrl;
+
+    /** 展示封面 */
+    private String ico;
+
+    /** 文件目录  */
+    private String fileDir;
+
+
+}

+ 43 - 0
museum_domain/src/main/java/com/museum/domain/entity/DownloadEntity.java

@@ -0,0 +1,43 @@
+package com.museum.domain.entity;
+
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 部件下载记录信息
+ */
+@Data
+@Table(name = "tb_download")
+public class DownloadEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5191918181588231778L;
+
+    /** 部件id */
+    private Long fkId;
+
+    /** 模块名称 */
+    private String name;
+
+    /** 申请原因 */
+    private String reason;
+
+    /** 状态,1:申请中,2:同意,3:驳回 */
+    private Integer status;
+
+    /** 申请人id */
+    private Long applyId;
+
+    /** 审核人id */
+    private Long auditId;
+
+    /** 文件id  */
+    private String fileIds;
+
+    /** 模块类型  */
+    private String type;
+
+
+
+}

+ 30 - 0
museum_domain/src/main/java/com/museum/domain/entity/FileEntity.java

@@ -0,0 +1,30 @@
+package com.museum.domain.entity;
+
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 文件表
+ */
+@Data
+@Table(name = "tb_file")
+public class FileEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5191917184688236778L;
+
+    /** 文件名 */
+    private String fileName;
+
+    /** 文件保存路径 */
+    private String filePath;
+
+    /** 关联表id */
+    private Long fkId;
+
+    /** 模型类型:building、part */
+    private String type;
+
+
+}

+ 46 - 0
museum_domain/src/main/java/com/museum/domain/entity/LogEntity.java

@@ -0,0 +1,46 @@
+package com.museum.domain.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 收集日志实体类
+ */
+@NoArgsConstructor                 //无参构造
+@AllArgsConstructor                //有参构造
+@Data
+@Table(name = "tb_log")
+public class LogEntity extends BaseEntity implements Serializable {
+
+
+    private static final long serialVersionUID = -3394791736156714542L;
+
+    /**
+     * 操作者用户id
+     */
+    private Long userId;
+
+    /**
+     * 操作类型
+     */
+    private String type;
+
+    /**
+     * 操作记录
+     */
+    private String description;
+
+//    @ApiModelProperty(value = "状态,0:成功,1:失败", name = "status")
+//    private Integer status;
+
+
+
+
+
+}

+ 34 - 0
museum_domain/src/main/java/com/museum/domain/entity/MessageEntity.java

@@ -0,0 +1,34 @@
+package com.museum.domain.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 留言信息
+ */
+@Data
+@Table(name = "tb_message")
+public class MessageEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5191918181588231778L;
+
+
+    /** 游客名称 */
+    @ApiModelProperty(value = "游客名称", name = "userName")
+    private String userName;
+
+    /** 电话 */
+    @ApiModelProperty(value = "电话", name = "phone")
+    private String phone;
+
+    /** 邮箱 */
+    @ApiModelProperty(value = "邮箱", name = "email")
+    private String email;
+
+    /** 留言  */
+    @ApiModelProperty(value = "留言", name = "message")
+    private String message;
+}

+ 51 - 0
museum_domain/src/main/java/com/museum/domain/entity/PartEntity.java

@@ -0,0 +1,51 @@
+package com.museum.domain.entity;
+
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 部件信息
+ */
+@Data
+@Table(name = "tb_part")
+public class PartEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5191918181588231778L;
+
+    /** 名称 */
+    private String name;
+
+    /** 楼体 */
+    private Integer block;
+
+    /** 区域 */
+    private String zone;
+
+//    /** 模型类型 */
+//    private String modelType;
+
+    /** 展示内容  */
+    private String content;
+
+    /** 场景rul  */
+    private String webSite;
+
+    /** 程序显示, 0:显示,1:不显示  */
+    private Integer display;
+
+    /** 图标,base64  */
+    private String ico;
+
+    /** 材质  */
+    private String material;
+
+    /** 展示类型  */
+    private Long typeId;
+
+    /** 文件目录  */
+    private String fileDir;
+
+
+}

+ 42 - 0
museum_domain/src/main/java/com/museum/domain/entity/RoamEntity.java

@@ -0,0 +1,42 @@
+package com.museum.domain.entity;
+
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 漫游信息
+ */
+@Data
+@Table(name = "tb_roam")
+public class RoamEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5191918181588231778L;
+
+    /** 名称 */
+    private String name;
+
+    /** 楼体 */
+    private Integer block;
+
+    /** 区域 */
+    private String zone;
+
+//    /** 模型类型 */
+//    private String modelType;
+
+    /** 展示内容  */
+    private String content;
+
+    /** 场景rul  */
+    private String webSite;
+
+    /** 程序显示, 0:显示,1:不显示  */
+    private Integer display;
+
+    /** 展示类型  */
+    private Long typeId;
+
+
+}

+ 25 - 0
museum_domain/src/main/java/com/museum/domain/entity/TypeEntity.java

@@ -0,0 +1,25 @@
+package com.museum.domain.entity;
+
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 组件类型
+ */
+@Data
+@Table(name = "tb_type")
+public class TypeEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5191918181588231778L;
+
+
+    /** 模型类型 */
+    private String modelType;
+
+    /** 展示类型  */
+    private String name;
+
+
+}

+ 45 - 0
museum_domain/src/main/java/com/museum/domain/entity/UserEntity.java

@@ -0,0 +1,45 @@
+package com.museum.domain.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 房源信息
+ */
+@Data
+@Table(name = "tb_user")
+public class UserEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -5191918184688236778L;
+
+    /** 用户名 */
+    private String userName;
+
+    /** 真实姓名 */
+//    private String realName;
+
+    @JSONField(serialize = false)
+    private String password;
+
+    /** 性别 0:男  1:女 */
+//    private Integer sex;
+
+    /** 电话 */
+    private String phone;
+
+    /** 邮箱 */
+    @JSONField(serialize = false)
+//    private String email;
+
+    /** 状态 0:启用  1:停用 2:注销 */
+    private Integer status;
+
+    /** 角色:只有两种 admin normal  */
+    private String role;
+
+    /** 头像 */
+    private String ico;
+}

+ 40 - 0
museum_domain/src/main/java/com/museum/domain/request/BuildingRequest.java

@@ -0,0 +1,40 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 建筑信息
+ */
+@Data
+public class BuildingRequest implements Serializable {
+
+    private static final long serialVersionUID = -519197184688236778L;
+
+    @ApiModelProperty(value = "id,修改时必须传,新增忽略", name = "id")
+    private Long id;
+
+    @NotNull(message = "建筑物名称不能为空")
+    @ApiModelProperty(value = "建筑物名称", name = "name", required = true)
+    private String name;
+
+    @NotNull(message = "建筑物描述不能为空")
+    @ApiModelProperty(value = "建筑物描述", name = "description", required = true)
+    private String description;
+
+    @NotNull(message = "模型链接不能为空")
+    @ApiModelProperty(value = "模型链接", name = "webSite", required = true)
+    private String webSite;
+
+//    @NotNull(message = "展示封面不能为空")
+    @ApiModelProperty(value = "展示封面, 以base64传输", name = "ico")
+    private String ico;
+
+    @ApiModelProperty(value = "多媒体资料", name = "files")
+    private MultipartFile[] files;
+
+}

+ 33 - 0
museum_domain/src/main/java/com/museum/domain/request/DownloadRequest.java

@@ -0,0 +1,33 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 部件下载信息
+ */
+@Data
+public class DownloadRequest implements Serializable {
+
+    private static final long serialVersionUID = -5191918184589231778L;
+
+    @ApiModelProperty(value = "模块id", name = "fkId", required = true)
+    private Long fkId;
+
+    @ApiModelProperty(value = "名称", name = "name", required = true)
+    private Long name;
+
+    @ApiModelProperty(value = "模块类型,part:部件, building:建筑物", name = "type", required = true)
+    private Long type;
+
+    @ApiModelProperty(value = "申请原因", name = "reason", required = true)
+    private String reason;
+
+    @ApiModelProperty(value = "审核人id", name = "auditId", required = true)
+    private Long auditId;
+
+    @ApiModelProperty(value = "多媒体资料id, 多个id用“,“隔开,例如:1,2,3", name = "fileIds", required = true)
+    private String fileIds;
+}

+ 21 - 0
museum_domain/src/main/java/com/museum/domain/request/LoginRequest.java

@@ -0,0 +1,21 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class LoginRequest {
+
+    @NotNull(message = "用户名不能为空")
+    @ApiModelProperty(value = "用户名", name = "userName", required = true)
+    private String userName;
+
+    @NotNull(message = "密码不能为空")
+    @ApiModelProperty(value = "密码", name = "password", required = true)
+    private String password;
+}

+ 32 - 0
museum_domain/src/main/java/com/museum/domain/request/MessageRequest.java

@@ -0,0 +1,32 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 留言信息
+ */
+@Data
+public class MessageRequest implements Serializable {
+
+    private static final long serialVersionUID = -5191918184588231778L;
+
+
+    /** 游客名称 */
+    @ApiModelProperty(value = "游客名称", name = "userName", required = true)
+    private String userName;
+
+    /** 电话 */
+    @ApiModelProperty(value = "电话", name = "phone")
+    private String phone;
+
+    /** 邮箱 */
+    @ApiModelProperty(value = "邮箱", name = "email")
+    private String email;
+
+    /** 留言  */
+    @ApiModelProperty(value = "留言", name = "message", required = true)
+    private String message;
+}

+ 33 - 0
museum_domain/src/main/java/com/museum/domain/request/NavRequest.java

@@ -0,0 +1,33 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 部件、漫游共用信息
+ */
+@Data
+public class NavRequest extends PageRequest implements Serializable {
+
+    private static final long serialVersionUID = -5182918184588231778L;
+
+
+    /** 楼体 */
+    @ApiModelProperty(value = "楼体, 1:东楼,2:西楼", name = "block")
+    private Integer block;
+
+    /** 区域 */
+    @ApiModelProperty(value = "区域, in:室内,out:室外", name = "zone")
+    private String zone;
+
+//    /** 模型类型 */
+//    @ApiModelProperty(value = "模型类型, roam:自由漫游,part:部件欣赏", name = "modelType")
+//    private String modelType;
+
+    /** 组件类型id  */
+    @ApiModelProperty(value = "组件类型id", name = "typeId")
+    private Long typeId;
+
+}

+ 27 - 0
museum_domain/src/main/java/com/museum/domain/request/PageDateRequest.java

@@ -0,0 +1,27 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * Created by Owen on 2019/10/28 0028 12:24
+ * 有时间
+ */
+@Data
+public class PageDateRequest extends PageRequest {
+
+    /**
+     * 开始时间
+     * 需要用字符串接收
+     */
+    @ApiModelProperty(value = "开始时间", name = "startTime")
+    private String startTime;
+
+
+    @ApiModelProperty(value = "结束时间", name = "endTime")
+    private String endTime;
+
+
+
+}

+ 26 - 0
museum_domain/src/main/java/com/museum/domain/request/PageRequest.java

@@ -0,0 +1,26 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * Created by Owen on 2019/10/28 0028 12:24
+ */
+@Data
+public class PageRequest {
+
+
+    @ApiModelProperty(value = "起始页码,默认1为第一页", name = "pageNum")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "每页数量", name = "pageSize")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "搜索条件", name = "searchKey")
+    private String searchKey;
+
+
+
+
+}

+ 58 - 0
museum_domain/src/main/java/com/museum/domain/request/PartRequest.java

@@ -0,0 +1,58 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 部件信息
+ */
+@Data
+public class PartRequest  {
+
+    @ApiModelProperty(value = "部件id,修改时必须传,新增忽略", name = "id")
+    private Long id;
+
+    @NotNull(message = "名称不能为空")
+    @ApiModelProperty(value = "名称", name = "name", required = true)
+    private String name;
+
+    @NotNull(message = "楼体不能为空")
+    @ApiModelProperty(value = "楼体, 1:东楼,2:西楼", name = "block", required = true)
+    private Integer block;
+
+    @NotNull(message = "区域不能为空")
+    @ApiModelProperty(value = "区域, in:室内,out:室外", name = "zone", required = true)
+    private String zone;
+
+//    @NotNull(message = "模型类型不能为空")
+//    @ApiModelProperty(value = "模型类型, roam:自由漫游,part:部件欣赏", name = "modelType")
+//    private String modelType;
+
+    @NotNull(message = "类型id不能为空")
+    @ApiModelProperty(value = "类型id", name = "typeId", required = true)
+    private Long typeId;
+
+    @NotNull(message = "展示内容不能为空")
+    @ApiModelProperty(value = "展示内容", name = "content", required = true)
+    private String content;
+
+    @ApiModelProperty(value = "场景url", name = "webSite")
+    private String webSite;
+
+    @ApiModelProperty(value = "程序显示, 0:显示,1:不显示", name = "display", required = true)
+    private Integer display;
+
+    @ApiModelProperty(value = "图标,以base64传输", name = "ico")
+    private String ico;
+
+    @ApiModelProperty(value = "材料", name = "material")
+    private String material;
+
+    @ApiModelProperty(value = "多媒体资料", name = "files")
+    private MultipartFile[] files;
+
+}

+ 21 - 0
museum_domain/src/main/java/com/museum/domain/request/PasswordRequest.java

@@ -0,0 +1,21 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class PasswordRequest {
+
+    @NotNull(message = "旧密码不能为空")
+    @ApiModelProperty(value = "旧密码", name = "oldPassword", required = true)
+    private String oldPassword;
+
+    @NotNull(message = "新密码不能为空")
+    @ApiModelProperty(value = "新密码", name = "newPassword", required = true)
+    private String newPassword;
+}

+ 50 - 0
museum_domain/src/main/java/com/museum/domain/request/RoamRequest.java

@@ -0,0 +1,50 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 漫游信息
+ */
+@Data
+public class RoamRequest implements Serializable {
+
+    private static final long serialVersionUID = -5181918185588231778L;
+
+    @ApiModelProperty(value = "id, 修改时必须传,新增忽略", name = "id")
+    private Long id;
+
+    @NotNull(message = "名称不能为空")
+    @ApiModelProperty(value = "名称", name = "name", required = true)
+    private String name;
+
+    @NotNull(message = "楼体不能为空")
+    @ApiModelProperty(value = "楼体, 1:东楼,2:西楼", name = "block", required = true)
+    private Integer block;
+
+    @NotNull(message = "区域不能为空")
+    @ApiModelProperty(value = "区域, in:室内,out:室外", name = "zone", required = true)
+    private String zone;
+
+//    @NotNull(message = "模型类型不能为空")
+//    @ApiModelProperty(value = "模型类型, roam:自由漫游,part:部件欣赏", name = "modelType")
+//    private String modelType;
+
+    @NotNull(message = "类型id不能为空")
+    @ApiModelProperty(value = "类型id", name = "typeId", required = true)
+    private Long typeId;
+
+    @NotNull(message = "展示内容不能为空")
+    @ApiModelProperty(value = "展示内容", name = "content", required = true)
+    private String content;
+
+    @ApiModelProperty(value = "场景url", name = "webSite")
+    private String webSite;
+
+    @ApiModelProperty(value = "程序显示, 0:显示,1:不显示", name = "display", required = true)
+    private Integer display;
+
+}

+ 50 - 0
museum_domain/src/main/java/com/museum/domain/request/UserRequest.java

@@ -0,0 +1,50 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 房源信息
+ */
+@Data
+public class UserRequest implements Serializable {
+
+    private static final long serialVersionUID = -5191918184688231778L;
+
+    @ApiModelProperty(value = "id, 修改时必须传,新增忽略", name = "id")
+    private Long id;
+
+    @NotNull(message = "用户名不能为空")
+    @ApiModelProperty(value = "用户名", name = "userName", required = true)
+    private String userName;
+
+    @NotNull(message = "手机号不能为空")
+    @ApiModelProperty(value = "手机号", name = "phone", required = true)
+    private String phone;
+
+    @NotNull(message = "状态不能为空")
+    @ApiModelProperty(value = "状态, 0:启用  1:停用 2:注销", name = "status", required = true)
+    private Integer status; // 0:启用  1:停用 2:注销
+
+    @NotNull(message = "角色不能为空")
+    @ApiModelProperty(value = "角色:只有两种 admin normal", name = "role", required = true)
+    private String role;
+
+    @NotNull(message = "头像不能为空")
+    @ApiModelProperty(value = "头像,base64", name = "ico", required = true)
+    private String ico;
+
+//    @ApiModelProperty(value = "真实姓名", name = "realName")
+//    private String realName;
+
+//    @ApiModelProperty(value = "性别,0:男  1:女", name = "sex")
+//    private Integer sex;
+
+
+//    @ApiModelProperty(value = "邮箱", name = "email")
+//    private String email;
+
+}

+ 33 - 0
museum_domain/src/main/java/com/museum/domain/response/DownloadResponse.java

@@ -0,0 +1,33 @@
+package com.museum.domain.response;
+
+import com.museum.domain.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2020/5/12.
+ */
+@Data
+public class DownloadResponse extends BaseEntity {
+
+    private Long id;
+
+    /** 模块类型 */
+    private String type;
+
+    @ApiModelProperty(value = "组件名称", name = "name")
+    private String name;
+
+    /** 申请原因 */
+    private String reason;
+
+    /** 状态  */
+    private Integer status;
+
+    /** 申请人 */
+    private String userName;
+
+    /** 文件id  */
+    private String fileIds;
+
+}

+ 26 - 0
museum_domain/src/main/java/com/museum/domain/response/LogResponse.java

@@ -0,0 +1,26 @@
+package com.museum.domain.response;
+
+import com.museum.domain.entity.BaseEntity;
+import lombok.Data;
+
+/**
+ * Created by owen on 2020/5/12.
+ */
+@Data
+public class LogResponse extends BaseEntity {
+
+
+    /** 操作者账号 */
+    private String userName;
+
+    /** 操作类型 */
+    private String type;
+
+
+    /** 操作记录 */
+    private String description;
+
+//    /** 操作状态,0:成功, 1:失败 */
+//    private Integer status;
+
+}

+ 23 - 0
museum_service/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>sh_museum_cms</artifactId>
+        <groupId>com.museum</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>museum_service</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.museum</groupId>
+            <artifactId>museum_dao</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

+ 18 - 0
museum_service/src/main/java/com/museum/service/BuildingService.java

@@ -0,0 +1,18 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.BuildingEntity;
+import com.museum.domain.entity.MessageEntity;
+import com.museum.domain.request.PageRequest;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:14
+ */
+public interface BuildingService extends IBaseService<BuildingEntity, Long> {
+
+//    List<MessageEntity> findBySearchKey(PageRequest param);
+
+}

+ 20 - 0
museum_service/src/main/java/com/museum/service/DownloadService.java

@@ -0,0 +1,20 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.DownloadEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.response.DownloadResponse;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:14
+ */
+public interface DownloadService extends IBaseService<DownloadEntity, Long> {
+
+
+//    List<PartDownloadResponse> search(PageRequest param);
+
+    List<DownloadResponse> search(PageRequest param, Long applyId, Long auditId);
+}

+ 18 - 0
museum_service/src/main/java/com/museum/service/FileService.java

@@ -0,0 +1,18 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.FileEntity;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:14
+ */
+public interface FileService extends IBaseService<FileEntity, Long> {
+
+
+    List<FileEntity> findByFkIdAndType(Long fkId, String type);
+
+    void deleteByFkIdAndType(Long fkId, String type);
+}

+ 47 - 0
museum_service/src/main/java/com/museum/service/IBaseService.java

@@ -0,0 +1,47 @@
+package com.museum.service;
+
+import com.github.pagehelper.PageInfo;
+import tk.mybatis.mapper.entity.Condition;
+
+import java.io.Serializable;
+import java.util.List;
+
+public interface IBaseService<T, ID extends Serializable> {
+
+    public abstract T findById(ID id);
+
+    public abstract T findOne(T entity);
+
+    public abstract List<T> findByIds(String ids);
+
+    public abstract long count();
+
+    public abstract boolean exists(ID id);
+
+    public abstract int save(T entity);
+
+    public abstract int update(T entity);
+
+    public abstract int updateAll(T entity);
+
+    public abstract int deleteById(ID id);
+
+    public abstract int deleteByIds(String ids);
+
+    public abstract int delete(T entity);
+
+    public abstract List<T> findAll(Condition condition, String orderBy);
+
+    public abstract List<T> findAll(Condition condition);
+
+    public abstract List<T> findAll();
+
+    public abstract PageInfo<T> findAll(int pageNum, int pageSize);
+
+    public abstract PageInfo<T> findAll(int pageNum, int pageSize, String orderBy);
+
+    public abstract PageInfo<T> findAll(Condition condition, int pageNum, int pageSize);
+
+    public abstract PageInfo<T> findAll(Condition condition, int pageNum, int pageSize, String orderBy);
+
+}

+ 18 - 0
museum_service/src/main/java/com/museum/service/LogService.java

@@ -0,0 +1,18 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.LogEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.response.LogResponse;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/12 0011 16:14
+ */
+public interface LogService extends IBaseService<LogEntity, Long> {
+
+
+    List<LogResponse> search(PageRequest param);
+}

+ 19 - 0
museum_service/src/main/java/com/museum/service/MessageService.java

@@ -0,0 +1,19 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.MessageEntity;
+import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.PageDateRequest;
+import com.museum.domain.request.PageRequest;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface MessageService extends IBaseService<MessageEntity, Long> {
+
+    List<MessageEntity> findBySearchKey(PageDateRequest param);
+
+}

+ 18 - 0
museum_service/src/main/java/com/museum/service/PartService.java

@@ -0,0 +1,18 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.PartEntity;
+import com.museum.domain.request.NavRequest;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:14
+ */
+public interface PartService extends IBaseService<PartEntity, Long> {
+
+    List<PartEntity> findByNav(NavRequest param);
+
+
+}

+ 19 - 0
museum_service/src/main/java/com/museum/service/RoamService.java

@@ -0,0 +1,19 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.RoamEntity;
+import com.museum.domain.request.NavRequest;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:14
+ */
+public interface RoamService extends IBaseService<RoamEntity, Long> {
+
+    List<RoamEntity> findByNav(NavRequest param);
+
+
+
+}

+ 15 - 0
museum_service/src/main/java/com/museum/service/TypeService.java

@@ -0,0 +1,15 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.TypeEntity;
+
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:14
+ */
+public interface TypeService extends IBaseService<TypeEntity, Long> {
+
+
+
+}

+ 23 - 0
museum_service/src/main/java/com/museum/service/UserService.java

@@ -0,0 +1,23 @@
+package com.museum.service;
+
+
+import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.PageRequest;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface UserService extends IBaseService<UserEntity, Long> {
+
+//    List<UserResponse> findAllBySearchKey(PageDto param);
+
+    UserEntity findByUserName(String userName);
+
+    UserEntity findByPhone(String phone);
+
+
+    List<UserEntity> findBySearchKey(PageRequest param);
+}

+ 43 - 0
museum_service/src/main/java/com/museum/service/impl/BuildingServiceImpl.java

@@ -0,0 +1,43 @@
+package com.museum.service.impl;
+
+import com.museum.dao.BuildingMapper;
+import com.museum.dao.IBaseMapper;
+import com.museum.dao.MessageMapper;
+import com.museum.domain.entity.BuildingEntity;
+import com.museum.domain.entity.MessageEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.service.BuildingService;
+import com.museum.service.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:16
+ */
+@Service
+public class BuildingServiceImpl extends IBaseServiceImpl<BuildingEntity, Long> implements BuildingService {
+
+    @Autowired
+    private BuildingMapper entityMapper;
+
+    @Override
+    public IBaseMapper<BuildingEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+//    @Override
+//    public List<MessageEntity> findBySearchKey(PageRequest param) {
+//        return entityMapper.findBySearchKey(param);
+//    }
+
+
+//    @Override
+//    public List<UserEntity> findBySearchKey(PageRequest param) {
+//        return entityMapper.findBySearchKey(param.getSearchKey());
+//    }
+
+
+}

+ 36 - 0
museum_service/src/main/java/com/museum/service/impl/DownloadServiceImpl.java

@@ -0,0 +1,36 @@
+package com.museum.service.impl;
+
+import com.museum.dao.DownloadMapper;
+import com.museum.dao.IBaseMapper;
+import com.museum.domain.entity.DownloadEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.response.DownloadResponse;
+import com.museum.service.DownloadService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:16
+ */
+@Service
+public class DownloadServiceImpl extends IBaseServiceImpl<DownloadEntity, Long> implements DownloadService {
+
+    @Autowired
+    private DownloadMapper entityMapper;
+
+    @Override
+    public IBaseMapper<DownloadEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+
+    @Override
+    public List<DownloadResponse> search(PageRequest param, Long applyId, Long auditId) {
+        return entityMapper.search(param, applyId, auditId);
+    }
+}
+

+ 37 - 0
museum_service/src/main/java/com/museum/service/impl/FileServiceImpl.java

@@ -0,0 +1,37 @@
+package com.museum.service.impl;
+
+import com.museum.dao.FileMapper;
+import com.museum.dao.IBaseMapper;
+import com.museum.domain.entity.FileEntity;
+import com.museum.service.FileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:16
+ */
+@Service
+public class FileServiceImpl extends IBaseServiceImpl<FileEntity, Long> implements FileService {
+
+    @Autowired
+    private FileMapper entityMapper;
+
+    @Override
+    public IBaseMapper<FileEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+    @Override
+    public List<FileEntity> findByFkIdAndType(Long fkId, String type) {
+        return entityMapper.findByFkIdAndType(fkId, type);
+    }
+
+    @Override
+    public void deleteByFkIdAndType(Long fkId, String type) {
+        entityMapper.deleteByFkIdAndType(fkId, type);
+    }
+}

+ 167 - 0
museum_service/src/main/java/com/museum/service/impl/IBaseServiceImpl.java

@@ -0,0 +1,167 @@
+package com.museum.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.museum.dao.IBaseMapper;
+import com.museum.domain.entity.BaseEntity;
+import com.museum.service.IBaseService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Condition;
+
+import java.io.Serializable;
+import java.lang.reflect.ParameterizedType;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by owen on 2020/2/18 0018 11:22
+ */
+@Transactional
+public abstract class IBaseServiceImpl<T extends BaseEntity, ID extends Serializable> implements IBaseService<T, ID> {
+
+    public abstract IBaseMapper<T, ID> getBaseMapper();
+
+    private Class<T> entityClass;
+
+    public IBaseServiceImpl(){
+        ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass();
+        entityClass = (Class<T>) pt.getActualTypeArguments()[0];
+    }
+
+    @Override
+    public T findById(ID id){
+        Condition condition = new Condition(entityClass);
+        condition.createCriteria().andEqualTo("id", id);
+        condition.and().andEqualTo("recStatus", "A");
+        List<T> ts = getBaseMapper().selectByCondition(condition);
+        if (ts != null && ts.size() > 0){
+            return ts.get(0);
+        }else{
+            return null;
+        }
+    }
+
+    @Override
+    public T findOne(T entity){
+        entity.setRecStatus("A");
+        return getBaseMapper().selectOne(entity);
+    }
+
+    @Override
+    public List<T> findAll(){
+        Condition condition = new Condition(entityClass);
+        condition.createCriteria().andEqualTo("recStatus", "A");
+        return getBaseMapper().selectByCondition(condition);
+    }
+
+    /**
+     * 根据主键字符串进行查询,类中只有存在一个带有@Id注解的字段
+     *
+     * @param ids 如 "1,2,3,4"
+     * @return
+     */
+    @Override
+    public List<T> findByIds(String ids){
+        return getBaseMapper().selectByIds(ids);
+    }
+
+    @Override
+    public long count(){
+        List<T> all = this.findAll();
+        if (all != null && all.size() > 0){
+            return all.size();
+        }
+        return 0;
+    }
+
+    @Override
+    public boolean exists(ID id){
+        return getBaseMapper().existsWithPrimaryKey(id);
+    }
+
+    @Override
+    public int save(T entity) {
+        //migration之后要删掉判断
+        if (entity.getCreateTime() == null){
+            entity.setCreateTime(new Date());
+        }
+        if (entity.getUpdateTime() == null){
+            entity.setUpdateTime(new Date());
+        }
+        entity.setRecStatus("A");
+        return getBaseMapper().insertSelective(entity);
+    }
+
+    @Override
+    public int update(T entity) {
+        //migration之后要删掉判断
+        if (entity.getUpdateTime() == null){
+            entity.setUpdateTime(new Date());
+        }
+        return getBaseMapper().updateByPrimaryKeySelective(entity);
+    }
+
+    @Override
+    public int updateAll(T entity) {
+        //migration之后要删掉判断
+        if (entity.getUpdateTime() == null){
+            entity.setUpdateTime(new Date());
+        }
+        return getBaseMapper().updateByPrimaryKey(entity);
+    }
+
+    @Override
+    public int deleteById(ID id) {
+        return getBaseMapper().deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int deleteByIds(String ids){
+        return getBaseMapper().deleteByIds(ids);
+    }
+
+    @Override
+    public int delete(T entity){
+        return getBaseMapper().delete(entity);
+    }
+
+    public List<T> findAll(Condition condition){
+        condition.and().andEqualTo("recStatus", "A");
+        return getBaseMapper().selectByCondition(condition);
+    }
+
+    public List<T> findAll(Condition condition, String orderBy){
+        condition.and().andEqualTo("recStatus", "A");
+        if (!StringUtils.isEmpty(orderBy)){
+            PageHelper.orderBy(orderBy);
+        }
+        return getBaseMapper().selectByCondition(condition);
+    }
+
+    public PageInfo<T> findAll(int pageNum, int pageSize){
+        PageHelper.startPage(pageNum, pageSize);
+        return new PageInfo<>(this.findAll());
+    }
+
+    public PageInfo<T> findAll(int pageNum, int pageSize, String orderBy){
+        PageHelper.startPage(pageNum, pageSize);
+        if (!StringUtils.isEmpty(orderBy)){
+            PageHelper.orderBy(orderBy);
+        }
+        return new PageInfo<>(this.findAll());
+    }
+
+    public PageInfo<T> findAll(Condition condition, int pageNum, int pageSize){
+        PageHelper.startPage(pageNum, pageSize);
+        return new PageInfo<>(this.findAll(condition));
+    }
+
+    public PageInfo<T> findAll(Condition condition, int pageNum, int pageSize, String orderBy){
+        PageHelper.startPage(pageNum, pageSize);
+        if (!StringUtils.isEmpty(orderBy)){
+            PageHelper.orderBy(orderBy);
+        }
+        return new PageInfo<>(this.findAll(condition));
+    }
+}

+ 34 - 0
museum_service/src/main/java/com/museum/service/impl/LogServiceImpl.java

@@ -0,0 +1,34 @@
+package com.museum.service.impl;
+
+import com.museum.dao.IBaseMapper;
+import com.museum.dao.LogMapper;
+import com.museum.domain.entity.LogEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.response.LogResponse;
+import com.museum.service.LogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/12 0011 16:16
+ */
+@Service
+public class LogServiceImpl extends IBaseServiceImpl<LogEntity, Long> implements LogService {
+
+    @Autowired
+    private LogMapper entityMapper;
+
+    @Override
+    public IBaseMapper<LogEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+    @Override
+    public List<LogResponse> search(PageRequest param) {
+        return entityMapper.search(param);
+    }
+}

+ 44 - 0
museum_service/src/main/java/com/museum/service/impl/MessageServiceImpl.java

@@ -0,0 +1,44 @@
+package com.museum.service.impl;
+
+import com.museum.dao.IBaseMapper;
+import com.museum.dao.MessageMapper;
+import com.museum.dao.UserMapper;
+import com.museum.domain.entity.MessageEntity;
+import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.PageDateRequest;
+import com.museum.domain.request.PageRequest;
+import com.museum.service.MessageService;
+import com.museum.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:16
+ */
+@Service
+public class MessageServiceImpl extends IBaseServiceImpl<MessageEntity, Long> implements MessageService {
+
+    @Autowired
+    private MessageMapper entityMapper;
+
+    @Override
+    public IBaseMapper<MessageEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+    @Override
+    public List<MessageEntity> findBySearchKey(PageDateRequest param) {
+        return entityMapper.findBySearchKey(param);
+    }
+
+
+//    @Override
+//    public List<UserEntity> findBySearchKey(PageRequest param) {
+//        return entityMapper.findBySearchKey(param.getSearchKey());
+//    }
+
+
+}

+ 36 - 0
museum_service/src/main/java/com/museum/service/impl/PartServiceImpl.java

@@ -0,0 +1,36 @@
+package com.museum.service.impl;
+
+import com.museum.dao.PartMapper;
+import com.museum.dao.IBaseMapper;
+import com.museum.domain.entity.PartEntity;
+import com.museum.domain.request.NavRequest;
+import com.museum.service.PartService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:16
+ */
+@Service
+public class PartServiceImpl extends IBaseServiceImpl<PartEntity, Long> implements PartService {
+
+    @Autowired
+    private PartMapper entityMapper;
+
+    @Override
+    public IBaseMapper<PartEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+    @Override
+    public List<PartEntity> findByNav(NavRequest param) {
+        return entityMapper.findByNav(param);
+    }
+
+
+
+
+}

+ 36 - 0
museum_service/src/main/java/com/museum/service/impl/RoamServiceImpl.java

@@ -0,0 +1,36 @@
+package com.museum.service.impl;
+
+import com.museum.dao.IBaseMapper;
+import com.museum.dao.RoamMapper;
+import com.museum.domain.entity.RoamEntity;
+import com.museum.domain.request.NavRequest;
+import com.museum.service.RoamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:16
+ */
+@Service
+public class RoamServiceImpl extends IBaseServiceImpl<RoamEntity, Long> implements RoamService {
+
+    @Autowired
+    private RoamMapper entityMapper;
+
+    @Override
+    public IBaseMapper<RoamEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+    @Override
+    public List<RoamEntity> findByNav(NavRequest param) {
+        return entityMapper.findByNav(param);
+    }
+
+
+
+
+}

+ 31 - 0
museum_service/src/main/java/com/museum/service/impl/TypeServiceImpl.java

@@ -0,0 +1,31 @@
+package com.museum.service.impl;
+
+import com.museum.dao.TypeMapper;
+import com.museum.dao.IBaseMapper;
+import com.museum.domain.entity.TypeEntity;
+import com.museum.service.TypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+
+/**
+ * Created by owen on 2020/5/11 0011 16:16
+ */
+@Service
+public class TypeServiceImpl extends IBaseServiceImpl<TypeEntity, Long> implements TypeService {
+
+    @Autowired
+    private TypeMapper entityMapper;
+
+    @Override
+    public IBaseMapper<TypeEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+
+
+
+
+}

+ 50 - 0
museum_service/src/main/java/com/museum/service/impl/UserServiceImpl.java

@@ -0,0 +1,50 @@
+package com.museum.service.impl;
+
+import com.museum.dao.IBaseMapper;
+import com.museum.dao.UserMapper;
+import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:16
+ */
+@Service
+public class UserServiceImpl extends IBaseServiceImpl<UserEntity, Long> implements UserService {
+
+    @Autowired
+    private UserMapper entityMapper;
+
+    @Override
+    public IBaseMapper<UserEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+//    @Override
+//    public List<UserResponse> findAllBySearchKey(PageDto param) {
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        return entityMapper.findAllBySearchKey(param.getSearchKey());
+//    }
+
+    @Override
+    public UserEntity findByUserName(String userName) {
+        return entityMapper.findByUserName(userName);
+    }
+
+    @Override
+    public UserEntity findByPhone(String phone) {
+        return entityMapper.findByPhone(phone);
+    }
+
+    @Override
+    public List<UserEntity> findBySearchKey(PageRequest param) {
+        return entityMapper.findBySearchKey(param.getSearchKey());
+    }
+
+
+}

+ 23 - 0
museum_web/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>sh_museum_cms</artifactId>
+        <groupId>com.museum</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>museum_web</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.museum</groupId>
+            <artifactId>museum_service</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

+ 13 - 0
museum_web/src/main/java/com/museum/web/aop/WebControllerLog.java

@@ -0,0 +1,13 @@
+package com.museum.web.aop;
+
+import java.lang.annotation.*;
+
+/**
+ * Created by Hb_zzZ on 2020/2/27.
+ */
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WebControllerLog {
+    String description() default "";
+}

+ 121 - 0
museum_web/src/main/java/com/museum/web/aop/WebLogAspect.java

@@ -0,0 +1,121 @@
+package com.museum.web.aop;
+
+import com.museum.domain.entity.LogEntity;
+import com.museum.service.LogService;
+import com.museum.web.shiro.JwtUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by owen on 2020/2/25 0025 9:24
+ *
+ * 日志aop
+ */
+@Slf4j
+@Aspect
+@Component
+public class WebLogAspect {
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private LogService logService;
+
+    @Pointcut("execution(* com.museum.web.controller.*.*(..))")//切入点描述 这个是controller包的切入点
+    public void controllerLog(){}//签名,可以理解成这个切入点的一个名称
+
+    @Before("controllerLog()") //在切入点的方法run之前要干的
+    public void logBeforeController(JoinPoint joinPoint) throws Exception {
+
+        // 获取token
+        String token = request.getHeader("token");
+        Long userId = null;
+        if (token != null) {
+            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));
+//        }
+
+        String description = getControllerLogDescription(joinPoint);
+
+        if (!StringUtils.isAllBlank(description)) {
+            log.info("request description : {}", description);
+            // 保存数据库
+            List<String> detail = getDetail(description);
+            logService.save(new LogEntity(userId, detail.get(0), detail.get(1)));
+        }
+
+        //下面这个getSignature().getDeclaringTypeName()是获取包+类名的   然后后面的joinPoint.getSignature.getName()获取了方法名
+        log.info("request Class_Method : {}" , joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName());
+
+
+
+    }
+
+
+    //使用@AfterReturning在切入点return内容之后切入内容(可以用来对处理返回值做一些加工处理)
+    @AfterReturning(returning = "ret", pointcut = "controllerLog()")
+    public void doAfterReturning(Object ret) throws Throwable {
+        // 处理完请求,返回内容
+//        log.info("响应RESPONSE : " + ret.toString());
+        log.warn("end : {}", request.getRequestURI());
+    }
+
+    /**
+     * 获取注解中对方法的描述信息 用于Controller层注解
+     *
+     * @param joinPoint
+     *            切点
+     * @return 方法描述
+     * @throws Exception
+     */
+    public static String getControllerLogDescription(JoinPoint joinPoint) throws Exception {
+        String targetName = joinPoint.getTarget().getClass().getName();
+        String methodName = joinPoint.getSignature().getName();
+        Object[] arguments = joinPoint.getArgs();
+        Class targetClass = Class.forName(targetName);
+        Method[] methods = targetClass.getMethods();
+        String description = "";
+        for (Method method : methods) {
+            if (method.getName().equals(methodName)) {
+                Class[] clazzs = method.getParameterTypes();
+                if (clazzs.length == arguments.length) {
+                    WebControllerLog annotation = method.getAnnotation(WebControllerLog.class);
+                    if (annotation != null) {
+                        description = annotation.description();
+                        break;
+                    }
+                }
+            }
+        }
+        return description;
+    }
+
+    private static List<String> getDetail(String str){
+        String[] split = str.split("-");
+        return Arrays.asList(split);
+    }
+}

+ 119 - 0
museum_web/src/main/java/com/museum/web/controller/BaseController.java

@@ -0,0 +1,119 @@
+package com.museum.web.controller;
+
+import com.github.pagehelper.PageHelper;
+
+import com.museum.common.util.FileUtils;
+import com.museum.domain.entity.FileEntity;
+import com.museum.domain.entity.LogEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.service.FileService;
+import com.museum.service.LogService;
+import com.museum.web.shiro.JwtUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by owen on 2020/5/20 0020 15:20
+ */
+@Slf4j
+public class BaseController {
+
+    @Autowired
+    protected HttpServletRequest request;
+
+    @Autowired
+    private LogService logService;
+
+    @Autowired
+    public FileService fileService;
+
+    @Value("${output.file.path}")
+    public String OUT_PATH;
+
+    /** 获取用户名*/
+    String getTokenUserName(){
+        String token = getToken();
+        return JwtUtil.getUsername(token);
+    }
+
+    /** 获取用户id*/
+    Long getTokenUserId(){
+        return JwtUtil.getUserId(getToken());
+    }
+
+    /** 获取用户角色*/
+    String getTokenUserRole(){
+        return JwtUtil.getUserRole(getToken());
+    }
+
+
+    /**
+     * 获取header token
+     */
+    String getToken(){
+        return request.getHeader("token");
+    }
+
+    /**
+     * 设置请求分页数据
+     */
+    void startPage(PageRequest param){
+        Integer pageNum = param.getPageNum();
+        Integer pageSize = param.getPageSize();
+        if (pageNum == null || pageNum <= 0) {
+            pageNum = 1;
+        }
+
+        if (pageSize == null || pageSize <= 0) {
+            pageSize = 10;
+        }
+
+        // orderBy:字段名称
+//        PageHelper.startPage(pageNum, pageSize, "create_time desc");
+        PageHelper.startPage(pageNum, pageSize);
+    }
+
+    /**
+     * 保存操作日志
+     */
+    void saveLog(LogEntity param){
+        // 保存数据库
+        logService.save(param);
+    }
+
+
+    /**
+     * 文件上传
+     */
+    String upload(MultipartFile[] files, Long id, String type) throws IOException {
+        if (files == null) {
+            log.error("文件不能为空");
+            return "";
+        }
+
+        String dir = "";
+        List<Map<String, String>> list = FileUtils.upload(files, OUT_PATH);
+        for (Map<String, String> map : list) {
+            FileEntity entity = new FileEntity();
+            entity.setFkId(id);
+            entity.setFileName(map.get("name"));
+            entity.setFilePath(map.get("path"));
+            entity.setType(type);
+            fileService.save(entity);
+            dir = map.get("dir");
+        }
+
+        return dir;
+
+    }
+
+
+
+}

+ 133 - 0
museum_web/src/main/java/com/museum/web/controller/BuildingController.java

@@ -0,0 +1,133 @@
+package com.museum.web.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.museum.common.constant.TypeCode;
+import com.museum.common.util.FileUtils;
+import com.museum.common.util.Result;
+import com.museum.domain.entity.BuildingEntity;
+import com.museum.domain.entity.FileEntity;
+import com.museum.domain.request.BuildingRequest;
+import com.museum.domain.request.PageRequest;
+import com.museum.service.BuildingService;
+import com.museum.service.FileService;
+import com.museum.web.aop.WebControllerLog;
+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.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Created by owen on 2020/5/9 0018 12:17
+ */
+@Log4j2
+@Api(tags = "建筑管理")
+@RestController
+@RequestMapping("manage/building")
+@Transactional
+public class BuildingController extends BaseController {
+
+    @Autowired
+    public BuildingService buildingService;
+
+    @Autowired
+    public FileService fileService;
+
+    @Value("${output.file.path}")
+    private String OUT_PATH;
+
+
+//    @RequiresRoles(value = {"admin"}, logical = Logical.OR)
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public Result list(@RequestBody PageRequest param) {
+        startPage(param);
+        PageInfo<BuildingEntity> page = new PageInfo<>(buildingService.findAll());
+        return Result.success(page);
+    }
+
+    @WebControllerLog(description = "建筑管理-新增/修改")
+    @ApiOperation("新增/修改")
+    @PostMapping(value = "save", consumes = {"multipart/form-data"})
+    public Result save(BuildingRequest param) throws IOException {
+
+        BuildingEntity entity = null;
+        Long id = param.getId();
+        if (id == null) {
+            entity = new BuildingEntity();
+            BeanUtils.copyProperties(param, entity);
+
+            String dir = upload(param.getFiles(), entity.getId(), TypeCode.MODEL_BUILDING);
+
+            if (StringUtils.isBlank(dir)) {
+                log.error("文件上传失败");
+                return Result.failure("文件上传失败");
+            }
+            entity.setFileDir(dir);
+            buildingService.save(entity);
+
+        } else {
+             entity = buildingService.findById(id);
+            if (entity == null) {
+                log.error("建筑信息不存在: {}", id);
+                return Result.failure("对象不存在");
+            }
+            BeanUtils.copyProperties(param, entity);
+            entity.setUpdateTime(new Date());
+            buildingService.update(entity);
+
+        }
+        return Result.success();
+    }
+
+
+
+
+
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        BuildingEntity entity = buildingService.findById(id);
+
+        if (entity == null) {
+            log.error("对象不存在: {}", id);
+            return Result.failure("对象不存在");
+        }
+
+        // 查找文件
+        List<FileEntity> files = fileService.findByFkIdAndType(id, TypeCode.MODEL_PART);
+
+        HashMap<String, Object> resultMap = new HashMap<>();
+        resultMap.put("building", entity);
+        resultMap.put("file", files);
+
+        return Result.success(resultMap);
+    }
+
+
+//    @ApiOperation("123")
+//    @PostMapping("123")
+//    public Result detail123(BuildingRequest param) {
+//
+////        @NotNull(message = "建筑物名称不能为空") String name = param.getName();
+////        @NotNull(message = "建筑物描述不能为空") String description = param.getDescription();
+//
+//        return Result.success();
+//    }
+
+
+}

+ 53 - 0
museum_web/src/main/java/com/museum/web/controller/CommonController.java

@@ -0,0 +1,53 @@
+package com.museum.web.controller;
+
+
+import com.museum.common.util.Result;
+import com.museum.domain.entity.TypeEntity;
+import com.museum.service.TypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/9 0018 12:17
+ */
+@Log4j2
+@Api(tags = "公共接口")
+@RestController
+@RequestMapping("manage/common")
+@Transactional
+public class CommonController extends BaseController {
+
+    @Autowired
+    public TypeService typeService;
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "modelType", value = "模型类型, roam:自由漫游,part:部件欣赏", required = true)
+    })
+    @ApiOperation("获取导航")
+    @GetMapping("nav/{modelType}")
+    public Result nav(@PathVariable String modelType) {
+        Condition condition = new Condition(TypeEntity.class);
+        condition.and().andEqualTo("modelType", modelType);
+        List<TypeEntity> list = typeService.findAll(condition);
+        return Result.success(list);
+    }
+
+
+
+
+
+
+
+
+}

+ 157 - 0
museum_web/src/main/java/com/museum/web/controller/DownloadController.java

@@ -0,0 +1,157 @@
+package com.museum.web.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.museum.common.util.Result;
+import com.museum.domain.entity.FileEntity;
+import com.museum.domain.entity.DownloadEntity;
+import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.request.DownloadRequest;
+import com.museum.domain.response.DownloadResponse;
+import com.museum.service.FileService;
+import com.museum.service.DownloadService;
+import com.museum.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+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 tk.mybatis.mapper.entity.Condition;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/9 0018 12:17
+ */
+@Log4j2
+@Api(tags = "下载管理")
+@RestController
+@RequestMapping("manage/download")
+@Transactional
+public class DownloadController extends BaseController {
+
+    @Autowired
+    public DownloadService downloadService;
+
+    @Autowired
+    public UserService userService;
+
+    @Autowired
+    public FileService fileService;
+
+
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public Result list(@Valid @RequestBody PageRequest param) {
+        startPage(param);
+        Long userId = getTokenUserId();
+        String userRole = getTokenUserRole();
+        List<DownloadResponse> search = null;
+        if ("admin".equals(userRole)) {
+            search = downloadService.search(param, null, userId);
+        } else {
+            // 普通用户
+            search = downloadService.search(param, userId, null);
+
+        }
+        PageInfo<DownloadResponse> page = new PageInfo<>(search);
+        return Result.success(page);
+    }
+
+
+    @ApiOperation("获取超级管理员")
+    @GetMapping("admin")
+    public Result admin() {
+        Condition condition = new Condition(UserEntity.class);
+        condition.and().andEqualTo("role", "admin");
+        List<UserEntity> list = userService.findAll(condition);
+
+        return Result.success(list);
+    }
+
+
+    @ApiOperation("申请")
+    @PostMapping("save")
+    public Result save(@Valid @RequestBody DownloadRequest param) {
+
+        DownloadEntity entity = new DownloadEntity();
+        BeanUtils.copyProperties(param, entity);
+        // 1:申请中
+        entity.setStatus(1);
+        entity.setApplyId(getTokenUserId());
+        downloadService.save(entity);
+        return Result.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        DownloadEntity entity = downloadService.findById(id);
+        if (entity == null) {
+            log.error("对象不存在: {}", id);
+            return Result.failure("对象不存在");
+        }
+
+        List<FileEntity> files = fileService.findByIds(entity.getFileIds());
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("obj", entity);
+        map.put("file", files);
+
+        return Result.success(map);
+    }
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "申请id", required = true),
+            @ApiImplicitParam(name = "status", value = "状态, 2:同意,3:驳回", required = true)
+    })
+    @RequiresRoles(value = {"admin"}, logical = Logical.OR)
+    @ApiOperation("审核")
+    @GetMapping("audit/{id}/{status}")
+    public Result audit(@PathVariable Long id, @PathVariable Integer status) {
+        DownloadEntity entity = downloadService.findById(id);
+        if (entity == null) {
+            log.error("对象不存在: {}", id);
+            return Result.failure("对象不存在");
+        }
+        entity.setStatus(status);
+        entity.setUpdateTime(new Date());
+        downloadService.update(entity);
+        return Result.success();
+    }
+
+
+
+
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "modelType", value = "模型类型, roam:自由漫游,part:部件欣赏", required = true)
+//    })
+//    @ApiOperation("获取导航")
+//    @GetMapping("nav/{modelType}")
+//    public Result nav(@PathVariable String modelType) {
+//        Condition condition = new Condition(TypeEntity.class);
+//        condition.and().andEqualTo("modelType", modelType);
+//        List<TypeEntity> list = typeService.findAll(condition);
+//        return Result.success(list);
+//    }
+
+
+
+
+
+
+
+
+}

+ 120 - 0
museum_web/src/main/java/com/museum/web/controller/ExceptionController.java

@@ -0,0 +1,120 @@
+package com.museum.web.controller;
+
+import com.museum.common.exception.BaseRuntimeException;
+import com.museum.common.util.Result;
+import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.ShiroException;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.ConstraintViolationException;
+import javax.validation.ValidationException;
+
+/**
+ * 统一捕捉异常,自定义返回参数
+ * 这里只可以捕获controller层的异常。
+ */
+@Log4j2
+@RestControllerAdvice
+public class ExceptionController {
+
+    // 捕捉shiro的异常
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+    @ExceptionHandler(ShiroException.class)
+    public Result handle401(ShiroException e) {
+//        return Result.failure(5001, e.getMessage());
+        log.error("没有授权1");
+        return Result.failure(5001, "没有授权");
+    }
+
+
+
+    /**
+     * 捕捉UnauthorizedException
+     *
+     * 权限不够,会抛这个异常
+     */
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+    @ExceptionHandler(UnauthorizedException.class)
+    public Result handle401() {
+        log.error("没有授权2");
+        return Result.failure(5001, "没有授权");
+    }
+
+    // 捕捉其他所有异常
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public Result globalException(HttpServletRequest request, Throwable ex) {
+        return Result.failure(getStatus(request).value(), ex.getMessage());
+    }
+
+
+    private HttpStatus getStatus(HttpServletRequest request) {
+        Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");
+        if (statusCode == null) {
+            return HttpStatus.INTERNAL_SERVER_ERROR;
+        }
+        return HttpStatus.valueOf(statusCode);
+    }
+
+    @ResponseBody
+    @ExceptionHandler(BaseRuntimeException.class)
+    @ResponseStatus(HttpStatus.OK)
+    public Result runtimeExceptionHandler(HttpServletRequest request, BaseRuntimeException e) {
+        log.error(request.getRequestURI() + ":" + e.getMsg());
+//        return Result.failure(e.getCode() == null ? Result.CODE_FAILURE : e.getCode(), e.getMsg());
+        return Result.failure(e.getCode(), e.getMsg());
+    }
+
+    /**
+     * 方法参数校验
+     *
+     * 注解验证异常
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Result handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+        return Result.failure(60001, e.getBindingResult().getFieldError().getDefaultMessage());
+    }
+
+    /**
+     * ValidationException
+     */
+    @ExceptionHandler(ValidationException.class)
+    public Result handleValidationException(ValidationException e) {
+        log.error(e.getMessage(), e);
+        return Result.failure(60002, e.getCause().getMessage());
+    }
+
+    /**
+     * ConstraintViolationException
+     */
+    @ExceptionHandler(ConstraintViolationException.class)
+    public Result handleConstraintViolationException(ConstraintViolationException e) {
+        log.error(e.getMessage(), e);
+        return Result.failure(60003, e.getMessage());
+    }
+
+    @ExceptionHandler(NoHandlerFoundException.class)
+    public Result handlerNoFoundException(Exception e) {
+        log.error(e.getMessage(), e);
+        return Result.failure(60004, "路径不存在,请检查路径是否正确");
+    }
+
+    @ExceptionHandler(DuplicateKeyException.class)
+    public Result handleDuplicateKeyException(DuplicateKeyException e) {
+        log.error(e.getMessage(), e);
+        return Result.failure(60005, "数据重复,请检查后提交");
+    }
+
+
+
+}
+

+ 120 - 0
museum_web/src/main/java/com/museum/web/controller/IndexController.java

@@ -0,0 +1,120 @@
+package com.museum.web.controller;
+
+import com.museum.common.constant.TypeCode;
+import com.museum.common.util.PasswordUtils;
+import com.museum.common.util.Result;
+import com.museum.domain.entity.BaseEntity;
+import com.museum.domain.entity.LogEntity;
+import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.LoginRequest;
+import com.museum.service.UserService;
+
+import com.museum.web.aop.WebControllerLog;
+import com.museum.web.shiro.JwtUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.subject.Subject;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by owen on 2020/2/19 0019 15:53
+ */
+@Api(value = "IndexController",tags = "登录管理")
+@RestController
+@Transactional
+@Log4j2
+public class IndexController extends BaseController {
+
+
+    // 目前是1h
+    private static Integer TOKEN_EXPIRE = 1000 * 60 * 60 * 24 ;
+
+    // -1 不限时间
+//    private static Integer TOKEN_EXPIRE = -1 ;
+
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    @ApiOperation("登录")
+    @PostMapping(value = "admin/login")
+    public Result login(@Valid @RequestBody LoginRequest param) throws Exception {
+
+        // 1.获取用户
+        UserEntity userEntity = userService.findByUserName(param.getUserName());
+        if (userEntity == null){
+            log.error("用户不存在");
+            return Result.failure("用户不存在");
+        }
+        // 验证密码,解密出来是明文密码,在跟输入密码比较
+        boolean decryptName = PasswordUtils.decrypt(userEntity.getPassword(), param.getPassword(), PasswordUtils.getStaticSalt());
+        if (!decryptName) {
+            log.error("密码错误");
+            return Result.failure("密码错误");
+        }
+
+        // 检查账号是否启用
+        if (userEntity.getStatus() != 0) {
+            log.error("账号已停用: {}", userEntity.getUserName());
+            return Result.failure("账号已停用");
+        }
+
+        // 创建新token
+        HashMap<String, Object> tokenMap = new HashMap<>();
+        tokenMap.put("userName", userEntity.getUserName());
+        tokenMap.put("id", userEntity.getId());
+        tokenMap.put("role", userEntity.getRole());
+
+        // 创建新token
+        String token = JwtUtil.createJWT(TOKEN_EXPIRE, tokenMap);
+
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("user", userEntity);
+        result.put("token", token);
+
+        // 保存操作日志
+        saveLog(new LogEntity(userEntity.getId(),"登录管理","用户登录"));
+
+        // 更新到 redis, 有效期24h, 旧token无效, 做单用户登录
+        redisTemplate.opsForValue().set(TypeCode.REDIS_TOKEN + token, token, Long.parseLong("23"), TimeUnit.HOURS);
+
+        return Result.success(result);
+
+    }
+
+    @ApiOperation("退出")
+    @GetMapping("admin/logout")
+    public Result logout() {
+        String token = getToken();
+        if (token == null) {
+            log.info("token is null");
+        }
+        redisTemplate.delete(TypeCode.REDIS_TOKEN + token);
+        return Result.success();
+    }
+
+
+
+
+}

+ 51 - 0
museum_web/src/main/java/com/museum/web/controller/LogController.java

@@ -0,0 +1,51 @@
+package com.museum.web.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.museum.common.util.Result;
+import com.museum.domain.entity.BuildingEntity;
+import com.museum.domain.entity.LogEntity;
+import com.museum.domain.request.BuildingRequest;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.response.LogResponse;
+import com.museum.service.BuildingService;
+import com.museum.service.LogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+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 javax.validation.Valid;
+import java.util.Date;
+
+
+/**
+ * Created by owen on 2020/5/12 0018 12:17
+ * 日志管理,只有admin权限访问
+ */
+@Log4j2
+@Api(tags = "日志管理")
+@RestController
+@RequestMapping("manage/log")
+@Transactional
+@RequiresRoles(value = {"admin"}, logical = Logical.OR)
+public class LogController extends BaseController {
+
+    @Autowired
+    public LogService logService;
+
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public Result list(@RequestBody PageRequest param) {
+        startPage(param);
+        PageInfo<LogResponse> page = new PageInfo<>(logService.search(param));
+        return Result.success(page);
+    }
+
+}

+ 80 - 0
museum_web/src/main/java/com/museum/web/controller/MessageController.java

@@ -0,0 +1,80 @@
+package com.museum.web.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.museum.common.util.Result;
+import com.museum.domain.entity.MessageEntity;
+import com.museum.domain.request.MessageRequest;
+import com.museum.domain.request.PageDateRequest;
+import com.museum.domain.request.PageRequest;
+import com.museum.service.MessageService;
+import com.museum.web.aop.WebControllerLog;
+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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+
+/**
+ * Created by owen on 2020/2/18 0018 12:17
+ */
+@Log4j2
+@Api(tags = "留言管理")
+@RestController
+@RequestMapping("manage/message")
+@Transactional
+public class MessageController extends BaseController {
+
+    @Autowired
+    public MessageService messageService;
+
+
+    @ApiOperation("留言列表")
+    @PostMapping("list")
+    public Result list(@RequestBody PageDateRequest param) {
+        startPage(param);
+        PageInfo<MessageEntity> page = new PageInfo<>(messageService.findBySearchKey(param));
+        return Result.success(page);
+    }
+
+    @WebControllerLog(description = "留言管理-新增留言")
+    @ApiOperation("新增留言")
+    @PostMapping("save")
+    public Result save(@Valid @RequestBody MessageRequest param) {
+
+        MessageEntity entity = new MessageEntity();
+        BeanUtils.copyProperties(param, entity);
+        messageService.save(entity);
+        return Result.success();
+    }
+
+
+    @ApiOperation("留言详情")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        MessageEntity entity = messageService.findById(id);
+
+        if (entity == null) {
+            log.error("留言不存在: {}", id);
+            return Result.failure("留言不存在");
+        }
+        return Result.success(entity);
+    }
+
+    @WebControllerLog(description = "留言管理-删除留言")
+    @ApiOperation("删除留言")
+    @GetMapping("removes/{ids}")
+    public Result removes(@PathVariable String ids){
+        messageService.deleteByIds(ids);
+        return Result.success();
+    }
+
+
+
+
+}

+ 149 - 0
museum_web/src/main/java/com/museum/web/controller/PartController.java

@@ -0,0 +1,149 @@
+package com.museum.web.controller;
+
+
+import cn.hutool.core.io.FileUtil;
+import com.github.pagehelper.PageInfo;
+import com.museum.common.constant.TypeCode;
+import com.museum.common.util.Result;
+import com.museum.domain.entity.PartEntity;
+import com.museum.domain.entity.FileEntity;
+import com.museum.domain.request.NavRequest;
+import com.museum.domain.request.PartRequest;
+import com.museum.service.PartService;
+import com.museum.web.aop.WebControllerLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+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.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/5/9 0018 12:17
+ */
+@Log4j2
+@Api(tags = "部件管理")
+@RestController
+@RequestMapping("manage/part")
+@Transactional
+public class PartController extends BaseController {
+
+    @Autowired
+    public PartService partService;
+
+//    @Autowired
+//    public FileService fileService;
+
+//    @Value("${output.file.path}")
+//    private String OUT_PATH;
+
+
+    @ApiOperation("列表/条件筛选")
+    @PostMapping("list")
+    public Result list(@Valid @RequestBody NavRequest param) {
+        startPage(param);
+        PageInfo<PartEntity> page = new PageInfo<>(partService.findByNav(param));
+        return Result.success(page);
+    }
+
+
+    @WebControllerLog(description = "部件管理-新增/修改")
+    @ApiOperation("新增/修改")
+    @PostMapping(value = "save", consumes = {"multipart/form-data"})
+    public Result save(PartRequest param) throws IOException {
+
+        PartEntity entity = null;
+        Long id = param.getId();
+        if (id == null) {
+            entity = new PartEntity();
+            BeanUtils.copyProperties(param, entity);
+
+            String dir = upload(param.getFiles(), entity.getId(), TypeCode.MODEL_PART);
+
+            if (StringUtils.isBlank(dir)) {
+                log.error("文件上传失败");
+                return Result.failure("文件上传失败");
+            }
+            entity.setFileDir(dir);
+            partService.save(entity);
+
+
+        } else {
+             entity = partService.findById(id);
+            if (entity == null) {
+                log.error("对象不存在: {}", id);
+                return Result.failure("对象不存在");
+            }
+            BeanUtils.copyProperties(param, entity);
+            entity.setUpdateTime(new Date());
+            partService.update(entity);
+
+        }
+
+        return Result.success();
+    }
+
+
+
+
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        PartEntity entity = partService.findById(id);
+
+        if (entity == null) {
+            log.error("对象不存在: {}", id);
+            return Result.failure("对象不存在");
+        }
+
+        // 查找文件
+        List<FileEntity> files = fileService.findByFkIdAndType(id, TypeCode.MODEL_PART);
+
+        HashMap<String, Object> resultMap = new HashMap<>();
+        resultMap.put("part", entity);
+        resultMap.put("file", files);
+
+        return Result.success(resultMap);
+    }
+
+    /**
+     * 是否要删除文件?再考虑
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "部件id,多个id用逗号隔开,如: 1,2,3", required = true)
+    })
+    @WebControllerLog(description = "部件管理-删除")
+    @ApiOperation("删除")
+    @GetMapping("removes/{ids}")
+    public Result removes(@PathVariable String ids){
+
+        String[] split = ids.split(",");
+        for (String partId: split) {
+            Long fkId = Long.valueOf(partId);
+            PartEntity entity = partService.findById(fkId);
+            if (entity == null) {
+                // 停止本次循环,跳到下一个循环
+                continue;
+            }
+            // 删除物理文件
+            FileUtil.del(OUT_PATH + entity.getFileDir());
+            fileService.deleteByFkIdAndType(fkId, TypeCode.MODEL_PART);
+        }
+
+        partService.deleteByIds(ids);
+        return Result.success();
+    }
+
+}

+ 102 - 0
museum_web/src/main/java/com/museum/web/controller/RoamController.java

@@ -0,0 +1,102 @@
+package com.museum.web.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.museum.common.util.Result;
+import com.museum.domain.entity.PartEntity;
+import com.museum.domain.entity.RoamEntity;
+import com.museum.domain.request.*;
+import com.museum.service.PartService;
+import com.museum.service.RoamService;
+import com.museum.service.TypeService;
+import com.museum.web.aop.WebControllerLog;
+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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+
+/**
+ * Created by owen on 2020/5/9 0018 12:17
+ */
+@Log4j2
+@Api(tags = "漫游管理")
+@RestController
+@RequestMapping("manage/roam")
+@Transactional
+public class RoamController extends BaseController {
+
+    @Autowired
+    public RoamService roamService;
+
+
+    @ApiOperation("列表/条件筛选")
+    @PostMapping("list")
+    public Result list(@Valid @RequestBody NavRequest param) {
+        startPage(param);
+        PageInfo<RoamEntity> page = new PageInfo<>(roamService.findByNav(param));
+        return Result.success(page);
+    }
+
+
+    @WebControllerLog(description = "漫游管理-新增/修改")
+    @ApiOperation("新增/修改")
+    @PostMapping("save")
+    public Result save(@Valid @RequestBody RoamRequest param) {
+
+        RoamEntity entity = null;
+        Long id = param.getId();
+        if (id == null) {
+            entity = new RoamEntity();
+            BeanUtils.copyProperties(param, entity);
+            roamService.save(entity);
+
+        } else {
+            entity = roamService.findById(id);
+            if (entity == null) {
+                log.error("对象不存在: {}", id);
+                return Result.failure("对象不存在");
+            }
+            BeanUtils.copyProperties(param, entity);
+            entity.setUpdateTime(new Date());
+            roamService.update(entity);
+
+        }
+        return Result.success();
+    }
+
+
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        RoamEntity entity = roamService.findById(id);
+
+        if (entity == null) {
+            log.error("对象不存在: {}", id);
+            return Result.failure("对象不存在");
+        }
+        return Result.success(entity);
+    }
+
+    @WebControllerLog(description = "部件管理-删除")
+    @ApiOperation("删除")
+    @GetMapping("removes/{ids}")
+    public Result removes(@PathVariable String ids){
+        roamService.deleteByIds(ids);
+        return Result.success();
+    }
+
+
+
+
+
+
+
+
+}

+ 22 - 0
museum_web/src/main/java/com/museum/web/controller/TestController.java

@@ -0,0 +1,22 @@
+package com.museum.web.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.time.LocalDateTime;
+
+/**
+ * Created by owen on 2020/5/8 0008 9:54
+ */
+@ApiIgnore
+@RestController
+@RequestMapping
+public class TestController {
+
+    @GetMapping
+    public String test(){
+        return LocalDateTime.now().toString();
+    }
+}

+ 174 - 0
museum_web/src/main/java/com/museum/web/controller/UserController.java

@@ -0,0 +1,174 @@
+package com.museum.web.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.museum.common.util.PasswordUtils;
+import com.museum.common.util.Result;
+import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.PageRequest;
+import com.museum.domain.request.PasswordRequest;
+import com.museum.domain.request.UserRequest;
+import com.museum.service.UserService;
+import com.museum.web.aop.WebControllerLog;
+import com.museum.web.shiro.JwtUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+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.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+
+/**
+ * Created by owen on 2020/2/18 0018 12:17
+ */
+@Log4j2
+@Api(tags = "用户管理")
+@RestController
+//@RequestMapping("api/user")
+@RequestMapping("manage/user")
+@Transactional
+public class UserController extends BaseController {
+
+    @Autowired
+    public UserService userService;
+
+
+    @Autowired
+    public RedisTemplate<Object, Object> redisTemplate;
+
+    @GetMapping("test")
+    public Result test() {
+
+        return Result.success();
+    }
+
+
+
+//        @RequiresRoles("admin")
+//    @WebControllerLog(description = "用户管理-用户列表")
+    @RequiresRoles(value = {"admin"}, logical = Logical.OR)
+    @ApiOperation("用户列表")
+    @PostMapping("list")
+    public Result list(@RequestBody PageRequest param) {
+        startPage(param);
+        PageInfo<UserEntity> page = new PageInfo<>(userService.findBySearchKey(param));
+        return Result.success(page);
+    }
+
+    @WebControllerLog(description = "用户管理-新增/修改用户信息")
+    @RequiresRoles(value = {"admin"}, logical = Logical.OR)
+    @ApiOperation("新增/修改用户信息")
+    @PostMapping("save")
+    public Result save(@Valid @RequestBody UserRequest param) {
+
+        UserEntity user = null;
+        if (param.getId() == null) {
+            user = userService.findByUserName(param.getUserName());
+            if (user != null) {
+                return Result.failure("用户名已存在");
+            }
+            user = new UserEntity();
+            BeanUtils.copyProperties(param, user);
+            user.setPassword(PasswordUtils.encrypt(param.getUserName(), "123456", PasswordUtils.getStaticSalt()));
+            userService.save(user);
+        } else {
+            user = userService.findById(param.getId());
+            if (user == null) {
+                log.error("用户不存在: {}", param.getId());
+                return Result.failure("用户不存在");
+            }
+            BeanUtils.copyProperties(param, user);
+            user.setUpdateTime(new Date());
+            userService.update(user);
+        }
+
+        return Result.success();
+    }
+
+
+    @ApiOperation("查询用户信息")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        UserEntity user = userService.findById(id);
+
+        if (user == null) {
+            log.error("用户不存在: {}", id);
+            return Result.failure("用户不存在");
+        }
+        return Result.success(user);
+    }
+
+    @WebControllerLog(description = "用户管理-修改密码")
+    @ApiOperation("修改密码")
+    @PostMapping("updatePwd")
+    public Result updatePwd(@Valid @RequestBody PasswordRequest param) {
+
+        UserEntity user = userService.findByUserName(JwtUtil.getUsername(getToken()));
+
+        // 验证原密码
+        Boolean isBoolean = PasswordUtils.decrypt(user.getPassword(), param.getOldPassword(), PasswordUtils.getStaticSalt());
+        if (!isBoolean) {
+            log.error("原始密码错误");
+            return Result.failure("原始密码错误");
+        }
+
+        user.setPassword(PasswordUtils.encrypt(user.getUserName(), param.getNewPassword(), PasswordUtils.getStaticSalt()));
+        user.setUpdateTime(new Date());
+        userService.update(user);
+        return Result.success();
+    }
+
+    @WebControllerLog(description = "用户管理-重置密码")
+    @RequiresRoles(value = {"admin"}, logical = Logical.OR)
+    @ApiOperation("重置密码")
+    @GetMapping("resetPass/{id}")
+    public Result resetPass(@PathVariable Long id) {
+        log.warn(111111111);
+        UserEntity user = userService.findById(id);
+
+        if (user == null) {
+            log.error("用户不存在: {}", id);
+            return Result.failure("用户不存在");
+        }
+
+        user.setPassword(PasswordUtils.encrypt(user.getUserName(), "123456", PasswordUtils.getStaticSalt()));
+        user.setUpdateTime(new Date());
+        userService.update(user);
+        return Result.success();
+    }
+
+    @WebControllerLog(description = "用户管理-启用、停用、注销账户")
+    @RequiresRoles(value = {"admin"}, logical = Logical.OR)
+    @ApiOperation("启用、停用、注销账户")
+    @GetMapping("setStatus/{id}/{status}")
+    public Result setStatus(@PathVariable Long id, @PathVariable Integer status) {
+
+        UserEntity user = userService.findById(id);
+        if (user == null) {
+            log.error("用户不存在: {}", id);
+            return Result.failure("用户不存在");
+        }
+
+        // 管理员账号不能停用
+        if ("admin".equals(user.getRole())) {
+            log.error("管理员账户不能停用/注销: {}", id);
+            return Result.failure("管理员账户不能停用/注销");
+        }
+
+        user.setStatus(status);
+        user.setUpdateTime(new Date());
+        userService.update(user);
+        return Result.success();
+    }
+
+
+}

+ 167 - 0
museum_web/src/main/java/com/museum/web/shiro/JWTFilter.java

@@ -0,0 +1,167 @@
+package com.museum.web.shiro;
+
+import com.alibaba.fastjson.JSONObject;
+import com.museum.common.exception.JwtAuthenticationException;
+import com.museum.common.util.Result;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+
+/**
+ * 自定义拦截规则
+ */
+@Log4j2
+public class JWTFilter extends BasicHttpAuthenticationFilter {
+
+
+    /**
+     * 判断用户是否想要登入。
+     * 检测header里面是否包含Authorization字段即可
+     *
+     * return false:直接不校验就可以访问api
+     */
+//    @Override
+//    protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) {
+//        HttpServletRequest req = (HttpServletRequest) request;
+//        String authorization = req.getHeader("token");
+//
+//        if (StringUtils.isEmpty(authorization)) {
+//            log.error("Authorization is null");
+//        }
+//
+//        return true;
+//
+//    }
+
+
+    /**
+     * 执行登录验证
+     */
+    @Override
+    protected boolean executeLogin(ServletRequest request, ServletResponse response) {
+        HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+        String authorization = httpServletRequest.getHeader("token");
+        JWTToken token = new JWTToken(authorization);
+
+        // 提交给realm进行登入,如果错误他会抛出异常并被捕获
+        getSubject(request, response).login(token);
+
+        // 如果没有抛出异常则代表登入成功,返回true
+        return true;
+    }
+
+    /**
+     * 这里我们详细说明下为什么最终返回的都是true,即允许访问
+     * 例如我们提供一个地址 GET /article
+     * 登入用户和游客看到的内容是不同的
+     * 如果在这里返回了false,请求会被直接拦截,用户看不到任何东西
+     * 所以我们在这里返回true,Controller中可以通过 subject.isAuthenticated() 来判断用户是否登入
+     * 如果有些资源只有登入用户才能访问,我们只需要在方法上面加上 @RequiresAuthentication 注解即可
+     * 但是这样做有一个缺点,就是不能够对GET,POST等请求进行分别过滤鉴权(因为我们重写了官方的方法),但实际上对应用影响不大
+     * <p>
+     * owen:
+     * return false ,表示全局拦截,必须登录才可以访问接口,除非配置了免拦截
+     * "" @RequiresAuthentication 现在不需要配置这个注解来免登录
+     */
+    @Override
+    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
+        try {
+            executeLogin(request, response);
+        } catch (Exception e) {
+            /**
+             * 这个异常需要自己写,全局捕获不了
+             * 认证出现异常,传递错误信息msg
+             */
+            exceptionMsg(e, response);
+        }
+        // return false 前端没有响应,接收不到异常
+        return true;
+
+
+    }
+
+    /**
+     * 对跨域提供支持
+     * 只对需要token验证的有效,不需要验证的还是需要用注解处理一下
+     */
+    @Override
+    protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception {
+        HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+        HttpServletResponse httpServletResponse = (HttpServletResponse) response;
+        httpServletResponse.setHeader("Access-control-Allow-Origin", httpServletRequest.getHeader("Origin"));
+        httpServletResponse.setHeader("Access-Control-Allow-Methods", "GET,POST,OPTIONS,PUT,DELETE");
+        httpServletResponse.setHeader("Access-Control-Allow-Headers", httpServletRequest.getHeader("Access-Control-Request-Headers"));
+        // 跨域时会首先发送一个option请求,这里我们给option请求直接返回正常状态
+        if (httpServletRequest.getMethod().equals(RequestMethod.OPTIONS.name())) {
+            httpServletResponse.setStatus(HttpStatus.OK.value());
+            return false;
+        }
+        return super.preHandle(request, response);
+    }
+
+
+    private void exceptionMsg(Integer code, String msg, ServletResponse response) {
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("code", code);
+        jsonObject.put("msg", msg);
+        writeResponse(response, jsonObject);
+
+    }
+
+    /**
+     * 无需转发,直接返回Response信息
+     */
+    private void writeResponse(ServletResponse response, JSONObject msg) {
+        response.setCharacterEncoding("UTF-8");
+        response.setContentType("application/json; charset=utf-8");
+        ServletOutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        assert outputStream != null;
+        PrintWriter printWriter = new PrintWriter(outputStream, true);
+        printWriter.write(msg.toString());//直接将json输出到页面
+        printWriter.flush();
+        printWriter.close();
+
+    }
+
+
+    /**
+     * 封装异常信息
+     */
+    private void exceptionMsg(Exception e, ServletResponse response) {
+        // 认证出现异常,传递错误信息msg
+        String msg = e.getMessage();
+        // 获取应用异常(该Cause是导致抛出此throwable(异常)的throwable(异常))
+        Throwable throwable = e.getCause();
+        JSONObject jsonObject = new JSONObject();
+        if (throwable instanceof JwtAuthenticationException) {
+            jsonObject.put("code", ((JwtAuthenticationException) throwable).getCode());
+            jsonObject.put("msg", ((JwtAuthenticationException) throwable).getMsg());
+        } else {
+            log.error(msg);
+            jsonObject.put("code", 5002);
+            jsonObject.put("msg", "token invalid");
+        }
+        // 直接返回Response信息
+        this.writeResponse(response, jsonObject);
+
+    }
+}

+ 23 - 0
museum_web/src/main/java/com/museum/web/shiro/JWTToken.java

@@ -0,0 +1,23 @@
+package com.museum.web.shiro;
+
+import org.apache.shiro.authc.AuthenticationToken;
+
+public class JWTToken implements AuthenticationToken {
+
+    // 密钥
+    private String token;
+
+    public JWTToken(String token) {
+        this.token = token;
+    }
+
+    @Override
+    public Object getPrincipal() {
+        return token;
+    }
+
+    @Override
+    public Object getCredentials() {
+        return token;
+    }
+}

+ 235 - 0
museum_web/src/main/java/com/museum/web/shiro/JwtUtil.java

@@ -0,0 +1,235 @@
+package com.museum.web.shiro;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.exceptions.JWTDecodeException;
+import com.auth0.jwt.interfaces.Claim;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.JwtBuilder;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import java.util.*;
+
+public class JwtUtil {
+
+    //生成签名的时候使用的秘钥secret
+    private static final String SECRET = "XX#$%()(#*!()!KL<><MQLMNQNQJQK&sdfkjsdrow32234545fdf>?N<:{LWPW";
+
+    /**
+     * 用户登录成功后生成Jwt
+     * 使用Hs256算法  私匙使用用户密码
+     *
+     * @param ttlMillis jwt过期时间
+     * @param userName  用户名
+     * @return
+     */
+    public static String createJWT(long ttlMillis, String userName) {
+        //指定签名的时候使用的签名算法,也就是header那部分,jjwt已经将这部分内容封装好了。
+        SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256;
+
+        //生成JWT的时间
+        long nowMillis = System.currentTimeMillis();
+        Date now = new Date(nowMillis);
+
+        //创建payload的私有声明(根据特定的业务需要添加,如果要拿这个做验证,一般是需要和jwt的接收方提前沟通好验证方式的)
+        Map<String, Object> claims = new HashMap<String, Object>();
+        claims.put("userName", userName);
+
+        //下面就是在为payload添加各种标准声明和私有声明了
+        //这里其实就是new一个JwtBuilder,设置jwt的body
+        JwtBuilder builder = Jwts.builder()
+                //如果有私有声明,一定要先设置这个自己创建的私有的声明,这个是给builder的claim赋值,一旦写在标准的声明赋值之后,就是覆盖了那些标准的声明的
+                .setClaims(claims)
+                //设置jti(JWT ID):是JWT的唯一标识,根据业务需要,这个可以设置为一个不重复的值,主要用来作为一次性token,从而回避重放攻击。
+                .setId(UUID.randomUUID().toString())
+                //iat: jwt的签发时间
+                .setIssuedAt(now)
+                //代表这个JWT的主体,即它的所有人,这个是一个json格式的字符串,可以存放什么userid,roldid之类的,作为什么用户的唯一标志。
+                .setSubject(userName)
+                //设置签名使用的签名算法和签名使用的秘钥
+                .signWith(signatureAlgorithm, SECRET);
+
+        if (ttlMillis >= 0) {
+            long expMillis = nowMillis + ttlMillis;
+            Date exp = new Date(expMillis);
+            //设置过期时间
+            builder.setExpiration(exp);
+        }/*else{
+            //设置过期时间半小时
+            DateTime expDate = new DateTime().plusMinutes(30);
+            builder.setExpiration(expDate.toDate());
+        }*/
+
+        return builder.compact();
+    }
+
+
+    /**
+     * Token的解密
+     * @param token 加密后的token
+     * @return
+     */
+    public static Claims parseJWT(String token) {
+        //得到DefaultJwtParser
+        Claims claims = Jwts.parser()
+                //设置签名的秘钥
+                .setSigningKey(SECRET)
+                //设置需要解析的jwt
+                .parseClaimsJws(token).getBody();
+        return claims;
+    }
+
+
+    /**
+     * 校验token
+     * 在这里可以使用官方的校验,我这里校验的是token中携带的密码于数据库一致的话就校验通过
+     * @param token
+     * @param userName
+     * @return
+     */
+    public static Boolean isVerify(String token, String userName) {
+
+        //得到DefaultJwtParser
+        Claims claims = Jwts.parser()
+                //设置签名的秘钥
+                .setSigningKey(SECRET)
+                //设置需要解析的jwt
+                .parseClaimsJws(token).getBody();
+
+        if (claims.get("userName").equals(userName)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获得token中的信息无需secret解密也能获得
+     *
+     * @return token中包含的用户名
+     */
+    public static String getUsername(String token) {
+        try {
+            DecodedJWT jwt = JWT.decode(token);
+            return jwt.getClaim("userName").asString();
+        } catch (JWTDecodeException e) {
+            return null;
+        }
+    }
+
+
+    public static String getUserRole(String token) {
+        try {
+            DecodedJWT jwt = JWT.decode(token);
+            return jwt.getClaim("role").asString();
+        } catch (JWTDecodeException e) {
+            return null;
+        }
+    }
+
+
+    public static List getUserRoles(String token) {
+//        try {
+            DecodedJWT jwt = JWT.decode(token);
+            Claim role = jwt.getClaim("role");
+            return role.as(List.class);
+//        } catch (JWTDecodeException e) {
+//            return null;
+//        }
+    }
+
+
+    public static String createJWT(long ttlMillis, Map<String, Object> paramMap) {
+        //指定签名的时候使用的签名算法,也就是header那部分,jjwt已经将这部分内容封装好了。
+        SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256;
+
+        String userName = paramMap.get("userName").toString();
+
+        //生成JWT的时间
+        long nowMillis = System.currentTimeMillis();
+        Date now = new Date(nowMillis);
+
+        //创建payload的私有声明(根据特定的业务需要添加,如果要拿这个做验证,一般是需要和jwt的接收方提前沟通好验证方式的)
+        Map<String, Object> claims = new HashMap<String, Object>();
+        claims.put("userName", userName);
+        claims.put("id", paramMap.get("id"));
+        claims.put("role", paramMap.get("role"));
+
+        //下面就是在为payload添加各种标准声明和私有声明了
+        //这里其实就是new一个JwtBuilder,设置jwt的body
+        JwtBuilder builder = Jwts.builder()
+                //如果有私有声明,一定要先设置这个自己创建的私有的声明,这个是给builder的claim赋值,一旦写在标准的声明赋值之后,就是覆盖了那些标准的声明的
+                .setClaims(claims)
+                //设置jti(JWT ID):是JWT的唯一标识,根据业务需要,这个可以设置为一个不重复的值,主要用来作为一次性token,从而回避重放攻击。
+                .setId(UUID.randomUUID().toString())
+                //iat: jwt的签发时间
+                .setIssuedAt(now)
+                //代表这个JWT的主体,即它的所有人,这个是一个json格式的字符串,可以存放什么userid,roldid之类的,作为什么用户的唯一标志。
+                .setSubject(userName)
+                //设置签名使用的签名算法和签名使用的秘钥
+                .signWith(signatureAlgorithm, SECRET);
+
+        if (ttlMillis >= 0) {
+            long expMillis = nowMillis + ttlMillis;
+            Date exp = new Date(expMillis);
+            //设置过期时间
+            builder.setExpiration(exp);
+        }/*else{
+            //设置过期时间半小时
+            DateTime expDate = new DateTime().plusMinutes(30);
+            builder.setExpiration(expDate.toDate());
+        }*/
+        return builder.compact();
+    }
+
+    public static Long getUserId(String token) {
+        try {
+            DecodedJWT jwt = JWT.decode(token);
+            Claim id = jwt.getClaim("id");
+            return id.asLong();
+        } catch (JWTDecodeException e) {
+            return null;
+        }
+    }
+
+    public static void main(String[] args) {
+//        test3();
+//        test2();
+        long nowMillis = System.currentTimeMillis();
+        System.out.println(nowMillis);
+        Date exp = new Date(nowMillis);
+        System.out.println(exp);
+    }
+
+    public static void test2(){
+        String token = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOlsiYWRtaW4iLCJyb290Il0sImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiaWF0IjoxNTgzODA5MzkzLCJqdGkiOiJkNjZiZTFkYi00MTQ0LTQxMTYtYTNlNi01ZDBjNjhlNTI3ODAifQ.-4AdsVP2RwmPS2grtO4aC8ov9PwkilzaGdThGetBJok";
+        System.out.println(getUserRole(token));
+
+    }
+
+    public static void test3(){
+        HashMap<String, Object> map = new HashMap<>();
+
+        ArrayList<Object> list = new ArrayList<>();
+        list.add("admin");
+        list.add("root");
+
+        map.put("userName", "admin");
+        map.put("id", Long.valueOf("1"));
+        map.put("role", list);
+
+        String token = createJWT(-1, map);
+        System.out.println(token);
+
+        Boolean isVerify = isVerify(token, "admin");
+        System.out.println(isVerify);
+
+    }
+
+    private static void testList(){
+        ArrayList<Object> list = new ArrayList<>();
+        list.add("admin");
+        list.add("root");
+    }
+
+}

+ 111 - 0
museum_web/src/main/java/com/museum/web/shiro/MyRealm.java

@@ -0,0 +1,111 @@
+package com.museum.web.shiro;
+
+import com.museum.common.constant.TypeCode;
+import com.museum.common.exception.JwtAuthenticationException;
+import com.museum.domain.entity.UserEntity;
+import com.museum.service.UserService;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.SimpleAuthorizationInfo;
+import org.apache.shiro.realm.AuthorizingRealm;
+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;
+
+/**
+ * 配置不校验的话,是不会走这个方法的
+ */
+@Log4j2
+@Service
+public class MyRealm extends AuthorizingRealm {
+
+
+
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    @Autowired
+    private UserService userService;
+
+
+
+    /**
+     * 大坑!,必须重写此方法,不然Shiro会报错
+     */
+    @Override
+    public boolean supports(AuthenticationToken token) {
+        return token instanceof JWTToken;
+    }
+
+
+
+
+    /**
+     * 只有当需要检测用户权限的时候才会调用此方法,例如checkRole,checkPermission之类的
+     *
+     * principals: 是token
+     */
+    @Override
+    protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+        String username = JwtUtil.getUsername(principals.toString());
+
+        UserEntity dbUserEntity = userService.findByUserName(username);
+
+        SimpleAuthorizationInfo simpleAuthorizationInfo = new SimpleAuthorizationInfo();
+
+
+        // 设置角色、权限
+        simpleAuthorizationInfo.addRole(dbUserEntity.getRole());
+        return simpleAuthorizationInfo;
+    }
+
+
+    /**
+     * 默认使用此方法进行用户名正确与否验证,错误抛出异常即可。
+     */
+    @Override
+    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) throws AuthenticationException {
+        String token = (String) auth.getCredentials();
+
+        if (StringUtils.isBlank(token)) {
+            log.error("header token is null ");
+            throw new JwtAuthenticationException(5001, "header token is null");
+        }
+
+
+        // 解密获得username,用于和数据库进行对比
+        String username = JwtUtil.getUsername(token);
+        if (username == null) {
+            log.error("error token username");
+            throw new JwtAuthenticationException(5001, "token invalid");
+        }
+
+        UserEntity userEntity = userService.findByUserName(username);
+        if (userEntity == null) {
+            log.error("error token userEntity");
+            throw new JwtAuthenticationException(5001, "User didn't existed!");
+        }
+
+        // 校验请求token是否跟redis token一致
+        String redisToken = redisTemplate.opsForValue().get(TypeCode.REDIS_TOKEN + token);
+        if (!token.equals(redisToken)) {
+            log.error("redis token is null");
+            throw new JwtAuthenticationException(5001, "redis token is null");
+
+        }
+
+
+        if (! JwtUtil.isVerify(token, username)) {
+            log.error("error token username or password");
+            throw new JwtAuthenticationException(5001, "token invalid");
+        }
+
+        return new SimpleAuthenticationInfo(token, token, "my_realm");
+    }
+}

+ 0 - 0
museum_web/src/main/java/com/museum/web/shiro/ShiroConfig.java


Some files were not shown because too many files changed in this diff