Jelajahi Sumber

first commit

allen 2 tahun lalu
melakukan
c2e978e0e0
100 mengubah file dengan 9865 tambahan dan 0 penghapusan
  1. 47 0
      .gitignore
  2. 20 0
      LICENSE
  3. 12 0
      bin/clean.bat
  4. 12 0
      bin/package.bat
  5. 14 0
      bin/run.bat
  6. TEMPAT SAMPAH
      doc/若依环境使用手册.docx
  7. 96 0
      fidms-admin/pom.xml
  8. 21 0
      fidms-admin/src/main/java/com/fidms/FidmsApplication.java
  9. 18 0
      fidms-admin/src/main/java/com/fidms/FidmsServletInitializer.java
  10. 99 0
      fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldInputController.java
  11. 98 0
      fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldOutputController.java
  12. 97 0
      fidms-admin/src/main/java/com/fidms/web/controller/InfraredInputController.java
  13. 98 0
      fidms-admin/src/main/java/com/fidms/web/controller/InfraredOutputController.java
  14. 104 0
      fidms-admin/src/main/java/com/fidms/web/controller/Model3dController.java
  15. 94 0
      fidms-admin/src/main/java/com/fidms/web/controller/common/CaptchaController.java
  16. 163 0
      fidms-admin/src/main/java/com/fidms/web/controller/common/CommonController.java
  17. 120 0
      fidms-admin/src/main/java/com/fidms/web/controller/monitor/CacheController.java
  18. 27 0
      fidms-admin/src/main/java/com/fidms/web/controller/monitor/ServerController.java
  19. 82 0
      fidms-admin/src/main/java/com/fidms/web/controller/monitor/SysLogininforController.java
  20. 69 0
      fidms-admin/src/main/java/com/fidms/web/controller/monitor/SysOperlogController.java
  21. 83 0
      fidms-admin/src/main/java/com/fidms/web/controller/monitor/SysUserOnlineController.java
  22. 133 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysConfigController.java
  23. 132 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysDeptController.java
  24. 121 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysDictDataController.java
  25. 131 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysDictTypeController.java
  26. 29 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysIndexController.java
  27. 86 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysLoginController.java
  28. 142 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysMenuController.java
  29. 91 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysNoticeController.java
  30. 129 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysPostController.java
  31. 141 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysProfileController.java
  32. 38 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysRegisterController.java
  33. 262 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysRoleController.java
  34. 251 0
      fidms-admin/src/main/java/com/fidms/web/controller/system/SysUserController.java
  35. 183 0
      fidms-admin/src/main/java/com/fidms/web/controller/tool/TestController.java
  36. 125 0
      fidms-admin/src/main/java/com/fidms/web/core/config/SwaggerConfig.java
  37. 303 0
      fidms-admin/src/main/java/com/fidms/web/domain/FlowFieldInput.java
  38. 183 0
      fidms-admin/src/main/java/com/fidms/web/domain/FlowFieldOutput.java
  39. 99 0
      fidms-admin/src/main/java/com/fidms/web/domain/InfraredInput.java
  40. 85 0
      fidms-admin/src/main/java/com/fidms/web/domain/InfraredOutput.java
  41. 82 0
      fidms-admin/src/main/java/com/fidms/web/domain/Model3d.java
  42. 61 0
      fidms-admin/src/main/java/com/fidms/web/mapper/FlowFieldInputMapper.java
  43. 61 0
      fidms-admin/src/main/java/com/fidms/web/mapper/FlowFieldOutputMapper.java
  44. 61 0
      fidms-admin/src/main/java/com/fidms/web/mapper/InfraredInputMapper.java
  45. 61 0
      fidms-admin/src/main/java/com/fidms/web/mapper/InfraredOutputMapper.java
  46. 63 0
      fidms-admin/src/main/java/com/fidms/web/mapper/Model3dMapper.java
  47. 61 0
      fidms-admin/src/main/java/com/fidms/web/service/IFlowFieldInputService.java
  48. 61 0
      fidms-admin/src/main/java/com/fidms/web/service/IFlowFieldOutputService.java
  49. 61 0
      fidms-admin/src/main/java/com/fidms/web/service/IInfraredInputService.java
  50. 61 0
      fidms-admin/src/main/java/com/fidms/web/service/IInfraredOutputService.java
  51. 63 0
      fidms-admin/src/main/java/com/fidms/web/service/IModel3dService.java
  52. 96 0
      fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldInputServiceImpl.java
  53. 96 0
      fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldOutputServiceImpl.java
  54. 97 0
      fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredInputServiceImpl.java
  55. 96 0
      fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredOutputServiceImpl.java
  56. 101 0
      fidms-admin/src/main/java/com/fidms/web/service/impl/Model3dServiceImpl.java
  57. 1 0
      fidms-admin/src/main/resources/META-INF/spring-devtools.properties
  58. 61 0
      fidms-admin/src/main/resources/application-druid.yml
  59. 131 0
      fidms-admin/src/main/resources/application.yml
  60. 24 0
      fidms-admin/src/main/resources/banner.txt
  61. 38 0
      fidms-admin/src/main/resources/i18n/messages.properties
  62. 93 0
      fidms-admin/src/main/resources/logback.xml
  63. 185 0
      fidms-admin/src/main/resources/mapper/data/FlowFieldInputMapper.xml
  64. 117 0
      fidms-admin/src/main/resources/mapper/data/FlowFieldOutputMapper.xml
  65. 87 0
      fidms-admin/src/main/resources/mapper/data/InfraredInputMapper.xml
  66. 82 0
      fidms-admin/src/main/resources/mapper/data/InfraredOutputMapper.xml
  67. 86 0
      fidms-admin/src/main/resources/mapper/data/Model3dMapper.xml
  68. 20 0
      fidms-admin/src/main/resources/mybatis/mybatis-config.xml
  69. 131 0
      fidms-common/pom.xml
  70. 19 0
      fidms-common/src/main/java/com/fidms/common/annotation/Anonymous.java
  71. 33 0
      fidms-common/src/main/java/com/fidms/common/annotation/DataScope.java
  72. 28 0
      fidms-common/src/main/java/com/fidms/common/annotation/DataSource.java
  73. 187 0
      fidms-common/src/main/java/com/fidms/common/annotation/Excel.java
  74. 18 0
      fidms-common/src/main/java/com/fidms/common/annotation/Excels.java
  75. 51 0
      fidms-common/src/main/java/com/fidms/common/annotation/Log.java
  76. 40 0
      fidms-common/src/main/java/com/fidms/common/annotation/RateLimiter.java
  77. 31 0
      fidms-common/src/main/java/com/fidms/common/annotation/RepeatSubmit.java
  78. 135 0
      fidms-common/src/main/java/com/fidms/common/config/FidmsConfig.java
  79. 44 0
      fidms-common/src/main/java/com/fidms/common/constant/CacheConstants.java
  80. 142 0
      fidms-common/src/main/java/com/fidms/common/constant/Constants.java
  81. 117 0
      fidms-common/src/main/java/com/fidms/common/constant/GenConstants.java
  82. 94 0
      fidms-common/src/main/java/com/fidms/common/constant/HttpStatus.java
  83. 50 0
      fidms-common/src/main/java/com/fidms/common/constant/ScheduleConstants.java
  84. 78 0
      fidms-common/src/main/java/com/fidms/common/constant/UserConstants.java
  85. 202 0
      fidms-common/src/main/java/com/fidms/common/core/controller/BaseController.java
  86. 185 0
      fidms-common/src/main/java/com/fidms/common/core/domain/AjaxResult.java
  87. 118 0
      fidms-common/src/main/java/com/fidms/common/core/domain/BaseEntity.java
  88. 115 0
      fidms-common/src/main/java/com/fidms/common/core/domain/R.java
  89. 79 0
      fidms-common/src/main/java/com/fidms/common/core/domain/TreeEntity.java
  90. 77 0
      fidms-common/src/main/java/com/fidms/common/core/domain/TreeSelect.java
  91. 203 0
      fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysDept.java
  92. 176 0
      fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysDictData.java
  93. 96 0
      fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysDictType.java
  94. 259 0
      fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysMenu.java
  95. 241 0
      fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysRole.java
  96. 324 0
      fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysUser.java
  97. 69 0
      fidms-common/src/main/java/com/fidms/common/core/domain/model/LoginBody.java
  98. 266 0
      fidms-common/src/main/java/com/fidms/common/core/domain/model/LoginUser.java
  99. 11 0
      fidms-common/src/main/java/com/fidms/common/core/domain/model/RegisterBody.java
  100. 101 0
      fidms-common/src/main/java/com/fidms/common/core/page/PageDomain.java

+ 47 - 0
.gitignore

@@ -0,0 +1,47 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml

+ 20 - 0
LICENSE

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

+ 12 - 0
bin/clean.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 清理工程target生成路径。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean
+
+pause

+ 12 - 0
bin/package.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 打包Web工程,生成war/jar包文件。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean package -Dmaven.test.skip=true
+
+pause

+ 14 - 0
bin/run.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [��Ϣ] ʹ��Jar��������Web���̡�
+echo.
+
+cd %~dp0
+cd ../fidms-admin/target
+
+set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -jar %JAVA_OPTS% fidms-admin.jar
+
+cd bin
+pause

TEMPAT SAMPAH
doc/若依环境使用手册.docx


+ 96 - 0
fidms-admin/pom.xml

@@ -0,0 +1,96 @@
+<?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>fidms</artifactId>
+        <groupId>com.fidms</groupId>
+        <version>3.8.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>fidms-admin</artifactId>
+
+    <description>
+        web服务入口
+    </description>
+
+    <dependencies>
+
+        <!-- spring-boot-devtools -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional> <!-- 表示依赖不会传递 -->
+        </dependency>
+
+        <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误,排除3.0.0中的引用,手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+         <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.fidms</groupId>
+            <artifactId>fidms-framework</artifactId>
+        </dependency>
+
+        <!-- 定时任务-->
+        <dependency>
+            <groupId>com.fidms</groupId>
+            <artifactId>fidms-quartz</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.fidms</groupId>
+            <artifactId>fidms-generator</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>   
+                <groupId>org.apache.maven.plugins</groupId>   
+                <artifactId>maven-war-plugin</artifactId>   
+                <version>3.1.0</version>   
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>   
+           </plugin>   
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>

+ 21 - 0
fidms-admin/src/main/java/com/fidms/FidmsApplication.java

@@ -0,0 +1,21 @@
+package com.fidms;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 启动程序
+ * 
+ * @author Allen
+ */
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class FidmsApplication
+{
+    public static void main(String[] args)
+    {
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        SpringApplication.run(FidmsApplication.class, args);
+        System.out.println("(♥◠‿◠)ノ゙  后台启动成功   ლ(´ڡ`ლ)゙ ");
+    }
+}

+ 18 - 0
fidms-admin/src/main/java/com/fidms/FidmsServletInitializer.java

@@ -0,0 +1,18 @@
+package com.fidms;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * web容器中进行部署
+ * 
+ * @author Allen
+ */
+public class FidmsServletInitializer extends SpringBootServletInitializer
+{
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    {
+        return application.sources(FidmsApplication.class);
+    }
+}

+ 99 - 0
fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldInputController.java

@@ -0,0 +1,99 @@
+package com.fidms.web.controller;
+
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.web.domain.FlowFieldInput;
+import com.fidms.web.service.IFlowFieldInputService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * 流场输入Controller
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@RestController
+@RequestMapping("/data/flowIn")
+public class FlowFieldInputController extends BaseController
+{
+    @Autowired
+    private IFlowFieldInputService flowFieldInputService;
+
+    /**
+     * 查询流场输入列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowIn:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FlowFieldInput flowFieldInput)
+    {
+        startPage();
+        List<FlowFieldInput> list = flowFieldInputService.selectFlowFieldInputList(flowFieldInput);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出流场输入列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowIn:export')")
+    @Log(title = "流场输入", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FlowFieldInput flowFieldInput)
+    {
+        List<FlowFieldInput> list = flowFieldInputService.selectFlowFieldInputList(flowFieldInput);
+        ExcelUtil<FlowFieldInput> util = new ExcelUtil<FlowFieldInput>(FlowFieldInput.class);
+        util.exportExcel(response, list, "流场输入数据");
+    }
+
+    /**
+     * 获取流场输入详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowIn:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(flowFieldInputService.selectFlowFieldInputById(id));
+    }
+
+    /**
+     * 新增流场输入
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowIn:add')")
+    @Log(title = "流场输入", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FlowFieldInput flowFieldInput)
+    {
+        return toAjax(flowFieldInputService.insertFlowFieldInput(flowFieldInput));
+    }
+
+    /**
+     * 修改流场输入
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowIn:edit')")
+    @Log(title = "流场输入", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FlowFieldInput flowFieldInput)
+    {
+        return toAjax(flowFieldInputService.updateFlowFieldInput(flowFieldInput));
+    }
+
+    /**
+     * 删除流场输入
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowIn:remove')")
+    @Log(title = "流场输入", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(flowFieldInputService.deleteFlowFieldInputByIds(ids));
+    }
+}

+ 98 - 0
fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldOutputController.java

@@ -0,0 +1,98 @@
+package com.fidms.web.controller;
+
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.web.domain.FlowFieldOutput;
+import com.fidms.web.service.IFlowFieldOutputService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 流场输出Controller
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@RestController
+@RequestMapping("/data/flowOut")
+public class FlowFieldOutputController extends BaseController
+{
+    @Autowired
+    private IFlowFieldOutputService flowFieldOutputService;
+
+    /**
+     * 查询流场输出列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowOut:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FlowFieldOutput flowFieldOutput)
+    {
+        startPage();
+        List<FlowFieldOutput> list = flowFieldOutputService.selectFlowFieldOutputList(flowFieldOutput);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出流场输出列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowOut:export')")
+    @Log(title = "流场输出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FlowFieldOutput flowFieldOutput)
+    {
+        List<FlowFieldOutput> list = flowFieldOutputService.selectFlowFieldOutputList(flowFieldOutput);
+        ExcelUtil<FlowFieldOutput> util = new ExcelUtil<FlowFieldOutput>(FlowFieldOutput.class);
+        util.exportExcel(response, list, "流场输出数据");
+    }
+
+    /**
+     * 获取流场输出详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowOut:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(flowFieldOutputService.selectFlowFieldOutputById(id));
+    }
+
+    /**
+     * 新增流场输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowOut:add')")
+    @Log(title = "流场输出", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FlowFieldOutput flowFieldOutput)
+    {
+        return toAjax(flowFieldOutputService.insertFlowFieldOutput(flowFieldOutput));
+    }
+
+    /**
+     * 修改流场输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowOut:edit')")
+    @Log(title = "流场输出", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FlowFieldOutput flowFieldOutput)
+    {
+        return toAjax(flowFieldOutputService.updateFlowFieldOutput(flowFieldOutput));
+    }
+
+    /**
+     * 删除流场输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:flowOut:remove')")
+    @Log(title = "流场输出", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(flowFieldOutputService.deleteFlowFieldOutputByIds(ids));
+    }
+}

+ 97 - 0
fidms-admin/src/main/java/com/fidms/web/controller/InfraredInputController.java

@@ -0,0 +1,97 @@
+package com.fidms.web.controller;
+
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.web.domain.InfraredInput;
+import com.fidms.web.service.IInfraredInputService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+/**
+ * 红外输入Controller
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@RestController
+@RequestMapping("/data/infraredIn")
+public class InfraredInputController extends BaseController
+{
+    @Autowired
+    private IInfraredInputService infraredInputService;
+
+    /**
+     * 查询红外输入列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredIn:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(InfraredInput infraredInput)
+    {
+        startPage();
+        List<InfraredInput> list = infraredInputService.selectInfraredInputList(infraredInput);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出红外输入列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredIn:export')")
+    @Log(title = "红外输入", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, InfraredInput infraredInput)
+    {
+        List<InfraredInput> list = infraredInputService.selectInfraredInputList(infraredInput);
+        ExcelUtil<InfraredInput> util = new ExcelUtil<InfraredInput>(InfraredInput.class);
+        util.exportExcel(response, list, "红外输入数据");
+    }
+
+    /**
+     * 获取红外输入详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredIn:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(infraredInputService.selectInfraredInputById(id));
+    }
+
+    /**
+     * 新增红外输入
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredIn:add')")
+    @Log(title = "红外输入", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody InfraredInput infraredInput)
+    {
+        return toAjax(infraredInputService.insertInfraredInput(infraredInput));
+    }
+
+    /**
+     * 修改红外输入
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredIn:edit')")
+    @Log(title = "红外输入", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody InfraredInput infraredInput)
+    {
+        return toAjax(infraredInputService.updateInfraredInput(infraredInput));
+    }
+
+    /**
+     * 删除红外输入
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredIn:remove')")
+    @Log(title = "红外输入", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(infraredInputService.deleteInfraredInputByIds(ids));
+    }
+}

+ 98 - 0
fidms-admin/src/main/java/com/fidms/web/controller/InfraredOutputController.java

@@ -0,0 +1,98 @@
+package com.fidms.web.controller;
+
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.web.domain.InfraredOutput;
+import com.fidms.web.service.IInfraredOutputService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 红外输出Controller
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@RestController
+@RequestMapping("/data/infraredOut")
+public class InfraredOutputController extends BaseController
+{
+    @Autowired
+    private IInfraredOutputService infraredOutputService;
+
+    /**
+     * 查询红外输出列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredOut:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(InfraredOutput infraredOutput)
+    {
+        startPage();
+        List<InfraredOutput> list = infraredOutputService.selectInfraredOutputList(infraredOutput);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出红外输出列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredOut:export')")
+    @Log(title = "红外输出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, InfraredOutput infraredOutput)
+    {
+        List<InfraredOutput> list = infraredOutputService.selectInfraredOutputList(infraredOutput);
+        ExcelUtil<InfraredOutput> util = new ExcelUtil<InfraredOutput>(InfraredOutput.class);
+        util.exportExcel(response, list, "红外输出数据");
+    }
+
+    /**
+     * 获取红外输出详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredOut:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(infraredOutputService.selectInfraredOutputById(id));
+    }
+
+    /**
+     * 新增红外输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredOut:add')")
+    @Log(title = "红外输出", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody InfraredOutput infraredOutput)
+    {
+        return toAjax(infraredOutputService.insertInfraredOutput(infraredOutput));
+    }
+
+    /**
+     * 修改红外输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredOut:edit')")
+    @Log(title = "红外输出", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody InfraredOutput infraredOutput)
+    {
+        return toAjax(infraredOutputService.updateInfraredOutput(infraredOutput));
+    }
+
+    /**
+     * 删除红外输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:infraredOut:remove')")
+    @Log(title = "红外输出", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(infraredOutputService.deleteInfraredOutputByIds(ids));
+    }
+}

+ 104 - 0
fidms-admin/src/main/java/com/fidms/web/controller/Model3dController.java

@@ -0,0 +1,104 @@
+package com.fidms.web.controller;
+
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.web.domain.Model3d;
+import com.fidms.web.service.IModel3dService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 3d模型Controller
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@RestController
+@RequestMapping("/data/model")
+public class Model3dController extends BaseController
+{
+    @Autowired
+    private IModel3dService model3dService;
+
+    /**
+     * 查询3d模型列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:model:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Model3d model3d)
+    {
+        startPage();
+        List<Model3d> list = model3dService.selectModel3dList(model3d);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出3d模型列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:model:export')")
+    @Log(title = "3d模型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Model3d model3d)
+    {
+        List<Model3d> list = model3dService.selectModel3dList(model3d);
+        ExcelUtil<Model3d> util = new ExcelUtil<Model3d>(Model3d.class);
+        util.exportExcel(response, list, "3d模型数据");
+    }
+
+    /**
+     * 获取3d模型详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('data:model:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(model3dService.selectModel3dById(id));
+    }
+
+    /**
+     * 新增3d模型
+     */
+    @PreAuthorize("@ss.hasPermi('data:model:add')")
+    @Log(title = "3d模型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Model3d model3d)
+    {
+        return toAjax(model3dService.insertModel3d(model3d));
+    }
+
+    /**
+     * 修改3d模型
+     */
+    @PreAuthorize("@ss.hasPermi('data:model:edit')")
+    @Log(title = "3d模型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Model3d model3d)
+    {
+        return toAjax(model3dService.updateModel3d(model3d));
+    }
+
+    /**
+     * 删除3d模型
+     */
+    @PreAuthorize("@ss.hasPermi('data:model:remove')")
+    @Log(title = "3d模型", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(model3dService.deleteModel3dByIds(ids));
+    }
+
+    @GetMapping("/getOption")
+    public AjaxResult getOption()
+    {
+        return success(model3dService.getOption());
+    }
+}

+ 94 - 0
fidms-admin/src/main/java/com/fidms/web/controller/common/CaptchaController.java

@@ -0,0 +1,94 @@
+package com.fidms.web.controller.common;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.google.code.kaptcha.Producer;
+import com.fidms.common.config.FidmsConfig;
+import com.fidms.common.constant.CacheConstants;
+import com.fidms.common.constant.Constants;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.redis.RedisCache;
+import com.fidms.common.utils.sign.Base64;
+import com.fidms.common.utils.uuid.IdUtils;
+import com.fidms.system.service.ISysConfigService;
+
+/**
+ * 验证码操作处理
+ * 
+ * @author Allen
+ */
+@RestController
+public class CaptchaController
+{
+    @Resource(name = "captchaProducer")
+    private Producer captchaProducer;
+
+    @Resource(name = "captchaProducerMath")
+    private Producer captchaProducerMath;
+
+    @Autowired
+    private RedisCache redisCache;
+    
+    @Autowired
+    private ISysConfigService configService;
+    /**
+     * 生成验证码
+     */
+    @GetMapping("/captchaImage")
+    public AjaxResult getCode(HttpServletResponse response) throws IOException
+    {
+        AjaxResult ajax = AjaxResult.success();
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
+        ajax.put("captchaEnabled", captchaEnabled);
+        if (!captchaEnabled)
+        {
+            return ajax;
+        }
+
+        // 保存验证码信息
+        String uuid = IdUtils.simpleUUID();
+        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+
+        String capStr = null, code = null;
+        BufferedImage image = null;
+
+        // 生成验证码
+        String captchaType = FidmsConfig.getCaptchaType();
+        if ("math".equals(captchaType))
+        {
+            String capText = captchaProducerMath.createText();
+            capStr = capText.substring(0, capText.lastIndexOf("@"));
+            code = capText.substring(capText.lastIndexOf("@") + 1);
+            image = captchaProducerMath.createImage(capStr);
+        }
+        else if ("char".equals(captchaType))
+        {
+            capStr = code = captchaProducer.createText();
+            image = captchaProducer.createImage(capStr);
+        }
+
+        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        // 转换流信息写出
+        FastByteArrayOutputStream os = new FastByteArrayOutputStream();
+        try
+        {
+            ImageIO.write(image, "jpg", os);
+        }
+        catch (IOException e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+
+        ajax.put("uuid", uuid);
+        ajax.put("img", Base64.encode(os.toByteArray()));
+        return ajax;
+    }
+}

+ 163 - 0
fidms-admin/src/main/java/com/fidms/web/controller/common/CommonController.java

@@ -0,0 +1,163 @@
+package com.fidms.web.controller.common;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.fidms.common.config.FidmsConfig;
+import com.fidms.common.constant.Constants;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.common.utils.file.FileUploadUtils;
+import com.fidms.common.utils.file.FileUtils;
+import com.fidms.framework.config.ServerConfig;
+
+/**
+ * 通用请求处理
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/common")
+public class CommonController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+    @Autowired
+    private ServerConfig serverConfig;
+
+    private static final String FILE_DELIMETER = ",";
+
+    /**
+     * 通用下载请求
+     * 
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("/download")
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法,不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = FidmsConfig.getDownloadPath() + fileName;
+
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, realFileName);
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+
+    /**
+     * 通用上传请求(单个)
+     */
+    @PostMapping("/upload")
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = FidmsConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("url", url);
+            ajax.put("fileName", fileName);
+            ajax.put("newFileName", FileUtils.getName(fileName));
+            ajax.put("originalFilename", file.getOriginalFilename());
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 通用上传请求(多个)
+     */
+    @PostMapping("/uploads")
+    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = FidmsConfig.getUploadPath();
+            List<String> urls = new ArrayList<String>();
+            List<String> fileNames = new ArrayList<String>();
+            List<String> newFileNames = new ArrayList<String>();
+            List<String> originalFilenames = new ArrayList<String>();
+            for (MultipartFile file : files)
+            {
+                // 上传并返回新文件名称
+                String fileName = FileUploadUtils.upload(filePath, file);
+                String url = serverConfig.getUrl() + fileName;
+                urls.add(url);
+                fileNames.add(fileName);
+                newFileNames.add(FileUtils.getName(fileName));
+                originalFilenames.add(file.getOriginalFilename());
+            }
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+            ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+            ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
+            ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 本地资源通用下载
+     */
+    @GetMapping("/download/resource")
+    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+            throws Exception
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(resource))
+            {
+                throw new Exception(StringUtils.format("资源文件({})非法,不允许下载。 ", resource));
+            }
+            // 本地资源路径
+            String localPath = FidmsConfig.getProfile();
+            // 数据库资源地址
+            String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
+            // 下载名称
+            String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, downloadName);
+            FileUtils.writeBytes(downloadPath, response.getOutputStream());
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+}

+ 120 - 0
fidms-admin/src/main/java/com/fidms/web/controller/monitor/CacheController.java

@@ -0,0 +1,120 @@
+package com.fidms.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.constant.CacheConstants;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.system.domain.SysCache;
+
+/**
+ * 缓存监控
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/monitor/cache")
+public class CacheController
+{
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    private final static List<SysCache> caches = new ArrayList<SysCache>();
+    {
+        caches.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "用户信息"));
+        caches.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "配置信息"));
+        caches.add(new SysCache(CacheConstants.SYS_DICT_KEY, "数据字典"));
+        caches.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "验证码"));
+        caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交"));
+        caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
+        caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception
+    {
+        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
+        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+        Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
+
+        Map<String, Object> result = new HashMap<>(3);
+        result.put("info", info);
+        result.put("dbSize", dbSize);
+
+        List<Map<String, String>> pieList = new ArrayList<>();
+        commandStats.stringPropertyNames().forEach(key -> {
+            Map<String, String> data = new HashMap<>(2);
+            String property = commandStats.getProperty(key);
+            data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+            data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+            pieList.add(data);
+        });
+        result.put("commandStats", pieList);
+        return AjaxResult.success(result);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getNames")
+    public AjaxResult cache()
+    {
+        return AjaxResult.success(caches);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getKeys/{cacheName}")
+    public AjaxResult getCacheKeys(@PathVariable String cacheName)
+    {
+        Set<String> cacheKeys = redisTemplate.keys(cacheName + "*");
+        return AjaxResult.success(cacheKeys);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getValue/{cacheName}/{cacheKey}")
+    public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
+    {
+        String cacheValue = redisTemplate.opsForValue().get(cacheKey);
+        SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
+        return AjaxResult.success(sysCache);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheName/{cacheName}")
+    public AjaxResult clearCacheName(@PathVariable String cacheName)
+    {
+        Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
+        redisTemplate.delete(cacheKeys);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheKey/{cacheKey}")
+    public AjaxResult clearCacheKey(@PathVariable String cacheKey)
+    {
+        redisTemplate.delete(cacheKey);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheAll")
+    public AjaxResult clearCacheAll()
+    {
+        Collection<String> cacheKeys = redisTemplate.keys("*");
+        redisTemplate.delete(cacheKeys);
+        return AjaxResult.success();
+    }
+}

+ 27 - 0
fidms-admin/src/main/java/com/fidms/web/controller/monitor/ServerController.java

@@ -0,0 +1,27 @@
+package com.fidms.web.controller.monitor;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.framework.web.domain.Server;
+
+/**
+ * 服务器监控
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/monitor/server")
+public class ServerController
+{
+    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception
+    {
+        Server server = new Server();
+        server.copyTo();
+        return AjaxResult.success(server);
+    }
+}

+ 82 - 0
fidms-admin/src/main/java/com/fidms/web/controller/monitor/SysLogininforController.java

@@ -0,0 +1,82 @@
+package com.fidms.web.controller.monitor;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.framework.web.service.SysPasswordService;
+import com.fidms.system.domain.SysLogininfor;
+import com.fidms.system.service.ISysLogininforService;
+
+/**
+ * 系统访问记录
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/monitor/logininfor")
+public class SysLogininforController extends BaseController
+{
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @Autowired
+    private SysPasswordService passwordService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysLogininfor logininfor)
+    {
+        startPage();
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        return getDataTable(list);
+    }
+
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysLogininfor logininfor)
+    {
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+        util.exportExcel(response, list, "登录日志");
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{infoIds}")
+    public AjaxResult remove(@PathVariable Long[] infoIds)
+    {
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        logininforService.cleanLogininfor();
+        return success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
+    @Log(title = "账户解锁", businessType = BusinessType.OTHER)
+    @GetMapping("/unlock/{userName}")
+    public AjaxResult unlock(@PathVariable("userName") String userName)
+    {
+        passwordService.clearLoginRecordCache(userName);
+        return success();
+    }
+}

+ 69 - 0
fidms-admin/src/main/java/com/fidms/web/controller/monitor/SysOperlogController.java

@@ -0,0 +1,69 @@
+package com.fidms.web.controller.monitor;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.system.domain.SysOperLog;
+import com.fidms.system.service.ISysOperLogService;
+
+/**
+ * 操作日志记录
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/monitor/operlog")
+public class SysOperlogController extends BaseController
+{
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysOperLog operLog)
+    {
+        startPage();
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return getDataTable(list);
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysOperLog operLog)
+    {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        util.exportExcel(response, list, "操作日志");
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/{operIds}")
+    public AjaxResult remove(@PathVariable Long[] operIds)
+    {
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        operLogService.cleanOperLog();
+        return success();
+    }
+}

+ 83 - 0
fidms-admin/src/main/java/com/fidms/web/controller/monitor/SysUserOnlineController.java

@@ -0,0 +1,83 @@
+package com.fidms.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.constant.CacheConstants;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.model.LoginUser;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.core.redis.RedisCache;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.system.domain.SysUserOnline;
+import com.fidms.system.service.ISysUserOnlineService;
+
+/**
+ * 在线用户监控
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/monitor/online")
+public class SysUserOnlineController extends BaseController
+{
+    @Autowired
+    private ISysUserOnlineService userOnlineService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(String ipaddr, String userName)
+    {
+        Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
+        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+        for (String key : keys)
+        {
+            LoginUser user = redisCache.getCacheObject(key);
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+            {
+                userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+            }
+            else if (StringUtils.isNotEmpty(ipaddr))
+            {
+                userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+            }
+            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+            {
+                userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+            }
+            else
+            {
+                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+            }
+        }
+        Collections.reverse(userOnlineList);
+        userOnlineList.removeAll(Collections.singleton(null));
+        return getDataTable(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @DeleteMapping("/{tokenId}")
+    public AjaxResult forceLogout(@PathVariable String tokenId)
+    {
+        redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
+        return success();
+    }
+}

+ 133 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysConfigController.java

@@ -0,0 +1,133 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.system.domain.SysConfig;
+import com.fidms.system.service.ISysConfigService;
+
+/**
+ * 参数配置 信息操作处理
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController extends BaseController
+{
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysConfig config)
+    {
+        startPage();
+        List<SysConfig> list = configService.selectConfigList(config);
+        return getDataTable(list);
+    }
+
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysConfig config)
+    {
+        List<SysConfig> list = configService.selectConfigList(config);
+        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+        util.exportExcel(response, list, "参数数据");
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long configId)
+    {
+        return success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    public AjaxResult getConfigKey(@PathVariable String configKey)
+    {
+        return success(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    {
+        if (!configService.checkConfigKeyUnique(config))
+        {
+            return error("新增参数'" + config.getConfigName() + "'失败,参数键名已存在");
+        }
+        config.setCreateBy(getUsername());
+        return toAjax(configService.insertConfig(config));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    {
+        if (!configService.checkConfigKeyUnique(config))
+        {
+            return error("修改参数'" + config.getConfigName() + "'失败,参数键名已存在");
+        }
+        config.setUpdateBy(getUsername());
+        return toAjax(configService.updateConfig(config));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public AjaxResult remove(@PathVariable Long[] configIds)
+    {
+        configService.deleteConfigByIds(configIds);
+        return success();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        configService.resetConfigCache();
+        return success();
+    }
+}

+ 132 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysDeptController.java

@@ -0,0 +1,132 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.constant.UserConstants;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.entity.SysDept;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.system.service.ISysDeptService;
+
+/**
+ * 部门信息
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/dept")
+public class SysDeptController extends BaseController
+{
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return success(depts);
+    }
+
+    /**
+     * 查询部门列表(排除节点)
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list/exclude/{deptId}")
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+        return success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @GetMapping(value = "/{deptId}")
+    public AjaxResult getInfo(@PathVariable Long deptId)
+    {
+        deptService.checkDeptDataScope(deptId);
+        return success(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 新增部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    {
+        if (!deptService.checkDeptNameUnique(dept))
+        {
+            return error("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在");
+        }
+        dept.setCreateBy(getUsername());
+        return toAjax(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    {
+        Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
+        if (!deptService.checkDeptNameUnique(dept))
+        {
+            return error("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在");
+        }
+        else if (dept.getParentId().equals(deptId))
+        {
+            return error("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己");
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
+        {
+            return error("该部门包含未停用的子部门!");
+        }
+        dept.setUpdateBy(getUsername());
+        return toAjax(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public AjaxResult remove(@PathVariable Long deptId)
+    {
+        if (deptService.hasChildByDeptId(deptId))
+        {
+            return warn("存在下级部门,不允许删除");
+        }
+        if (deptService.checkDeptExistUser(deptId))
+        {
+            return warn("部门存在用户,不允许删除");
+        }
+        deptService.checkDeptDataScope(deptId);
+        return toAjax(deptService.deleteDeptById(deptId));
+    }
+}

+ 121 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysDictDataController.java

@@ -0,0 +1,121 @@
+package com.fidms.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.entity.SysDictData;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.system.service.ISysDictDataService;
+import com.fidms.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+public class SysDictDataController extends BaseController
+{
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictData dictData)
+    {
+        startPage();
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDictData dictData)
+    {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+        util.exportExcel(response, list, "字典数据");
+    }
+
+    /**
+     * 查询字典数据详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictCode}")
+    public AjaxResult getInfo(@PathVariable Long dictCode)
+    {
+        return success(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @GetMapping(value = "/type/{dictType}")
+    public AjaxResult dictType(@PathVariable String dictType)
+    {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        if (StringUtils.isNull(data))
+        {
+            data = new ArrayList<SysDictData>();
+        }
+        return success(data);
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setCreateBy(getUsername());
+        return toAjax(dictDataService.insertDictData(dict));
+    }
+
+    /**
+     * 修改保存字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setUpdateBy(getUsername());
+        return toAjax(dictDataService.updateDictData(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    {
+        dictDataService.deleteDictDataByIds(dictCodes);
+        return success();
+    }
+}

+ 131 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysDictTypeController.java

@@ -0,0 +1,131 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.entity.SysDictType;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+public class SysDictTypeController extends BaseController
+{
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictType dictType)
+    {
+        startPage();
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDictType dictType)
+    {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+        util.exportExcel(response, list, "字典类型");
+    }
+
+    /**
+     * 查询字典类型详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictId}")
+    public AjaxResult getInfo(@PathVariable Long dictId)
+    {
+        return success(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictType dict)
+    {
+        if (!dictTypeService.checkDictTypeUnique(dict))
+        {
+            return error("新增字典'" + dict.getDictName() + "'失败,字典类型已存在");
+        }
+        dict.setCreateBy(getUsername());
+        return toAjax(dictTypeService.insertDictType(dict));
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
+    {
+        if (!dictTypeService.checkDictTypeUnique(dict))
+        {
+            return error("修改字典'" + dict.getDictName() + "'失败,字典类型已存在");
+        }
+        dict.setUpdateBy(getUsername());
+        return toAjax(dictTypeService.updateDictType(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public AjaxResult remove(@PathVariable Long[] dictIds)
+    {
+        dictTypeService.deleteDictTypeByIds(dictIds);
+        return success();
+    }
+
+    /**
+     * 刷新字典缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        dictTypeService.resetDictCache();
+        return success();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+        return success(dictTypes);
+    }
+}

+ 29 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysIndexController.java

@@ -0,0 +1,29 @@
+package com.fidms.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.config.FidmsConfig;
+import com.fidms.common.utils.StringUtils;
+
+/**
+ * 首页
+ *
+ * @author Allen
+ */
+@RestController
+public class SysIndexController
+{
+    /** 系统基础配置 */
+    @Autowired
+    private FidmsConfig FidmsConfig;
+
+    /**
+     * 访问首页,提示语
+     */
+    @RequestMapping("/")
+    public String index()
+    {
+        return StringUtils.format("欢迎使用{}后台管理框架,当前版本:v{},请通过前端地址访问。", FidmsConfig.getName(), FidmsConfig.getVersion());
+    }
+}

+ 86 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysLoginController.java

@@ -0,0 +1,86 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+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 com.fidms.common.constant.Constants;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.entity.SysMenu;
+import com.fidms.common.core.domain.entity.SysUser;
+import com.fidms.common.core.domain.model.LoginBody;
+import com.fidms.common.utils.SecurityUtils;
+import com.fidms.framework.web.service.SysLoginService;
+import com.fidms.framework.web.service.SysPermissionService;
+import com.fidms.system.service.ISysMenuService;
+
+/**
+ * 登录验证
+ * 
+ * @author Allen
+ */
+@RestController
+public class SysLoginController
+{
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    /**
+     * 登录方法
+     * 
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+    /**
+     * 获取用户信息
+     * 
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    public AjaxResult getInfo()
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        return ajax;
+    }
+
+    /**
+     * 获取路由信息
+     * 
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters()
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+}

+ 142 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysMenuController.java

@@ -0,0 +1,142 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.constant.UserConstants;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.entity.SysMenu;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.system.service.ISysMenuService;
+
+/**
+ * 菜单信息
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController
+{
+    @Autowired
+    private ISysMenuService menuService;
+
+    /**
+     * 获取菜单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysMenu menu)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return success(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @GetMapping(value = "/{menuId}")
+    public AjaxResult getInfo(@PathVariable Long menuId)
+    {
+        return success(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysMenu menu)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return success(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(getUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ajax;
+    }
+
+    /**
+     * 新增菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    {
+        if (!menuService.checkMenuNameUnique(menu))
+        {
+            return error("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+        {
+            return error("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
+        }
+        menu.setCreateBy(getUsername());
+        return toAjax(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    {
+        if (!menuService.checkMenuNameUnique(menu))
+        {
+            return error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+        {
+            return error("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
+        }
+        else if (menu.getMenuId().equals(menu.getParentId()))
+        {
+            return error("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
+        }
+        menu.setUpdateBy(getUsername());
+        return toAjax(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    {
+        if (menuService.hasChildByMenuId(menuId))
+        {
+            return warn("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId))
+        {
+            return warn("菜单已分配,不允许删除");
+        }
+        return toAjax(menuService.deleteMenuById(menuId));
+    }
+}

+ 91 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysNoticeController.java

@@ -0,0 +1,91 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.system.domain.SysNotice;
+import com.fidms.system.service.ISysNoticeService;
+
+/**
+ * 公告 信息操作处理
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController
+{
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable Long noticeId)
+    {
+        return success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setCreateBy(getUsername());
+        return toAjax(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setUpdateBy(getUsername());
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    {
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}

+ 129 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysPostController.java

@@ -0,0 +1,129 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.system.domain.SysPost;
+import com.fidms.system.service.ISysPostService;
+
+/**
+ * 岗位信息操作处理
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/post")
+public class SysPostController extends BaseController
+{
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysPost post)
+    {
+        startPage();
+        List<SysPost> list = postService.selectPostList(post);
+        return getDataTable(list);
+    }
+    
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysPost post)
+    {
+        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+        util.exportExcel(response, list, "岗位数据");
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @GetMapping(value = "/{postId}")
+    public AjaxResult getInfo(@PathVariable Long postId)
+    {
+        return success(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysPost post)
+    {
+        if (!postService.checkPostNameUnique(post))
+        {
+            return error("新增岗位'" + post.getPostName() + "'失败,岗位名称已存在");
+        }
+        else if (!postService.checkPostCodeUnique(post))
+        {
+            return error("新增岗位'" + post.getPostName() + "'失败,岗位编码已存在");
+        }
+        post.setCreateBy(getUsername());
+        return toAjax(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysPost post)
+    {
+        if (!postService.checkPostNameUnique(post))
+        {
+            return error("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在");
+        }
+        else if (!postService.checkPostCodeUnique(post))
+        {
+            return error("修改岗位'" + post.getPostName() + "'失败,岗位编码已存在");
+        }
+        post.setUpdateBy(getUsername());
+        return toAjax(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{postIds}")
+    public AjaxResult remove(@PathVariable Long[] postIds)
+    {
+        return toAjax(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysPost> posts = postService.selectPostAll();
+        return success(posts);
+    }
+}

+ 141 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysProfileController.java

@@ -0,0 +1,141 @@
+package com.fidms.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.config.FidmsConfig;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.entity.SysUser;
+import com.fidms.common.core.domain.model.LoginUser;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.SecurityUtils;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.common.utils.file.FileUploadUtils;
+import com.fidms.common.utils.file.MimeTypeUtils;
+import com.fidms.framework.web.service.TokenService;
+import com.fidms.system.service.ISysUserService;
+
+/**
+ * 个人信息 业务处理
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    public AjaxResult profile()
+    {
+        LoginUser loginUser = getLoginUser();
+        SysUser user = loginUser.getUser();
+        AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        return ajax;
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult updateProfile(@RequestBody SysUser user)
+    {
+        LoginUser loginUser = getLoginUser();
+        SysUser sysUser = loginUser.getUser();
+        user.setUserName(sysUser.getUserName());
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
+        }
+        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
+        }
+        user.setUserId(sysUser.getUserId());
+        user.setPassword(null);
+        user.setAvatar(null);
+        user.setDeptId(null);
+        if (userService.updateUserProfile(user) > 0)
+        {
+            // 更新缓存用户信息
+            sysUser.setNickName(user.getNickName());
+            sysUser.setPhonenumber(user.getPhonenumber());
+            sysUser.setEmail(user.getEmail());
+            sysUser.setSex(user.getSex());
+            tokenService.setLoginUser(loginUser);
+            return success();
+        }
+        return error("修改个人信息异常,请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    {
+        LoginUser loginUser = getLoginUser();
+        String userName = loginUser.getUsername();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return error("修改密码失败,旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return error("新密码不能与旧密码相同");
+        }
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        {
+            // 更新缓存用户密码
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            tokenService.setLoginUser(loginUser);
+            return success();
+        }
+        return error("修改密码异常,请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/avatar")
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
+    {
+        if (!file.isEmpty())
+        {
+            LoginUser loginUser = getLoginUser();
+            String avatar = FileUploadUtils.upload(FidmsConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            {
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
+                // 更新缓存用户头像
+                loginUser.getUser().setAvatar(avatar);
+                tokenService.setLoginUser(loginUser);
+                return ajax;
+            }
+        }
+        return error("上传图片异常,请联系管理员");
+    }
+}

+ 38 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysRegisterController.java

@@ -0,0 +1,38 @@
+package com.fidms.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.model.RegisterBody;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.framework.web.service.SysRegisterService;
+import com.fidms.system.service.ISysConfigService;
+
+/**
+ * 注册验证
+ * 
+ * @author Allen
+ */
+@RestController
+public class SysRegisterController extends BaseController
+{
+    @Autowired
+    private SysRegisterService registerService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    @PostMapping("/register")
+    public AjaxResult register(@RequestBody RegisterBody user)
+    {
+        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
+        {
+            return error("当前系统没有开启注册功能!");
+        }
+        String msg = registerService.register(user);
+        return StringUtils.isEmpty(msg) ? success() : error(msg);
+    }
+}

+ 262 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysRoleController.java

@@ -0,0 +1,262 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.entity.SysDept;
+import com.fidms.common.core.domain.entity.SysRole;
+import com.fidms.common.core.domain.entity.SysUser;
+import com.fidms.common.core.domain.model.LoginUser;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.framework.web.service.SysPermissionService;
+import com.fidms.framework.web.service.TokenService;
+import com.fidms.system.domain.SysUserRole;
+import com.fidms.system.service.ISysDeptService;
+import com.fidms.system.service.ISysRoleService;
+import com.fidms.system.service.ISysUserService;
+
+/**
+ * 角色信息
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController
+{
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRole role)
+    {
+        startPage();
+        List<SysRole> list = roleService.selectRoleList(role);
+        return getDataTable(list);
+    }
+
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRole role)
+    {
+        List<SysRole> list = roleService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        util.exportExcel(response, list, "角色数据");
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable Long roleId)
+    {
+        roleService.checkRoleDataScope(roleId);
+        return success(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role)
+    {
+        if (!roleService.checkRoleNameUnique(role))
+        {
+            return error("新增角色'" + role.getRoleName() + "'失败,角色名称已存在");
+        }
+        else if (!roleService.checkRoleKeyUnique(role))
+        {
+            return error("新增角色'" + role.getRoleName() + "'失败,角色权限已存在");
+        }
+        role.setCreateBy(getUsername());
+        return toAjax(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        if (!roleService.checkRoleNameUnique(role))
+        {
+            return error("修改角色'" + role.getRoleName() + "'失败,角色名称已存在");
+        }
+        else if (!roleService.checkRoleKeyUnique(role))
+        {
+            return error("修改角色'" + role.getRoleName() + "'失败,角色权限已存在");
+        }
+        role.setUpdateBy(getUsername());
+        
+        if (roleService.updateRole(role) > 0)
+        {
+            // 更新缓存用户权限
+            LoginUser loginUser = getLoginUser();
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            {
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                tokenService.setLoginUser(loginUser);
+            }
+            return success();
+        }
+        return error("修改角色'" + role.getRoleName() + "'失败,请联系管理员");
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/dataScope")
+    public AjaxResult dataScope(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        return toAjax(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        role.setUpdateBy(getUsername());
+        return toAjax(roleService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds)
+    {
+        return toAjax(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        return success(roleService.selectRoleAll());
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo allocatedList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectAllocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo unallocatedList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUnallocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
+    {
+        return toAjax(roleService.deleteAuthUser(userRole));
+    }
+
+    /**
+     * 批量取消授权用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+    {
+        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    {
+        roleService.checkRoleDataScope(roleId);
+        return toAjax(roleService.insertAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 获取对应角色部门树列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/deptTree/{roleId}")
+    public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
+        return ajax;
+    }
+}

+ 251 - 0
fidms-admin/src/main/java/com/fidms/web/controller/system/SysUserController.java

@@ -0,0 +1,251 @@
+package com.fidms.web.controller.system;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.entity.SysDept;
+import com.fidms.common.core.domain.entity.SysRole;
+import com.fidms.common.core.domain.entity.SysUser;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.SecurityUtils;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.common.utils.poi.ExcelUtil;
+import com.fidms.system.service.ISysDeptService;
+import com.fidms.system.service.ISysPostService;
+import com.fidms.system.service.ISysRoleService;
+import com.fidms.system.service.ISysUserService;
+
+/**
+ * 用户信息
+ * 
+ * @author Allen
+ */
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysUser user)
+    {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        util.exportExcel(response, list, "用户数据");
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream());
+        String operName = getUsername();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return success(message);
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response)
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        util.importTemplateExcel(response, "用户数据");
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = { "/", "/{userId}" })
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    {
+        userService.checkUserDataScope(userId);
+        AjaxResult ajax = AjaxResult.success();
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
+        if (StringUtils.isNotNull(userId))
+        {
+            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put(AjaxResult.DATA_TAG, sysUser);
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+        }
+        return ajax;
+    }
+
+    /**
+     * 新增用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysUser user)
+    {
+        if (!userService.checkUserNameUnique(user))
+        {
+            return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+        {
+            return error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+        {
+            return error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
+        }
+        user.setCreateBy(getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toAjax(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        if (!userService.checkUserNameUnique(user))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
+        }
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        if (ArrayUtils.contains(userIds, getUserId()))
+        {
+            return error("当前用户不能删除");
+        }
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public AjaxResult resetPwd(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.resetPwd(user));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.updateUserStatus(user));
+    }
+
+    /**
+     * 根据用户编号获取授权角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/authRole/{userId}")
+    public AjaxResult authRole(@PathVariable("userId") Long userId)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        SysUser user = userService.selectUserById(userId);
+        List<SysRole> roles = roleService.selectRolesByUserId(userId);
+        ajax.put("user", user);
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        return ajax;
+    }
+
+    /**
+     * 用户授权角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authRole")
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
+    {
+        userService.checkUserDataScope(userId);
+        userService.insertUserAuth(userId, roleIds);
+        return success();
+    }
+
+    /**
+     * 获取部门树列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/deptTree")
+    public AjaxResult deptTree(SysDept dept)
+    {
+        return success(deptService.selectDeptTreeList(dept));
+    }
+}

+ 183 - 0
fidms-admin/src/main/java/com/fidms/web/controller/tool/TestController.java

@@ -0,0 +1,183 @@
+package com.fidms.web.controller.tool;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.domain.R;
+import com.fidms.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * swagger 用户测试方法
+ * 
+ * @author Allen
+ */
+@Api("用户信息管理")
+@RestController
+@RequestMapping("/test/user")
+public class TestController extends BaseController
+{
+    private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
+    {
+        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
+        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
+    }
+
+    @ApiOperation("获取用户列表")
+    @GetMapping("/list")
+    public R<List<UserEntity>> userList()
+    {
+        List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
+        return R.ok(userList);
+    }
+
+    @ApiOperation("获取用户详细")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+    @GetMapping("/{userId}")
+    public R<UserEntity> getUser(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            return R.ok(users.get(userId));
+        }
+        else
+        {
+            return R.fail("用户不存在");
+        }
+    }
+
+    @ApiOperation("新增用户")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class),
+        @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
+    })
+    @PostMapping("/save")
+    public R<String> save(UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return R.fail("用户ID不能为空");
+        }
+        users.put(user.getUserId(), user);
+        return R.ok();
+    }
+
+    @ApiOperation("更新用户")
+    @PutMapping("/update")
+    public R<String> update(@RequestBody UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return R.fail("用户ID不能为空");
+        }
+        if (users.isEmpty() || !users.containsKey(user.getUserId()))
+        {
+            return R.fail("用户不存在");
+        }
+        users.remove(user.getUserId());
+        users.put(user.getUserId(), user);
+        return R.ok();
+    }
+
+    @ApiOperation("删除用户信息")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+    @DeleteMapping("/{userId}")
+    public R<String> delete(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            users.remove(userId);
+            return R.ok();
+        }
+        else
+        {
+            return R.fail("用户不存在");
+        }
+    }
+}
+
+@ApiModel(value = "UserEntity", description = "用户实体")
+class UserEntity
+{
+    @ApiModelProperty("用户ID")
+    private Integer userId;
+
+    @ApiModelProperty("用户名称")
+    private String username;
+
+    @ApiModelProperty("用户密码")
+    private String password;
+
+    @ApiModelProperty("用户手机")
+    private String mobile;
+
+    public UserEntity()
+    {
+
+    }
+
+    public UserEntity(Integer userId, String username, String password, String mobile)
+    {
+        this.userId = userId;
+        this.username = username;
+        this.password = password;
+        this.mobile = mobile;
+    }
+
+    public Integer getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Integer userId)
+    {
+        this.userId = userId;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getMobile()
+    {
+        return mobile;
+    }
+
+    public void setMobile(String mobile)
+    {
+        this.mobile = mobile;
+    }
+}

+ 125 - 0
fidms-admin/src/main/java/com/fidms/web/core/config/SwaggerConfig.java

@@ -0,0 +1,125 @@
+package com.fidms.web.core.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.fidms.common.config.FidmsConfig;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+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.Contact;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * Swagger2的接口配置
+ * 
+ * @author Allen
+ */
+@Configuration
+public class SwaggerConfig
+{
+    /** 系统基础配置 */
+    @Autowired
+    private FidmsConfig FidmsConfig;
+
+    /** 是否开启swagger */
+    @Value("${swagger.enabled}")
+    private boolean enabled;
+
+    /** 设置请求的统一前缀 */
+    @Value("${swagger.pathMapping}")
+    private String pathMapping;
+
+    /**
+     * 创建API
+     */
+    @Bean
+    public Docket createRestApi()
+    {
+        return new Docket(DocumentationType.OAS_30)
+                // 是否启用Swagger
+                .enable(enabled)
+                // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息)
+                .apiInfo(apiInfo())
+                // 设置哪些接口暴露给Swagger展示
+                .select()
+                // 扫描所有有注解的api,用这种方式更灵活
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                // 扫描指定包中的swagger注解
+                // .apis(RequestHandlerSelectors.basePackage("com.fidms.project.tool.swagger"))
+                // 扫描所有 .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                /* 设置安全模式,swagger可以设置访问token */
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts())
+                .pathMapping(pathMapping);
+    }
+
+    /**
+     * 安全模式,这里指定token通过Authorization头请求头传递
+     */
+    private List<SecurityScheme> securitySchemes()
+    {
+        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
+        return apiKeyList;
+    }
+
+    /**
+     * 安全上下文
+     */
+    private List<SecurityContext> securityContexts()
+    {
+        List<SecurityContext> securityContexts = new ArrayList<>();
+        securityContexts.add(
+                SecurityContext.builder()
+                        .securityReferences(defaultAuth())
+                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+                        .build());
+        return securityContexts;
+    }
+
+    /**
+     * 默认的安全上引用
+     */
+    private List<SecurityReference> defaultAuth()
+    {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        List<SecurityReference> securityReferences = new ArrayList<>();
+        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+        return securityReferences;
+    }
+
+    /**
+     * 添加摘要信息
+     */
+    private ApiInfo apiInfo()
+    {
+        // 用ApiInfoBuilder进行定制
+        return new ApiInfoBuilder()
+                // 设置标题
+                .title("标题:目标流场及红外信息数据管理系统_接口文档")
+                // 描述
+                .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                // 作者信息
+                .contact(new Contact(FidmsConfig.getName(), null, null))
+                // 版本
+                .version("版本号:" + FidmsConfig.getVersion())
+                .build();
+    }
+}

+ 303 - 0
fidms-admin/src/main/java/com/fidms/web/domain/FlowFieldInput.java

@@ -0,0 +1,303 @@
+package com.fidms.web.domain;
+
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 流场输入对象 bz_flow_field_input_t
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public class FlowFieldInput extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 3d模型主键 */
+    @Excel(name = "3d模型主键")
+    private Long model3dId;
+
+    @Excel(name = "3d模型")
+    private String model3dName;
+
+    /** 来流马赫数 */
+    @Excel(name = "来流马赫数")
+    private BigDecimal machNumber;
+
+    /** 飞行高度 */
+    @Excel(name = "飞行高度")
+    private Long flightHeight;
+
+    /** OX坐标值 */
+    @Excel(name = "OX坐标值")
+    private BigDecimal oxCoordinate;
+
+    /** OY坐标值 */
+    @Excel(name = "OY坐标值")
+    private BigDecimal oyCoordinate;
+
+    /** OZ坐标值 */
+    @Excel(name = "OZ坐标值")
+    private BigDecimal ozCoordinate;
+
+    /** 压强 */
+    @Excel(name = "压强")
+    private BigDecimal pressure;
+
+    /** 流速 */
+    @Excel(name = "流速")
+    private Long flowVelocity;
+
+    /** 密度 */
+    @Excel(name = "密度")
+    private Long density;
+
+    /** 二氧化碳质量分数 */
+    @Excel(name = "二氧化碳质量分数")
+    private BigDecimal co2MassFraction;
+
+    /** 一氧化碳质量分数 */
+    @Excel(name = "一氧化碳质量分数")
+    private BigDecimal coMassFraction;
+
+    /** 水蒸气质量分数 */
+    @Excel(name = "水蒸气质量分数")
+    private BigDecimal h2oMassFraction;
+
+    /** Fluent网格文件 */
+    @Excel(name = "Fluent网格文件")
+    private String fluentGridFile;
+
+    /** Fluent网格文件路径 */
+    @Excel(name = "Fluent网格文件路径")
+    private String fluentGridFilePath;
+
+    /** Fluent cas文件 */
+    @Excel(name = "Fluent cas文件")
+    private String fluentCasFile;
+
+    /** Fluent cas文件路径 */
+    @Excel(name = "Fluent cas文件路径")
+    private String fluentCasFilePath;
+
+    /** Fluent dat文件路径 */
+    @Excel(name = "Fluent dat文件路径")
+    private String fluentDatFile;
+
+    /** Fluent dat文件 */
+    @Excel(name = "Fluent dat文件")
+    private String fluentDatFilePath;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setModel3dId(Long model3dId) 
+    {
+        this.model3dId = model3dId;
+    }
+
+    public Long getModel3dId() 
+    {
+        return model3dId;
+    }
+    public void setMachNumber(BigDecimal machNumber) 
+    {
+        this.machNumber = machNumber;
+    }
+
+    public String getModel3dName() {
+        return model3dName;
+    }
+
+    public void setModel3dName(String model3dName) {
+        this.model3dName = model3dName;
+    }
+
+    public BigDecimal getMachNumber()
+    {
+        return machNumber;
+    }
+    public void setFlightHeight(Long flightHeight) 
+    {
+        this.flightHeight = flightHeight;
+    }
+
+    public Long getFlightHeight() 
+    {
+        return flightHeight;
+    }
+    public void setOxCoordinate(BigDecimal oxCoordinate) 
+    {
+        this.oxCoordinate = oxCoordinate;
+    }
+
+    public BigDecimal getOxCoordinate() 
+    {
+        return oxCoordinate;
+    }
+    public void setOyCoordinate(BigDecimal oyCoordinate) 
+    {
+        this.oyCoordinate = oyCoordinate;
+    }
+
+    public BigDecimal getOyCoordinate() 
+    {
+        return oyCoordinate;
+    }
+    public void setOzCoordinate(BigDecimal ozCoordinate) 
+    {
+        this.ozCoordinate = ozCoordinate;
+    }
+
+    public BigDecimal getOzCoordinate() 
+    {
+        return ozCoordinate;
+    }
+    public void setPressure(BigDecimal pressure) 
+    {
+        this.pressure = pressure;
+    }
+
+    public BigDecimal getPressure() 
+    {
+        return pressure;
+    }
+    public void setFlowVelocity(Long flowVelocity) 
+    {
+        this.flowVelocity = flowVelocity;
+    }
+
+    public Long getFlowVelocity() 
+    {
+        return flowVelocity;
+    }
+    public void setDensity(Long density) 
+    {
+        this.density = density;
+    }
+
+    public Long getDensity() 
+    {
+        return density;
+    }
+    public void setCo2MassFraction(BigDecimal co2MassFraction) 
+    {
+        this.co2MassFraction = co2MassFraction;
+    }
+
+    public BigDecimal getCo2MassFraction() 
+    {
+        return co2MassFraction;
+    }
+    public void setCoMassFraction(BigDecimal coMassFraction) 
+    {
+        this.coMassFraction = coMassFraction;
+    }
+
+    public BigDecimal getCoMassFraction() 
+    {
+        return coMassFraction;
+    }
+    public void setH2oMassFraction(BigDecimal h2oMassFraction) 
+    {
+        this.h2oMassFraction = h2oMassFraction;
+    }
+
+    public BigDecimal getH2oMassFraction() 
+    {
+        return h2oMassFraction;
+    }
+    public void setFluentGridFile(String fluentGridFile) 
+    {
+        this.fluentGridFile = fluentGridFile;
+    }
+
+    public String getFluentGridFile() 
+    {
+        return fluentGridFile;
+    }
+    public void setFluentGridFilePath(String fluentGridFilePath) 
+    {
+        this.fluentGridFilePath = fluentGridFilePath;
+    }
+
+    public String getFluentGridFilePath() 
+    {
+        return fluentGridFilePath;
+    }
+    public void setFluentCasFile(String fluentCasFile) 
+    {
+        this.fluentCasFile = fluentCasFile;
+    }
+
+    public String getFluentCasFile() 
+    {
+        return fluentCasFile;
+    }
+    public void setFluentCasFilePath(String fluentCasFilePath) 
+    {
+        this.fluentCasFilePath = fluentCasFilePath;
+    }
+
+    public String getFluentCasFilePath() 
+    {
+        return fluentCasFilePath;
+    }
+    public void setFluentDatFile(String fluentDatFile) 
+    {
+        this.fluentDatFile = fluentDatFile;
+    }
+
+    public String getFluentDatFile() 
+    {
+        return fluentDatFile;
+    }
+    public void setFluentDatFilePath(String fluentDatFilePath) 
+    {
+        this.fluentDatFilePath = fluentDatFilePath;
+    }
+
+    public String getFluentDatFilePath() 
+    {
+        return fluentDatFilePath;
+    }
+
+    @Override
+    public String toString() {
+        return "FlowFieldInput{" +
+                "id=" + id +
+                ", model3dId=" + model3dId +
+                ", model3dName=" + model3dName +
+                ", machNumber=" + machNumber +
+                ", flightHeight=" + flightHeight +
+                ", oxCoordinate=" + oxCoordinate +
+                ", oyCoordinate=" + oyCoordinate +
+                ", ozCoordinate=" + ozCoordinate +
+                ", pressure=" + pressure +
+                ", flowVelocity=" + flowVelocity +
+                ", density=" + density +
+                ", co2MassFraction=" + co2MassFraction +
+                ", coMassFraction=" + coMassFraction +
+                ", h2oMassFraction=" + h2oMassFraction +
+                ", fluentGridFile='" + fluentGridFile + '\'' +
+                ", fluentGridFilePath='" + fluentGridFilePath + '\'' +
+                ", fluentCasFile='" + fluentCasFile + '\'' +
+                ", fluentCasFilePath='" + fluentCasFilePath + '\'' +
+                ", fluentDatFile='" + fluentDatFile + '\'' +
+                ", fluentDatFilePath='" + fluentDatFilePath + '\'' +
+                '}';
+    }
+}

+ 183 - 0
fidms-admin/src/main/java/com/fidms/web/domain/FlowFieldOutput.java

@@ -0,0 +1,183 @@
+package com.fidms.web.domain;
+
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 流场输出对象 bz_flow_field_output_t
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public class FlowFieldOutput extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 文件输出 */
+    @Excel(name = "文件输出")
+    private String outputFile;
+
+    /** 文件输出路径 */
+    @Excel(name = "文件输出路径")
+    private String outputFilePath;
+
+    /** 软件界面截屏 */
+    @Excel(name = "软件界面截屏")
+    private String softScreenShoot;
+
+    /** 软件界面截屏路径 */
+    @Excel(name = "软件界面截屏路径")
+    private String softScreenShootPath;
+
+    /** 网格数 */
+    @Excel(name = "网格数")
+    private BigDecimal gridNumber;
+
+    /** 是否为结构网格 */
+    @Excel(name = "是否为结构网格")
+    private Boolean isStructureGrid;
+
+    /** 温度 */
+    @Excel(name = "温度")
+    private BigDecimal temperature;
+
+    /** 二氧化碳 */
+    @Excel(name = "二氧化碳")
+    private BigDecimal co2;
+
+    /** 一氧化碳 */
+    @Excel(name = "一氧化碳")
+    private BigDecimal co;
+
+    /** 水蒸气 */
+    @Excel(name = "水蒸气")
+    private BigDecimal h2o;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOutputFile(String outputFile) 
+    {
+        this.outputFile = outputFile;
+    }
+
+    public String getOutputFile() 
+    {
+        return outputFile;
+    }
+    public void setOutputFilePath(String outputFilePath) 
+    {
+        this.outputFilePath = outputFilePath;
+    }
+
+    public String getOutputFilePath() 
+    {
+        return outputFilePath;
+    }
+    public void setSoftScreenShoot(String softScreenShoot) 
+    {
+        this.softScreenShoot = softScreenShoot;
+    }
+
+    public String getSoftScreenShoot() 
+    {
+        return softScreenShoot;
+    }
+    public void setSoftScreenShootPath(String softScreenShootPath) 
+    {
+        this.softScreenShootPath = softScreenShootPath;
+    }
+
+    public String getSoftScreenShootPath() 
+    {
+        return softScreenShootPath;
+    }
+    public void setGridNumber(BigDecimal gridNumber) 
+    {
+        this.gridNumber = gridNumber;
+    }
+
+    public BigDecimal getGridNumber() 
+    {
+        return gridNumber;
+    }
+    public void setIsStructureGrid(Boolean isStructureGrid)
+    {
+        this.isStructureGrid = isStructureGrid;
+    }
+
+    public Boolean getIsStructureGrid()
+    {
+        return isStructureGrid;
+    }
+    public void setTemperature(BigDecimal temperature) 
+    {
+        this.temperature = temperature;
+    }
+
+    public BigDecimal getTemperature() 
+    {
+        return temperature;
+    }
+    public void setCo2(BigDecimal co2) 
+    {
+        this.co2 = co2;
+    }
+
+    public BigDecimal getCo2() 
+    {
+        return co2;
+    }
+    public void setCo(BigDecimal co) 
+    {
+        this.co = co;
+    }
+
+    public BigDecimal getCo() 
+    {
+        return co;
+    }
+    public void setH2o(BigDecimal h2o) 
+    {
+        this.h2o = h2o;
+    }
+
+    public BigDecimal getH2o() 
+    {
+        return h2o;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("outputFile", getOutputFile())
+            .append("outputFilePath", getOutputFilePath())
+            .append("softScreenShoot", getSoftScreenShoot())
+            .append("softScreenShootPath", getSoftScreenShootPath())
+            .append("gridNumber", getGridNumber())
+            .append("isStructureGrid", getIsStructureGrid())
+            .append("temperature", getTemperature())
+            .append("co2", getCo2())
+            .append("co", getCo())
+            .append("h2o", getH2o())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 99 - 0
fidms-admin/src/main/java/com/fidms/web/domain/InfraredInput.java

@@ -0,0 +1,99 @@
+package com.fidms.web.domain;
+
+import java.math.BigDecimal;
+
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 红外输入对象 bz_infrared_input_t
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public class InfraredInput extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 流场输出结果编号 */
+    @Excel(name = "流场输出结果编号")
+    private BigDecimal flowFieldOutputId;
+
+    /** 流场输出结果 */
+    @Excel(name = "流场输出结果")
+    private String flowFieldOutputPath;
+
+    /** 表面材质 */
+    @Excel(name = "表面材质")
+    private BigDecimal surfaceMaterial;
+
+    /** 红外观测距离 */
+    @Excel(name = "红外观测距离")
+    private BigDecimal infraredObserDist;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setFlowFieldOutputId(BigDecimal flowFieldOutputId) 
+    {
+        this.flowFieldOutputId = flowFieldOutputId;
+    }
+
+    public BigDecimal getFlowFieldOutputId() 
+    {
+        return flowFieldOutputId;
+    }
+    public void setFlowFieldOutputPath(String flowFieldOutputPath)
+    {
+        this.flowFieldOutputPath = flowFieldOutputPath;
+    }
+
+    public String getFlowFieldOutputPath()
+    {
+        return flowFieldOutputPath;
+    }
+    public void setSurfaceMaterial(BigDecimal surfaceMaterial) 
+    {
+        this.surfaceMaterial = surfaceMaterial;
+    }
+
+    public BigDecimal getSurfaceMaterial() 
+    {
+        return surfaceMaterial;
+    }
+    public void setInfraredObserDist(BigDecimal infraredObserDist) 
+    {
+        this.infraredObserDist = infraredObserDist;
+    }
+
+    public BigDecimal getInfraredObserDist() 
+    {
+        return infraredObserDist;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("flowFieldOutputId", getFlowFieldOutputId())
+            .append("flowFieldOutputPath", getFlowFieldOutputPath())
+            .append("surfaceMaterial", getSurfaceMaterial())
+            .append("infraredObserDist", getInfraredObserDist())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 85 - 0
fidms-admin/src/main/java/com/fidms/web/domain/InfraredOutput.java

@@ -0,0 +1,85 @@
+package com.fidms.web.domain;
+
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 红外输出对象 bz_infrared_output_t
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public class InfraredOutput extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 文件输出 */
+    @Excel(name = "文件输出")
+    private String outputFile;
+
+    /** 文件输出路径 */
+    @Excel(name = "文件输出路径")
+    private String outputFilePath;
+
+    /** 红外辐射强度 */
+    @Excel(name = "红外辐射强度")
+    private BigDecimal radiationIntensity;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOutputFile(String outputFile) 
+    {
+        this.outputFile = outputFile;
+    }
+
+    public String getOutputFile() 
+    {
+        return outputFile;
+    }
+    public void setOutputFilePath(String outputFilePath) 
+    {
+        this.outputFilePath = outputFilePath;
+    }
+
+    public String getOutputFilePath() 
+    {
+        return outputFilePath;
+    }
+    public void setRadiationIntensity(BigDecimal radiationIntensity) 
+    {
+        this.radiationIntensity = radiationIntensity;
+    }
+
+    public BigDecimal getRadiationIntensity() 
+    {
+        return radiationIntensity;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("outputFile", getOutputFile())
+            .append("outputFilePath", getOutputFilePath())
+            .append("radiationIntensity", getRadiationIntensity())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 82 - 0
fidms-admin/src/main/java/com/fidms/web/domain/Model3d.java

@@ -0,0 +1,82 @@
+package com.fidms.web.domain;
+
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+/**
+ * 3d模型对象 bz_model_3d_t
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public class Model3d extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 3d模型名称 */
+    @Excel(name = "3d模型名称")
+    private String name;
+
+    /** 3d模型文件名称 */
+    @Excel(name = "3d模型文件名称")
+    private String model3dFile;
+
+    /** 3d模型文件名称路径 */
+    @Excel(name = "3d模型文件名称路径")
+    private String model3dFilePath;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setModel3dFile(String model3dFile) 
+    {
+        this.model3dFile = model3dFile;
+    }
+
+    public String getModel3dFile() 
+    {
+        return model3dFile;
+    }
+    public void setModel3dFilePath(String model3dFilePath) 
+    {
+        this.model3dFilePath = model3dFilePath;
+    }
+
+    public String getModel3dFilePath() 
+    {
+        return model3dFilePath;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("model3dFile", getModel3dFile())
+            .append("model3dFilePath", getModel3dFilePath())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 61 - 0
fidms-admin/src/main/java/com/fidms/web/mapper/FlowFieldInputMapper.java

@@ -0,0 +1,61 @@
+package com.fidms.web.mapper;
+
+import java.util.List;
+import com.fidms.web.domain.FlowFieldInput;
+
+/**
+ * 流场输入Mapper接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface FlowFieldInputMapper 
+{
+    /**
+     * 查询流场输入
+     * 
+     * @param id 流场输入主键
+     * @return 流场输入
+     */
+    public FlowFieldInput selectFlowFieldInputById(Long id);
+
+    /**
+     * 查询流场输入列表
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 流场输入集合
+     */
+    public List<FlowFieldInput> selectFlowFieldInputList(FlowFieldInput flowFieldInput);
+
+    /**
+     * 新增流场输入
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 结果
+     */
+    public int insertFlowFieldInput(FlowFieldInput flowFieldInput);
+
+    /**
+     * 修改流场输入
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 结果
+     */
+    public int updateFlowFieldInput(FlowFieldInput flowFieldInput);
+
+    /**
+     * 删除流场输入
+     * 
+     * @param id 流场输入主键
+     * @return 结果
+     */
+    public int deleteFlowFieldInputById(Long id);
+
+    /**
+     * 批量删除流场输入
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFlowFieldInputByIds(Long[] ids);
+}

+ 61 - 0
fidms-admin/src/main/java/com/fidms/web/mapper/FlowFieldOutputMapper.java

@@ -0,0 +1,61 @@
+package com.fidms.web.mapper;
+
+import java.util.List;
+import com.fidms.web.domain.FlowFieldOutput;
+
+/**
+ * 流场输出Mapper接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface FlowFieldOutputMapper 
+{
+    /**
+     * 查询流场输出
+     * 
+     * @param id 流场输出主键
+     * @return 流场输出
+     */
+    public FlowFieldOutput selectFlowFieldOutputById(Long id);
+
+    /**
+     * 查询流场输出列表
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 流场输出集合
+     */
+    public List<FlowFieldOutput> selectFlowFieldOutputList(FlowFieldOutput flowFieldOutput);
+
+    /**
+     * 新增流场输出
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 结果
+     */
+    public int insertFlowFieldOutput(FlowFieldOutput flowFieldOutput);
+
+    /**
+     * 修改流场输出
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 结果
+     */
+    public int updateFlowFieldOutput(FlowFieldOutput flowFieldOutput);
+
+    /**
+     * 删除流场输出
+     * 
+     * @param id 流场输出主键
+     * @return 结果
+     */
+    public int deleteFlowFieldOutputById(Long id);
+
+    /**
+     * 批量删除流场输出
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFlowFieldOutputByIds(Long[] ids);
+}

+ 61 - 0
fidms-admin/src/main/java/com/fidms/web/mapper/InfraredInputMapper.java

@@ -0,0 +1,61 @@
+package com.fidms.web.mapper;
+
+import java.util.List;
+import com.fidms.web.domain.InfraredInput;
+
+/**
+ * 红外输入Mapper接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface InfraredInputMapper 
+{
+    /**
+     * 查询红外输入
+     * 
+     * @param id 红外输入主键
+     * @return 红外输入
+     */
+    public InfraredInput selectInfraredInputById(Long id);
+
+    /**
+     * 查询红外输入列表
+     * 
+     * @param infraredInput 红外输入
+     * @return 红外输入集合
+     */
+    public List<InfraredInput> selectInfraredInputList(InfraredInput infraredInput);
+
+    /**
+     * 新增红外输入
+     * 
+     * @param infraredInput 红外输入
+     * @return 结果
+     */
+    public int insertInfraredInput(InfraredInput infraredInput);
+
+    /**
+     * 修改红外输入
+     * 
+     * @param infraredInput 红外输入
+     * @return 结果
+     */
+    public int updateInfraredInput(InfraredInput infraredInput);
+
+    /**
+     * 删除红外输入
+     * 
+     * @param id 红外输入主键
+     * @return 结果
+     */
+    public int deleteInfraredInputById(Long id);
+
+    /**
+     * 批量删除红外输入
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInfraredInputByIds(Long[] ids);
+}

+ 61 - 0
fidms-admin/src/main/java/com/fidms/web/mapper/InfraredOutputMapper.java

@@ -0,0 +1,61 @@
+package com.fidms.web.mapper;
+
+import java.util.List;
+import com.fidms.web.domain.InfraredOutput;
+
+/**
+ * 红外输出Mapper接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface InfraredOutputMapper 
+{
+    /**
+     * 查询红外输出
+     * 
+     * @param id 红外输出主键
+     * @return 红外输出
+     */
+    public InfraredOutput selectInfraredOutputById(Long id);
+
+    /**
+     * 查询红外输出列表
+     * 
+     * @param infraredOutput 红外输出
+     * @return 红外输出集合
+     */
+    public List<InfraredOutput> selectInfraredOutputList(InfraredOutput infraredOutput);
+
+    /**
+     * 新增红外输出
+     * 
+     * @param infraredOutput 红外输出
+     * @return 结果
+     */
+    public int insertInfraredOutput(InfraredOutput infraredOutput);
+
+    /**
+     * 修改红外输出
+     * 
+     * @param infraredOutput 红外输出
+     * @return 结果
+     */
+    public int updateInfraredOutput(InfraredOutput infraredOutput);
+
+    /**
+     * 删除红外输出
+     * 
+     * @param id 红外输出主键
+     * @return 结果
+     */
+    public int deleteInfraredOutputById(Long id);
+
+    /**
+     * 批量删除红外输出
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInfraredOutputByIds(Long[] ids);
+}

+ 63 - 0
fidms-admin/src/main/java/com/fidms/web/mapper/Model3dMapper.java

@@ -0,0 +1,63 @@
+package com.fidms.web.mapper;
+
+import java.util.List;
+import com.fidms.web.domain.Model3d;
+
+/**
+ * 3d模型Mapper接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface Model3dMapper 
+{
+    /**
+     * 查询3d模型
+     * 
+     * @param id 3d模型主键
+     * @return 3d模型
+     */
+    public Model3d selectModel3dById(Long id);
+
+    /**
+     * 查询3d模型列表
+     * 
+     * @param model3d 3d模型
+     * @return 3d模型集合
+     */
+    public List<Model3d> selectModel3dList(Model3d model3d);
+
+    /**
+     * 新增3d模型
+     * 
+     * @param model3d 3d模型
+     * @return 结果
+     */
+    public int insertModel3d(Model3d model3d);
+
+    /**
+     * 修改3d模型
+     * 
+     * @param model3d 3d模型
+     * @return 结果
+     */
+    public int updateModel3d(Model3d model3d);
+
+    /**
+     * 删除3d模型
+     * 
+     * @param id 3d模型主键
+     * @return 结果
+     */
+    public int deleteModel3dById(Long id);
+
+    /**
+     * 批量删除3d模型
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteModel3dByIds(Long[] ids);
+
+    List getOption();
+}

+ 61 - 0
fidms-admin/src/main/java/com/fidms/web/service/IFlowFieldInputService.java

@@ -0,0 +1,61 @@
+package com.fidms.web.service;
+
+import java.util.List;
+import com.fidms.web.domain.FlowFieldInput;
+
+/**
+ * 流场输入Service接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface IFlowFieldInputService 
+{
+    /**
+     * 查询流场输入
+     * 
+     * @param id 流场输入主键
+     * @return 流场输入
+     */
+    public FlowFieldInput selectFlowFieldInputById(Long id);
+
+    /**
+     * 查询流场输入列表
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 流场输入集合
+     */
+    public List<FlowFieldInput> selectFlowFieldInputList(FlowFieldInput flowFieldInput);
+
+    /**
+     * 新增流场输入
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 结果
+     */
+    public int insertFlowFieldInput(FlowFieldInput flowFieldInput);
+
+    /**
+     * 修改流场输入
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 结果
+     */
+    public int updateFlowFieldInput(FlowFieldInput flowFieldInput);
+
+    /**
+     * 批量删除流场输入
+     * 
+     * @param ids 需要删除的流场输入主键集合
+     * @return 结果
+     */
+    public int deleteFlowFieldInputByIds(Long[] ids);
+
+    /**
+     * 删除流场输入信息
+     * 
+     * @param id 流场输入主键
+     * @return 结果
+     */
+    public int deleteFlowFieldInputById(Long id);
+}

+ 61 - 0
fidms-admin/src/main/java/com/fidms/web/service/IFlowFieldOutputService.java

@@ -0,0 +1,61 @@
+package com.fidms.web.service;
+
+import java.util.List;
+import com.fidms.web.domain.FlowFieldOutput;
+
+/**
+ * 流场输出Service接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface IFlowFieldOutputService 
+{
+    /**
+     * 查询流场输出
+     * 
+     * @param id 流场输出主键
+     * @return 流场输出
+     */
+    public FlowFieldOutput selectFlowFieldOutputById(Long id);
+
+    /**
+     * 查询流场输出列表
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 流场输出集合
+     */
+    public List<FlowFieldOutput> selectFlowFieldOutputList(FlowFieldOutput flowFieldOutput);
+
+    /**
+     * 新增流场输出
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 结果
+     */
+    public int insertFlowFieldOutput(FlowFieldOutput flowFieldOutput);
+
+    /**
+     * 修改流场输出
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 结果
+     */
+    public int updateFlowFieldOutput(FlowFieldOutput flowFieldOutput);
+
+    /**
+     * 批量删除流场输出
+     * 
+     * @param ids 需要删除的流场输出主键集合
+     * @return 结果
+     */
+    public int deleteFlowFieldOutputByIds(Long[] ids);
+
+    /**
+     * 删除流场输出信息
+     * 
+     * @param id 流场输出主键
+     * @return 结果
+     */
+    public int deleteFlowFieldOutputById(Long id);
+}

+ 61 - 0
fidms-admin/src/main/java/com/fidms/web/service/IInfraredInputService.java

@@ -0,0 +1,61 @@
+package com.fidms.web.service;
+
+import java.util.List;
+import com.fidms.web.domain.InfraredInput;
+
+/**
+ * 红外输入Service接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface IInfraredInputService 
+{
+    /**
+     * 查询红外输入
+     * 
+     * @param id 红外输入主键
+     * @return 红外输入
+     */
+    public InfraredInput selectInfraredInputById(Long id);
+
+    /**
+     * 查询红外输入列表
+     * 
+     * @param infraredInput 红外输入
+     * @return 红外输入集合
+     */
+    public List<InfraredInput> selectInfraredInputList(InfraredInput infraredInput);
+
+    /**
+     * 新增红外输入
+     * 
+     * @param infraredInput 红外输入
+     * @return 结果
+     */
+    public int insertInfraredInput(InfraredInput infraredInput);
+
+    /**
+     * 修改红外输入
+     * 
+     * @param infraredInput 红外输入
+     * @return 结果
+     */
+    public int updateInfraredInput(InfraredInput infraredInput);
+
+    /**
+     * 批量删除红外输入
+     * 
+     * @param ids 需要删除的红外输入主键集合
+     * @return 结果
+     */
+    public int deleteInfraredInputByIds(Long[] ids);
+
+    /**
+     * 删除红外输入信息
+     * 
+     * @param id 红外输入主键
+     * @return 结果
+     */
+    public int deleteInfraredInputById(Long id);
+}

+ 61 - 0
fidms-admin/src/main/java/com/fidms/web/service/IInfraredOutputService.java

@@ -0,0 +1,61 @@
+package com.fidms.web.service;
+
+import java.util.List;
+import com.fidms.web.domain.InfraredOutput;
+
+/**
+ * 红外输出Service接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface IInfraredOutputService 
+{
+    /**
+     * 查询红外输出
+     * 
+     * @param id 红外输出主键
+     * @return 红外输出
+     */
+    public InfraredOutput selectInfraredOutputById(Long id);
+
+    /**
+     * 查询红外输出列表
+     * 
+     * @param infraredOutput 红外输出
+     * @return 红外输出集合
+     */
+    public List<InfraredOutput> selectInfraredOutputList(InfraredOutput infraredOutput);
+
+    /**
+     * 新增红外输出
+     * 
+     * @param infraredOutput 红外输出
+     * @return 结果
+     */
+    public int insertInfraredOutput(InfraredOutput infraredOutput);
+
+    /**
+     * 修改红外输出
+     * 
+     * @param infraredOutput 红外输出
+     * @return 结果
+     */
+    public int updateInfraredOutput(InfraredOutput infraredOutput);
+
+    /**
+     * 批量删除红外输出
+     * 
+     * @param ids 需要删除的红外输出主键集合
+     * @return 结果
+     */
+    public int deleteInfraredOutputByIds(Long[] ids);
+
+    /**
+     * 删除红外输出信息
+     * 
+     * @param id 红外输出主键
+     * @return 结果
+     */
+    public int deleteInfraredOutputById(Long id);
+}

+ 63 - 0
fidms-admin/src/main/java/com/fidms/web/service/IModel3dService.java

@@ -0,0 +1,63 @@
+package com.fidms.web.service;
+
+import java.util.List;
+import com.fidms.web.domain.Model3d;
+
+/**
+ * 3d模型Service接口
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+public interface IModel3dService 
+{
+    /**
+     * 查询3d模型
+     * 
+     * @param id 3d模型主键
+     * @return 3d模型
+     */
+    public Model3d selectModel3dById(Long id);
+
+    /**
+     * 查询3d模型列表
+     * 
+     * @param model3d 3d模型
+     * @return 3d模型集合
+     */
+    public List<Model3d> selectModel3dList(Model3d model3d);
+
+    /**
+     * 新增3d模型
+     * 
+     * @param model3d 3d模型
+     * @return 结果
+     */
+    public int insertModel3d(Model3d model3d);
+
+    /**
+     * 修改3d模型
+     * 
+     * @param model3d 3d模型
+     * @return 结果
+     */
+    public int updateModel3d(Model3d model3d);
+
+    /**
+     * 批量删除3d模型
+     * 
+     * @param ids 需要删除的3d模型主键集合
+     * @return 结果
+     */
+    public int deleteModel3dByIds(Long[] ids);
+
+    /**
+     * 删除3d模型信息
+     * 
+     * @param id 3d模型主键
+     * @return 结果
+     */
+    public int deleteModel3dById(Long id);
+
+    List getOption();
+}

+ 96 - 0
fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldInputServiceImpl.java

@@ -0,0 +1,96 @@
+package com.fidms.web.service.impl;
+
+import java.util.List;
+import com.fidms.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fidms.web.mapper.FlowFieldInputMapper;
+import com.fidms.web.domain.FlowFieldInput;
+import com.fidms.web.service.IFlowFieldInputService;
+
+/**
+ * 流场输入Service业务层处理
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@Service
+public class FlowFieldInputServiceImpl implements IFlowFieldInputService 
+{
+    @Autowired
+    private FlowFieldInputMapper flowFieldInputMapper;
+
+    /**
+     * 查询流场输入
+     * 
+     * @param id 流场输入主键
+     * @return 流场输入
+     */
+    @Override
+    public FlowFieldInput selectFlowFieldInputById(Long id)
+    {
+        return flowFieldInputMapper.selectFlowFieldInputById(id);
+    }
+
+    /**
+     * 查询流场输入列表
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 流场输入
+     */
+    @Override
+    public List<FlowFieldInput> selectFlowFieldInputList(FlowFieldInput flowFieldInput)
+    {
+        return flowFieldInputMapper.selectFlowFieldInputList(flowFieldInput);
+    }
+
+    /**
+     * 新增流场输入
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 结果
+     */
+    @Override
+    public int insertFlowFieldInput(FlowFieldInput flowFieldInput)
+    {
+        flowFieldInput.setCreateTime(DateUtils.getNowDate());
+        return flowFieldInputMapper.insertFlowFieldInput(flowFieldInput);
+    }
+
+    /**
+     * 修改流场输入
+     * 
+     * @param flowFieldInput 流场输入
+     * @return 结果
+     */
+    @Override
+    public int updateFlowFieldInput(FlowFieldInput flowFieldInput)
+    {
+        flowFieldInput.setUpdateTime(DateUtils.getNowDate());
+        return flowFieldInputMapper.updateFlowFieldInput(flowFieldInput);
+    }
+
+    /**
+     * 批量删除流场输入
+     * 
+     * @param ids 需要删除的流场输入主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFlowFieldInputByIds(Long[] ids)
+    {
+        return flowFieldInputMapper.deleteFlowFieldInputByIds(ids);
+    }
+
+    /**
+     * 删除流场输入信息
+     * 
+     * @param id 流场输入主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFlowFieldInputById(Long id)
+    {
+        return flowFieldInputMapper.deleteFlowFieldInputById(id);
+    }
+}

+ 96 - 0
fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldOutputServiceImpl.java

@@ -0,0 +1,96 @@
+package com.fidms.web.service.impl;
+
+import java.util.List;
+import com.fidms.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fidms.web.mapper.FlowFieldOutputMapper;
+import com.fidms.web.domain.FlowFieldOutput;
+import com.fidms.web.service.IFlowFieldOutputService;
+
+/**
+ * 流场输出Service业务层处理
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@Service
+public class FlowFieldOutputServiceImpl implements IFlowFieldOutputService 
+{
+    @Autowired
+    private FlowFieldOutputMapper flowFieldOutputMapper;
+
+    /**
+     * 查询流场输出
+     * 
+     * @param id 流场输出主键
+     * @return 流场输出
+     */
+    @Override
+    public FlowFieldOutput selectFlowFieldOutputById(Long id)
+    {
+        return flowFieldOutputMapper.selectFlowFieldOutputById(id);
+    }
+
+    /**
+     * 查询流场输出列表
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 流场输出
+     */
+    @Override
+    public List<FlowFieldOutput> selectFlowFieldOutputList(FlowFieldOutput flowFieldOutput)
+    {
+        return flowFieldOutputMapper.selectFlowFieldOutputList(flowFieldOutput);
+    }
+
+    /**
+     * 新增流场输出
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 结果
+     */
+    @Override
+    public int insertFlowFieldOutput(FlowFieldOutput flowFieldOutput)
+    {
+        flowFieldOutput.setCreateTime(DateUtils.getNowDate());
+        return flowFieldOutputMapper.insertFlowFieldOutput(flowFieldOutput);
+    }
+
+    /**
+     * 修改流场输出
+     * 
+     * @param flowFieldOutput 流场输出
+     * @return 结果
+     */
+    @Override
+    public int updateFlowFieldOutput(FlowFieldOutput flowFieldOutput)
+    {
+        flowFieldOutput.setUpdateTime(DateUtils.getNowDate());
+        return flowFieldOutputMapper.updateFlowFieldOutput(flowFieldOutput);
+    }
+
+    /**
+     * 批量删除流场输出
+     * 
+     * @param ids 需要删除的流场输出主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFlowFieldOutputByIds(Long[] ids)
+    {
+        return flowFieldOutputMapper.deleteFlowFieldOutputByIds(ids);
+    }
+
+    /**
+     * 删除流场输出信息
+     * 
+     * @param id 流场输出主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFlowFieldOutputById(Long id)
+    {
+        return flowFieldOutputMapper.deleteFlowFieldOutputById(id);
+    }
+}

+ 97 - 0
fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredInputServiceImpl.java

@@ -0,0 +1,97 @@
+package com.fidms.web.service.impl;
+
+import java.util.List;
+
+import com.fidms.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fidms.web.mapper.InfraredInputMapper;
+import com.fidms.web.domain.InfraredInput;
+import com.fidms.web.service.IInfraredInputService;
+
+/**
+ * 红外输入Service业务层处理
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@Service
+public class InfraredInputServiceImpl implements IInfraredInputService 
+{
+    @Autowired
+    private InfraredInputMapper infraredInputMapper;
+
+    /**
+     * 查询红外输入
+     * 
+     * @param id 红外输入主键
+     * @return 红外输入
+     */
+    @Override
+    public InfraredInput selectInfraredInputById(Long id)
+    {
+        return infraredInputMapper.selectInfraredInputById(id);
+    }
+
+    /**
+     * 查询红外输入列表
+     * 
+     * @param infraredInput 红外输入
+     * @return 红外输入
+     */
+    @Override
+    public List<InfraredInput> selectInfraredInputList(InfraredInput infraredInput)
+    {
+        return infraredInputMapper.selectInfraredInputList(infraredInput);
+    }
+
+    /**
+     * 新增红外输入
+     * 
+     * @param infraredInput 红外输入
+     * @return 结果
+     */
+    @Override
+    public int insertInfraredInput(InfraredInput infraredInput)
+    {
+        infraredInput.setCreateTime(DateUtils.getNowDate());
+        return infraredInputMapper.insertInfraredInput(infraredInput);
+    }
+
+    /**
+     * 修改红外输入
+     * 
+     * @param infraredInput 红外输入
+     * @return 结果
+     */
+    @Override
+    public int updateInfraredInput(InfraredInput infraredInput)
+    {
+        infraredInput.setUpdateTime(DateUtils.getNowDate());
+        return infraredInputMapper.updateInfraredInput(infraredInput);
+    }
+
+    /**
+     * 批量删除红外输入
+     * 
+     * @param ids 需要删除的红外输入主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInfraredInputByIds(Long[] ids)
+    {
+        return infraredInputMapper.deleteInfraredInputByIds(ids);
+    }
+
+    /**
+     * 删除红外输入信息
+     * 
+     * @param id 红外输入主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInfraredInputById(Long id)
+    {
+        return infraredInputMapper.deleteInfraredInputById(id);
+    }
+}

+ 96 - 0
fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredOutputServiceImpl.java

@@ -0,0 +1,96 @@
+package com.fidms.web.service.impl;
+
+import java.util.List;
+import com.fidms.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fidms.web.mapper.InfraredOutputMapper;
+import com.fidms.web.domain.InfraredOutput;
+import com.fidms.web.service.IInfraredOutputService;
+
+/**
+ * 红外输出Service业务层处理
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@Service
+public class InfraredOutputServiceImpl implements IInfraredOutputService 
+{
+    @Autowired
+    private InfraredOutputMapper infraredOutputMapper;
+
+    /**
+     * 查询红外输出
+     * 
+     * @param id 红外输出主键
+     * @return 红外输出
+     */
+    @Override
+    public InfraredOutput selectInfraredOutputById(Long id)
+    {
+        return infraredOutputMapper.selectInfraredOutputById(id);
+    }
+
+    /**
+     * 查询红外输出列表
+     * 
+     * @param infraredOutput 红外输出
+     * @return 红外输出
+     */
+    @Override
+    public List<InfraredOutput> selectInfraredOutputList(InfraredOutput infraredOutput)
+    {
+        return infraredOutputMapper.selectInfraredOutputList(infraredOutput);
+    }
+
+    /**
+     * 新增红外输出
+     * 
+     * @param infraredOutput 红外输出
+     * @return 结果
+     */
+    @Override
+    public int insertInfraredOutput(InfraredOutput infraredOutput)
+    {
+        infraredOutput.setCreateTime(DateUtils.getNowDate());
+        return infraredOutputMapper.insertInfraredOutput(infraredOutput);
+    }
+
+    /**
+     * 修改红外输出
+     * 
+     * @param infraredOutput 红外输出
+     * @return 结果
+     */
+    @Override
+    public int updateInfraredOutput(InfraredOutput infraredOutput)
+    {
+        infraredOutput.setUpdateTime(DateUtils.getNowDate());
+        return infraredOutputMapper.updateInfraredOutput(infraredOutput);
+    }
+
+    /**
+     * 批量删除红外输出
+     * 
+     * @param ids 需要删除的红外输出主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInfraredOutputByIds(Long[] ids)
+    {
+        return infraredOutputMapper.deleteInfraredOutputByIds(ids);
+    }
+
+    /**
+     * 删除红外输出信息
+     * 
+     * @param id 红外输出主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInfraredOutputById(Long id)
+    {
+        return infraredOutputMapper.deleteInfraredOutputById(id);
+    }
+}

+ 101 - 0
fidms-admin/src/main/java/com/fidms/web/service/impl/Model3dServiceImpl.java

@@ -0,0 +1,101 @@
+package com.fidms.web.service.impl;
+
+import java.util.List;
+import com.fidms.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fidms.web.mapper.Model3dMapper;
+import com.fidms.web.domain.Model3d;
+import com.fidms.web.service.IModel3dService;
+
+/**
+ * 3d模型Service业务层处理
+ * 
+ * @author Allen
+ * @date 2023-05-08
+ */
+@Service
+public class Model3dServiceImpl implements IModel3dService 
+{
+    @Autowired
+    private Model3dMapper model3dMapper;
+
+    /**
+     * 查询3d模型
+     * 
+     * @param id 3d模型主键
+     * @return 3d模型
+     */
+    @Override
+    public Model3d selectModel3dById(Long id)
+    {
+        return model3dMapper.selectModel3dById(id);
+    }
+
+    /**
+     * 查询3d模型列表
+     * 
+     * @param model3d 3d模型
+     * @return 3d模型
+     */
+    @Override
+    public List<Model3d> selectModel3dList(Model3d model3d)
+    {
+        return model3dMapper.selectModel3dList(model3d);
+    }
+
+    /**
+     * 新增3d模型
+     * 
+     * @param model3d 3d模型
+     * @return 结果
+     */
+    @Override
+    public int insertModel3d(Model3d model3d)
+    {
+        model3d.setCreateTime(DateUtils.getNowDate());
+        return model3dMapper.insertModel3d(model3d);
+    }
+
+    /**
+     * 修改3d模型
+     * 
+     * @param model3d 3d模型
+     * @return 结果
+     */
+    @Override
+    public int updateModel3d(Model3d model3d)
+    {
+        model3d.setUpdateTime(DateUtils.getNowDate());
+        return model3dMapper.updateModel3d(model3d);
+    }
+
+    /**
+     * 批量删除3d模型
+     * 
+     * @param ids 需要删除的3d模型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteModel3dByIds(Long[] ids)
+    {
+        return model3dMapper.deleteModel3dByIds(ids);
+    }
+
+    /**
+     * 删除3d模型信息
+     * 
+     * @param id 3d模型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteModel3dById(Long id)
+    {
+        return model3dMapper.deleteModel3dById(id);
+    }
+
+    @Override
+    public List getOption() {
+        return model3dMapper.getOption();
+    }
+}

+ 1 - 0
fidms-admin/src/main/resources/META-INF/spring-devtools.properties

@@ -0,0 +1 @@
+restart.include.json=/com.alibaba.fastjson.*.jar

+ 61 - 0
fidms-admin/src/main/resources/application-druid.yml

@@ -0,0 +1,61 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://124.71.193.202:3306/fidms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: Password1
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间,单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间,单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单,不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: fidms
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true

+ 131 - 0
fidms-admin/src/main/resources/application.yml

@@ -0,0 +1,131 @@
+# 项目相关配置
+fidms:
+  # 名称
+  name: fidms
+  # 版本
+  version: 3.8.5
+  # 版权年份
+  copyrightYear: 2023
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例( Windows配置D:/fidms/uploadPath,Linux配置 /home/fidms/uploadPath)
+  profile: C:/fidms/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口,默认为8080
+  port: 8080
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # 连接数满后的排队数,默认为100
+    accept-count: 1000
+    threads:
+      # tomcat最大线程数,默认为200
+      max: 800
+      # Tomcat启动初始化的线程数,默认值10
+      min-spare: 100
+
+# 日志配置
+logging:
+  level:
+    com.fidms: debug
+    org.springframework: warn
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间(默认10分钟)
+    lockTime: 10
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles: 
+    active: druid
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  # redis 配置
+  redis:
+    # 地址
+    host: localhost
+    # 端口,默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # 密码
+    password:
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-wait: -1ms
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期(默认30分钟)
+    expireTime: 30
+  
+# MyBatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.fidms.**.domain
+    # 配置mapper的扫描,找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper: 
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql 
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /dev-api
+
+# 防止XSS攻击
+xss: 
+  # 过滤开关
+  enabled: true
+  # 排除链接(多个用逗号分隔)
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*

+ 24 - 0
fidms-admin/src/main/resources/banner.txt

@@ -0,0 +1,24 @@
+Application Version: ${fidms.version}
+Spring Boot Version: ${spring-boot.version}
+////////////////////////////////////////////////////////////////////
+//                          _ooOoo_                               //
+//                         o8888888o                              //
+//                         88" . "88                              //
+//                         (| ^_^ |)                              //
+//                         O\  =  /O                              //
+//                      ____/`---'\____                           //
+//                    .'  \\|     |//  `.                         //
+//                   /  \\|||  :  |||//  \                        //
+//                  /  _||||| -:- |||||-  \                       //
+//                  |   | \\\  -  /// |   |                       //
+//                  | \_|  ''\---/''  |   |                       //
+//                  \  .-\__  `-`  ___/-. /                       //
+//                ___`. .'  /--.--\  `. . ___                     //
+//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
+//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
+//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
+//      ========`-.____`-.___\_____/___.-`____.-'========         //
+//                           `=---='                              //
+//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
+//             佛祖保佑       永不宕机      永无BUG               //
+////////////////////////////////////////////////////////////////////

+ 38 - 0
fidms-admin/src/main/resources/i18n/messages.properties

@@ -0,0 +1,38 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次,帐户锁定{1}分钟
+user.password.delete=对不起,您的账号已被删除
+user.blocked=用户已封禁,请联系管理员
+role.blocked=角色已封禁,请联系管理员
+login.blocked=很遗憾,访问IP已被列入系统黑名单
+user.logout.success=退出成功
+
+length.not.valid=长度必须在{min}到{max}个字符之间
+
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成,且必须以非数字开头
+user.password.not.valid=* 5-50个字符
+ 
+user.email.not.valid=邮箱格式错误
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出,请重新登录
+user.unknown.error=未知错误,请重新登录
+
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小!<br/>允许的文件最大大小是:{0}MB!
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+
+##权限
+no.permission=您没有数据的权限,请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限,请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限,请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限,请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限,请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限,请联系管理员添加权限 [{0}]

+ 93 - 0
fidms-admin/src/main/resources/logback.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="/home/fidms/logs" />
+    <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+	<!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+	
+	<!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-info.log</file>
+        <!-- 循环政策:基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<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">
+	    <file>${log.path}/sys-error.log</file>
+        <!-- 循环政策:基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作:接收(记录) -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作:拒绝(不记录) -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+	
+	<!-- 用户访问日志输出  -->
+    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/sys-user.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+	
+	<!-- 系统模块日志级别控制  -->
+	<logger name="com.fidms" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+	
+	<!--系统用户操作日志-->
+    <logger name="sys-user" level="info">
+        <appender-ref ref="sys-user"/>
+    </logger>
+</configuration> 

+ 185 - 0
fidms-admin/src/main/resources/mapper/data/FlowFieldInputMapper.xml

@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fidms.web.mapper.FlowFieldInputMapper">
+    
+    <resultMap type="FlowFieldInput" id="FlowFieldInputResult">
+        <result property="id"    column="id"    />
+        <result property="model3dId"    column="model_3d_id"    />
+        <result property="model3dName"    column="model3dName"    />
+        <result property="machNumber"    column="mach_number"    />
+        <result property="flightHeight"    column="flight_height"    />
+        <result property="oxCoordinate"    column="ox_coordinate"    />
+        <result property="oyCoordinate"    column="oy_coordinate"    />
+        <result property="ozCoordinate"    column="oz_coordinate"    />
+        <result property="pressure"    column="pressure"    />
+        <result property="flowVelocity"    column="flow_velocity"    />
+        <result property="density"    column="density"    />
+        <result property="co2MassFraction"    column="co2_mass_fraction"    />
+        <result property="coMassFraction"    column="co_mass_fraction"    />
+        <result property="h2oMassFraction"    column="h2o_mass_fraction"    />
+        <result property="fluentGridFile"    column="fluent_grid_file"    />
+        <result property="fluentGridFilePath"    column="fluent_grid_file_path"    />
+        <result property="fluentCasFile"    column="fluent_cas_file"    />
+        <result property="fluentCasFilePath"    column="fluent_cas_file_path"    />
+        <result property="fluentDatFile"    column="fluent_dat_file"    />
+        <result property="fluentDatFilePath"    column="fluent_dat_file_path"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectFlowFieldInputVo">
+        SELECT
+            ffi.id,
+            ffi.model_3d_id,
+            m3.`name` model3dName,
+            ffi.mach_number,
+            ffi.flight_height,
+            ffi.ox_coordinate,
+            ffi.oy_coordinate,
+            ffi.oz_coordinate,
+            ffi.pressure,
+            ffi.flow_velocity,
+            ffi.density,
+            ffi.co2_mass_fraction,
+            ffi.co_mass_fraction,
+            ffi.h2o_mass_fraction,
+            ffi.fluent_grid_file,
+            ffi.fluent_grid_file_path,
+            ffi.fluent_cas_file,
+            ffi.fluent_cas_file_path,
+            ffi.fluent_dat_file,
+            ffi.fluent_dat_file_path,
+            ffi.create_by,
+            ffi.create_time,
+            ffi.update_by,
+            ffi.update_time
+        FROM
+            bz_flow_field_input_t ffi
+            LEFT JOIN bz_model_3d_t m3 ON ffi.model_3d_id = m3.id
+    </sql>
+
+    <select id="selectFlowFieldInputList" parameterType="FlowFieldInput" resultMap="FlowFieldInputResult">
+        <include refid="selectFlowFieldInputVo"/>
+        <where>  
+            <if test="model3dId != null "> and model_3d_id = #{model3dId}</if>
+            <if test="machNumber != null "> and mach_number = #{machNumber}</if>
+            <if test="flightHeight != null "> and flight_height = #{flightHeight}</if>
+            <if test="oxCoordinate != null "> and ox_coordinate = #{oxCoordinate}</if>
+            <if test="oyCoordinate != null "> and oy_coordinate = #{oyCoordinate}</if>
+            <if test="ozCoordinate != null "> and oz_coordinate = #{ozCoordinate}</if>
+            <if test="pressure != null "> and pressure = #{pressure}</if>
+            <if test="flowVelocity != null "> and flow_velocity = #{flowVelocity}</if>
+            <if test="density != null "> and density = #{density}</if>
+            <if test="co2MassFraction != null "> and co2_mass_fraction = #{co2MassFraction}</if>
+            <if test="coMassFraction != null "> and co_mass_fraction = #{coMassFraction}</if>
+            <if test="h2oMassFraction != null "> and h2o_mass_fraction = #{h2oMassFraction}</if>
+            <if test="fluentGridFile != null  and fluentGridFile != ''"> and fluent_grid_file = #{fluentGridFile}</if>
+            <if test="fluentGridFilePath != null  and fluentGridFilePath != ''"> and fluent_grid_file_path = #{fluentGridFilePath}</if>
+            <if test="fluentCasFile != null  and fluentCasFile != ''"> and fluent_cas_file = #{fluentCasFile}</if>
+            <if test="fluentCasFilePath != null  and fluentCasFilePath != ''"> and fluent_cas_file_path = #{fluentCasFilePath}</if>
+            <if test="fluentDatFile != null  and fluentDatFile != ''"> and fluent_dat_file = #{fluentDatFile}</if>
+            <if test="fluentDatFilePath != null  and fluentDatFilePath != ''"> and fluent_dat_file_path = #{fluentDatFilePath}</if>
+        </where>
+    </select>
+    
+    <select id="selectFlowFieldInputById" parameterType="Long" resultMap="FlowFieldInputResult">
+        <include refid="selectFlowFieldInputVo"/>
+        where ffi.id = #{id}
+    </select>
+        
+    <insert id="insertFlowFieldInput" parameterType="FlowFieldInput" useGeneratedKeys="true" keyProperty="id">
+        insert into bz_flow_field_input_t
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="model3dId != null">model_3d_id,</if>
+            <if test="machNumber != null">mach_number,</if>
+            <if test="flightHeight != null">flight_height,</if>
+            <if test="oxCoordinate != null">ox_coordinate,</if>
+            <if test="oyCoordinate != null">oy_coordinate,</if>
+            <if test="ozCoordinate != null">oz_coordinate,</if>
+            <if test="pressure != null">pressure,</if>
+            <if test="flowVelocity != null">flow_velocity,</if>
+            <if test="density != null">density,</if>
+            <if test="co2MassFraction != null">co2_mass_fraction,</if>
+            <if test="coMassFraction != null">co_mass_fraction,</if>
+            <if test="h2oMassFraction != null">h2o_mass_fraction,</if>
+            <if test="fluentGridFile != null and fluentGridFile != ''">fluent_grid_file,</if>
+            <if test="fluentGridFilePath != null and fluentGridFilePath != ''">fluent_grid_file_path,</if>
+            <if test="fluentCasFile != null and fluentCasFile != ''">fluent_cas_file,</if>
+            <if test="fluentCasFilePath != null and fluentCasFilePath != ''">fluent_cas_file_path,</if>
+            <if test="fluentDatFile != null and fluentDatFile != ''">fluent_dat_file,</if>
+            <if test="fluentDatFilePath != null and fluentDatFilePath != ''">fluent_dat_file_path,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="model3dId != null">#{model3dId},</if>
+            <if test="machNumber != null">#{machNumber},</if>
+            <if test="flightHeight != null">#{flightHeight},</if>
+            <if test="oxCoordinate != null">#{oxCoordinate},</if>
+            <if test="oyCoordinate != null">#{oyCoordinate},</if>
+            <if test="ozCoordinate != null">#{ozCoordinate},</if>
+            <if test="pressure != null">#{pressure},</if>
+            <if test="flowVelocity != null">#{flowVelocity},</if>
+            <if test="density != null">#{density},</if>
+            <if test="co2MassFraction != null">#{co2MassFraction},</if>
+            <if test="coMassFraction != null">#{coMassFraction},</if>
+            <if test="h2oMassFraction != null">#{h2oMassFraction},</if>
+            <if test="fluentGridFile != null and fluentGridFile != ''">#{fluentGridFile},</if>
+            <if test="fluentGridFilePath != null and fluentGridFilePath != ''">#{fluentGridFilePath},</if>
+            <if test="fluentCasFile != null and fluentCasFile != ''">#{fluentCasFile},</if>
+            <if test="fluentCasFilePath != null and fluentCasFilePath != ''">#{fluentCasFilePath},</if>
+            <if test="fluentDatFile != null and fluentDatFile != ''">#{fluentDatFile},</if>
+            <if test="fluentDatFilePath != null and fluentDatFilePath != ''">#{fluentDatFilePath},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFlowFieldInput" parameterType="FlowFieldInput">
+        update bz_flow_field_input_t
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="model3dId != null">model_3d_id = #{model3dId},</if>
+            <if test="machNumber != null">mach_number = #{machNumber},</if>
+            <if test="flightHeight != null">flight_height = #{flightHeight},</if>
+            <if test="oxCoordinate != null">ox_coordinate = #{oxCoordinate},</if>
+            <if test="oyCoordinate != null">oy_coordinate = #{oyCoordinate},</if>
+            <if test="ozCoordinate != null">oz_coordinate = #{ozCoordinate},</if>
+            <if test="pressure != null">pressure = #{pressure},</if>
+            <if test="flowVelocity != null">flow_velocity = #{flowVelocity},</if>
+            <if test="density != null">density = #{density},</if>
+            <if test="co2MassFraction != null">co2_mass_fraction = #{co2MassFraction},</if>
+            <if test="coMassFraction != null">co_mass_fraction = #{coMassFraction},</if>
+            <if test="h2oMassFraction != null">h2o_mass_fraction = #{h2oMassFraction},</if>
+            <if test="fluentGridFile != null and fluentGridFile != ''">fluent_grid_file = #{fluentGridFile},</if>
+            <if test="fluentGridFilePath != null and fluentGridFilePath != ''">fluent_grid_file_path = #{fluentGridFilePath},</if>
+            <if test="fluentCasFile != null and fluentCasFile != ''">fluent_cas_file = #{fluentCasFile},</if>
+            <if test="fluentCasFilePath != null and fluentCasFilePath != ''">fluent_cas_file_path = #{fluentCasFilePath},</if>
+            <if test="fluentDatFile != null and fluentDatFile != ''">fluent_dat_file = #{fluentDatFile},</if>
+            <if test="fluentDatFilePath != null and fluentDatFilePath != ''">fluent_dat_file_path = #{fluentDatFilePath},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFlowFieldInputById" parameterType="Long">
+        delete from bz_flow_field_input_t where id = #{id}
+    </delete>
+
+    <delete id="deleteFlowFieldInputByIds" parameterType="String">
+        delete from bz_flow_field_input_t where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 117 - 0
fidms-admin/src/main/resources/mapper/data/FlowFieldOutputMapper.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fidms.web.mapper.FlowFieldOutputMapper">
+    
+    <resultMap type="FlowFieldOutput" id="FlowFieldOutputResult">
+        <result property="id"    column="id"    />
+        <result property="outputFile"    column="output_file"    />
+        <result property="outputFilePath"    column="output_file_path"    />
+        <result property="softScreenShoot"    column="soft_screen_shoot"    />
+        <result property="softScreenShootPath"    column="soft_screen_shoot_path"    />
+        <result property="gridNumber"    column="grid_number"    />
+        <result property="isStructureGrid"    column="is_structure_grid"    />
+        <result property="temperature"    column="temperature"    />
+        <result property="co2"    column="co2"    />
+        <result property="co"    column="co"    />
+        <result property="h2o"    column="h2o"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectFlowFieldOutputVo">
+        select id, output_file, output_file_path, soft_screen_shoot, soft_screen_shoot_path, grid_number, is_structure_grid, temperature, co2, co, h2o, create_by, create_time, update_by, update_time from bz_flow_field_output_t
+    </sql>
+
+    <select id="selectFlowFieldOutputList" parameterType="FlowFieldOutput" resultMap="FlowFieldOutputResult">
+        <include refid="selectFlowFieldOutputVo"/>
+        <where>  
+            <if test="outputFile != null  and outputFile != ''"> and output_file = #{outputFile}</if>
+            <if test="outputFilePath != null  and outputFilePath != ''"> and output_file_path = #{outputFilePath}</if>
+            <if test="softScreenShoot != null  and softScreenShoot != ''"> and soft_screen_shoot = #{softScreenShoot}</if>
+            <if test="softScreenShootPath != null  and softScreenShootPath != ''"> and soft_screen_shoot_path = #{softScreenShootPath}</if>
+            <if test="gridNumber != null "> and grid_number = #{gridNumber}</if>
+            <if test="isStructureGrid != null "> and is_structure_grid = #{isStructureGrid}</if>
+            <if test="temperature != null "> and temperature = #{temperature}</if>
+            <if test="co2 != null "> and co2 = #{co2}</if>
+            <if test="co != null "> and co = #{co}</if>
+            <if test="h2o != null "> and h2o = #{h2o}</if>
+        </where>
+    </select>
+    
+    <select id="selectFlowFieldOutputById" parameterType="Long" resultMap="FlowFieldOutputResult">
+        <include refid="selectFlowFieldOutputVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFlowFieldOutput" parameterType="FlowFieldOutput" useGeneratedKeys="true" keyProperty="id">
+        insert into bz_flow_field_output_t
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="outputFile != null">output_file,</if>
+            <if test="outputFilePath != null">output_file_path,</if>
+            <if test="softScreenShoot != null">soft_screen_shoot,</if>
+            <if test="softScreenShootPath != null">soft_screen_shoot_path,</if>
+            <if test="gridNumber != null">grid_number,</if>
+            <if test="isStructureGrid != null">is_structure_grid,</if>
+            <if test="temperature != null">temperature,</if>
+            <if test="co2 != null">co2,</if>
+            <if test="co != null">co,</if>
+            <if test="h2o != null">h2o,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="outputFile != null">#{outputFile},</if>
+            <if test="outputFilePath != null">#{outputFilePath},</if>
+            <if test="softScreenShoot != null">#{softScreenShoot},</if>
+            <if test="softScreenShootPath != null">#{softScreenShootPath},</if>
+            <if test="gridNumber != null">#{gridNumber},</if>
+            <if test="isStructureGrid != null">#{isStructureGrid},</if>
+            <if test="temperature != null">#{temperature},</if>
+            <if test="co2 != null">#{co2},</if>
+            <if test="co != null">#{co},</if>
+            <if test="h2o != null">#{h2o},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFlowFieldOutput" parameterType="FlowFieldOutput">
+        update bz_flow_field_output_t
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="outputFile != null">output_file = #{outputFile},</if>
+            <if test="outputFilePath != null">output_file_path = #{outputFilePath},</if>
+            <if test="softScreenShoot != null">soft_screen_shoot = #{softScreenShoot},</if>
+            <if test="softScreenShootPath != null">soft_screen_shoot_path = #{softScreenShootPath},</if>
+            <if test="gridNumber != null">grid_number = #{gridNumber},</if>
+            <if test="isStructureGrid != null">is_structure_grid = #{isStructureGrid},</if>
+            <if test="temperature != null">temperature = #{temperature},</if>
+            <if test="co2 != null">co2 = #{co2},</if>
+            <if test="co != null">co = #{co},</if>
+            <if test="h2o != null">h2o = #{h2o},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFlowFieldOutputById" parameterType="Long">
+        delete from bz_flow_field_output_t where id = #{id}
+    </delete>
+
+    <delete id="deleteFlowFieldOutputByIds" parameterType="String">
+        delete from bz_flow_field_output_t where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 87 - 0
fidms-admin/src/main/resources/mapper/data/InfraredInputMapper.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fidms.web.mapper.InfraredInputMapper">
+    
+    <resultMap type="InfraredInput" id="InfraredInputResult">
+        <result property="id"    column="id"    />
+        <result property="flowFieldOutputId"    column="flow_field_output_id"    />
+        <result property="flowFieldOutputPath"    column="flow_field_output_path"    />
+        <result property="surfaceMaterial"    column="surface_material"    />
+        <result property="infraredObserDist"    column="infrared_obser_dist"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectInfraredInputVo">
+        select id, flow_field_output_id, flow_field_output_path, surface_material, infrared_obser_dist, create_by, create_time, update_by, update_time from bz_infrared_input_t
+    </sql>
+
+    <select id="selectInfraredInputList" parameterType="InfraredInput" resultMap="InfraredInputResult">
+        <include refid="selectInfraredInputVo"/>
+        <where>  
+            <if test="flowFieldOutputId != null "> and flow_field_output_id = #{flowFieldOutputId}</if>
+            <if test="flowFieldOutputPath != null "> and flow_field_output_path = #{flowFieldOutputPath}</if>
+            <if test="surfaceMaterial != null "> and surface_material = #{surfaceMaterial}</if>
+            <if test="infraredObserDist != null "> and infrared_obser_dist = #{infraredObserDist}</if>
+        </where>
+    </select>
+    
+    <select id="selectInfraredInputById" parameterType="Long" resultMap="InfraredInputResult">
+        <include refid="selectInfraredInputVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertInfraredInput" parameterType="InfraredInput" useGeneratedKeys="true" keyProperty="id">
+        insert into bz_infrared_input_t
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="flowFieldOutputId != null">flow_field_output_id,</if>
+            <if test="flowFieldOutputPath != null">flow_field_output_path,</if>
+            <if test="surfaceMaterial != null">surface_material,</if>
+            <if test="infraredObserDist != null">infrared_obser_dist,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="flowFieldOutputId != null">#{flowFieldOutputId},</if>
+            <if test="flowFieldOutputPath != null">#{flowFieldOutputPath},</if>
+            <if test="surfaceMaterial != null">#{surfaceMaterial},</if>
+            <if test="infraredObserDist != null">#{infraredObserDist},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInfraredInput" parameterType="InfraredInput">
+        update bz_infrared_input_t
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="flowFieldOutputId != null">flow_field_output_id = #{flowFieldOutputId},</if>
+            <if test="flowFieldOutputPath != null">flow_field_output_path = #{flowFieldOutputPath},</if>
+            <if test="surfaceMaterial != null">surface_material = #{surfaceMaterial},</if>
+            <if test="infraredObserDist != null">infrared_obser_dist = #{infraredObserDist},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteInfraredInputById" parameterType="Long">
+        delete from bz_infrared_input_t where id = #{id}
+    </delete>
+
+    <delete id="deleteInfraredInputByIds" parameterType="String">
+        delete from bz_infrared_input_t where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 82 - 0
fidms-admin/src/main/resources/mapper/data/InfraredOutputMapper.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fidms.web.mapper.InfraredOutputMapper">
+    
+    <resultMap type="InfraredOutput" id="InfraredOutputResult">
+        <result property="id"    column="id"    />
+        <result property="outputFile"    column="output_file"    />
+        <result property="outputFilePath"    column="output_file_path"    />
+        <result property="radiationIntensity"    column="radiation_intensity"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectInfraredOutputVo">
+        select id, output_file, output_file_path, radiation_intensity, create_by, create_time, update_by, update_time from bz_infrared_output_t
+    </sql>
+
+    <select id="selectInfraredOutputList" parameterType="InfraredOutput" resultMap="InfraredOutputResult">
+        <include refid="selectInfraredOutputVo"/>
+        <where>  
+            <if test="outputFile != null  and outputFile != ''"> and output_file = #{outputFile}</if>
+            <if test="outputFilePath != null  and outputFilePath != ''"> and output_file_path = #{outputFilePath}</if>
+            <if test="radiationIntensity != null "> and radiation_intensity = #{radiationIntensity}</if>
+        </where>
+    </select>
+    
+    <select id="selectInfraredOutputById" parameterType="Long" resultMap="InfraredOutputResult">
+        <include refid="selectInfraredOutputVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertInfraredOutput" parameterType="InfraredOutput" useGeneratedKeys="true" keyProperty="id">
+        insert into bz_infrared_output_t
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="outputFile != null">output_file,</if>
+            <if test="outputFilePath != null">output_file_path,</if>
+            <if test="radiationIntensity != null">radiation_intensity,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="outputFile != null">#{outputFile},</if>
+            <if test="outputFilePath != null">#{outputFilePath},</if>
+            <if test="radiationIntensity != null">#{radiationIntensity},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInfraredOutput" parameterType="InfraredOutput">
+        update bz_infrared_output_t
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="outputFile != null">output_file = #{outputFile},</if>
+            <if test="outputFilePath != null">output_file_path = #{outputFilePath},</if>
+            <if test="radiationIntensity != null">radiation_intensity = #{radiationIntensity},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteInfraredOutputById" parameterType="Long">
+        delete from bz_infrared_output_t where id = #{id}
+    </delete>
+
+    <delete id="deleteInfraredOutputByIds" parameterType="String">
+        delete from bz_infrared_output_t where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 86 - 0
fidms-admin/src/main/resources/mapper/data/Model3dMapper.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fidms.web.mapper.Model3dMapper">
+    
+    <resultMap type="Model3d" id="Model3dResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="model3dFile"    column="model_3d_file"    />
+        <result property="model3dFilePath"    column="model_3d_file_path"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectModel3dVo">
+        select id, name, model_3d_file, model_3d_file_path, create_by, create_time, update_by, update_time from bz_model_3d_t
+    </sql>
+
+    <select id="selectModel3dList" parameterType="Model3d" resultMap="Model3dResult">
+        <include refid="selectModel3dVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="model3dFile != null  and model3dFile != ''"> and model_3d_file = #{model3dFile}</if>
+            <if test="model3dFilePath != null  and model3dFilePath != ''"> and model_3d_file_path = #{model3dFilePath}</if>
+        </where>
+    </select>
+    
+    <select id="selectModel3dById" parameterType="Long" resultMap="Model3dResult">
+        <include refid="selectModel3dVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertModel3d" parameterType="Model3d" useGeneratedKeys="true" keyProperty="id">
+        insert into bz_model_3d_t
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">name,</if>
+            <if test="model3dFile != null and model3dFile != ''">model_3d_file,</if>
+            <if test="model3dFilePath != null and model3dFilePath != ''">model_3d_file_path,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="model3dFile != null and model3dFile != ''">#{model3dFile},</if>
+            <if test="model3dFilePath != null and model3dFilePath != ''">#{model3dFilePath},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateModel3d" parameterType="Model3d">
+        update bz_model_3d_t
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="model3dFile != null and model3dFile != ''">model_3d_file = #{model3dFile},</if>
+            <if test="model3dFilePath != null and model3dFilePath != ''">model_3d_file_path = #{model3dFilePath},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteModel3dById" parameterType="Long">
+        delete from bz_model_3d_t where id = #{id}
+    </delete>
+
+    <delete id="deleteModel3dByIds" parameterType="String">
+        delete from bz_model_3d_t where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getOption" resultType="Map">
+        select id, name from bz_model_3d_t order by id desc
+    </select>
+</mapper>

+ 20 - 0
fidms-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <!-- 全局参数 -->
+    <settings>
+        <!-- 使全局的映射器启用或禁用缓存 -->
+        <setting name="cacheEnabled"             value="true"   />
+        <!-- 允许JDBC 支持自动生成主键 -->
+        <setting name="useGeneratedKeys"         value="true"   />
+        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
+        <setting name="defaultExecutorType"      value="SIMPLE" />
+		<!-- 指定 MyBatis 所用日志的具体实现 -->
+        <setting name="logImpl"                  value="SLF4J"  />
+        <!-- 使用驼峰命名法转换字段 -->
+		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+	</settings>
+	
+</configuration>

+ 131 - 0
fidms-common/pom.xml

@@ -0,0 +1,131 @@
+<?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>fidms</artifactId>
+        <groupId>com.fidms</groupId>
+        <version>3.8.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>fidms-common</artifactId>
+
+    <description>
+        common通用工具
+    </description>
+
+    <dependencies>
+
+        <!-- Spring框架基本的核心工具 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+
+        <!-- SpringWeb模块 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <!-- spring security 安全认证 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <!-- pagehelper 分页插件 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <!--常用工具类 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+  
+        <!-- JSON工具类 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        
+        <!-- 动态数据源 -->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+			<version>3.5.2</version>
+		</dependency>
+
+        <!-- 阿里JSON解析器 -->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
+
+        <!-- io常用工具类 -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <!-- excel工具 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+
+        <!-- yml解析器 -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
+
+        <!-- Token生成与解析-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+
+        <!-- Jaxb -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+        <!-- redis 缓存操作 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <!-- pool 对象池 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+        <!-- 解析客户端操作系统、浏览器等 -->
+        <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+        </dependency>
+
+        <!-- servlet包 -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

+ 19 - 0
fidms-common/src/main/java/com/fidms/common/annotation/Anonymous.java

@@ -0,0 +1,19 @@
+package com.fidms.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 匿名访问不鉴权注解
+ * 
+ * @author Allen
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Anonymous
+{
+}

+ 33 - 0
fidms-common/src/main/java/com/fidms/common/annotation/DataScope.java

@@ -0,0 +1,33 @@
+package com.fidms.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 数据权限过滤注解
+ * 
+ * @author Allen
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataScope
+{
+    /**
+     * 部门表的别名
+     */
+    public String deptAlias() default "";
+
+    /**
+     * 用户表的别名
+     */
+    public String userAlias() default "";
+
+    /**
+     * 权限字符(用于多个角色匹配符合要求的权限)默认根据权限注解@ss获取,多个权限用逗号分隔开来
+     */
+    public String permission() default "";
+}

+ 28 - 0
fidms-common/src/main/java/com/fidms/common/annotation/DataSource.java

@@ -0,0 +1,28 @@
+package com.fidms.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import com.fidms.common.enums.DataSourceType;
+
+/**
+ * 自定义多数据源切换注解
+ *
+ * 优先级:先方法,后类,如果方法覆盖了类上的数据源类型,以方法的为准,否则以类上的为准
+ *
+ * @author Allen
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface DataSource
+{
+    /**
+     * 切换数据源名称
+     */
+    public DataSourceType value() default DataSourceType.MASTER;
+}

+ 187 - 0
fidms-common/src/main/java/com/fidms/common/annotation/Excel.java

@@ -0,0 +1,187 @@
+package com.fidms.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.math.BigDecimal;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import com.fidms.common.utils.poi.ExcelHandlerAdapter;
+
+/**
+ * 自定义导出Excel数据注解
+ * 
+ * @author Allen
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Excel
+{
+    /**
+     * 导出时在excel中排序
+     */
+    public int sort() default Integer.MAX_VALUE;
+
+    /**
+     * 导出到Excel中的名字.
+     */
+    public String name() default "";
+
+    /**
+     * 日期格式, 如: yyyy-MM-dd
+     */
+    public String dateFormat() default "";
+
+    /**
+     * 如果是字典类型,请设置字典的type值 (如: sys_user_sex)
+     */
+    public String dictType() default "";
+
+    /**
+     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
+     */
+    public String readConverterExp() default "";
+
+    /**
+     * 分隔符,读取字符串组内容
+     */
+    public String separator() default ",";
+
+    /**
+     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
+     */
+    public int scale() default -1;
+
+    /**
+     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
+     */
+    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+
+    /**
+     * 导出时在excel中每个列的高度 单位为字符
+     */
+    public double height() default 14;
+
+    /**
+     * 导出时在excel中每个列的宽 单位为字符
+     */
+    public double width() default 16;
+
+    /**
+     * 文字后缀,如% 90 变成90%
+     */
+    public String suffix() default "";
+
+    /**
+     * 当值为空时,字段的默认值
+     */
+    public String defaultValue() default "";
+
+    /**
+     * 提示信息
+     */
+    public String prompt() default "";
+
+    /**
+     * 设置只能选择不能输入的列内容.
+     */
+    public String[] combo() default {};
+
+    /**
+     * 是否需要纵向合并单元格,应对需求:含有list集合单元格)
+     */
+    public boolean needMerge() default false;
+
+    /**
+     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
+     */
+    public boolean isExport() default true;
+
+    /**
+     * 另一个类中的属性名称,支持多级获取,以小数点隔开
+     */
+    public String targetAttr() default "";
+
+    /**
+     * 是否自动统计数据,在最后追加一行统计数据总和
+     */
+    public boolean isStatistics() default false;
+
+    /**
+     * 导出类型(0数字 1字符串 2图片)
+     */
+    public ColumnType cellType() default ColumnType.STRING;
+
+    /**
+     * 导出列头背景色
+     */
+    public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
+
+    /**
+     * 导出列头字体颜色
+     */
+    public IndexedColors headerColor() default IndexedColors.WHITE;
+
+    /**
+     * 导出单元格背景色
+     */
+    public IndexedColors backgroundColor() default IndexedColors.WHITE;
+
+    /**
+     * 导出单元格字体颜色
+     */
+    public IndexedColors color() default IndexedColors.BLACK;
+
+    /**
+     * 导出字段对齐方式
+     */
+    public HorizontalAlignment align() default HorizontalAlignment.CENTER;
+
+    /**
+     * 自定义数据处理器
+     */
+    public Class<?> handler() default ExcelHandlerAdapter.class;
+
+    /**
+     * 自定义数据处理器参数
+     */
+    public String[] args() default {};
+
+    /**
+     * 字段类型(0:导出导入;1:仅导出;2:仅导入)
+     */
+    Type type() default Type.ALL;
+
+    public enum Type
+    {
+        ALL(0), EXPORT(1), IMPORT(2);
+        private final int value;
+
+        Type(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+
+    public enum ColumnType
+    {
+        NUMERIC(0), STRING(1), IMAGE(2);
+        private final int value;
+
+        ColumnType(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+}

+ 18 - 0
fidms-common/src/main/java/com/fidms/common/annotation/Excels.java

@@ -0,0 +1,18 @@
+package com.fidms.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Excel注解集
+ * 
+ * @author Allen
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Excels
+{
+    public Excel[] value();
+}

+ 51 - 0
fidms-common/src/main/java/com/fidms/common/annotation/Log.java

@@ -0,0 +1,51 @@
+package com.fidms.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.enums.OperatorType;
+
+/**
+ * 自定义操作日志记录注解
+ * 
+ * @author Allen
+ *
+ */
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Log
+{
+    /**
+     * 模块
+     */
+    public String title() default "";
+
+    /**
+     * 功能
+     */
+    public BusinessType businessType() default BusinessType.OTHER;
+
+    /**
+     * 操作人类别
+     */
+    public OperatorType operatorType() default OperatorType.MANAGE;
+
+    /**
+     * 是否保存请求的参数
+     */
+    public boolean isSaveRequestData() default true;
+
+    /**
+     * 是否保存响应的参数
+     */
+    public boolean isSaveResponseData() default true;
+
+    /**
+     * 排除指定的请求参数
+     */
+    public String[] excludeParamNames() default {};
+}

+ 40 - 0
fidms-common/src/main/java/com/fidms/common/annotation/RateLimiter.java

@@ -0,0 +1,40 @@
+package com.fidms.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import com.fidms.common.constant.CacheConstants;
+import com.fidms.common.enums.LimitType;
+
+/**
+ * 限流注解
+ * 
+ * @author Allen
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RateLimiter
+{
+    /**
+     * 限流key
+     */
+    public String key() default CacheConstants.RATE_LIMIT_KEY;
+
+    /**
+     * 限流时间,单位秒
+     */
+    public int time() default 60;
+
+    /**
+     * 限流次数
+     */
+    public int count() default 100;
+
+    /**
+     * 限流类型
+     */
+    public LimitType limitType() default LimitType.DEFAULT;
+}

+ 31 - 0
fidms-common/src/main/java/com/fidms/common/annotation/RepeatSubmit.java

@@ -0,0 +1,31 @@
+package com.fidms.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自定义注解防止表单重复提交
+ * 
+ * @author Allen
+ *
+ */
+@Inherited
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RepeatSubmit
+{
+    /**
+     * 间隔时间(ms),小于此时间视为重复提交
+     */
+    public int interval() default 5000;
+
+    /**
+     * 提示消息
+     */
+    public String message() default "不允许重复提交,请稍候再试";
+}

+ 135 - 0
fidms-common/src/main/java/com/fidms/common/config/FidmsConfig.java

@@ -0,0 +1,135 @@
+package com.fidms.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取项目相关配置
+ * 
+ * @author Allen
+ */
+@Component
+@ConfigurationProperties(prefix = "fidms")
+public class FidmsConfig
+{
+    /** 项目名称 */
+    private String name;
+
+    /** 版本 */
+    private String version;
+
+    /** 版权年份 */
+    private String copyrightYear;
+
+    /** 实例演示开关 */
+    private boolean demoEnabled;
+
+    /** 上传路径 */
+    private static String profile;
+
+    /** 获取地址开关 */
+    private static boolean addressEnabled;
+
+    /** 验证码类型 */
+    private static String captchaType;
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getVersion()
+    {
+        return version;
+    }
+
+    public void setVersion(String version)
+    {
+        this.version = version;
+    }
+
+    public String getCopyrightYear()
+    {
+        return copyrightYear;
+    }
+
+    public void setCopyrightYear(String copyrightYear)
+    {
+        this.copyrightYear = copyrightYear;
+    }
+
+    public boolean isDemoEnabled()
+    {
+        return demoEnabled;
+    }
+
+    public void setDemoEnabled(boolean demoEnabled)
+    {
+        this.demoEnabled = demoEnabled;
+    }
+
+    public static String getProfile()
+    {
+        return profile;
+    }
+
+    public void setProfile(String profile)
+    {
+        FidmsConfig.profile = profile;
+    }
+
+    public static boolean isAddressEnabled()
+    {
+        return addressEnabled;
+    }
+
+    public void setAddressEnabled(boolean addressEnabled)
+    {
+        FidmsConfig.addressEnabled = addressEnabled;
+    }
+
+    public static String getCaptchaType() {
+        return captchaType;
+    }
+
+    public void setCaptchaType(String captchaType) {
+        FidmsConfig.captchaType = captchaType;
+    }
+
+    /**
+     * 获取导入上传路径
+     */
+    public static String getImportPath()
+    {
+        return getProfile() + "/import";
+    }
+
+    /**
+     * 获取头像上传路径
+     */
+    public static String getAvatarPath()
+    {
+        return getProfile() + "/avatar";
+    }
+
+    /**
+     * 获取下载路径
+     */
+    public static String getDownloadPath()
+    {
+        return getProfile() + "/download";
+    }
+
+    /**
+     * 获取上传路径
+     */
+    public static String getUploadPath()
+    {
+        return getProfile() + "/upload";
+    }
+}

+ 44 - 0
fidms-common/src/main/java/com/fidms/common/constant/CacheConstants.java

@@ -0,0 +1,44 @@
+package com.fidms.common.constant;
+
+/**
+ * 缓存的key 常量
+ * 
+ * @author Allen
+ */
+public class CacheConstants
+{
+    /**
+     * 登录用户 redis key
+     */
+    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+
+    /**
+     * 验证码 redis key
+     */
+    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+
+    /**
+     * 参数管理 cache key
+     */
+    public static final String SYS_CONFIG_KEY = "sys_config:";
+
+    /**
+     * 字典管理 cache key
+     */
+    public static final String SYS_DICT_KEY = "sys_dict:";
+
+    /**
+     * 防重提交 redis key
+     */
+    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+
+    /**
+     * 限流 redis key
+     */
+    public static final String RATE_LIMIT_KEY = "rate_limit:";
+
+    /**
+     * 登录账户密码错误次数 redis key
+     */
+    public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+}

+ 142 - 0
fidms-common/src/main/java/com/fidms/common/constant/Constants.java

@@ -0,0 +1,142 @@
+package com.fidms.common.constant;
+
+import io.jsonwebtoken.Claims;
+
+/**
+ * 通用常量信息
+ * 
+ * @author Allen
+ */
+public class Constants
+{
+    /**
+     * UTF-8 字符集
+     */
+    public static final String UTF8 = "UTF-8";
+
+    /**
+     * GBK 字符集
+     */
+    public static final String GBK = "GBK";
+
+    /**
+     * www主域
+     */
+    public static final String WWW = "www.";
+
+    /**
+     * http请求
+     */
+    public static final String HTTP = "http://";
+
+    /**
+     * https请求
+     */
+    public static final String HTTPS = "https://";
+
+    /**
+     * 通用成功标识
+     */
+    public static final String SUCCESS = "0";
+
+    /**
+     * 通用失败标识
+     */
+    public static final String FAIL = "1";
+
+    /**
+     * 登录成功
+     */
+    public static final String LOGIN_SUCCESS = "Success";
+
+    /**
+     * 注销
+     */
+    public static final String LOGOUT = "Logout";
+
+    /**
+     * 注册
+     */
+    public static final String REGISTER = "Register";
+
+    /**
+     * 登录失败
+     */
+    public static final String LOGIN_FAIL = "Error";
+ 
+    /**
+     * 验证码有效期(分钟)
+     */
+    public static final Integer CAPTCHA_EXPIRATION = 2;
+
+    /**
+     * 令牌
+     */
+    public static final String TOKEN = "token";
+
+    /**
+     * 令牌前缀
+     */
+    public static final String TOKEN_PREFIX = "Bearer ";
+
+    /**
+     * 令牌前缀
+     */
+    public static final String LOGIN_USER_KEY = "login_user_key";
+
+    /**
+     * 用户ID
+     */
+    public static final String JWT_USERID = "userid";
+
+    /**
+     * 用户名称
+     */
+    public static final String JWT_USERNAME = Claims.SUBJECT;
+
+    /**
+     * 用户头像
+     */
+    public static final String JWT_AVATAR = "avatar";
+
+    /**
+     * 创建时间
+     */
+    public static final String JWT_CREATED = "created";
+
+    /**
+     * 用户权限
+     */
+    public static final String JWT_AUTHORITIES = "authorities";
+
+    /**
+     * 资源映射路径 前缀
+     */
+    public static final String RESOURCE_PREFIX = "/profile";
+
+    /**
+     * RMI 远程方法调用
+     */
+    public static final String LOOKUP_RMI = "rmi:";
+
+    /**
+     * LDAP 远程方法调用
+     */
+    public static final String LOOKUP_LDAP = "ldap:";
+
+    /**
+     * LDAPS 远程方法调用
+     */
+    public static final String LOOKUP_LDAPS = "ldaps:";
+
+    /**
+     * 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加)
+     */
+    public static final String[] JOB_WHITELIST_STR = { "com.fidms" };
+
+    /**
+     * 定时任务违规的字符
+     */
+    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
+            "org.springframework", "org.apache", "com.fidms.common.utils.file", "com.fidms.common.config" };
+}

+ 117 - 0
fidms-common/src/main/java/com/fidms/common/constant/GenConstants.java

@@ -0,0 +1,117 @@
+package com.fidms.common.constant;
+
+/**
+ * 代码生成通用常量
+ * 
+ * @author Allen
+ */
+public class GenConstants
+{
+    /** 单表(增删改查) */
+    public static final String TPL_CRUD = "crud";
+
+    /** 树表(增删改查) */
+    public static final String TPL_TREE = "tree";
+
+    /** 主子表(增删改查) */
+    public static final String TPL_SUB = "sub";
+
+    /** 树编码字段 */
+    public static final String TREE_CODE = "treeCode";
+
+    /** 树父编码字段 */
+    public static final String TREE_PARENT_CODE = "treeParentCode";
+
+    /** 树名称字段 */
+    public static final String TREE_NAME = "treeName";
+
+    /** 上级菜单ID字段 */
+    public static final String PARENT_MENU_ID = "parentMenuId";
+
+    /** 上级菜单名称字段 */
+    public static final String PARENT_MENU_NAME = "parentMenuName";
+
+    /** 数据库字符串类型 */
+    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+
+    /** 数据库文本类型 */
+    public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
+
+    /** 数据库时间类型 */
+    public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
+
+    /** 数据库数字类型 */
+    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
+            "bit", "bigint", "float", "double", "decimal" };
+
+    /** 页面不需要编辑字段 */
+    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
+
+    /** 页面不需要显示的列表字段 */
+    public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time" };
+
+    /** 页面不需要查询字段 */
+    public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark" };
+
+    /** Entity基类字段 */
+    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+
+    /** Tree基类字段 */
+    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };
+
+    /** 文本框 */
+    public static final String HTML_INPUT = "input";
+
+    /** 文本域 */
+    public static final String HTML_TEXTAREA = "textarea";
+
+    /** 下拉框 */
+    public static final String HTML_SELECT = "select";
+
+    /** 单选框 */
+    public static final String HTML_RADIO = "radio";
+
+    /** 复选框 */
+    public static final String HTML_CHECKBOX = "checkbox";
+
+    /** 日期控件 */
+    public static final String HTML_DATETIME = "datetime";
+
+    /** 图片上传控件 */
+    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+
+    /** 文件上传控件 */
+    public static final String HTML_FILE_UPLOAD = "fileUpload";
+
+    /** 富文本控件 */
+    public static final String HTML_EDITOR = "editor";
+
+    /** 字符串类型 */
+    public static final String TYPE_STRING = "String";
+
+    /** 整型 */
+    public static final String TYPE_INTEGER = "Integer";
+
+    /** 长整型 */
+    public static final String TYPE_LONG = "Long";
+
+    /** 浮点型 */
+    public static final String TYPE_DOUBLE = "Double";
+
+    /** 高精度计算类型 */
+    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+
+    /** 时间类型 */
+    public static final String TYPE_DATE = "Date";
+
+    /** 模糊查询 */
+    public static final String QUERY_LIKE = "LIKE";
+
+    /** 相等查询 */
+    public static final String QUERY_EQ = "EQ";
+
+    /** 需要 */
+    public static final String REQUIRE = "1";
+}

+ 94 - 0
fidms-common/src/main/java/com/fidms/common/constant/HttpStatus.java

@@ -0,0 +1,94 @@
+package com.fidms.common.constant;
+
+/**
+ * 返回状态码
+ * 
+ * @author Allen
+ */
+public class HttpStatus
+{
+    /**
+     * 操作成功
+     */
+    public static final int SUCCESS = 200;
+
+    /**
+     * 对象创建成功
+     */
+    public static final int CREATED = 201;
+
+    /**
+     * 请求已经被接受
+     */
+    public static final int ACCEPTED = 202;
+
+    /**
+     * 操作已经执行成功,但是没有返回数据
+     */
+    public static final int NO_CONTENT = 204;
+
+    /**
+     * 资源已被移除
+     */
+    public static final int MOVED_PERM = 301;
+
+    /**
+     * 重定向
+     */
+    public static final int SEE_OTHER = 303;
+
+    /**
+     * 资源没有被修改
+     */
+    public static final int NOT_MODIFIED = 304;
+
+    /**
+     * 参数列表错误(缺少,格式不匹配)
+     */
+    public static final int BAD_REQUEST = 400;
+
+    /**
+     * 未授权
+     */
+    public static final int UNAUTHORIZED = 401;
+
+    /**
+     * 访问受限,授权过期
+     */
+    public static final int FORBIDDEN = 403;
+
+    /**
+     * 资源,服务未找到
+     */
+    public static final int NOT_FOUND = 404;
+
+    /**
+     * 不允许的http方法
+     */
+    public static final int BAD_METHOD = 405;
+
+    /**
+     * 资源冲突,或者资源被锁
+     */
+    public static final int CONFLICT = 409;
+
+    /**
+     * 不支持的数据,媒体类型
+     */
+    public static final int UNSUPPORTED_TYPE = 415;
+
+    /**
+     * 系统内部错误
+     */
+    public static final int ERROR = 500;
+
+    /**
+     * 接口未实现
+     */
+    public static final int NOT_IMPLEMENTED = 501;
+
+    /**
+     * 系统警告消息
+     */
+    public static final int WARN = 601;
+}

+ 50 - 0
fidms-common/src/main/java/com/fidms/common/constant/ScheduleConstants.java

@@ -0,0 +1,50 @@
+package com.fidms.common.constant;
+
+/**
+ * 任务调度通用常量
+ * 
+ * @author Allen
+ */
+public class ScheduleConstants
+{
+    public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
+
+    /** 执行目标key */
+    public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
+
+    /** 默认 */
+    public static final String MISFIRE_DEFAULT = "0";
+
+    /** 立即触发执行 */
+    public static final String MISFIRE_IGNORE_MISFIRES = "1";
+
+    /** 触发一次执行 */
+    public static final String MISFIRE_FIRE_AND_PROCEED = "2";
+
+    /** 不触发立即执行 */
+    public static final String MISFIRE_DO_NOTHING = "3";
+
+    public enum Status
+    {
+        /**
+         * 正常
+         */
+        NORMAL("0"),
+        /**
+         * 暂停
+         */
+        PAUSE("1");
+
+        private String value;
+
+        private Status(String value)
+        {
+            this.value = value;
+        }
+
+        public String getValue()
+        {
+            return value;
+        }
+    }
+}

+ 78 - 0
fidms-common/src/main/java/com/fidms/common/constant/UserConstants.java

@@ -0,0 +1,78 @@
+package com.fidms.common.constant;
+
+/**
+ * 用户常量信息
+ * 
+ * @author Allen
+ */
+public class UserConstants
+{
+    /**
+     * 平台内系统用户的唯一标志
+     */
+    public static final String SYS_USER = "SYS_USER";
+
+    /** 正常状态 */
+    public static final String NORMAL = "0";
+
+    /** 异常状态 */
+    public static final String EXCEPTION = "1";
+
+    /** 用户封禁状态 */
+    public static final String USER_DISABLE = "1";
+
+    /** 角色封禁状态 */
+    public static final String ROLE_DISABLE = "1";
+
+    /** 部门正常状态 */
+    public static final String DEPT_NORMAL = "0";
+
+    /** 部门停用状态 */
+    public static final String DEPT_DISABLE = "1";
+
+    /** 字典正常状态 */
+    public static final String DICT_NORMAL = "0";
+
+    /** 是否为系统默认(是) */
+    public static final String YES = "Y";
+
+    /** 是否菜单外链(是) */
+    public static final String YES_FRAME = "0";
+
+    /** 是否菜单外链(否) */
+    public static final String NO_FRAME = "1";
+
+    /** 菜单类型(目录) */
+    public static final String TYPE_DIR = "M";
+
+    /** 菜单类型(菜单) */
+    public static final String TYPE_MENU = "C";
+
+    /** 菜单类型(按钮) */
+    public static final String TYPE_BUTTON = "F";
+
+    /** Layout组件标识 */
+    public final static String LAYOUT = "Layout";
+    
+    /** ParentView组件标识 */
+    public final static String PARENT_VIEW = "ParentView";
+
+    /** InnerLink组件标识 */
+    public final static String INNER_LINK = "InnerLink";
+
+    /** 校验是否唯一的返回标识 */
+    public final static boolean UNIQUE = true;
+    public final static boolean NOT_UNIQUE = false;
+
+    /**
+     * 用户名长度限制
+     */
+    public static final int USERNAME_MIN_LENGTH = 2;
+    public static final int USERNAME_MAX_LENGTH = 20;
+
+    /**
+     * 密码长度限制
+     */
+    public static final int PASSWORD_MIN_LENGTH = 5;
+    public static final int PASSWORD_MAX_LENGTH = 20;
+}

+ 202 - 0
fidms-common/src/main/java/com/fidms/common/core/controller/BaseController.java

@@ -0,0 +1,202 @@
+package com.fidms.common.core.controller;
+
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.fidms.common.constant.HttpStatus;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.core.domain.model.LoginUser;
+import com.fidms.common.core.page.PageDomain;
+import com.fidms.common.core.page.TableDataInfo;
+import com.fidms.common.core.page.TableSupport;
+import com.fidms.common.utils.DateUtils;
+import com.fidms.common.utils.PageUtils;
+import com.fidms.common.utils.SecurityUtils;
+import com.fidms.common.utils.StringUtils;
+import com.fidms.common.utils.sql.SqlUtil;
+
+/**
+ * web层通用数据处理
+ * 
+ * @author Allen
+ */
+public class BaseController
+{
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * 将前台传递过来的日期格式的字符串,自动转化为Date类型
+     */
+    @InitBinder
+    public void initBinder(WebDataBinder binder)
+    {
+        // Date 类型转换
+        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
+        {
+            @Override
+            public void setAsText(String text)
+            {
+                setValue(DateUtils.parseDate(text));
+            }
+        });
+    }
+
+    /**
+     * 设置请求分页数据
+     */
+    protected void startPage()
+    {
+        PageUtils.startPage();
+    }
+
+    /**
+     * 设置请求排序数据
+     */
+    protected void startOrderBy()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.orderBy(orderBy);
+        }
+    }
+
+    /**
+     * 清理分页的线程变量
+     */
+    protected void clearPage()
+    {
+        PageUtils.clearPage();
+    }
+
+    /**
+     * 响应请求分页数据
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected TableDataInfo getDataTable(List<?> list)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
+
+    /**
+     * 返回成功
+     */
+    public AjaxResult success()
+    {
+        return AjaxResult.success();
+    }
+
+    /**
+     * 返回失败消息
+     */
+    public AjaxResult error()
+    {
+        return AjaxResult.error();
+    }
+
+    /**
+     * 返回成功消息
+     */
+    public AjaxResult success(String message)
+    {
+        return AjaxResult.success(message);
+    }
+    
+    /**
+     * 返回成功消息
+     */
+    public AjaxResult success(Object data)
+    {
+        return AjaxResult.success(data);
+    }
+
+    /**
+     * 返回失败消息
+     */
+    public AjaxResult error(String message)
+    {
+        return AjaxResult.error(message);
+    }
+
+    /**
+     * 返回警告消息
+     */
+    public AjaxResult warn(String message)
+    {
+        return AjaxResult.warn(message);
+    }
+
+    /**
+     * 响应返回结果
+     * 
+     * @param rows 影响行数
+     * @return 操作结果
+     */
+    protected AjaxResult toAjax(int rows)
+    {
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 响应返回结果
+     * 
+     * @param result 结果
+     * @return 操作结果
+     */
+    protected AjaxResult toAjax(boolean result)
+    {
+        return result ? success() : error();
+    }
+
+    /**
+     * 页面跳转
+     */
+    public String redirect(String url)
+    {
+        return StringUtils.format("redirect:{}", url);
+    }
+
+    /**
+     * 获取用户缓存信息
+     */
+    public LoginUser getLoginUser()
+    {
+        return SecurityUtils.getLoginUser();
+    }
+
+    /**
+     * 获取登录用户id
+     */
+    public Long getUserId()
+    {
+        return getLoginUser().getUserId();
+    }
+
+    /**
+     * 获取登录部门id
+     */
+    public Long getDeptId()
+    {
+        return getLoginUser().getDeptId();
+    }
+
+    /**
+     * 获取登录用户名
+     */
+    public String getUsername()
+    {
+        return getLoginUser().getUsername();
+    }
+}

+ 185 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/AjaxResult.java

@@ -0,0 +1,185 @@
+package com.fidms.common.core.domain;
+
+import java.util.HashMap;
+import com.fidms.common.constant.HttpStatus;
+import com.fidms.common.utils.StringUtils;
+
+/**
+ * 操作消息提醒
+ * 
+ * @author Allen
+ */
+public class AjaxResult extends HashMap<String, Object>
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 状态码 */
+    public static final String CODE_TAG = "code";
+
+    /** 返回内容 */
+    public static final String MSG_TAG = "msg";
+
+    /** 数据对象 */
+    public static final String DATA_TAG = "data";
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象,使其表示一个空消息。
+     */
+    public AjaxResult()
+    {
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     * 
+     * @param code 状态码
+     * @param msg 返回内容
+     */
+    public AjaxResult(int code, String msg)
+    {
+        super.put(CODE_TAG, code);
+        super.put(MSG_TAG, msg);
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     * 
+     * @param code 状态码
+     * @param msg 返回内容
+     * @param data 数据对象
+     */
+    public AjaxResult(int code, String msg, Object data)
+    {
+        super.put(CODE_TAG, code);
+        super.put(MSG_TAG, msg);
+        if (StringUtils.isNotNull(data))
+        {
+            super.put(DATA_TAG, data);
+        }
+    }
+
+    /**
+     * 返回成功消息
+     * 
+     * @return 成功消息
+     */
+    public static AjaxResult success()
+    {
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 返回成功数据
+     * 
+     * @return 成功消息
+     */
+    public static AjaxResult success(Object data)
+    {
+        return AjaxResult.success("操作成功", data);
+    }
+
+    /**
+     * 返回成功消息
+     * 
+     * @param msg 返回内容
+     * @return 成功消息
+     */
+    public static AjaxResult success(String msg)
+    {
+        return AjaxResult.success(msg, null);
+    }
+
+    /**
+     * 返回成功消息
+     * 
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 成功消息
+     */
+    public static AjaxResult success(String msg, Object data)
+    {
+        return new AjaxResult(HttpStatus.SUCCESS, msg, data);
+    }
+
+    /**
+     * 返回警告消息
+     *
+     * @param msg 返回内容
+     * @return 警告消息
+     */
+    public static AjaxResult warn(String msg)
+    {
+        return AjaxResult.warn(msg, null);
+    }
+
+    /**
+     * 返回警告消息
+     *
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 警告消息
+     */
+    public static AjaxResult warn(String msg, Object data)
+    {
+        return new AjaxResult(HttpStatus.WARN, msg, data);
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @return 错误消息
+     */
+    public static AjaxResult error()
+    {
+        return AjaxResult.error("操作失败");
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @param msg 返回内容
+     * @return 错误消息
+     */
+    public static AjaxResult error(String msg)
+    {
+        return AjaxResult.error(msg, null);
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 错误消息
+     */
+    public static AjaxResult error(String msg, Object data)
+    {
+        return new AjaxResult(HttpStatus.ERROR, msg, data);
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @param code 状态码
+     * @param msg 返回内容
+     * @return 错误消息
+     */
+    public static AjaxResult error(int code, String msg)
+    {
+        return new AjaxResult(code, msg, null);
+    }
+
+    /**
+     * 方便链式调用
+     *
+     * @param key 键
+     * @param value 值
+     * @return 数据对象
+     */
+    @Override
+    public AjaxResult put(String key, Object value)
+    {
+        super.put(key, value);
+        return this;
+    }
+}

+ 118 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/BaseEntity.java

@@ -0,0 +1,118 @@
+package com.fidms.common.core.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * Entity基类
+ * 
+ * @author Allen
+ */
+public class BaseEntity implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 搜索值 */
+    @JsonIgnore
+    private String searchValue;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    private String remark;
+
+    /** 请求参数 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, Object> params;
+
+    public String getSearchValue()
+    {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue)
+    {
+        this.searchValue = searchValue;
+    }
+
+    public String getCreateBy()
+    {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy)
+    {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime()
+    {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime)
+    {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy()
+    {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy)
+    {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime()
+    {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime)
+    {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params)
+    {
+        this.params = params;
+    }
+}

+ 115 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/R.java

@@ -0,0 +1,115 @@
+package com.fidms.common.core.domain;
+
+import java.io.Serializable;
+import com.fidms.common.constant.HttpStatus;
+
+/**
+ * 响应信息主体
+ *
+ * @author Allen
+ */
+public class R<T> implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 成功 */
+    public static final int SUCCESS = HttpStatus.SUCCESS;
+
+    /** 失败 */
+    public static final int FAIL = HttpStatus.ERROR;
+
+    private int code;
+
+    private String msg;
+
+    private T data;
+
+    public static <T> R<T> ok()
+    {
+        return restResult(null, SUCCESS, "操作成功");
+    }
+
+    public static <T> R<T> ok(T data)
+    {
+        return restResult(data, SUCCESS, "操作成功");
+    }
+
+    public static <T> R<T> ok(T data, String msg)
+    {
+        return restResult(data, SUCCESS, msg);
+    }
+
+    public static <T> R<T> fail()
+    {
+        return restResult(null, FAIL, "操作失败");
+    }
+
+    public static <T> R<T> fail(String msg)
+    {
+        return restResult(null, FAIL, msg);
+    }
+
+    public static <T> R<T> fail(T data)
+    {
+        return restResult(data, FAIL, "操作失败");
+    }
+
+    public static <T> R<T> fail(T data, String msg)
+    {
+        return restResult(data, FAIL, msg);
+    }
+
+    public static <T> R<T> fail(int code, String msg)
+    {
+        return restResult(null, code, msg);
+    }
+
+    private static <T> R<T> restResult(T data, int code, String msg)
+    {
+        R<T> apiResult = new R<>();
+        apiResult.setCode(code);
+        apiResult.setData(data);
+        apiResult.setMsg(msg);
+        return apiResult;
+    }
+
+    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;
+    }
+
+    public T getData()
+    {
+        return data;
+    }
+
+    public void setData(T data)
+    {
+        this.data = data;
+    }
+
+    public static <T> Boolean isError(R<T> ret)
+    {
+        return !isSuccess(ret);
+    }
+
+    public static <T> Boolean isSuccess(R<T> ret)
+    {
+        return R.SUCCESS == ret.getCode();
+    }
+}

+ 79 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/TreeEntity.java

@@ -0,0 +1,79 @@
+package com.fidms.common.core.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tree基类
+ * 
+ * @author Allen
+ */
+public class TreeEntity extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 父菜单名称 */
+    private String parentName;
+
+    /** 父菜单ID */
+    private Long parentId;
+
+    /** 显示顺序 */
+    private Integer orderNum;
+
+    /** 祖级列表 */
+    private String ancestors;
+
+    /** 子部门 */
+    private List<?> children = new ArrayList<>();
+
+    public String getParentName()
+    {
+        return parentName;
+    }
+
+    public void setParentName(String parentName)
+    {
+        this.parentName = parentName;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public Integer getOrderNum()
+    {
+        return orderNum;
+    }
+
+    public void setOrderNum(Integer orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+
+    public String getAncestors()
+    {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors)
+    {
+        this.ancestors = ancestors;
+    }
+
+    public List<?> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<?> children)
+    {
+        this.children = children;
+    }
+}

+ 77 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/TreeSelect.java

@@ -0,0 +1,77 @@
+package com.fidms.common.core.domain;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fidms.common.core.domain.entity.SysDept;
+import com.fidms.common.core.domain.entity.SysMenu;
+
+/**
+ * Treeselect树结构实体类
+ * 
+ * @author Allen
+ */
+public class TreeSelect implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeSelect> children;
+
+    public TreeSelect()
+    {
+
+    }
+
+    public TreeSelect(SysDept dept)
+    {
+        this.id = dept.getDeptId();
+        this.label = dept.getDeptName();
+        this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+    public TreeSelect(SysMenu menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public void setLabel(String label)
+    {
+        this.label = label;
+    }
+
+    public List<TreeSelect> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<TreeSelect> children)
+    {
+        this.children = children;
+    }
+}

+ 203 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysDept.java

@@ -0,0 +1,203 @@
+package com.fidms.common.core.domain.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fidms.common.core.domain.BaseEntity;
+
+/**
+ * 部门表 sys_dept
+ * 
+ * @author Allen
+ */
+public class SysDept extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 父部门ID */
+    private Long parentId;
+
+    /** 祖级列表 */
+    private String ancestors;
+
+    /** 部门名称 */
+    private String deptName;
+
+    /** 显示顺序 */
+    private Integer orderNum;
+
+    /** 负责人 */
+    private String leader;
+
+    /** 联系电话 */
+    private String phone;
+
+    /** 邮箱 */
+    private String email;
+
+    /** 部门状态:0正常,1停用 */
+    private String status;
+
+    /** 删除标志(0代表存在 2代表删除) */
+    private String delFlag;
+
+    /** 父部门名称 */
+    private String parentName;
+    
+    /** 子部门 */
+    private List<SysDept> children = new ArrayList<SysDept>();
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public String getAncestors()
+    {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors)
+    {
+        this.ancestors = ancestors;
+    }
+
+    @NotBlank(message = "部门名称不能为空")
+    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    @NotNull(message = "显示顺序不能为空")
+    public Integer getOrderNum()
+    {
+        return orderNum;
+    }
+
+    public void setOrderNum(Integer orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+
+    public String getLeader()
+    {
+        return leader;
+    }
+
+    public void setLeader(String leader)
+    {
+        this.leader = leader;
+    }
+
+    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
+    public String getPhone()
+    {
+        return phone;
+    }
+
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    public void setEmail(String email)
+    {
+        this.email = email;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getParentName()
+    {
+        return parentName;
+    }
+
+    public void setParentName(String parentName)
+    {
+        this.parentName = parentName;
+    }
+
+    public List<SysDept> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<SysDept> children)
+    {
+        this.children = children;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deptId", getDeptId())
+            .append("parentId", getParentId())
+            .append("ancestors", getAncestors())
+            .append("deptName", getDeptName())
+            .append("orderNum", getOrderNum())
+            .append("leader", getLeader())
+            .append("phone", getPhone())
+            .append("email", getEmail())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 176 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysDictData.java

@@ -0,0 +1,176 @@
+package com.fidms.common.core.domain.entity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.annotation.Excel.ColumnType;
+import com.fidms.common.constant.UserConstants;
+import com.fidms.common.core.domain.BaseEntity;
+
+/**
+ * 字典数据表 sys_dict_data
+ * 
+ * @author Allen
+ */
+public class SysDictData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典编码 */
+    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+    private Long dictCode;
+
+    /** 字典排序 */
+    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+    private Long dictSort;
+
+    /** 字典标签 */
+    @Excel(name = "字典标签")
+    private String dictLabel;
+
+    /** 字典键值 */
+    @Excel(name = "字典键值")
+    private String dictValue;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    private String dictType;
+
+    /** 样式属性(其他样式扩展) */
+    private String cssClass;
+
+    /** 表格字典样式 */
+    private String listClass;
+
+    /** 是否默认(Y是 N否) */
+    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+    private String isDefault;
+
+    /** 状态(0正常 1停用) */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    public Long getDictCode()
+    {
+        return dictCode;
+    }
+
+    public void setDictCode(Long dictCode)
+    {
+        this.dictCode = dictCode;
+    }
+
+    public Long getDictSort()
+    {
+        return dictSort;
+    }
+
+    public void setDictSort(Long dictSort)
+    {
+        this.dictSort = dictSort;
+    }
+
+    @NotBlank(message = "字典标签不能为空")
+    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+    public String getDictLabel()
+    {
+        return dictLabel;
+    }
+
+    public void setDictLabel(String dictLabel)
+    {
+        this.dictLabel = dictLabel;
+    }
+
+    @NotBlank(message = "字典键值不能为空")
+    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+    public String getDictValue()
+    {
+        return dictValue;
+    }
+
+    public void setDictValue(String dictValue)
+    {
+        this.dictValue = dictValue;
+    }
+
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+    public String getDictType()
+    {
+        return dictType;
+    }
+
+    public void setDictType(String dictType)
+    {
+        this.dictType = dictType;
+    }
+
+    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+    public String getCssClass()
+    {
+        return cssClass;
+    }
+
+    public void setCssClass(String cssClass)
+    {
+        this.cssClass = cssClass;
+    }
+
+    public String getListClass()
+    {
+        return listClass;
+    }
+
+    public void setListClass(String listClass)
+    {
+        this.listClass = listClass;
+    }
+
+    public boolean getDefault()
+    {
+        return UserConstants.YES.equals(this.isDefault);
+    }
+
+    public String getIsDefault()
+    {
+        return isDefault;
+    }
+
+    public void setIsDefault(String isDefault)
+    {
+        this.isDefault = isDefault;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("dictCode", getDictCode())
+            .append("dictSort", getDictSort())
+            .append("dictLabel", getDictLabel())
+            .append("dictValue", getDictValue())
+            .append("dictType", getDictType())
+            .append("cssClass", getCssClass())
+            .append("listClass", getListClass())
+            .append("isDefault", getIsDefault())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 96 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysDictType.java

@@ -0,0 +1,96 @@
+package com.fidms.common.core.domain.entity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.annotation.Excel.ColumnType;
+import com.fidms.common.core.domain.BaseEntity;
+
+/**
+ * 字典类型表 sys_dict_type
+ * 
+ * @author Allen
+ */
+public class SysDictType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典主键 */
+    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+    private Long dictId;
+
+    /** 字典名称 */
+    @Excel(name = "字典名称")
+    private String dictName;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    private String dictType;
+
+    /** 状态(0正常 1停用) */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    public Long getDictId()
+    {
+        return dictId;
+    }
+
+    public void setDictId(Long dictId)
+    {
+        this.dictId = dictId;
+    }
+
+    @NotBlank(message = "字典名称不能为空")
+    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
+    public String getDictName()
+    {
+        return dictName;
+    }
+
+    public void setDictName(String dictName)
+    {
+        this.dictName = dictName;
+    }
+
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头,且只能为(小写字母,数字,下滑线)")
+    public String getDictType()
+    {
+        return dictType;
+    }
+
+    public void setDictType(String dictType)
+    {
+        this.dictType = dictType;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("dictId", getDictId())
+            .append("dictName", getDictName())
+            .append("dictType", getDictType())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 259 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysMenu.java

@@ -0,0 +1,259 @@
+package com.fidms.common.core.domain.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fidms.common.core.domain.BaseEntity;
+
+/**
+ * 菜单权限表 sys_menu
+ * 
+ * @author Allen
+ */
+public class SysMenu extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 菜单ID */
+    private Long menuId;
+
+    /** 菜单名称 */
+    private String menuName;
+
+    /** 父菜单名称 */
+    private String parentName;
+
+    /** 父菜单ID */
+    private Long parentId;
+
+    /** 显示顺序 */
+    private Integer orderNum;
+
+    /** 路由地址 */
+    private String path;
+
+    /** 组件路径 */
+    private String component;
+
+    /** 路由参数 */
+    private String query;
+
+    /** 是否为外链(0是 1否) */
+    private String isFrame;
+
+    /** 是否缓存(0缓存 1不缓存) */
+    private String isCache;
+
+    /** 类型(M目录 C菜单 F按钮) */
+    private String menuType;
+
+    /** 显示状态(0显示 1隐藏) */
+    private String visible;
+    
+    /** 菜单状态(0正常 1停用) */
+    private String status;
+
+    /** 权限字符串 */
+    private String perms;
+
+    /** 菜单图标 */
+    private String icon;
+
+    /** 子菜单 */
+    private List<SysMenu> children = new ArrayList<SysMenu>();
+
+    public Long getMenuId()
+    {
+        return menuId;
+    }
+
+    public void setMenuId(Long menuId)
+    {
+        this.menuId = menuId;
+    }
+
+    @NotBlank(message = "菜单名称不能为空")
+    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
+    public String getMenuName()
+    {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName)
+    {
+        this.menuName = menuName;
+    }
+
+    public String getParentName()
+    {
+        return parentName;
+    }
+
+    public void setParentName(String parentName)
+    {
+        this.parentName = parentName;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    @NotNull(message = "显示顺序不能为空")
+    public Integer getOrderNum()
+    {
+        return orderNum;
+    }
+
+    public void setOrderNum(Integer orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+
+    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
+    public String getPath()
+    {
+        return path;
+    }
+
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
+    public String getComponent()
+    {
+        return component;
+    }
+
+    public void setComponent(String component)
+    {
+        this.component = component;
+    }
+
+    public String getQuery()
+    {
+        return query;
+    }
+
+    public void setQuery(String query)
+    {
+        this.query = query;
+    }
+
+    public String getIsFrame()
+    {
+        return isFrame;
+    }
+
+    public void setIsFrame(String isFrame)
+    {
+        this.isFrame = isFrame;
+    }
+
+    public String getIsCache()
+    {
+        return isCache;
+    }
+
+    public void setIsCache(String isCache)
+    {
+        this.isCache = isCache;
+    }
+
+    @NotBlank(message = "菜单类型不能为空")
+    public String getMenuType()
+    {
+        return menuType;
+    }
+
+    public void setMenuType(String menuType)
+    {
+        this.menuType = menuType;
+    }
+
+    public String getVisible()
+    {
+        return visible;
+    }
+
+    public void setVisible(String visible)
+    {
+        this.visible = visible;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
+    public String getPerms()
+    {
+        return perms;
+    }
+
+    public void setPerms(String perms)
+    {
+        this.perms = perms;
+    }
+
+    public String getIcon()
+    {
+        return icon;
+    }
+
+    public void setIcon(String icon)
+    {
+        this.icon = icon;
+    }
+
+    public List<SysMenu> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<SysMenu> children)
+    {
+        this.children = children;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("menuId", getMenuId())
+            .append("menuName", getMenuName())
+            .append("parentId", getParentId())
+            .append("orderNum", getOrderNum())
+            .append("path", getPath())
+            .append("component", getComponent())
+            .append("isFrame", getIsFrame())
+            .append("IsCache", getIsCache())
+            .append("menuType", getMenuType())
+            .append("visible", getVisible())
+            .append("status ", getStatus())
+            .append("perms", getPerms())
+            .append("icon", getIcon())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 241 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysRole.java

@@ -0,0 +1,241 @@
+package com.fidms.common.core.domain.entity;
+
+import java.util.Set;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.annotation.Excel.ColumnType;
+import com.fidms.common.core.domain.BaseEntity;
+
+/**
+ * 角色表 sys_role
+ * 
+ * @author Allen
+ */
+public class SysRole extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 角色ID */
+    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+    private Long roleId;
+
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    private String roleName;
+
+    /** 角色权限 */
+    @Excel(name = "角色权限")
+    private String roleKey;
+
+    /** 角色排序 */
+    @Excel(name = "角色排序")
+    private Integer roleSort;
+
+    /** 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限;5:仅本人数据权限) */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
+    private String dataScope;
+
+    /** 菜单树选择项是否关联显示( 0:父子不互相关联显示 1:父子互相关联显示) */
+    private boolean menuCheckStrictly;
+
+    /** 部门树选择项是否关联显示(0:父子不互相关联显示 1:父子互相关联显示 ) */
+    private boolean deptCheckStrictly;
+
+    /** 角色状态(0正常 1停用) */
+    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志(0代表存在 2代表删除) */
+    private String delFlag;
+
+    /** 用户是否存在此角色标识 默认不存在 */
+    private boolean flag = false;
+
+    /** 菜单组 */
+    private Long[] menuIds;
+
+    /** 部门组(数据权限) */
+    private Long[] deptIds;
+
+    /** 角色菜单权限 */
+    private Set<String> permissions;
+
+    public SysRole()
+    {
+
+    }
+
+    public SysRole(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.roleId);
+    }
+
+    public static boolean isAdmin(Long roleId)
+    {
+        return roleId != null && 1L == roleId;
+    }
+
+    @NotBlank(message = "角色名称不能为空")
+    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
+    public String getRoleName()
+    {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName)
+    {
+        this.roleName = roleName;
+    }
+
+    @NotBlank(message = "权限字符不能为空")
+    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
+    public String getRoleKey()
+    {
+        return roleKey;
+    }
+
+    public void setRoleKey(String roleKey)
+    {
+        this.roleKey = roleKey;
+    }
+
+    @NotNull(message = "显示顺序不能为空")
+    public Integer getRoleSort()
+    {
+        return roleSort;
+    }
+
+    public void setRoleSort(Integer roleSort)
+    {
+        this.roleSort = roleSort;
+    }
+
+    public String getDataScope()
+    {
+        return dataScope;
+    }
+
+    public void setDataScope(String dataScope)
+    {
+        this.dataScope = dataScope;
+    }
+
+    public boolean isMenuCheckStrictly()
+    {
+        return menuCheckStrictly;
+    }
+
+    public void setMenuCheckStrictly(boolean menuCheckStrictly)
+    {
+        this.menuCheckStrictly = menuCheckStrictly;
+    }
+
+    public boolean isDeptCheckStrictly()
+    {
+        return deptCheckStrictly;
+    }
+
+    public void setDeptCheckStrictly(boolean deptCheckStrictly)
+    {
+        this.deptCheckStrictly = deptCheckStrictly;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public boolean isFlag()
+    {
+        return flag;
+    }
+
+    public void setFlag(boolean flag)
+    {
+        this.flag = flag;
+    }
+
+    public Long[] getMenuIds()
+    {
+        return menuIds;
+    }
+
+    public void setMenuIds(Long[] menuIds)
+    {
+        this.menuIds = menuIds;
+    }
+
+    public Long[] getDeptIds()
+    {
+        return deptIds;
+    }
+
+    public void setDeptIds(Long[] deptIds)
+    {
+        this.deptIds = deptIds;
+    }
+
+    public Set<String> getPermissions()
+    {
+        return permissions;
+    }
+
+    public void setPermissions(Set<String> permissions)
+    {
+        this.permissions = permissions;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("roleName", getRoleName())
+            .append("roleKey", getRoleKey())
+            .append("roleSort", getRoleSort())
+            .append("dataScope", getDataScope())
+            .append("menuCheckStrictly", isMenuCheckStrictly())
+            .append("deptCheckStrictly", isDeptCheckStrictly())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 324 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/entity/SysUser.java

@@ -0,0 +1,324 @@
+package com.fidms.common.core.domain.entity;
+
+import java.util.Date;
+import java.util.List;
+import javax.validation.constraints.*;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.annotation.Excel.ColumnType;
+import com.fidms.common.annotation.Excel.Type;
+import com.fidms.common.annotation.Excels;
+import com.fidms.common.core.domain.BaseEntity;
+import com.fidms.common.xss.Xss;
+
+/**
+ * 用户对象 sys_user
+ * 
+ * @author Allen
+ */
+public class SysUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    private Long userId;
+
+    /** 部门ID */
+    @Excel(name = "部门编号", type = Type.IMPORT)
+    private Long deptId;
+
+    /** 用户账号 */
+    @Excel(name = "登录名称")
+    private String userName;
+
+    /** 用户昵称 */
+    @Excel(name = "用户名称")
+    private String nickName;
+
+    /** 用户邮箱 */
+    @Excel(name = "用户邮箱")
+    private String email;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
+    /** 用户性别 */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 帐号状态(0正常 1停用) */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志(0代表存在 2代表删除) */
+    private String delFlag;
+
+    /** 最后登录IP */
+    @Excel(name = "最后登录IP", type = Type.EXPORT)
+    private String loginIp;
+
+    /** 最后登录时间 */
+    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    private Date loginDate;
+
+    /** 部门对象 */
+    @Excels({
+        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+    })
+    private SysDept dept;
+
+    /** 角色对象 */
+    private List<SysRole> roles;
+
+    /** 角色组 */
+    private Long[] roleIds;
+
+    /** 岗位组 */
+    private Long[] postIds;
+
+    /** 角色ID */
+    private Long roleId;
+
+    public SysUser()
+    {
+
+    }
+
+    public SysUser(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    @Xss(message = "用户昵称不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    public String getNickName()
+    {
+        return nickName;
+    }
+
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+
+    @Xss(message = "用户账号不能包含脚本字符")
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    public void setEmail(String email)
+    {
+        this.email = email;
+    }
+
+    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber)
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getAvatar()
+    {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar)
+    {
+        this.avatar = avatar;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getLoginIp()
+    {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp)
+    {
+        this.loginIp = loginIp;
+    }
+
+    public Date getLoginDate()
+    {
+        return loginDate;
+    }
+
+    public void setLoginDate(Date loginDate)
+    {
+        this.loginDate = loginDate;
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
+
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+    }
+
+    public List<SysRole> getRoles()
+    {
+        return roles;
+    }
+
+    public void setRoles(List<SysRole> roles)
+    {
+        this.roles = roles;
+    }
+
+    public Long[] getRoleIds()
+    {
+        return roleIds;
+    }
+
+    public void setRoleIds(Long[] roleIds)
+    {
+        this.roleIds = roleIds;
+    }
+
+    public Long[] getPostIds()
+    {
+        return postIds;
+    }
+
+    public void setPostIds(Long[] postIds)
+    {
+        this.postIds = postIds;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .append("userName", getUserName())
+            .append("nickName", getNickName())
+            .append("email", getEmail())
+            .append("phonenumber", getPhonenumber())
+            .append("sex", getSex())
+            .append("avatar", getAvatar())
+            .append("password", getPassword())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("loginIp", getLoginIp())
+            .append("loginDate", getLoginDate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("dept", getDept())
+            .toString();
+    }
+}

+ 69 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/model/LoginBody.java

@@ -0,0 +1,69 @@
+package com.fidms.common.core.domain.model;
+
+/**
+ * 用户登录对象
+ * 
+ * @author Allen
+ */
+public class LoginBody
+{
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    private String password;
+
+    /**
+     * 验证码
+     */
+    private String code;
+
+    /**
+     * 唯一标识
+     */
+    private String uuid;
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    public String getUuid()
+    {
+        return uuid;
+    }
+
+    public void setUuid(String uuid)
+    {
+        this.uuid = uuid;
+    }
+}

+ 266 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/model/LoginUser.java

@@ -0,0 +1,266 @@
+package com.fidms.common.core.domain.model;
+
+import java.util.Collection;
+import java.util.Set;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fidms.common.core.domain.entity.SysUser;
+
+/**
+ * 登录用户身份权限
+ * 
+ * @author Allen
+ */
+public class LoginUser implements UserDetails
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户唯一标识
+     */
+    private String token;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 权限列表
+     */
+    private Set<String> permissions;
+
+    /**
+     * 用户信息
+     */
+    private SysUser user;
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public String getToken()
+    {
+        return token;
+    }
+
+    public void setToken(String token)
+    {
+        this.token = token;
+    }
+
+    public LoginUser()
+    {
+    }
+
+    public LoginUser(SysUser user, Set<String> permissions)
+    {
+        this.user = user;
+        this.permissions = permissions;
+    }
+
+    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+    {
+        this.userId = userId;
+        this.deptId = deptId;
+        this.user = user;
+        this.permissions = permissions;
+    }
+
+    @JSONField(serialize = false)
+    @Override
+    public String getPassword()
+    {
+        return user.getPassword();
+    }
+
+    @Override
+    public String getUsername()
+    {
+        return user.getUserName();
+    }
+
+    /**
+     * 账户是否未过期,过期无法验证
+     */
+    @JSONField(serialize = false)
+    @Override
+    public boolean isAccountNonExpired()
+    {
+        return true;
+    }
+
+    /**
+     * 指定用户是否解锁,锁定的用户无法进行身份验证
+     * 
+     * @return
+     */
+    @JSONField(serialize = false)
+    @Override
+    public boolean isAccountNonLocked()
+    {
+        return true;
+    }
+
+    /**
+     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
+     * 
+     * @return
+     */
+    @JSONField(serialize = false)
+    @Override
+    public boolean isCredentialsNonExpired()
+    {
+        return true;
+    }
+
+    /**
+     * 是否可用 ,禁用的用户不能身份验证
+     * 
+     * @return
+     */
+    @JSONField(serialize = false)
+    @Override
+    public boolean isEnabled()
+    {
+        return true;
+    }
+
+    public Long getLoginTime()
+    {
+        return loginTime;
+    }
+
+    public void setLoginTime(Long loginTime)
+    {
+        this.loginTime = loginTime;
+    }
+
+    public String getIpaddr()
+    {
+        return ipaddr;
+    }
+
+    public void setIpaddr(String ipaddr)
+    {
+        this.ipaddr = ipaddr;
+    }
+
+    public String getLoginLocation()
+    {
+        return loginLocation;
+    }
+
+    public void setLoginLocation(String loginLocation)
+    {
+        this.loginLocation = loginLocation;
+    }
+
+    public String getBrowser()
+    {
+        return browser;
+    }
+
+    public void setBrowser(String browser)
+    {
+        this.browser = browser;
+    }
+
+    public String getOs()
+    {
+        return os;
+    }
+
+    public void setOs(String os)
+    {
+        this.os = os;
+    }
+
+    public Long getExpireTime()
+    {
+        return expireTime;
+    }
+
+    public void setExpireTime(Long expireTime)
+    {
+        this.expireTime = expireTime;
+    }
+
+    public Set<String> getPermissions()
+    {
+        return permissions;
+    }
+
+    public void setPermissions(Set<String> permissions)
+    {
+        this.permissions = permissions;
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities()
+    {
+        return null;
+    }
+}

+ 11 - 0
fidms-common/src/main/java/com/fidms/common/core/domain/model/RegisterBody.java

@@ -0,0 +1,11 @@
+package com.fidms.common.core.domain.model;
+
+/**
+ * 用户注册对象
+ * 
+ * @author Allen
+ */
+public class RegisterBody extends LoginBody
+{
+
+}

+ 101 - 0
fidms-common/src/main/java/com/fidms/common/core/page/PageDomain.java

@@ -0,0 +1,101 @@
+package com.fidms.common.core.page;
+
+import com.fidms.common.utils.StringUtils;
+
+/**
+ * 分页数据
+ * 
+ * @author Allen
+ */
+public class PageDomain
+{
+    /** 当前记录起始索引 */
+    private Integer pageNum;
+
+    /** 每页显示记录数 */
+    private Integer pageSize;
+
+    /** 排序列 */
+    private String orderByColumn;
+
+    /** 排序的方向desc或者asc */
+    private String isAsc = "asc";
+
+    /** 分页参数合理化 */
+    private Boolean reasonable = true;
+
+    public String getOrderBy()
+    {
+        if (StringUtils.isEmpty(orderByColumn))
+        {
+            return "";
+        }
+        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
+    }
+
+    public Integer getPageNum()
+    {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum)
+    {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize()
+    {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize)
+    {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByColumn()
+    {
+        return orderByColumn;
+    }
+
+    public void setOrderByColumn(String orderByColumn)
+    {
+        this.orderByColumn = orderByColumn;
+    }
+
+    public String getIsAsc()
+    {
+        return isAsc;
+    }
+
+    public void setIsAsc(String isAsc)
+    {
+        if (StringUtils.isNotEmpty(isAsc))
+        {
+            // 兼容前端排序类型
+            if ("ascending".equals(isAsc))
+            {
+                isAsc = "asc";
+            }
+            else if ("descending".equals(isAsc))
+            {
+                isAsc = "desc";
+            }
+            this.isAsc = isAsc;
+        }
+    }
+
+    public Boolean getReasonable()
+    {
+        if (StringUtils.isNull(reasonable))
+        {
+            return Boolean.TRUE;
+        }
+        return reasonable;
+    }
+
+    public void setReasonable(Boolean reasonable)
+    {
+        this.reasonable = reasonable;
+    }
+}

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini