init

pom.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>3.4.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.sooka.onest</groupId>
+    <artifactId>sooka-onest-system</artifactId>
+
+    <description>
+        sooka-onest-system运管中心
+    </description>
+
+    <dependencies>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataSource -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>sooka-sponest-common-datasource</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataScope -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>sooka-sponest-common-datascope</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Log -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>sooka-sponest-common-log</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Swagger -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>sooka-sponest-common-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>sooka-sponest-api-monitor</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+
+        <!--解决seata序列化问题-->
+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>kryo</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>de.javakaffee</groupId>
+            <artifactId>kryo-serializers</artifactId>
+            <version>0.45</version>
+        </dependency>
+
+        <!-- hutool 工具类 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!--hutool 工具类-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.0.M1</version>
+        </dependency>
+
+        <!--spire.doc 操作word文档-->
+        <dependency>
+            <groupId>e-iceblue</groupId>
+            <artifactId>spire.doc.free</artifactId>
+            <version>3.9.0</version>
+        </dependency>
+
+
+    </dependencies>
+
+<!--    <repositories>-->
+<!--        <repository>-->
+<!--            <id>com.e-iceblue</id>-->
+<!--            <url>https://repo.e-iceblue.cn/repository/maven-public</url>-->
+<!--        </repository>-->
+<!--    </repositories>-->
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.5.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+
+

src/main/java/com/ruoyi/system/SookaSystemApplication.java

@@ -0,0 +1,31 @@
+package com.ruoyi.system;
+
+import com.ruoyi.common.security.annotation.EnableCustomConfig;
+import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 系统模块
+ *
+ * @author ruoyi
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class SookaSystemApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(SookaSystemApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  首佳科技 运管中心 启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                "  __________   ____ |  | _______          ____________   ____   ____   ____   _______/  |_\n"+
+                " /  ___/  _ \\ /  _ \\|  |/ /\\__  \\        /  ___/\\____ \\ /  _ \\ /    \\_/ __ \\ /  ___/\\   __\\\n"+
+                " \\___ (  <_> |  <_> )    <  / __ \\_      \\___ \\ |  |_> >  <_> )   |  \\  ___/ \\___ \\  |  |\n"+
+                "/____  >____/ \\____/|__|_ \\(____  /     /____  >|   __/ \\____/|___|  /\\___  >____  > |__|\n"+
+                "     \\/                  \\/     \\/           \\/ |__|               \\/     \\/     \\/\n"
+        );
+    }
+}

src/main/java/com/ruoyi/system/controller/HwMeetingController.java

@@ -0,0 +1,40 @@
+package com.ruoyi.system.controller;
+
+import cn.hutool.http.HttpStatus;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.remoteapi.service.center.middleground.RemoteMiddleGroundBaseService;
+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 javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+
+
+@RestController
+@RequestMapping("/hwMeeting")
+public class HwMeetingController {
+
+    @Resource
+    public RemoteMiddleGroundBaseService remoteMiddleGroundBaseService;
+
+    @RequestMapping("/joinConferences/{eventId}/{meetingSubject}/{userName}")
+    public AjaxResult joinConferences(@PathVariable("eventId") String eventId, @PathVariable("meetingSubject") String meetingSubject, @PathVariable("userName") String userName) throws UnsupportedEncodingException {
+        AjaxResult ajaxResult = remoteMiddleGroundBaseService.hasConferences(eventId,meetingSubject,userName);
+        if(ajaxResult.get("code") != null && ajaxResult.get("code").equals(HttpStatus.HTTP_OK)){
+            return AjaxResult.success(ajaxResult.get("data"));
+        }
+        return AjaxResult.error();
+    }
+
+    /**
+     * 获取入会链接
+     * */
+    @GetMapping("/guestJoinUri/{eventId}")
+    public AjaxResult guestJoinUri(@PathVariable(name = "eventId") String eventId){
+        return remoteMiddleGroundBaseService.guestJoinUri(eventId);
+    }
+
+
+
+}

src/main/java/com/ruoyi/system/controller/SysAppRetaionController.java

@@ -0,0 +1,112 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.SysAppRetaion;
+import com.ruoyi.system.service.ISysAppRetaionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+
+/**
+ * app主页轮播图Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+@Api(tags = "App主页轮播图控制器")
+@RestController
+@RequestMapping("/retaion")
+public class SysAppRetaionController extends BaseController {
+    private final ISysAppRetaionService sysAppRetaionService;
+
+    public SysAppRetaionController(ISysAppRetaionService sysAppRetaionService) {
+        this.sysAppRetaionService = sysAppRetaionService;
+    }
+
+    @ApiOperation(value = "查询轮播图列表(无参)", notes = "查询轮播图列表(无参)")
+    @RequestMapping(value = "/selectList",method = GET)
+    public TableDataInfo selectList() {
+        startPage();
+        List<SysAppRetaion> list = sysAppRetaionService.selectSysAppRetaionList(new SysAppRetaion());
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询app主页轮播图列表
+     */
+    @ApiOperation(value = "查询轮播图列表(有参)", notes = "查询轮播图列表(有参)")
+    @RequiresPermissions("system:retaion:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysAppRetaion sysAppRetaion) {
+        startPage();
+        List<SysAppRetaion> list = sysAppRetaionService.selectSysAppRetaionList(sysAppRetaion);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出app主页轮播图列表
+     */
+    @ApiOperation(value = "导出app主页轮播图列表", notes = "导出app主页轮播图列表")
+    @RequiresPermissions("system:retaion:export")
+    @Log(title = "app主页轮播图", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysAppRetaion sysAppRetaion) {
+        List<SysAppRetaion> list = sysAppRetaionService.selectSysAppRetaionList(sysAppRetaion);
+        ExcelUtil<SysAppRetaion> util = new ExcelUtil<>(SysAppRetaion.class);
+        util.exportExcel(response, list, "app主页轮播图数据");
+    }
+
+    /**
+     * 获取app主页轮播图详细信息
+     */
+    @ApiOperation(value = "获取app主页轮播图详细信息", notes = "获取app主页轮播图详细信息")
+    @RequiresPermissions("system:retaion:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success(sysAppRetaionService.selectSysAppRetaionById(id));
+    }
+
+    /**
+     * 新增app主页轮播图
+     */
+    @ApiOperation(value = "新增app主页轮播图", notes = "新增app主页轮播图")
+    @RequiresPermissions("system:retaion:add")
+    @Log(title = "app主页轮播图", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysAppRetaion sysAppRetaion) {
+        return toAjax(sysAppRetaionService.insertSysAppRetaion(sysAppRetaion));
+    }
+
+    /**
+     * 修改app主页轮播图
+     */
+    @ApiOperation(value = "修改app主页轮播图", notes = "修改app主页轮播图")
+    @RequiresPermissions("system:retaion:edit")
+    @Log(title = "app主页轮播图", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysAppRetaion sysAppRetaion) {
+        return toAjax(sysAppRetaionService.updateSysAppRetaion(sysAppRetaion));
+    }
+
+    /**
+     * 删除app主页轮播图
+     */
+    @ApiOperation(value = "删除app主页轮播图", notes = "删除app主页轮播图")
+    @RequiresPermissions("system:retaion:remove")
+    @Log(title = "app主页轮播图", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(sysAppRetaionService.deleteSysAppRetaionByIds(ids));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysAppVersionController.java

@@ -0,0 +1,111 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.AppVersionBO;
+import com.ruoyi.system.domain.SysAppVersion;
+import com.ruoyi.system.service.ISysAppVersionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * app版本Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+@Api(tags = "App版本控制器")
+@RestController
+@RequestMapping("/version")
+public class SysAppVersionController extends BaseController {
+    private final ISysAppVersionService sysAppVersionService;
+
+    public SysAppVersionController(ISysAppVersionService sysAppVersionService) {
+        this.sysAppVersionService = sysAppVersionService;
+    }
+
+    /**
+     * 查询app版本列表
+     */
+    @ApiOperation(value = "查询app版本列表", notes = "查询app版本列表")
+    @RequiresPermissions("system:version:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysAppVersion sysAppVersion) {
+        startPage();
+        List<SysAppVersion> list = sysAppVersionService.selectSysAppVersionList(sysAppVersion);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出app版本列表
+     */
+    @ApiOperation(value = "导出app版本列表", notes = "导出app版本列表")
+    @RequiresPermissions("system:version:export")
+    @Log(title = "app版本", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysAppVersion sysAppVersion) {
+        List<SysAppVersion> list = sysAppVersionService.selectSysAppVersionList(sysAppVersion);
+        ExcelUtil<SysAppVersion> util = new ExcelUtil<>(SysAppVersion.class);
+        util.exportExcel(response, list, "app版本数据");
+    }
+
+    /**
+     * 获取app版本详细信息
+     */
+    @ApiOperation(value = "获取app版本详细信息", notes = "获取app版本详细信息")
+    @RequiresPermissions("system:version:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success(sysAppVersionService.selectSysAppVersionById(id));
+    }
+
+    /**
+     * 新增app版本
+     */
+    @ApiOperation(value = "新增app版本", notes = "新增app版本")
+    @RequiresPermissions("system:version:add")
+    @Log(title = "app版本", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysAppVersion sysAppVersion) {
+        return toAjax(sysAppVersionService.insertSysAppVersion(sysAppVersion));
+    }
+
+    /**
+     * 修改app版本
+     */
+    @ApiOperation(value = "修改app版本", notes = "修改app版本")
+    @RequiresPermissions("system:version:edit")
+    @Log(title = "app版本", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysAppVersion sysAppVersion) {
+        return toAjax(sysAppVersionService.updateSysAppVersion(sysAppVersion));
+    }
+
+    /**
+     * 删除app版本
+     */
+    @ApiOperation(value = "删除app版本", notes = "删除app版本")
+    @RequiresPermissions("system:version:remove")
+    @Log(title = "app版本", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(sysAppVersionService.deleteSysAppVersionByIds(ids));
+    }
+
+    @ApiOperation(value = "获取版本", notes = "获取版本")
+    @PostMapping("getVersionInfo")
+    public R<AppVersionBO> getVersionInfo(String packageName) {
+        if(packageName == null) packageName = "com.sjkj.integratedplatform_siping_tsgz";
+        return R.ok(sysAppVersionService.getVersionInfo(packageName));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysAttendanceController.java

@@ -0,0 +1,72 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.SysAttendance;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.service.ISysAttendanceService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("sysAttendance")
+public class SysAttendanceController extends BaseController {
+
+    @Resource
+    ISysAttendanceService sysAttendanceService;
+
+
+    /**
+     * 手机端新增考勤打卡
+     *
+     * @param vo
+     * @return com.ruoyi.common.core.web.domain.AjaxResult
+     * @author pengyu
+     * @date 2023/2/21 15:52
+     */
+    @PutMapping("addAttendance")
+    public AjaxResult addAttendance(@RequestBody SysAttendance vo) {
+        return sysAttendanceService.addAttendance(vo);
+    }
+
+
+    /**
+     * 手机端查询考勤打卡
+     *
+     * @param userId
+     * @return com.ruoyi.common.core.web.domain.AjaxResult
+     * @author pengyu
+     * @date 2023/2/21 15:53
+     */
+    @GetMapping("getAttendance/{userId}")
+    public AjaxResult getAttendance(@PathVariable("userId") Long userId) {
+        return sysAttendanceService.getAttendance(userId);
+    }
+
+    /**
+     * 查询考勤打卡
+     */
+    @ApiOperation(value = "查询考勤打卡", notes = "查询考勤打卡")
+    @GetMapping("/list")
+    public TableDataInfo list(SysAttendance sysAttendance) {
+        startPage();
+        List<SysAttendance> list = sysAttendanceService.selectSysAttendanceListAll(sysAttendance);
+        return getDataTable(list);
+    }
+
+    /**
+     * 大数据统计考勤用
+     */
+    @ApiOperation(value = "查询考勤打卡", notes = "查询考勤打卡")
+    @GetMapping("/bigFindAttend")
+    public AjaxResult bigFindAttend(SysAttendance sysAttendance) {
+        List<Map<String,Object>> list = sysAttendanceService.bigFindAttend();
+        return AjaxResult.success(list);
+    }
+}

src/main/java/com/ruoyi/system/controller/SysConfigController.java

@@ -0,0 +1,177 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.service.ISysConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author ruoyi
+ */
+@Api(tags = "参数配置、信息操作处理控制器")
+@RestController
+@RequestMapping("/config")
+public class SysConfigController extends BaseController {
+
+    private final ISysConfigService configService;
+
+    public SysConfigController(ISysConfigService configService) {
+        this.configService = configService;
+    }
+
+    /**
+     * 获取参数配置列表
+     */
+    @ApiOperation(value = "获取参数配置列表", notes = "获取参数配置列表")
+    @RequiresPermissions("system:config:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysConfig config) {
+        startPage();
+        List<SysConfig> list = configService.selectConfigList(config);
+        return getDataTable(list);
+    }
+    /**
+     * 导出参数配置列表
+     */
+    @ApiOperation(value = "导出参数配置列表", notes = "导出参数配置列表")
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:config:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysConfig config) {
+        List<SysConfig> list = configService.selectConfigList(config);
+        ExcelUtil<SysConfig> util = new ExcelUtil<>(SysConfig.class);
+        util.exportExcel(response, list, "参数数据");
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @ApiOperation(value = "根据参数编号获取详细信息", notes = "根据参数编号获取详细信息")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long configId) {
+        return AjaxResult.success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @ApiOperation(value = "根据参数键名查询参数值", notes = "根据参数键名查询参数值")
+    @GetMapping(value = "/configKey/{configKey}")
+    public AjaxResult getConfigKey(@PathVariable String configKey) {
+        return AjaxResult.success(configService.selectConfigByKey(configKey));
+    }
+    /**
+     * 根据参数键名查询参数值
+     */
+    @ApiOperation(value = "根据参数键名查询参数值", notes = "根据参数键名查询参数值")
+    @PostMapping(value = "/remotegetConfigKey")
+    public R<String> remotegetConfigKey(@RequestBody String configKey) {
+        return R.ok(configService.selectConfigByKey(configKey));
+    }
+    /**
+     * 根据参数键名查询参数值
+     */
+    @ApiOperation(value = "根据参数键名查询参数值", notes = "根据参数键名查询参数值")
+    @RequestMapping(value = "/selectConfigKey/{configKey}",method = GET)
+    public R<String> selectConfigKey(@PathVariable("configKey") String configKey) {
+        return R.ok(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @ApiOperation(value = "根据参数键名查询参数值（APP）", notes = "根据参数键名查询参数值（APP）")
+    @RequestMapping(value = "/configKeyapp",method = POST)
+    public AjaxResult configKeyapp(@RequestParam(value = "configKey") String configKey) {
+        return AjaxResult.success(configService.selectConfigByKey(configKey));
+    }
+    /**
+     * 根据参数键名查询参数值
+     */
+    @ApiOperation(value = "根据多个参数键名查询多个参数键值MAP", notes = "根据多个参数键名查询多个参数键值MAP")
+    @RequestMapping(value = "/getConfigMap",method = POST)
+    public AjaxResult getConfigMap(@RequestParam(value = "keys") List<String> keys) {
+        Map<String, String> resultMap = new HashMap<>();
+        for (String key : keys) {
+            resultMap.put(key, configService.selectConfigByKey(key));
+        }
+        return AjaxResult.success(resultMap);
+    }
+
+
+    /**
+     * 新增参数配置
+     */
+    @ApiOperation(value = "新增参数配置", notes = "新增参数配置")
+    @RequiresPermissions("system:config:add")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysConfig config) {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
+            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(configService.insertConfig(config));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @ApiOperation(value = "修改参数配置", notes = "修改参数配置")
+    @RequiresPermissions("system:config:edit")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysConfig config) {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
+            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(configService.updateConfig(config));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @ApiOperation(value = "删除参数配置", notes = "删除参数配置")
+    @RequiresPermissions("system:config:remove")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public AjaxResult remove(@PathVariable Long[] configIds) {
+        configService.deleteConfigByIds(configIds);
+        return success();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @ApiOperation(value = "刷新参数缓存", notes = "刷新参数缓存")
+    @RequiresPermissions("system:config:remove")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache() {
+        configService.resetConfigCache();
+        return AjaxResult.success();
+    }
+}

src/main/java/com/ruoyi/system/controller/SysDeptController.java

@@ -0,0 +1,458 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.domain.vo.TreeSelect;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysPostService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+
+/**
+ * 部门信息
+ *
+ * @author ruoyi
+ */
+@Api(tags = "部门信息控制器")
+@RestController
+@RequestMapping("/dept")
+public class SysDeptController extends BaseController {
+    private final ISysDeptService deptService;
+
+    private final ISysPostService postService;
+
+    @Resource
+    private SysDeptMapper sysDeptMapper;
+
+    public SysDeptController(ISysDeptService deptService, ISysPostService postService) {
+        this.deptService = deptService;
+        this.postService = postService;
+    }
+
+    /**
+     * 获取部门列表
+     */
+    @ApiOperation(value = "获取部门列表", notes = "获取部门列表")
+    @GetMapping("/appList")
+    public AjaxResult appList(String deptName) {
+        SysDept dept = new SysDept();
+        dept.setDeptName(deptName);
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 获取部门列表
+     */
+    @ApiOperation(value = "获取部门列表", notes = "获取部门列表")
+    @RequiresPermissions("system:dept:list")
+    @GetMapping("/list")
+    public AjaxResult list(SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        AjaxResult ajaxResult = AjaxResult.success(depts);
+        ajaxResult.put("posts", postService.selectPostAll());
+        return ajaxResult;
+    }
+
+    /**
+     * 根据DEPT_ID查询下级的乡镇或区县部门列表，如果传入市级部门则查询区县，如果传入区县部门则查询乡镇街道（不带数据权限）
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    @ApiOperation(value = "根据DEPT_ID查询下级的乡镇或区县部门列表", notes = "根据DEPT_ID查询下级的乡镇或区县部门列表")
+    @GetMapping("/selectChildrenCountyOrVillagesDeptListByDeptId")
+    public AjaxResult selectChildrenCountyOrVillagesDeptListByDeptId(SysDept dept) {
+        List<SysDept> deptList = deptService.selectChildrenCountyOrVillagesDeptListByDeptId(dept);
+        return AjaxResult.success(deptList);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @ApiOperation(value = "查询部门列表（排除节点）", notes = "查询部门列表（排除节点）")
+    @RequiresPermissions("system:dept:list")
+    @GetMapping("/list/exclude/{deptId}")
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        Iterator<SysDept> it = depts.iterator();
+        while (it.hasNext()) {
+            SysDept d = it.next();
+            if (d.getDeptId().intValue() == deptId
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) {
+                it.remove();
+            }
+        }
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @ApiOperation(value = "根据部门编号获取详细信息", notes = "根据部门编号获取详细信息")
+    @RequestMapping(value = "/selectDeptById/{deptId}",method = GET)
+    public R<SysDept> selectDeptById(@PathVariable("deptId") Long deptId) {
+        return R.ok(sysDeptMapper.selectDeptById(deptId));
+    }
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @ApiOperation(value = "根据部门编号获取详细信息(包含部门岗位：posts、postIds)", notes = "根据部门编号获取详细信息(包含部门岗位：posts、postIds)")
+    @RequiresPermissions("system:dept:query")
+    @GetMapping(value = "/{deptId}")
+    public AjaxResult getInfo(@PathVariable Long deptId) {
+        deptService.checkDeptDataScope(deptId);
+        AjaxResult ajaxResult = AjaxResult.success(deptService.selectDeptById(deptId));
+        ajaxResult.put("posts", postService.selectPostAll());
+        ajaxResult.put("postIds", postService.selectPostListByDeptId(deptId));
+        return ajaxResult;
+    }
+    /**
+     * 根据多个部门编号获取部门集合
+     */
+    @ApiOperation(value = "根据多个部门编号获取部门集合", notes = "根据多个部门编号获取部门集合")
+    @InnerAuth
+    @GetMapping(value = "/getDept/{deptIds}")
+    public R<List<SysDept>> getDept(@PathVariable String deptIds) {
+        List<Long> deptIdList = Arrays.stream(deptIds.split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+        List<SysDept> sysDeptList = deptService.selectDeptByIds(deptIdList);
+        if (sysDeptList.size() > 0) {
+            return R.ok(sysDeptList);
+        }
+        return R.fail("部门不存在");
+    }
+    /**
+     * 根据部门ID查询父节点的兄弟节点集合
+     */
+    @ApiOperation(value = "根据部门ID查询父节点的兄弟节点集合", notes = "根据部门ID查询父节点的兄弟节点集合")
+    @InnerAuth
+    @GetMapping("/parentSiblings/{deptId}")
+    public R<List<SysDept>> parentSiblings(@PathVariable Long deptId) {
+        List<SysDept> siblingsDeptList = deptService.selectParentSiblingsDeptsById(deptId);
+        if (siblingsDeptList.size() > 0) {
+            return R.ok(siblingsDeptList);
+        }
+        return R.fail("未找到对应的部门");
+    }
+    /**
+     * 根据部门ID查询子节点集合
+     */
+    @ApiOperation(value = "根据部门ID查询子节点集合", notes = "根据部门ID查询子节点集合")
+    @GetMapping(value = "/getChildren/{deptId}")
+    public R<List<TreeSelect>> selectChildrenDeptById(@PathVariable Long deptId) {
+        List<SysDept> childrenDeptList = deptService.selectChildrenDeptById(deptId);
+        if (childrenDeptList.size() > 0) {
+            List<TreeSelect> treeSelects = deptService.buildDeptTreeSelect(childrenDeptList);
+            return R.ok(treeSelects);
+        }
+        return R.fail("未找到对应的部门");
+    }
+    /**
+     * 根据部门ID和岗位ID查询子节点集合
+     */
+    @ApiOperation(value = "根据部门ID查询子节点集合", notes = "根据部门ID查询子节点集合")
+    @GetMapping(value = "/getChildren/{deptId}/{postId}")
+    public AjaxResult selectChildrenDeptById(@PathVariable String deptId,@PathVariable String postId) {
+        List<SysDept> childrenDeptList = deptService.selectChildrenDeptById(deptId,postId);
+        if (childrenDeptList.size() > 0) {
+            return AjaxResult.success(deptService.buildDeptTreeSelect(childrenDeptList));
+        }
+        return AjaxResult.error("未找到对应的部门");
+    }
+    /**
+     * 根据部门postId查询部门集合
+     */
+    @ApiOperation(value = "根据部门postId查询部门集合", notes = "根据部门postId查询部门集合")
+    @InnerAuth
+    @GetMapping(value = "/getDeptsByPostId/{postId}")
+    public R<List<SysDept>> getDeptsByPostId(@PathVariable Long postId) {
+        List<SysDept> deptList = deptService.getDeptsByPostId(postId);
+        if (deptList.size() > 0) {
+            return R.ok(deptList);
+        }
+        return R.fail("未找到对应的部门");
+    }
+
+    /**
+     * 根据部门deptType和deptId查询部门集合
+     */
+    @ApiOperation(value = "根据部门deptType和deptId查询部门集合", notes = "根据部门deptType和deptId查询部门集合")
+    @PostMapping(value = "/getDeptsByDeptType")
+    public R<List<SysDept>> getDeptsByDeptType(@RequestBody SysDept sysDept) {
+        List<SysDept> deptList = deptService.getDeptsByDeptType(sysDept);
+        return R.ok(deptList);
+    }
+
+    /**
+     * 根据部门ID获取指挥中心 --网格化用
+     */
+    @ApiOperation(value = "根据部门ID获取指挥中心", notes = "根据部门ID获取指挥中心")
+    @InnerAuth
+    @GetMapping(value = "/getCommandCenter/{deptId}/{postId}")
+    public R<SysDept> getCommandCenter(@PathVariable String deptId, @PathVariable String postId) {
+        SysDept sysDept = deptService.getCommandCenter(deptId,postId);
+        if (sysDept != null) {
+            return R.ok(sysDept);
+        }
+        return R.fail("未找到对应的部门");
+    }
+
+    /**
+     * 根据部门ID获取区级指挥中心 --网格化用
+     */
+    @ApiOperation(value = "根据deptId获取区级指挥中心对象", notes = "根据deptId获取区级指挥中心对象")
+    @InnerAuth
+    @GetMapping(value = "/getDistrict/{deptId}")
+    public R<SysDept> selectDistrictDeptByAnyDeptId(@PathVariable Long deptId) {
+        SysDept sysDept = deptService.selectDistrictDeptByAnyDeptId(deptId);
+        if (sysDept != null) {
+            return R.ok(sysDept);
+        }
+        return R.fail("未找到对应的部门");
+    }
+    /**
+     * 根据角色ID查询部门树信息
+     */
+    @ApiOperation(value = "根据角色ID查询部门树信息", notes = "根据角色ID查询部门树信息")
+    @GetMapping(value = "/selectDeptListByRoleId/{roleId}")
+    public R<List<Long>> selectDeptListByRoleId(@PathVariable Long roleId) {
+        List ls = deptService.selectDeptListByRoleId(roleId);
+        return R.ok(ls);
+    }
+
+    /**
+     * 获取部门下拉树列表
+     */
+    @ApiOperation(value = "获取部门下拉树列表", notes = "获取部门下拉树列表")
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 获取部门下拉树列表(本部门及以下)
+     */
+    @ApiOperation(value = "获取部门下拉树列表", notes = "获取部门下拉树列表")
+    @GetMapping("/treeselectBelow")
+    public AjaxResult treeselectBelow(SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptBelowList(dept);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 获取用户所属部门下拉树列表
+     */
+    @ApiOperation(value = "获取用户所属部门下拉树列表", notes = "获取用户所属部门下拉树列表")
+    @GetMapping("/userDeptSelect")
+    public AjaxResult userDeptSelect() {
+        List<SysDept> depts = SecurityUtils.getLoginUser().getSysUser().getDepts();
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 根据ID查询所有子部门
+     */
+    @ApiOperation(value = "根据ID查询所有子部门节点下拉树列表", notes = "根据ID查询所有子部门节点下拉树列表")
+    @GetMapping("/userDeptSelectIncludeChildren/{deptId}")
+    public AjaxResult userDeptSelectIncludeChildren(@PathVariable("deptId") Long deptId) {
+        List<SysDept> childrenDeptList = deptService.selectChildrenDeptById(deptId);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(childrenDeptList));
+    }
+
+    /**
+     * 获取用户所属部门包含子节点下拉树列表
+     */
+    @ApiOperation(value = "获取全部部门包含子节点下拉树列表", notes = "获取全部部门包含子节点下拉树列表")
+    @GetMapping("/userAllDeptSelectIncludeChildren")
+    public AjaxResult userAllDeptSelectIncludeChildren() {
+        List<SysDept> childrenDeptList = deptService.userAllDeptSelectIncludeChildren();
+        return AjaxResult.success(deptService.buildDeptTreeSelect(childrenDeptList));
+    }
+
+
+    /**
+     * 远程调用获取部门下拉树列表
+     */
+    @ApiOperation(value = "远程调用获取部门下拉树列表", notes = "远程调用获取部门下拉树列表")
+    @GetMapping("/remotetreeselect")
+    public R<List<TreeSelect>> remotetreeselect(List<SysDept> depts) {
+        return R.ok(deptService.buildDeptTreeSelect(depts));
+    }
+
+
+    /**
+     * 获取全部部门下拉树列表
+     */
+    @ApiOperation(value = "获取全部部门下拉树列表", notes = "获取全部部门下拉树列表")
+    @GetMapping("/treeselectAll")
+    public AjaxResult treeselectAll(SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptAllList(dept);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 获取全部部门下拉树列表
+     */
+    @ApiOperation(value = "获取全部部门列表", notes = "获取全部部门列表")
+    @GetMapping("/getDeptListAll")
+    public AjaxResult getDeptListAll(SysDept dept) {
+        return AjaxResult.success(deptService.selectDeptAllList(dept));
+    }
+
+    /**
+     * 加载对应角色部门列表树
+     */
+    @ApiOperation(value = "加载对应角色部门列表树", notes = "加载对应角色部门列表树")
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
+        return ajax;
+    }
+
+    /**
+     * 新增部门
+     */
+    @ApiOperation(value = "新增部门", notes = "新增部门")
+    @RequiresPermissions("system:dept:add")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDept dept) {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
+            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        dept.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @ApiOperation(value = "修改部门", notes = "修改部门")
+    @RequiresPermissions("system:dept:edit")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDept dept) {
+        Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        } else if (dept.getParentId().equals(deptId)) {
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) {
+            return AjaxResult.error("该部门包含未停用的子部门！");
+        }
+        dept.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @ApiOperation(value = "删除部门", notes = "删除部门")
+    @RequiresPermissions("system:dept:remove")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public AjaxResult remove(@PathVariable Long deptId) {
+        if (deptService.hasChildByDeptId(deptId)) {
+            return AjaxResult.error("存在下级部门,不允许删除");
+        }
+        if (deptService.checkDeptExistUser(deptId)) {
+            return AjaxResult.error("部门存在用户,不允许删除");
+        }
+        deptService.checkDeptDataScope(deptId);
+        return toAjax(deptService.deleteDeptById(deptId));
+    }
+
+    /**
+     * 可视化信息获取所属街道信息数据
+     */
+    @ApiOperation(value = "可视化信息获取所属街道信息数据", notes = "可视化信息获取所属街道信息数据")
+    @GetMapping("/selectWghXz")
+    public AjaxResult selectWghXz(SysDept dept) {
+        if (dept.getPostId() == null){
+            dept.setPostId("14");//不传查街道
+        }
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 后端人房户获取部门权限信息
+     */
+    @ApiOperation(value = "后端人房户获取部门权限信息", notes = "后端人房户获取部门权限信息")
+    @GetMapping("/selectRfhDept")
+    public AjaxResult selectRfhDept(SysDept dept) {
+        dept.setPostId(null);
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 获取行管部门下可接收短信人员
+     */
+    @ApiOperation(value = "获取行管部门下可接收短信人员", notes = "获取行管部门下可接收短信人员")
+    @PostMapping("/selectDeptAndUsersByDeptType")
+    public R selectDeptAndUsersByDeptType(@RequestBody SysDept dept) {
+        if(dept.getDeptId() == null || dept.getDeptTypes() == null
+        || dept.getDeptTypes().length == 0){
+            return  R.fail("缺少必要参数");
+        }
+        List<SysDept> depts = deptService.selectDeptAndUsersByDeptType(dept);
+        return R.ok(depts);
+    }
+
+    /**
+     * 判断DEPT上级中是否有除消防支队外的行管局
+     * */
+    @GetMapping("/deptParentsHasBureau/{deptId}")
+    public AjaxResult deptParentsHasBureau(@PathVariable("deptId") Long deptId){
+        return AjaxResult.success(deptService.deptParentsHasBureau(deptId)>0?true:false);
+    }
+
+    /**
+     * 根据子deptId和父级类型递归获取上级部门
+     * */
+    @GetMapping("/findParentIdByChildDeptIdAndParentType/{deptId}/{deptType}")
+    public AjaxResult findParentIdByChildDeptIdAndParentType(@PathVariable("deptId") Long deptId, @PathVariable("deptType") String deptType){
+        return AjaxResult.success("查询成功",deptService.findParentIdByChildDeptIdAndParentType(deptId,deptType));
+    }
+
+    /**
+     * 查询部门管理数据
+     *
+     * @param deptName 部门信息
+     * @return 部门信息集合
+     */
+    @PostMapping("/selectDeptListByDeptNames")
+    public AjaxResult selectDeptListByDeptNames(String[] deptName){
+        return AjaxResult.success("查询成功",deptService.selectDeptListByDeptNames(deptName));
+    }
+
+
+}

src/main/java/com/ruoyi/system/controller/SysDeptPartyController.java

@@ -0,0 +1,155 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDeptParty;
+import com.ruoyi.system.service.ISysDeptPartyService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+/**
+ * 部门信息
+ *
+ * @author ruoyi
+ */
+@ApiIgnore
+@RestController
+@RequestMapping("/deptparty")
+public class SysDeptPartyController extends BaseController
+{
+    private final ISysDeptPartyService deptPartyService;
+
+    public SysDeptPartyController(ISysDeptPartyService deptPartyService) {
+        this.deptPartyService = deptPartyService;
+    }
+
+    /**
+     * 获取部门列表
+     */
+    @RequiresPermissions("system:deptparty:list")
+    @GetMapping("/list")
+    public AjaxResult list(SysDeptParty dept)
+    {
+        List<SysDeptParty> depts = deptPartyService.selectDeptList(dept);
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @RequiresPermissions("system:deptparty:list")
+    @GetMapping("/list/exclude/{deptId}")
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    {
+        List<SysDeptParty> depts = deptPartyService.selectDeptList(new SysDeptParty());
+        depts.removeIf(d -> d.getDeptId().intValue() == deptId
+                || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @RequiresPermissions("system:deptparty:query")
+    @GetMapping(value = "/{deptId}")
+    public AjaxResult getInfo(@PathVariable Long deptId)
+    {
+        deptPartyService.checkDeptDataScope(deptId);
+        return AjaxResult.success(deptPartyService.selectDeptById(deptId));
+    }
+
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysDeptParty dept)
+    {
+        List<SysDeptParty> depts = deptPartyService.selectDeptList(dept);
+        return AjaxResult.success(deptPartyService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 加载对应角色部门列表树
+     */
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        List<SysDeptParty> depts = deptPartyService.selectDeptList(new SysDeptParty());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptPartyService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptPartyService.buildDeptTreeSelect(depts));
+        return ajax;
+    }
+
+    /**
+     * 新增部门
+     */
+    @RequiresPermissions("system:deptparty:add")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDeptParty dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptPartyService.checkDeptNameUnique(dept)))
+        {
+            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        dept.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(deptPartyService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @RequiresPermissions("system:deptparty:edit")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDeptParty dept)
+    {
+        Long deptId = dept.getDeptId();
+        deptPartyService.checkDeptDataScope(deptId);
+        if (UserConstants.NOT_UNIQUE.equals(deptPartyService.checkDeptNameUnique(dept)))
+        {
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        else if (dept.getParentId().equals(deptId))
+        {
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptPartyService.selectNormalChildrenDeptById(deptId) > 0)
+        {
+            return AjaxResult.error("该部门包含未停用的子部门！");
+        }
+        dept.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(deptPartyService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @RequiresPermissions("system:deptparty:remove")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public AjaxResult remove(@PathVariable Long deptId)
+    {
+        if (deptPartyService.hasChildByDeptId(deptId))
+        {
+            return AjaxResult.error("存在下级部门,不允许删除");
+        }
+        if (deptPartyService.checkDeptExistUser(deptId))
+        {
+            return AjaxResult.error("部门存在用户,不允许删除");
+        }
+        deptPartyService.checkDeptDataScope(deptId);
+        return toAjax(deptPartyService.deleteDeptById(deptId));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysDictDataController.java

@@ -0,0 +1,168 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDictData;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.system.service.ISysDictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据字典信息
+ *
+ * @author ruoyi
+ */
+@Api(tags = "字典数据控制器")
+@RestController
+@RequestMapping("/dict/data")
+public class SysDictDataController extends BaseController {
+    private final ISysDictDataService dictDataService;
+
+    private final ISysDictTypeService dictTypeService;
+
+    public SysDictDataController(ISysDictDataService dictDataService, ISysDictTypeService dictTypeService) {
+        this.dictDataService = dictDataService;
+        this.dictTypeService = dictTypeService;
+    }
+    /**
+     * 获取字典数据列表
+     */
+    @ApiOperation(value = "获取字典数据列表", notes = "获取字典数据列表")
+    @RequiresPermissions("system:dict:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictData dictData) {
+        startPage();
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return getDataTable(list);
+    }
+    /**
+     * 获取字典数据列表
+     */
+    @ApiOperation(value = "远程获取字典数据列表", notes = "远程获取字典数据列表")
+    @PostMapping("/feignList")
+    public R<List<SysDictData>> feignList(@RequestBody SysDictData sysDictData) {
+        List<SysDictData> list = dictDataService.selectDictDataList(sysDictData);
+        return R.ok(list);
+    }
+    /**
+     * 导出字典数据列表
+     */
+    @ApiOperation(value = "导出字典数据列表", notes = "导出字典数据列表")
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:dict:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDictData dictData) {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil<SysDictData> util = new ExcelUtil<>(SysDictData.class);
+        util.exportExcel(response, list, "字典数据");
+    }
+
+    /**
+     * 查询字典数据详细
+     */
+    @ApiOperation(value = "查询字典数据详细", notes = "查询字典数据详细")
+    @RequiresPermissions("system:dict:query")
+    @GetMapping(value = "/{dictCode}")
+    public AjaxResult getInfo(@PathVariable Long dictCode) {
+        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @ApiOperation(value = "根据字典类型查询字典数据信息", notes = "根据字典类型查询字典数据信息")
+    @GetMapping(value = "/type/{dictType}")
+    public AjaxResult dictType(@PathVariable String dictType) {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        if (StringUtils.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return AjaxResult.success(data);
+    }
+
+    /**
+     * 根据字典类型查询摄像头,传感器,云广播类型数量
+     */
+    @ApiOperation(value = "根据字典类型查询摄像头,传感器,云广播类型数量", notes = "根据字典类型查询摄像头,传感器,云广播类型数量")
+    @GetMapping(value = "/internetOfThings/{dictType}")
+    public AjaxResult internetOfThings(@PathVariable String dictType) {
+        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+        if (sysUser == null) return AjaxResult.error("未获取到token");
+        List<SysDictData> data = dictTypeService.selectDictDataByDevice(dictType,sysUser.getDepts().get(0).getDeptId());
+        if (StringUtils.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return AjaxResult.success(data);
+    }
+
+    /**
+     * 新增字典数据
+     */
+    @ApiOperation(value = "新增字典数据", notes = "新增字典数据")
+    @RequiresPermissions("system:dict:add")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictData dict) {
+        dict.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(dictDataService.insertDictData(dict));
+    }
+
+    /**
+     * 修改保存字典数据
+     */
+    @ApiOperation(value = "修改保存字典数据", notes = "修改保存字典数据")
+    @RequiresPermissions("system:dict:edit")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
+        dict.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(dictDataService.updateDictData(dict));
+    }
+
+    /**
+     * 删除字典数据
+     */
+    @ApiOperation(value = "删除字典数据", notes = "删除字典数据")
+    @RequiresPermissions("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public AjaxResult remove(@PathVariable Long[] dictCodes) {
+        dictDataService.deleteDictDataByIds(dictCodes);
+        return success();
+    }
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType 字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    @ApiOperation(value = "根据字典类型和字典键值查询字典数据信息", notes = "根据字典类型和字典键值查询字典数据信息")
+    @GetMapping("/selectDictLabels")
+    public AjaxResult selectDictLabels(String dictType,String dictValue)
+    {
+        Map param = new HashMap();
+        param.put("dictType",dictType);
+        param.put("dictValue",dictValue.split(","));
+        return AjaxResult.success(dictDataService.selectDictLabels(param));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysDictTypeController.java

@@ -0,0 +1,133 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDictType;
+import com.ruoyi.system.service.ISysDictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 数据字典信息
+ *
+ * @author ruoyi
+ */
+@Api(tags = "字典类型控制器")
+@RestController
+@RequestMapping("/dict/type")
+public class SysDictTypeController extends BaseController {
+    private final ISysDictTypeService dictTypeService;
+
+    public SysDictTypeController(ISysDictTypeService dictTypeService) {
+        this.dictTypeService = dictTypeService;
+    }
+    /**
+     * 获取字典类型列表
+     */
+    @ApiOperation(value = "获取字典类型列表", notes = "获取字典类型列表")
+    @RequiresPermissions("system:dict:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictType dictType) {
+        startPage();
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return getDataTable(list);
+    }
+    /**
+     * 导出字典类型列表
+     */
+    @ApiOperation(value = "导出字典类型列表", notes = "导出字典类型列表")
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:dict:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDictType dictType) {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil<SysDictType> util = new ExcelUtil<>(SysDictType.class);
+        util.exportExcel(response, list, "字典类型");
+    }
+
+    /**
+     * 查询字典类型详细
+     */
+    @ApiOperation(value = "根据数据字典ID查询字典类型详细", notes = "根据数据字典ID查询字典类型详细")
+    @RequiresPermissions("system:dict:query")
+    @GetMapping(value = "/{dictId}")
+    public AjaxResult getInfo(@PathVariable Long dictId) {
+        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @ApiOperation(value = "新增字典类型", notes = "新增字典类型")
+    @RequiresPermissions("system:dict:add")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictType dict) {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
+            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(dictTypeService.insertDictType(dict));
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @ApiOperation(value = "修改字典类型", notes = "修改字典类型")
+    @RequiresPermissions("system:dict:edit")
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictType dict) {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
+            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(dictTypeService.updateDictType(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @ApiOperation(value = "删除字典类型", notes = "删除字典类型")
+    @RequiresPermissions("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public AjaxResult remove(@PathVariable Long[] dictIds) {
+        dictTypeService.deleteDictTypeByIds(dictIds);
+        return success();
+    }
+
+    /**
+     * 刷新字典缓存
+     */
+    @ApiOperation(value = "刷新字典缓存", notes = "刷新字典缓存")
+    @RequiresPermissions("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache() {
+        dictTypeService.resetDictCache();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @ApiOperation(value = "获取字典选择框列表", notes = "获取字典选择框列表")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect() {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+        return AjaxResult.success(dictTypes);
+    }
+}

src/main/java/com/ruoyi/system/controller/SysFontConfigController.java

@@ -0,0 +1,99 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.SysAppRetaion;
+import com.ruoyi.system.domain.SysFontConfig;
+import com.ruoyi.system.service.ISysFontConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 前端配置处理控制器
+ *
+ * @author ruoyi
+ */
+@Api(tags = "前端配置处理控制器")
+@RestController
+@RequestMapping("/fontConfig")
+public class SysFontConfigController extends BaseController {
+
+    private final ISysFontConfigService configService;
+
+    public SysFontConfigController(ISysFontConfigService configService) {
+        this.configService = configService;
+    }
+
+    /**
+     * 获取前端配置列表
+     */
+    @ApiOperation(value = "获取前端配置列表", notes = "获取前端配置列表")
+    @RequiresPermissions("system:fontConfig:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysFontConfig config) {
+        startPage();
+        List<SysFontConfig> list = configService.selectConfigList(config);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询前端配置详细
+     */
+    @ApiOperation(value = "根据ID查询前端配置详细", notes = "根据ID查询前端配置详细")
+    @RequiresPermissions("system:fontConfig:query")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long configId) {
+        return AjaxResult.success(configService.selectFontConfigById(configId));
+    }
+
+    /**
+     * 新增前端配置
+     */
+    @ApiOperation(value = "新增前端配置", notes = "新增前端配置")
+    @RequiresPermissions("system:fontConfig:add")
+    @Log(title = "前端配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysFontConfig config) {
+        return toAjax(configService.insertFontConfig(config));
+    }
+
+    /**
+     * 修改前端配置
+     */
+    @ApiOperation(value = "修改前端配置", notes = "修改前端配置")
+    @RequiresPermissions("system:fontConfig:edit")
+    @Log(title = "修改前端配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysFontConfig config) {
+        return toAjax(configService.updateFontConfig(config));
+    }
+
+    /**
+     * 删除前端配置
+     */
+    @ApiOperation(value = "删除前端配置", notes = "删除前端配置")
+    @RequiresPermissions("system:fontConfig:remove")
+    @Log(title = "删除前端配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public AjaxResult remove(@PathVariable Long[] configIds) {
+        return toAjax(configService.deleteFontConfigByconfigIds(configIds));
+    }
+
+    /**
+     * 前端接口获取数据
+     */
+    @ApiOperation(value = "前端接口获取数据", notes = "前端接口获取数据")
+    @GetMapping("/getSysFontConfig/{fontKey}")
+    public AjaxResult getSysFontConfig(@PathVariable String fontKey) {
+        SysFontConfig a = configService.getSysFontConfig(fontKey);
+        return AjaxResult.success(a);
+    }
+
+}

src/main/java/com/ruoyi/system/controller/SysLogininforController.java

@@ -0,0 +1,121 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.api.domain.SysLogininfor;
+import com.ruoyi.system.domain.SysLoginActive;
+import com.ruoyi.system.service.ISysLogininforService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 系统访问记录
+ *
+ * @author ruoyi
+ */
+@Api(tags = "系统访问记录控制器")
+@RestController
+@RequestMapping("/logininfor")
+public class SysLogininforController extends BaseController {
+    private final ISysLogininforService logininforService;
+
+    public SysLogininforController(ISysLogininforService logininforService) {
+        this.logininforService = logininforService;
+    }
+    /**
+     * 获取系统访问记录列表
+     */
+    @ApiOperation(value = "获取系统访问记录列表", notes = "获取系统访问记录列表")
+    @RequiresPermissions("system:logininfor:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysLogininfor logininfor) {
+        startPage();
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取活跃排名列表
+     */
+    @ApiOperation(value = "获取活跃排名列表", notes = "获取活跃排名列表")
+    @RequiresPermissions("system:logininfor:activeList")
+    @GetMapping("/activeList")
+    public TableDataInfo activeList(SysLogininfor logininfor) {
+        startPage();
+        List<SysLoginActive> list = logininforService.selectLogininforActiveList(logininfor);
+        return getDataTable(list);
+    }
+    /**
+     * 导出系统访问记录列表
+     */
+    @ApiOperation(value = "导出系统访问记录列表", notes = "导出系统访问记录列表")
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:logininfor:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysLogininfor logininfor) {
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<>(SysLogininfor.class);
+        util.exportExcel(response, list, "登录日志");
+    }
+
+    /**
+     * 导出活跃排名列表
+     */
+    @ApiOperation(value = "导出系统访问记录列表", notes = "导出系统访问记录列表")
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:logininfor:exportActive")
+    @PostMapping("/exportActive")
+    public void activeExport(HttpServletResponse response, SysLogininfor logininfor) {
+        List<SysLoginActive> activeList = logininforService.selectLogininforActiveList(logininfor);
+        ExcelUtil<SysLoginActive> util = new ExcelUtil<>(SysLoginActive.class);
+        util.exportExcel(response, activeList, "登录日志");
+    }
+    /**
+     * 删除系统访问记录
+     */
+    @ApiOperation(value = "删除系统访问记录", notes = "删除系统访问记录")
+    @RequiresPermissions("system:logininfor:remove")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{infoIds}")
+    public AjaxResult remove(@PathVariable Long[] infoIds) {
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    }
+    /**
+     * 清空系统访问记录
+     */
+    @ApiOperation(value = "*慎用*清空系统访问记录", notes = "*慎用*清空系统访问记录")
+    @RequiresPermissions("system:logininfor:remove")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/clean")
+    public AjaxResult clean() {
+        logininforService.cleanLogininfor();
+        return AjaxResult.success();
+    }
+    /**
+     * 新增系统访问记录
+     */
+    @ApiOperation(value = "新增系统访问记录", notes = "新增系统访问记录")
+    @InnerAuth
+    @PostMapping
+    public AjaxResult add(@RequestBody SysLogininfor logininfor) {
+        return toAjax(logininforService.insertLogininfor(logininfor));
+    }
+
+    /**
+     * 获取系统账号数和活跃用户数
+     */
+    @GetMapping("/getUserAndActiveCount")
+    public AjaxResult getUserAndActiveCount() {
+        return AjaxResult.success(logininforService.getUserAndActiveCount());
+    }
+}

src/main/java/com/ruoyi/system/controller/SysMenuAppController.java

@@ -0,0 +1,209 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.UUID;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysMenuEventType;
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.domain.SysMenuApp;
+import com.ruoyi.system.service.*;
+import io.swagger.annotations.ApiOperation;
+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.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.SysMenuApp;
+import com.ruoyi.system.service.ISysMenuAppService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 手机端菜单管理Controller
+ *
+ * @author ruoyi
+ * @date 2023-06-09
+ */
+@RestController
+@RequestMapping("/menuApp")
+public class SysMenuAppController extends BaseController
+{
+    @Autowired
+    private ISysMenuAppService sysMenuAppService;
+    @Resource
+    private ISysMenuEventTypeService sysMenuEventTypeService;
+    @Resource
+    private ISysRoleService sysRoleService;
+
+
+    public SysMenuAppController(ISysMenuAppService sysMenuAppService) {
+        this.sysMenuAppService = sysMenuAppService;
+    }
+
+/**
+ * 查询手机端菜单管理列表
+ */
+@ApiOperation(value = "查询手机端菜单权限列表", notes = "查询手机端菜单权限列表")
+@RequiresPermissions("system:menuApp:list")
+@GetMapping("/list")
+    public AjaxResult list(SysMenuApp sysMenuApp)
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenuApp> menus = sysMenuAppService.selectMenuList(sysMenuApp, userId);
+        return AjaxResult.success(menus);
+    }
+
+    /**
+     * 导出手机端菜单管理列表
+     */
+    @RequiresPermissions("system:menuApp:export")
+    @Log(title = "手机端菜单管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysMenuApp sysMenuApp)
+    {
+        List<SysMenuApp> list = sysMenuAppService.selectSysMenuAppList(sysMenuApp);
+        ExcelUtil<SysMenuApp> util = new ExcelUtil<>(SysMenuApp.class);
+        util.exportExcel(response, list, "手机端菜单管理数据");
+    }
+
+    /**
+     * 获取手机端菜单管理详细信息
+     */
+    @RequiresPermissions("system:menuApp:query")
+    @GetMapping(value = "/{menuId}")
+    public AjaxResult getInfo(@PathVariable("menuId") Long menuId)
+    {
+        SysMenuApp sysMenuApp = sysMenuAppService.selectSysMenuAppByMenuId(menuId);
+        SysMenuEventType sysMenuEventType = new SysMenuEventType();
+        sysMenuEventType.setMenuId(Integer.valueOf(menuId.toString()));
+        List<SysMenuEventType> sysMenuEventTypeList = sysMenuEventTypeService.selectSysMenuEventTypeList(sysMenuEventType);
+        sysMenuApp.setSysMenuEventTypes(sysMenuEventTypeList);
+        return AjaxResult.success(sysMenuApp);
+    }
+
+    /**
+     * 新增手机端菜单管理
+     */
+    @RequiresPermissions("system:menuApp:add")
+    @Log(title = "手机端菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysMenuApp sysMenuApp)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(sysMenuAppService.checkMenuNameUnique(sysMenuApp))) {
+            return AjaxResult.error("新增菜单'" + sysMenuApp.getMenuName() + "'失败，菜单名称已存在");
+        } else if (UserConstants.YES_FRAME.equals(sysMenuApp.getIsFrame())  && !StringUtils.ishttp(sysMenuApp.getPath())){
+            return AjaxResult.error("新增菜单'" + sysMenuApp.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        sysMenuApp.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(sysMenuAppService.insertSysMenuApp(sysMenuApp));
+    }
+
+    /**
+     * 修改手机端菜单管理
+     */
+    @ApiOperation(value = "修改手机端菜单权限", notes = "修改手机端菜单权限")
+    @RequiresPermissions("system:menuApp:edit")
+    @Log(title = "手机端菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysMenuApp sysMenuApp)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(sysMenuAppService.checkMenuNameUnique(sysMenuApp))) {
+            return AjaxResult.error("修改菜单'" + sysMenuApp.getMenuName() + "'失败，菜单名称已存在");
+        } else if (UserConstants.YES_FRAME.equals(sysMenuApp.getIsFrame())  && !StringUtils.ishttp(sysMenuApp.getPath())){
+            return AjaxResult.error("修改菜单'" + sysMenuApp.getMenuName() + "'失败，地址必须以http(s)://开头");
+        } else if (sysMenuApp.getMenuId().equals(sysMenuApp.getParentId())) {
+            return AjaxResult.error("修改菜单'" + sysMenuApp.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        sysMenuApp.setUpdateBy(SecurityUtils.getUsername());
+        sysMenuEventTypeService.deleteSysMenuEventTypeByMenuId(sysMenuApp.getMenuId().toString());
+        sysMenuApp.getSysMenuEventTypes().forEach(item -> {
+            item.setId(UUID.getUUID());
+            sysMenuEventTypeService.insertSysMenuEventType(item);
+        });
+        return toAjax(sysMenuAppService.updateSysMenuApp(sysMenuApp));
+    }
+
+    /**
+     * 删除可视化菜单权限
+     */
+    @ApiOperation(value = "删除手机端菜单管理", notes = "删除手机端菜单管理")
+    @RequiresPermissions("system:menuApp:remove")
+    @Log(title = "可视化菜单权限", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+        if (sysMenuAppService.hasChildByMenuId(menuId)) {
+            return AjaxResult.error("存在子菜单,不允许删除");
+        }
+        if (sysMenuAppService.checkMenuExistRole(menuId)) {
+            return AjaxResult.error("菜单已分配,不允许删除");
+        }
+        return toAjax(sysMenuAppService.deleteSysMenuAppByMenuId(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @ApiOperation(value = "获取菜单下拉树列表", notes = "获取菜单下拉树列表")
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysMenuApp sysMenuApp) {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenuApp> menus = sysMenuAppService.selectMenuList(sysMenuApp, userId);
+        return AjaxResult.success(sysMenuAppService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @ApiOperation(value = "加载对应角色菜单列表树", notes = "加载对应角色菜单列表树")
+    @GetMapping(value = "/roleMenuAppTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenuApp> App = sysMenuAppService.selectMenuList(userId);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", sysMenuAppService.selectMenuListByRoleId(roleId));
+        ajax.put("menusApp", sysMenuAppService.buildMenuTreeSelect(App));
+        return ajax;
+    }
+
+    /**
+     * 根据父级ID获取子级菜单或按钮
+     */
+    @ApiOperation(value = "根据父级ID获取子级菜单或按钮", notes = "根据父级ID获取子级菜单或按钮")
+    @GetMapping(value = "/getAppChildrenMenuOrButtonByParentId")
+    public AjaxResult getAppChildrenMenuOrButtonByParentId(SysMenuApp sysMenuApp) {
+        Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId();
+        sysMenuApp.setUserId(userId);
+        List<SysMenuApp> list = sysMenuAppService.getAppChildrenMenuOrButtonByParentId(sysMenuApp);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 根据父级ID加载角色对应菜单列表树
+     */
+    @ApiOperation(value = "根据父级ID加载角色对应菜单列表树", notes = "根据父级ID加载角色对应菜单列表树")
+    @GetMapping(value = "/selectMenuListByParentIdAndRoleId/{parentId}")
+    public AjaxResult selectMenuListByParentIdAndRoleId(@PathVariable("parentId") Long parentId) {
+        Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId();
+        List<Long> roleIds = sysRoleService.selectRoleListByUserId(userId);
+        List<SysMenuApp> list = sysMenuAppService.selectMenuListByParentIdAndRole(parentId, roleIds);
+        return AjaxResult.success(list);
+    }
+
+
+
+}

src/main/java/com/ruoyi/system/controller/SysMenuController.java

@@ -0,0 +1,173 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.service.ISysMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 菜单信息
+ *
+ * @author ruoyi
+ */
+@Api(tags="系统菜单控制器")
+@RestController
+@RequestMapping("/menu")
+public class SysMenuController extends BaseController
+{
+    private final ISysMenuService menuService;
+
+    public SysMenuController(ISysMenuService menuService) {
+        this.menuService = menuService;
+    }
+
+    /**
+     * 获取菜单列表
+     */
+    @ApiOperation(value = "获取菜单列表", notes = "获取菜单列表")
+    @RequiresPermissions("system:menu:list")
+    @GetMapping("/list")
+    public AjaxResult list(SysMenu menu)
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        return AjaxResult.success(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @ApiOperation(value = "根据菜单编号获取详细信息", notes = "根据菜单编号获取详细信息")
+    @RequiresPermissions("system:menu:query")
+    @GetMapping(value = "/{menuId}")
+    public AjaxResult getInfo(@PathVariable Long menuId)
+    {
+        return AjaxResult.success(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @ApiOperation(value = "获取菜单下拉树列表", notes = "获取菜单下拉树列表")
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysMenu menu)
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @ApiOperation(value = "加载对应角色菜单列表树", notes = "加载对应角色菜单列表树")
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(userId);
+        //List<SysMenuVisu> visu = sysMenuVisuService.selectMenuList(userId);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        //ajax.put("menuVisuCheckStrictly", sysMenuVisuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        //ajax.put("menusvisu", sysMenuVisuService.buildMenuTreeSelect(visu));
+        return ajax;
+    }
+
+    /**
+     * 新增菜单
+     */
+    @ApiOperation(value = "新增菜单", notes = "新增菜单")
+    @RequiresPermissions("system:menu:add")
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+        {
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        menu.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @ApiOperation(value = "修改菜单", notes = "修改菜单")
+    @RequiresPermissions("system:menu:edit")
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        else if (menu.getMenuId().equals(menu.getParentId()))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        menu.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     */
+    @ApiOperation(value = "删除菜单", notes = "删除菜单")
+    @RequiresPermissions("system:menu:remove")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    {
+        if (menuService.hasChildByMenuId(menuId))
+        {
+            return AjaxResult.error("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId))
+        {
+            return AjaxResult.error("菜单已分配,不允许删除");
+        }
+        return toAjax(menuService.deleteMenuById(menuId));
+    }
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @ApiOperation(value = "获取路由信息", notes = "获取路由信息")
+    @GetMapping("getRouters")
+    public AjaxResult getRouters(SysMenu sysMenu)
+    {
+        if(sysMenu.getFrontTypes() == null || sysMenu.getFrontTypes().length ==0){
+            return AjaxResult.error("未配置前端对应类型!");
+        }
+        Long userId = SecurityUtils.getUserId();
+        sysMenu.setUserId(userId);
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(sysMenu);
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysMenuEventTypeController.java

@@ -0,0 +1,133 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.uuid.UUID;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.api.domain.SysMenuEventType;
+import com.ruoyi.system.service.ISysMenuEventTypeService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 事件类型菜单Controller
+ *
+ * @author ruoyi
+ * @date 2023-04-10
+ */
+@RestController
+@RequestMapping("/menuEventType")
+public class SysMenuEventTypeController extends BaseController {
+    @Autowired
+    private ISysMenuEventTypeService sysMenuEventTypeService;
+
+    /**
+     * 查询事件类型菜单列表
+     */
+    @RequiresPermissions("system:type:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysMenuEventType sysMenuEventType) {
+        startPage();
+        List<SysMenuEventType> list = sysMenuEventTypeService.selectSysMenuEventTypeList(sysMenuEventType);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出事件类型菜单列表
+     */
+    @RequiresPermissions("system:type:export")
+    @Log(title = "导出事件类型菜单列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysMenuEventType sysMenuEventType) {
+        List<SysMenuEventType> list = sysMenuEventTypeService.selectSysMenuEventTypeList(sysMenuEventType);
+        ExcelUtil<SysMenuEventType> util = new ExcelUtil<SysMenuEventType>(SysMenuEventType.class);
+        util.exportExcel(response, list, "事件类型菜单数据");
+    }
+
+    /**
+     * 获取事件类型菜单详细信息
+     */
+    @RequiresPermissions("system:type:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success(sysMenuEventTypeService.selectSysMenuEventTypeById(id));
+    }
+
+    /**
+     * 新增事件类型菜单
+     */
+    @RequiresPermissions("system:type:add")
+    @Log(title = "新增事件类型菜单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysMenuEventType sysMenuEventType) {
+        return toAjax(sysMenuEventTypeService.insertSysMenuEventType(sysMenuEventType));
+    }
+
+    /**
+     * 批量新增事件类型菜单
+     */
+    @RequiresPermissions("system:type:add")
+    @Log(title = "批量新增事件类型菜单", businessType = BusinessType.INSERT)
+    @PostMapping("/addBatch")
+    public AjaxResult addBatch(@RequestBody List<SysMenuEventType> eventTypeList) {
+        try {
+            for (int i = 0; i < eventTypeList.size(); i++) {
+                SysMenuEventType eventType = eventTypeList.get(i);
+                eventType.setId(UUID.getUUID());
+                sysMenuEventTypeService.insertSysMenuEventType(eventType);
+            }
+            return AjaxResult.success();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("事件类型添加失败");
+        }
+    }
+
+    /**
+     * 修改事件类型菜单
+     */
+    @RequiresPermissions("system:type:edit")
+    @Log(title = "修改事件类型菜单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysMenuEventType sysMenuEventType) {
+        return toAjax(sysMenuEventTypeService.updateSysMenuEventType(sysMenuEventType));
+    }
+
+    /**
+     * 删除事件类型菜单
+     */
+    @RequiresPermissions("system:type:remove")
+    @Log(title = "删除事件类型菜单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(sysMenuEventTypeService.deleteSysMenuEventTypeByIds(ids));
+    }
+
+    /**
+     *   |\_/|        ****************************    (\_/)
+     *  / @ @ \       *      Creator:李佳新       *   (='.'=)
+     * ( > º < )      *     Emil:VIP@LYCM.NET    *   (")_(")
+     *  `>>x<<´       *    Date:2023/4/12 13:33 *
+     *  /  O  \       ****************************
+     * @Description: 通过menu_id查询事件类型
+     * @param sysMenuEventType
+     * @return: AjaxResult
+     * */
+    @PostMapping(value = "/selectByMenuId")
+    public R<List<SysMenuEventType>> selectByMenuId(@RequestBody SysMenuEventType sysMenuEventType){
+        return R.ok(sysMenuEventTypeService.selectSysMenuEventTypeList(sysMenuEventType));
+    }
+
+    @GetMapping(value = "/selectByMenuIds/{ids}")
+    public R<List<SysMenuEventType>> selectByMenuIds(@PathVariable String[] ids){
+        return R.ok(sysMenuEventTypeService.selectByMenuIds(ids));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysMenuVisuController.java

@@ -0,0 +1,173 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.utils.uuid.UUID;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysMenuEventType;
+import com.ruoyi.system.domain.SysMenuVisu;
+import com.ruoyi.system.service.ISysMenuEventTypeService;
+import com.ruoyi.system.service.ISysMenuVisuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 可视化菜单权限Controller
+ *
+ * @author ruoyi
+ * @date 2022-05-24
+ */
+@Api(tags = "可视化菜单权限控制器")
+@RestController
+@RequestMapping("/menuVisu")
+public class SysMenuVisuController extends BaseController {
+    private final ISysMenuVisuService sysMenuVisuService;
+    @Resource
+    private ISysMenuEventTypeService sysMenuEventTypeService;
+
+    public SysMenuVisuController(ISysMenuVisuService sysMenuVisuService) {
+        this.sysMenuVisuService = sysMenuVisuService;
+    }
+
+    /**
+     * 查询可视化菜单权限列表
+     */
+    @ApiOperation(value = "查询可视化菜单权限列表", notes = "查询可视化菜单权限列表")
+    @RequiresPermissions("system:menuVisu:list")
+    @GetMapping("/list")
+    public AjaxResult list(SysMenuVisu sysMenuVisu) {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenuVisu> menus = sysMenuVisuService.selectMenuList(sysMenuVisu, userId);
+        return AjaxResult.success(menus);
+    }
+
+    /**
+     * 导出可视化菜单权限列表
+     */
+    @ApiOperation(value = "导出可视化菜单权限列表", notes = "导出可视化菜单权限列表")
+    @RequiresPermissions("system:menuVisu:export")
+    @Log(title = "可视化菜单权限", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysMenuVisu sysMenuVisu) {
+        List<SysMenuVisu> list = sysMenuVisuService.selectSysMenuVisuList(sysMenuVisu);
+        ExcelUtil<SysMenuVisu> util = new ExcelUtil<>(SysMenuVisu.class);
+        util.exportExcel(response, list, "可视化菜单权限数据");
+    }
+
+    /**
+     * 获取可视化菜单权限详细信息
+     */
+    @ApiOperation(value = "获取可视化菜单权限详细信息", notes = "获取可视化菜单权限详细信息")
+    @RequiresPermissions("system:menuVisu:query")
+    @GetMapping(value = "/{menuId}")
+    public AjaxResult getInfo(@PathVariable("menuId") Long menuId) {
+        SysMenuVisu sysMenuVisu = sysMenuVisuService.selectSysMenuVisuByMenuId(menuId);
+        SysMenuEventType sysMenuEventType = new SysMenuEventType();
+        sysMenuEventType.setMenuId(Integer.valueOf(menuId.toString()));
+        List<SysMenuEventType> sysMenuEventTypeList = sysMenuEventTypeService.selectSysMenuEventTypeList(sysMenuEventType);
+        sysMenuVisu.setSysMenuEventTypes(sysMenuEventTypeList);
+        return AjaxResult.success(sysMenuVisu);
+    }
+
+    /**
+     * 新增可视化菜单权限
+     */
+    @ApiOperation(value = "新增可视化菜单权限", notes = "新增可视化菜单权限")
+    @RequiresPermissions("system:menuVisu:add")
+    @Log(title = "可视化菜单权限", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysMenuVisu menu) {
+        if (UserConstants.NOT_UNIQUE.equals(sysMenuVisuService.checkMenuNameUnique(menu))) {
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPageServerUrl())) {
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        menu.setCreateBy(SecurityUtils.getUsername());
+        int i = sysMenuVisuService.insertSysMenuVisu(menu);
+        menu.getSysMenuEventTypes().forEach(item -> {
+            item.setId(UUID.getUUID());
+            item.setMenuId(Integer.valueOf(menu.getMenuId().toString()));
+            sysMenuEventTypeService.insertSysMenuEventType(item);
+        });
+        return toAjax(i);
+    }
+
+    /**
+     * 修改可视化菜单权限
+     */
+    @ApiOperation(value = "修改可视化菜单权限", notes = "修改可视化菜单权限")
+    @RequiresPermissions("system:menuVisu:edit")
+    @Log(title = "可视化菜单权限", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysMenuVisu menu) {
+        if (UserConstants.NOT_UNIQUE.equals(sysMenuVisuService.checkMenuNameUnique(menu))) {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPageServerUrl())) {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        menu.setUpdateBy(SecurityUtils.getUsername());
+        sysMenuEventTypeService.deleteSysMenuEventTypeByMenuId(menu.getMenuId().toString());
+        menu.getSysMenuEventTypes().forEach(item -> {
+            item.setId(UUID.getUUID());
+            sysMenuEventTypeService.insertSysMenuEventType(item);
+        });
+        return toAjax(sysMenuVisuService.updateSysMenuVisu(menu));
+    }
+
+    /**
+     * 删除可视化菜单权限
+     */
+    @ApiOperation(value = "删除可视化菜单权限", notes = "删除可视化菜单权限")
+    @RequiresPermissions("system:menuVisu:remove")
+    @Log(title = "可视化菜单权限", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+        if (sysMenuVisuService.hasChildByMenuId(menuId)) {
+            return AjaxResult.error("存在子菜单,不允许删除");
+        }
+        if (sysMenuVisuService.checkMenuExistRole(menuId)) {
+            return AjaxResult.error("菜单已分配,不允许删除");
+        }
+        return toAjax(sysMenuVisuService.deleteSysMenuVisuByMenuId(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @ApiOperation(value = "获取菜单下拉树列表", notes = "获取菜单下拉树列表")
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysMenuVisu menu) {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenuVisu> menus = sysMenuVisuService.selectMenuList(menu, userId);
+        return AjaxResult.success(sysMenuVisuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @ApiOperation(value = "加载对应角色菜单列表树", notes = "加载对应角色菜单列表树")
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenuVisu> visu = sysMenuVisuService.selectMenuList(userId);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", sysMenuVisuService.selectMenuListByRoleId(roleId));
+        ajax.put("menusvisu", sysMenuVisuService.buildMenuTreeSelect(visu));
+        return ajax;
+    }
+
+}

src/main/java/com/ruoyi/system/controller/SysMenuVisuImageController.java

@@ -0,0 +1,119 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.SysFontConfig;
+import com.ruoyi.system.domain.SysMenuVisu;
+import io.swagger.annotations.ApiOperation;
+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.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.SysMenuVisuImage;
+import com.ruoyi.system.service.ISysMenuVisuImageService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 可视化前端配置表Controller
+ *
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+@RestController
+@RequestMapping("/image")
+public class SysMenuVisuImageController extends BaseController
+{
+    @Autowired
+    private ISysMenuVisuImageService sysMenuVisuImageService;
+
+/**
+ * 查询可视化前端配置表列表
+ */
+@RequiresPermissions("system:image:list")
+@GetMapping("/list")
+    public TableDataInfo list(SysMenuVisuImage sysMenuVisuImage)
+    {
+        startPage();
+        List<SysMenuVisuImage> list = sysMenuVisuImageService.selectSysMenuVisuImageList(sysMenuVisuImage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出可视化前端配置表列表
+     */
+    @RequiresPermissions("system:image:export")
+    @Log(title = "可视化前端配置表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysMenuVisuImage sysMenuVisuImage)
+    {
+        List<SysMenuVisuImage> list = sysMenuVisuImageService.selectSysMenuVisuImageList(sysMenuVisuImage);
+        ExcelUtil<SysMenuVisuImage> util = new ExcelUtil<SysMenuVisuImage>(SysMenuVisuImage.class);
+        util.exportExcel(response, list, "可视化前端配置表数据");
+    }
+
+    /**
+     * 获取可视化前端配置表详细信息
+     */
+    @RequiresPermissions("system:image:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(sysMenuVisuImageService.selectSysMenuVisuImageById(id));
+    }
+
+    /**
+     * 新增可视化前端配置表
+     */
+    @RequiresPermissions("system:image:add")
+    @Log(title = "可视化前端配置表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysMenuVisuImage sysMenuVisuImage)
+    {
+        return toAjax(sysMenuVisuImageService.insertSysMenuVisuImage(sysMenuVisuImage));
+    }
+
+    /**
+     * 修改可视化前端配置表
+     */
+    @RequiresPermissions("system:image:edit")
+    @Log(title = "可视化前端配置表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysMenuVisuImage sysMenuVisuImage)
+    {
+        return toAjax(sysMenuVisuImageService.updateSysMenuVisuImage(sysMenuVisuImage));
+    }
+
+    /**
+     * 删除可视化前端配置表
+     */
+    @RequiresPermissions("system:image:remove")
+    @Log(title = "可视化前端配置表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(sysMenuVisuImageService.deleteSysMenuVisuImageByIds(ids));
+    }
+    /**
+     * 修改设为当前状态
+     */
+    @ApiOperation(value = "修改设为当前状态", notes = "修改设为当前状态")
+    @RequiresPermissions("system:image:editImageCurrent")
+    @Log(title = "修改设为当前状态", businessType = BusinessType.UPDATE)
+    @PutMapping("/editImageCurrent")
+    public AjaxResult editCurrent(@RequestBody SysMenuVisu sysMenuVisuImage) {
+        return toAjax(sysMenuVisuImageService.updateCurrentImage(sysMenuVisuImage));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysMenuVisuMapController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.controller;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.system.domain.SysMenuVisuMap;
+import com.ruoyi.system.service.SysMenuVisuMapService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+/**
+ * 可视化图层管理
+ * */
+@RestController
+@RequestMapping("/sysMenuVisuMap")
+public class SysMenuVisuMapController extends BaseController {
+
+    @Resource
+    private SysMenuVisuMapService sysMenuVisuMapService;
+
+    /**
+     * 根据属性,部门,id查询可视化前端配置图层
+     */
+    @PostMapping("/queryMap")
+    public List<SysMenuVisuMap> queryMap(@RequestBody SysMenuVisuMap sysMenuVisuMap) {
+        return sysMenuVisuMapService.queryMap(sysMenuVisuMap);
+    }
+
+    /**
+     * 查询可视化前端配置图层列表
+     */
+    @GetMapping("/queryMapList")
+    public TableDataInfo listMap(SysMenuVisuMap sysMenuVisuMap) {
+        startPage();
+        List<SysMenuVisuMap> list = sysMenuVisuMapService.getMap(sysMenuVisuMap);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询可视化前端图层配置表列表（下拉框）
+     */
+    @GetMapping("/queryMapLists")
+    public TableDataInfo listMaps(SysMenuVisuMap sysMenuVisuMap) {
+        List<SysMenuVisuMap> list = sysMenuVisuMapService.getMaps(sysMenuVisuMap);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询可视化前端图层连接底图池
+     */
+    @GetMapping("/selectMapping")
+    public TableDataInfo selectmapping(SysMenuVisuMap sysMenuVisuMap) {
+        List<SysMenuVisuMap> list = sysMenuVisuMapService.getmaping(sysMenuVisuMap);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增可视化前端配置地图表详细信息
+     */
+    @PostMapping("/addMap")
+    public AjaxResult addMap(@RequestBody SysMenuVisuMap sysMenuVisuMap) {
+        return toAjax(sysMenuVisuMapService.insertSysMenuMapVisuImage(sysMenuVisuMap));
+    }
+
+    /**
+     * 修改可视化前端配置地图表
+     */
+    @PostMapping("/modifyMap")
+    public AjaxResult modifyMap(@RequestBody SysMenuVisuMap sysMenuVisuMap) {
+        Integer[] id = {sysMenuVisuMap.getId()};
+        if (sysMenuVisuMapService.checkMappingExists(id)) {
+            List<SysMenuVisuMap> menuVisuMaps = sysMenuVisuMapService.getMenuNamesByMenuIds(id[0]);
+            StringBuilder menuNameBuilder = new StringBuilder();
+            for (SysMenuVisuMap menuVisuMap : menuVisuMaps) {
+                menuNameBuilder.append(menuVisuMap.getMenuName()).append(", ");
+            }
+            return AjaxResult.error("该图层已被应用到: " + menuNameBuilder.toString() + " 不允许修改该图层 ");
+        }
+        return toAjax(sysMenuVisuMapService.modifyMap(sysMenuVisuMap));
+    }
+
+
+    /**
+     * 查询可视化前端修改页
+     */
+    @GetMapping("/queryModificationPage/{id}")
+    public AjaxResult queryModificationPage(@PathVariable("id") Integer id) {
+        return AjaxResult.success(sysMenuVisuMapService.queryModificationPage(id));
+    }
+
+
+    /**
+     * 删除可视化前端配置图层表详细信息
+     */
+    @DeleteMapping("/remove/{id}")
+    public AjaxResult remove(@PathVariable("id") Integer[] id) {
+        if (sysMenuVisuMapService.checkMappingExists(id)) {
+            List<SysMenuVisuMap> menuVisuMaps = sysMenuVisuMapService.getMenuNamesByMenuIds(id[0]);
+            StringBuilder menuNameBuilder = new StringBuilder();
+            for (SysMenuVisuMap menuVisuMap : menuVisuMaps) {
+                menuNameBuilder.append(menuVisuMap.getMenuName()).append(", ");
+            }
+            return AjaxResult.error("该图层已被应用到: " + menuNameBuilder.toString() + " 不允许删除该图层 ");
+        }
+        return toAjax(sysMenuVisuMapService.deleteSysMenuMapVisuImageByIds(id));
+    }
+
+    /**
+     * 移入地图图层
+     */
+    @PostMapping("/MoveIntoMap")
+    public AjaxResult MoveIntoMap(@RequestBody SysMenuVisuMap sysMenuVisuMap) {
+        int a=sysMenuVisuMapService.insertSysMenuMapVisuImages(sysMenuVisuMap);
+        return toAjax(a);
+    }
+
+    /**
+     * 移出地图图层
+     */
+    @DeleteMapping("/RemoveMap")
+    public AjaxResult RemoveMap(@RequestBody SysMenuVisuMap sysMenuVisuMap) {
+        return toAjax(sysMenuVisuMapService.deleteSysMenuMapVisuImageByIdss(sysMenuVisuMap));
+
+    }
+}

src/main/java/com/ruoyi/system/controller/SysNoticeController.java

@@ -0,0 +1,188 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.domain.SysNoticeDept;
+import com.ruoyi.system.service.ISysNoticeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.catalina.security.SecurityUtil;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 公告 信息操作处理
+ *
+ * @author ruoyi
+ */
+@Api(tags = "通知、公告控制器")
+@RestController
+@RequestMapping("/notice")
+public class SysNoticeController extends BaseController
+{
+    private final ISysNoticeService noticeService;
+
+    public SysNoticeController(ISysNoticeService noticeService) {
+        this.noticeService = noticeService;
+    }
+
+    /**
+     * 获取通知公告列表
+     */
+    @ApiOperation(value = "获取通知公告列表", notes = "获取通知公告列表")
+    @RequiresPermissions("system:notice:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+    /**
+     * 获取通知公告列表
+     */
+    @ApiOperation(value = "获取通知公告列表", notes = "获取通知公告列表")
+    @GetMapping(value = "/noticeList")
+    public TableDataInfo noticeList(SysNotice notice)
+    {
+        startPage();
+        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+        notice.setDeptId(deptId);
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 按部门获取通知公告列表
+     * limeng
+     */
+    @ApiOperation(value = "按部门获取通知公告列表", notes = "按部门获取通知公告列表")
+    @GetMapping(value = "/listNoticeByDeptId")
+    public AjaxResult listNoticeByDeptId(SysNotice notice)
+    {
+        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+        notice.setDeptId(deptId);
+        List<SysNotice> list = noticeService.listNoticeByDeptId(notice);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 获取最新一条通知公告
+     * limeng
+     *
+     */
+    @ApiOperation(value = "获取最新一条通知公告", notes = "获取最新一条通知公告")
+    @GetMapping(value = "/getLatestNotice")
+    public AjaxResult getLatestNotice(SysNotice notice)
+    {
+        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+        notice.setDeptId(deptId);
+        return AjaxResult.success(noticeService.getLatestNotice(notice) == null?new SysNotice():noticeService.getLatestNotice(notice));
+    }
+
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @ApiOperation(value = "根据通知公告编号获取详细信息", notes = "根据通知公告编号获取详细信息")
+    @RequiresPermissions("system:notice:query")
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable Long noticeId)
+    {
+        SysNotice sysNotice = noticeService.selectNoticeById(noticeId);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put(AjaxResult.DATA_TAG, sysNotice);
+        ajax.put("deptIds", sysNotice.getDepts().stream().map(SysNoticeDept::getDeptId).collect(Collectors.toList()));
+        return ajax;
+    }
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @ApiOperation(value = "根据通知公告编号获取详细信息（App）", notes = "根据通知公告编号获取详细信息（App）")
+    @GetMapping(value = "/getInfoApp")
+    public AjaxResult getInfoApp(Long noticeId)
+    {
+        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @ApiOperation(value = "新增通知公告", notes = "新增通知公告")
+    @RequiresPermissions("system:notice:add")
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @ApiOperation(value = "修改通知公告", notes = "修改通知公告")
+    @RequiresPermissions("system:notice:edit")
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @ApiOperation(value = "删除通知公告", notes = "删除通知公告")
+    @RequiresPermissions("system:notice:remove")
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    {
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+    }
+
+    /**
+     * 根据部门id查公告
+     * @return
+     */
+
+    @GetMapping("/listNotice")
+    public AjaxResult listNotice() {
+        if (SecurityUtils.getLoginUser() == null ) {
+            return AjaxResult.error("您的token为空！！！");
+        }
+        List<SysDept> depts = SecurityUtils.getLoginUser().getSysUser().getDepts();
+        startPage();
+        List<SysNotice> list = noticeService.listNotice(depts);
+        return AjaxResult.success(list);
+    }
+
+
+    /**
+     * 根据公告id查详情
+     */
+    @GetMapping("/details/{noticeId}")
+    public AjaxResult details(@PathVariable Integer noticeId){
+        try{
+            SysNotice sysNotice =noticeService.details(noticeId);
+            return AjaxResult.success(sysNotice);
+        }catch(Exception ex){
+            return AjaxResult.error("查询失败");
+        }
+
+    }
+}

src/main/java/com/ruoyi/system/controller/SysOperlogController.java

@@ -0,0 +1,257 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.api.domain.SysOperLog;
+import com.ruoyi.system.api.domain.SysOperLogVO;
+import com.ruoyi.system.domain.SysDahuaOperLogCount;
+import com.ruoyi.system.service.ISysOperLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 操作日志记录
+ *
+ * @author ruoyi
+ */
+@Api(tags = "操作日志记录控制器")
+@RestController
+@RequestMapping("/operlog")
+public class SysOperlogController extends BaseController {
+    private final ISysOperLogService operLogService;
+
+    public SysOperlogController(ISysOperLogService operLogService) {
+        this.operLogService = operLogService;
+    }
+
+    /**
+     * 获取操作日志列表
+     */
+    @ApiOperation(value = "获取操作日志列表", notes = "获取操作日志列表")
+    @RequiresPermissions("system:operlog:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysOperLog operLog) {
+        startPage();
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出操作日志
+     */
+    @ApiOperation(value = "导出操作日志", notes = "导出操作日志")
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:operlog:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysOperLog operLog) {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<>(SysOperLog.class);
+        util.exportExcel(response, list, "操作日志");
+    }
+
+    /**
+     * 删除操作日志
+     */
+    @ApiOperation(value = "删除操作日志", notes = "删除操作日志")
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @RequiresPermissions("system:operlog:remove")
+    @DeleteMapping("/{operIds}")
+    public AjaxResult remove(@PathVariable Long[] operIds) {
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    /**
+     * 清除操作日志缓存
+     */
+    @ApiOperation(value = "清除操作日志缓存", notes = "清除操作日志缓存")
+    @RequiresPermissions("system:operlog:remove")
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public AjaxResult clean() {
+        operLogService.cleanOperLog();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 新增操作日志
+     */
+    @ApiOperation(value = "新增操作日志", notes = "新增操作日志")
+    @InnerAuth
+    @PostMapping
+    public AjaxResult add(@RequestBody SysOperLog operLog) {
+        return toAjax(operLogService.insertOperlog(operLog));
+    }
+
+
+    /**
+     * 更新dept_id, parent_id, ancestors, dept_name
+     */
+    @ApiOperation(value = "清洗系统操作日志数据", notes = "清洗系统操作日志数据")
+    @GetMapping("/updateSystemFourField")
+    public AjaxResult updateFourField(String year) {
+        operLogService.updateFourField(year);
+        return AjaxResult.success();
+    }
+
+
+    /**
+     * 查询市本级所有局、三县两区的摄像头总操作数，日均操作数操作情况报告列表
+     */
+    @GetMapping("/selectOperateLogGroupByDept")
+    public AjaxResult selectOperateLogGroupByDept(SysDahuaOperLogCount sysDahuaOperLogCount) {
+        return AjaxResult.success(operLogService.selectOperateLogGroupByDept(sysDahuaOperLogCount));
+    }
+
+    /**
+     * 导出操作日志
+     */
+    @ApiOperation(value = "导出操作日志", notes = "导出操作日志")
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportOperateLog")
+    public void exportOperateLog(HttpServletResponse response, SysDahuaOperLogCount sysDahuaOperLogCount) {
+        List<SysOperLogVO> list = operLogService.selectOperateLogGroupByDept(sysDahuaOperLogCount);
+        String tableTitle = "态势感知平台操作情况汇总表";
+        if (StringUtils.isNotEmpty(sysDahuaOperLogCount.getDateRange()) && sysDahuaOperLogCount.getDateRange() != null) {
+            tableTitle += "(" + parseDateRange(sysDahuaOperLogCount.getDateRange())[0] + "-" + parseDateRange(sysDahuaOperLogCount.getDateRange())[1] + ")";
+        }
+        try {
+            //1、创建一个工作簿
+            XSSFWorkbook wb = new XSSFWorkbook();
+            //2、创建一个工作表sheet
+            XSSFSheet sheet = wb.createSheet(tableTitle);
+            sheet.setDefaultRowHeight((short) 800);
+            sheet.setDefaultColumnWidth((short) 20);
+            //3、创建单元格样式
+            XSSFCellStyle style = wb.createCellStyle();
+            style.setFillForegroundColor(IndexedColors.WHITE.getIndex());//设置背景颜色
+            style.setFillPattern(FillPatternType.NO_FILL); //填充样式 有全部填充 有小点填充  有大点填充
+            //设置文字的格式
+            style.setAlignment(HorizontalAlignment.CENTER);//文字水平居中
+            style.setVerticalAlignment(VerticalAlignment.CENTER);//文字垂直居中
+            style.setBorderBottom(BorderStyle.THIN);//边框加黑
+            style.setBorderLeft(BorderStyle.THIN);//边框加黑
+            style.setBorderRight(BorderStyle.THIN);//边框加黑
+            style.setBorderTop(BorderStyle.THIN);//边框加黑
+
+            //创建单元格
+            for (int i = 0; i < list.size() + 2; i++) {//创建的行数
+                Row row = sheet.createRow(i);//创建行
+                for (int j = 0; j < 5; j++) {//每行的列数
+                    row.createCell(j).setCellStyle(style);
+                }
+            }
+
+            //合并单元格  参数说明 参数1：合并的开始行  参数2：合并的结束行  参数3：合并的开始单元格  参数4：合并结束的单元格
+            sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 4));
+
+            //4、插入数据
+            /**第一行表头**/
+            XSSFRow row1 = sheet.getRow(0);//获取第一行
+            Cell cell0 = row1.getCell(0);//获取第一行的第一个单元格
+            cell0.setCellValue(tableTitle);//插入数据
+            CellStyle cellStyle = wb.createCellStyle();//字体
+            cellStyle.setAlignment(HorizontalAlignment.CENTER);//文字水平居中
+            cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//文字垂直居中
+            cellStyle.setBorderBottom(BorderStyle.THIN);//边框加黑
+            cellStyle.setBorderLeft(BorderStyle.THIN);//边框加黑
+            cellStyle.setBorderRight(BorderStyle.THIN);//边框加黑
+            cellStyle.setBorderTop(BorderStyle.THIN);//边框加黑
+            Font font = wb.createFont();
+            font.setFontName("黑体");// 字体
+            font.setFontHeightInPoints((short) 16);// 字体高度
+            cellStyle.setFont(font);
+            row1.getCell(0).setCellStyle(cellStyle);
+
+            /**第二行字段列**/
+            XSSFRow row2 = sheet.getRow(1);//获取第二行
+            Cell cell2_1 = row2.getCell(0);//获取第二行的第一个单元格
+            cell2_1.setCellValue("辖区/部门");//插入数据
+            CellStyle cellStyle2_1 = wb.createCellStyle();//字体
+            cellStyle2_1.setWrapText(true);//自动换行
+            cellStyle2_1.setAlignment(HorizontalAlignment.CENTER);//文字水平居中
+            cellStyle2_1.setVerticalAlignment(VerticalAlignment.CENTER);//文字垂直居中
+            cellStyle2_1.setBorderBottom(BorderStyle.THIN);//边框加黑
+            cellStyle2_1.setBorderLeft(BorderStyle.THIN);//边框加黑
+            cellStyle2_1.setBorderRight(BorderStyle.THIN);//边框加黑
+            cellStyle2_1.setBorderTop(BorderStyle.THIN);//边框加黑
+            Font font2_1 = wb.createFont();
+            font2_1.setFontName("黑体");// 字体
+            font2_1.setFontHeightInPoints((short) 12);// 字体高度
+            cellStyle2_1.setFont(font2_1);
+            row2.getCell(0).setCellStyle(cellStyle2_1);
+
+            /**第三行字段列**/
+            XSSFRow row3 = sheet.getRow(1);//获取第三行
+            Cell cell3_1 = row3.getCell(1);//获取第三行的第二个单元格
+            cell3_1.setCellValue("摄像头总操作数");
+            cell3_1.setCellStyle(cellStyle2_1);
+            Cell cell3_2 = row3.getCell(2);//获取第三行的第三个单元格
+            cell3_2.setCellValue("摄像头日均操作数");
+            cell3_2.setCellStyle(cellStyle2_1);
+            Cell cell3_3 = row3.getCell(3);//获取第三行的第四个单元格
+            cell3_3.setCellValue("系统总操作数");
+            cell3_3.setCellStyle(cellStyle2_1);
+            Cell cell3_4 = row3.getCell(4);//获取第三行的第五个单元格
+            cell3_4.setCellValue("系统日均操作数");
+            cell3_4.setCellStyle(cellStyle2_1);
+            for (int i = 0; i < list.size(); i++) {
+                SysOperLogVO vo = list.get(i);
+                XSSFRow row = sheet.getRow(i + 2);//获取第i行
+                row.getCell(0).setCellValue(vo.getDeptName());
+                row.getCell(0).setCellStyle(cellStyle2_1);
+                row.getCell(1).setCellValue(vo.getCameraTotalCount());
+                row.getCell(1).setCellStyle(cellStyle2_1);
+                row.getCell(2).setCellValue(String.valueOf(vo.getCameraDayAvgCount()));
+                row.getCell(2).setCellStyle(cellStyle2_1);
+                row.getCell(3).setCellValue(vo.getSystemTotalCount());
+                row.getCell(3).setCellStyle(cellStyle2_1);
+                row.getCell(4).setCellValue(String.valueOf(vo.getSystemDayAvgCount()));
+                row.getCell(4).setCellStyle(cellStyle2_1);
+
+            }
+            wb.write(response.getOutputStream());
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String[] parseDateRange(String[] args) {
+        SimpleDateFormat sdf0 = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年M月d日");
+        String[] arr = new String[2];
+        if (args == null) return new String[0];
+        try {
+            Date date0 = sdf0.parse(args[0]);
+            Date date1 = sdf0.parse(args[1]);
+            arr[0] = sdf1.format(date0);
+            arr[1] = sdf1.format(date1);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return arr;
+    }
+}

src/main/java/com/ruoyi/system/controller/SysPicFontConfigController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.SysFontConfig;
+import com.ruoyi.system.domain.SysPicFontConfig;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysPicFontConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 图片配置处理控制器
+ *
+ * @author ruoyi
+ */
+@Api(tags = "图片配置处理控制器")
+@RestController
+@RequestMapping("/picFontConfig")
+public class SysPicFontConfigController extends BaseController {
+
+    private final ISysPicFontConfigService picFontConfigService;
+
+    @Autowired
+     ISysConfigService configService;
+
+    public SysPicFontConfigController(ISysPicFontConfigService picFontConfigService) {
+        this.picFontConfigService = picFontConfigService;
+    }
+
+    /**
+     * 获取图片配置列表
+     */
+    @ApiOperation(value = "获取图片配置列表", notes = "获取图片配置列表")
+    @RequiresPermissions("system:picFontConfig:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysPicFontConfig picFontConfig) {
+        startPage();
+        List<SysPicFontConfig> list = picFontConfigService.selectPicConfigList(picFontConfig);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询图片配置详细
+     */
+    @ApiOperation(value = "根据ID查询图片配置详细", notes = "根据ID查询图片配置详细")
+    @RequiresPermissions("system:picFontConfig:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id) {
+        return AjaxResult.success(picFontConfigService.selectPicFontConfigById(id));
+    }
+
+    /**
+     * 新增图片配置
+     */
+    @ApiOperation(value = "新增图片配置", notes = "新增图片配置")
+    @RequiresPermissions("system:picFontConfig:add")
+    @Log(title = "图片配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysPicFontConfig picFontConfig) {
+        return toAjax(picFontConfigService.insertPicFontConfig(picFontConfig));
+    }
+
+    /**
+     * 修改前端配置
+     */
+    @ApiOperation(value = "修改图片配置", notes = "修改图片配置")
+    @RequiresPermissions("system:picFontConfig:edit")
+    @Log(title = "修改图片配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysPicFontConfig picFontConfig) {
+        return toAjax(picFontConfigService.updatePicFontConfig(picFontConfig));
+    }
+
+    /**
+     * 修改设为当前状态
+     */
+    @ApiOperation(value = "修改设为当前状态", notes = "修改设为当前状态")
+    @RequiresPermissions("system:picFontConfig:editCurrent")
+    @Log(title = "修改设为当前状态", businessType = BusinessType.UPDATE)
+    @PutMapping("/editCurrent")
+    public AjaxResult editCurrent(@RequestBody SysFontConfig picFontConfig) {
+        return toAjax(picFontConfigService.updateCurrentPicFontConfig(picFontConfig));
+    }
+
+    /**
+     * 删除图片配置
+     */
+    @ApiOperation(value = "删除图片配置", notes = "删除图片配置")
+    @RequiresPermissions("system:picFontConfig:remove")
+    @Log(title = "删除图片配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(picFontConfigService.deletePicFontConfigByconfigIds(ids));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysPostController.java

@@ -0,0 +1,150 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.service.ISysPostService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 岗位信息操作处理
+ *
+ * @author ruoyi
+ */
+@Api(tags = "岗位信息控制器")
+@RestController
+@RequestMapping("/post")
+public class SysPostController extends BaseController
+{
+    private final ISysPostService postService;
+
+    public SysPostController(ISysPostService postService) {
+        this.postService = postService;
+    }
+
+    /**
+     * 获取岗位列表
+     */
+    @ApiOperation(value = "获取岗位列表", notes = "获取岗位列表")
+    @RequiresPermissions("system:post:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysPost post)
+    {
+        startPage();
+        List<SysPost> list = postService.selectPostList(post);
+        return getDataTable(list);
+    }
+    /**
+     * 导出岗位列表
+     */
+    @ApiOperation(value = "导出岗位列表", notes = "导出岗位列表")
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:post:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysPost post)
+    {
+        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil<SysPost> util = new ExcelUtil<>(SysPost.class);
+        util.exportExcel(response, list, "岗位数据");
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     */
+    @ApiOperation(value = "根据岗位编号获取详细信息", notes = "根据岗位编号获取详细信息")
+    @RequiresPermissions("system:post:query")
+    @GetMapping(value = "/{postId}")
+    public AjaxResult getInfo(@PathVariable Long postId)
+    {
+        return AjaxResult.success(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @ApiOperation(value = "新增岗位", notes = "新增岗位")
+    @RequiresPermissions("system:post:add")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @ApiOperation(value = "修改岗位", notes = "修改岗位")
+    @RequiresPermissions("system:post:edit")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     */
+    @ApiOperation(value = "删除岗位", notes = "删除岗位")
+    @RequiresPermissions("system:post:remove")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{postIds}")
+    public AjaxResult remove(@PathVariable Long[] postIds)
+    {
+        return toAjax(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @ApiOperation(value = "获取岗位选择框列表", notes = "获取岗位选择框列表")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysPost> posts = postService.selectPostAll();
+        return AjaxResult.success(posts);
+    }
+    /**
+     * 根据部门集合获取岗位code集合
+     */
+    @ApiOperation(value = "根据部门集合获取岗位code集合", notes = "根据部门集合获取岗位code集合")
+    @PostMapping("selectPostCodeByDepts")
+    public R<List> selectPostCodeByDepts(@RequestBody List<SysDept> depts){
+        List ls = postService.selectDeptCodeByDepts(depts);
+        return R.ok(ls);
+    }
+}

src/main/java/com/ruoyi/system/controller/SysProfileController.java

@@ -0,0 +1,231 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.PassUtil;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.RemoteFileService;
+import com.ruoyi.system.api.domain.SysFile;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.domain.dto.AppResetPwd;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**
+ * 个人信息 业务处理
+ *
+ * @author ruoyi
+ */
+@Api(tags = "个人信息控制器")
+@RestController
+@RequestMapping("/user/profile")
+public class SysProfileController extends BaseController
+{
+    private final ISysUserService userService;
+
+    private final TokenService tokenService;
+
+
+    private final RemoteFileService remoteFileService;
+
+    @Resource
+    private ISysDeptService deptService;
+
+    @Resource
+    private ISysConfigService configService;
+
+    public SysProfileController(ISysUserService userService, TokenService tokenService, RemoteFileService remoteFileService) {
+        this.userService = userService;
+        this.tokenService = tokenService;
+        this.remoteFileService = remoteFileService;
+    }
+
+    /**
+     * 获取个人信息
+     */
+    @ApiOperation(value = "获取用户个人信息", notes = "获取用户个人信息")
+    @GetMapping
+    public AjaxResult profile()
+    {
+        Long[] deptIds = {369L,370L,371L,372L,373L};
+        String username = SecurityUtils.getUsername();
+        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+        SysUser user = userService.selectUserByUserName(username);
+        /**图片前缀**/
+        String uri = configService.selectConfigByKey("fileUrl");
+        if(StringUtils.isNotEmpty(user.getAvatar())){
+            user.setAvatar(uri+user.getAvatar());
+        }
+        AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(username));
+        ajax.put("postGroup", userService.selectUserPostGroup(username));
+        boolean isItSelf = Arrays.asList(deptIds).contains(deptId);
+        if(isItSelf) {//如果是三县两区本身
+            ajax.put("mapDeptId", deptId);
+        } else if (deptService.thisDeptIdIsParentIdChild(deptId, 369L) > 0){//双辽
+            ajax.put("mapDeptId", 369L);
+        } else if (deptService.thisDeptIdIsParentIdChild(deptId, 370L) > 0) {//伊通
+            ajax.put("mapDeptId", 370L);
+        } else if (deptService.thisDeptIdIsParentIdChild(deptId, 371L) > 0) {//梨树
+            ajax.put("mapDeptId", 371L);
+        } else if (deptService.thisDeptIdIsParentIdChild(deptId, 372L) > 0) {//铁东
+            ajax.put("mapDeptId", 372L);
+        } else if (deptService.thisDeptIdIsParentIdChild(deptId, 373L) > 0) {//铁西
+            ajax.put("mapDeptId", 373L);
+        }else{//四平
+            ajax.put("mapDeptId", 365L);
+        }
+        return ajax;
+    }
+
+    /**
+     * 修改用户
+     */
+    @ApiOperation(value = "修改用户个人信息", notes = "修改用户个人信息")
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult updateProfile(@RequestBody SysUser user)
+    {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser sysUser = loginUser.getSysUser();
+        user.setUserName(sysUser.getUserName());
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUserId(sysUser.getUserId());
+        user.setPassword(null);
+        if (userService.updateUserProfile(user) > 0)
+        {
+            // 更新缓存用户信息
+            loginUser.getSysUser().setNickName(user.getNickName());
+            loginUser.getSysUser().setPhonenumber(user.getPhonenumber());
+            loginUser.getSysUser().setEmail(user.getEmail());
+            loginUser.getSysUser().setSex(user.getSex());
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改个人信息异常，请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     */
+    @ApiOperation(value = "重置密码", notes = "重置密码")
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    {
+        String username = SecurityUtils.getUsername();
+        SysUser user = userService.selectUserByUserName(username);
+        String password = user.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return AjaxResult.error("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return AjaxResult.error("新密码不能与旧密码相同");
+        }
+        if (PassUtil.isStringPwd(newPassword).equals("0")) {
+            return AjaxResult.error("密码必须大于等于8位，包含特殊字符，数字，大小写字母");
+        }
+        if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0)
+        {
+            // 更新缓存用户密码
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     */
+    @ApiOperation(value = "头像上传", notes = "头像上传")
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/avatar")
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file)
+    {
+        if (!file.isEmpty())
+        {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            R<SysFile> fileResult = remoteFileService.upload(file);
+            if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData()))
+            {
+                return AjaxResult.error("文件服务异常，请联系管理员");
+            }
+            String url = fileResult.getData().getUrl();
+            if (userService.updateUserAvatar(loginUser.getUsername(), url))
+            {
+                AjaxResult ajax = AjaxResult.success();
+                /**图片前缀**/
+                String uri = configService.selectConfigByKey("fileUrl");
+                ajax.put("imgUrl", uri + url);
+                // 更新缓存用户头像
+                loginUser.getSysUser().setAvatar(url);
+                tokenService.setLoginUser(loginUser);
+                return ajax;
+            }
+        }
+        return AjaxResult.error("上传图片异常，请联系管理员");
+    }
+
+
+    /**
+     * app重置密码
+     */
+    @ApiOperation(value = "app重置密码", notes = "app重置密码")
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateAppPwd")
+    public AjaxResult updateAppPwd(@RequestBody AppResetPwd appResetPwd)
+    {
+        SysUser user = userService.selectUserByUserName(appResetPwd.getUn());
+        String password = user.getPassword();
+        if (!SecurityUtils.matchesPassword(appResetPwd.getOp(), password))
+        {
+            return AjaxResult.error("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(appResetPwd.getNp(), password))
+        {
+            return AjaxResult.error("新密码不能与旧密码相同");
+        }
+        if (PassUtil.isStringPwd(appResetPwd.getNp()).equals("0")) {
+            return AjaxResult.error("密码必须大于等于8位，包含特殊字符，数字，大小写字母");
+        }
+        if (userService.resetUserPwd(appResetPwd.getUn(), SecurityUtils.encryptPassword(appResetPwd.getNp())) > 0)
+        {
+            // 更新缓存用户密码
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(appResetPwd.getNp()));
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改密码异常，请联系管理员");
+    }
+
+}

src/main/java/com/ruoyi/system/controller/SysReportController.java

@@ -0,0 +1,391 @@
+package com.ruoyi.system.controller;
+
+import java.io.*;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.io.FileUtil;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysReportData;
+import com.ruoyi.system.domain.SysSystemUseReport;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysReportService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.SysReport;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 系统运行报告Controller
+ *
+ * @author limeng
+ * @date 2023-08-09
+ */
+@RestController
+@RequestMapping("/report")
+public class SysReportController extends BaseController {
+
+    @Resource
+    private ISysReportService sysReportService;
+    @Resource
+    private ISysConfigService configService;
+
+    /**
+     * 查询系统运行报告列表
+     */
+    @RequiresPermissions("system:report:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysReport sysReport) {
+        startPage();
+        List<SysReport> list = sysReportService.selectSysReportList(sysReport);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询系统运行报告列表
+     */
+    @GetMapping("/selectSysReportData")
+    public AjaxResult  selectSysReportData() {
+        SysReportData list = sysReportService.selectSysReportData();
+        return AjaxResult.success(list);
+    }
+
+//    /**
+//     * 导出report列表
+//     */
+//    @RequiresPermissions("system:report:export")
+//    @Log(title = "report", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, SysReport sysReport) {
+//        List<SysReport> list = sysReportService.selectSysReportList(sysReport);
+//        ExcelUtil<SysReport> util = new ExcelUtil<SysReport>(SysReport.class);
+//        util.exportExcel(response, list, "report数据");
+//    }
+
+    /**
+     * 获取系统运行报告详细信息
+     */
+    @RequiresPermissions("system:report:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success(sysReportService.selectSysReportById(id));
+    }
+
+    /**
+     * 新增系统运行报告
+     */
+    @RequiresPermissions("system:report:add")
+    @Log(title = "report", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysReport sysReport) {
+        return toAjax(sysReportService.insertSysReport(sysReport));
+    }
+
+    /**
+     * 新增系统运行报告
+     */
+    @PostMapping("/addReportData")
+    public AjaxResult addReportData(@RequestBody SysReportData sysReportData) {
+        return toAjax(sysReportService.insertSysReportData(sysReportData));
+    }
+
+    /**
+     * 修改系统运行报告
+     */
+    @RequiresPermissions("system:report:edit")
+    @Log(title = "report", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysReport sysReport) {
+        return toAjax(sysReportService.updateSysReport(sysReport));
+    }
+
+    /**
+     * 修改系统运行报告
+     */
+    @PostMapping("/editSysReportData")
+    public AjaxResult editSysReportData(@RequestBody SysReportData sysReportData) {
+        return toAjax(sysReportService.updateSysReportData(sysReportData));
+    }
+
+    /**
+     * 删除系统运行报告
+     */
+    @RequiresPermissions("system:report:remove")
+    @Log(title = "report", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(sysReportService.deleteSysReportByIds(ids));
+    }
+
+    /**
+     * 生成报告
+     */
+    @GetMapping(value = "/generateReport")
+    public void generateReport(HttpServletResponse response) {
+        try{
+            Map<String, String> map = sysReportService.generateReport();
+            SysReport sysReport = new SysReport();
+            sysReport.setFileName(map.get("fileName"));
+            sysReport.setFileUrl(map.get("filePath"));
+            sysReport.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            sysReportService.insertSysReport(sysReport);
+            File file = new File(map.get("localFilePath"));
+            response.setContentType("application/octet-stream;charset=utf-8");
+            String responseName = URLEncoder.encode("态势感知系统使用情况报告.docx", "UTF-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + responseName);
+            OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
+            toClient.write(FileUtil.readBytes(file));
+            toClient.flush();
+            toClient.close();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 获取历史报告
+     */
+    @GetMapping(value = "/getReportById/{id}")
+    public String getReportById(@PathVariable("id") String id) {
+        try {
+            String filePath = configService.selectConfigByKey("fileUrl");
+            SysReport report = sysReportService.selectSysReportById(id);
+            return filePath + report.getFileUrl();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 查询平台使用情况报告列表
+     */
+    @RequiresPermissions("system:report:useReport")
+    @GetMapping(value = "/selectSystemUseReportList")
+    public TableDataInfo selectSystemUseReportList(SysReportData sysReportData) {
+        startPage();
+        List<SysSystemUseReport> list = sysReportService.selectUserActiveAndRate(sysReportData);
+        return getDataTable(list);
+    }
+
+    public String[] parseDateRange(String[] args) {
+        SimpleDateFormat sdf0 = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年M月d日");
+        String [] arr = new String[2];
+        if (args == null) return new String[0];
+        try {
+            Date date0 = sdf0.parse(args[0]);
+            Date date1 = sdf0.parse(args[1]);
+            arr[0] = sdf1.format(date0);
+            arr[1] = sdf1.format(date1);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return arr;
+    }
+
+    /**
+     * 导出平台使用情况报告列表
+     */
+    @ApiOperation(value = "导出平台使用情况报告列表", notes = "导出平台使用情况报告列表")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysReportData sysReportData) {
+        List<SysSystemUseReport> list = sysReportService.selectUserActiveAndRate(sysReportData);
+        String tableTitle = "态势感知平台使用情况汇总表";
+        if(StringUtils.isNotEmpty(sysReportData.getDateRange()) && sysReportData.getDateRange() != null){
+            tableTitle += "("+parseDateRange(sysReportData.getDateRange())[0]+"-"+parseDateRange(sysReportData.getDateRange())[1]+")";
+        }
+        try {
+            //1、创建一个工作簿
+            XSSFWorkbook wb = new XSSFWorkbook();
+            //2、创建一个工作表sheet
+            XSSFSheet sheet = wb.createSheet(tableTitle);
+            sheet.setDefaultRowHeight((short)600);
+            sheet.setDefaultColumnWidth((short)10);
+            //3、创建单元格样式
+            XSSFCellStyle style = wb.createCellStyle();
+            style.setFillForegroundColor(IndexedColors.WHITE.getIndex());//设置背景颜色
+            style.setFillPattern(FillPatternType.NO_FILL); //填充样式 有全部填充 有小点填充  有大点填充
+            //设置文字的格式
+            style.setAlignment(HorizontalAlignment.CENTER);//文字水平居中
+            style.setVerticalAlignment(VerticalAlignment.CENTER);//文字垂直居中
+            style.setBorderBottom(BorderStyle.THIN);//边框加黑
+            style.setBorderLeft(BorderStyle.THIN);//边框加黑
+            style.setBorderRight(BorderStyle.THIN);//边框加黑
+            style.setBorderTop(BorderStyle.THIN);//边框加黑
+
+            //创建单元格
+            for (int i = 0; i < 19; i++) {//创建的行数
+                Row row = sheet.createRow(i);//创建行
+                for (int j = 0; j < 14; j++) {//每行的列数
+                    row.createCell(j).setCellStyle(style);
+                }
+            }
+
+            //合并单元格  参数说明 参数1：合并的开始行  参数2：合并的结束行  参数3：合并的开始单元格  参数4：合并结束的单元格
+            sheet.addMergedRegion(new CellRangeAddress(0,0,0,13));
+            sheet.addMergedRegion(new CellRangeAddress(1,2,0,0));
+            sheet.addMergedRegion(new CellRangeAddress(1,1,1,3));
+            sheet.addMergedRegion(new CellRangeAddress(1,1,4,10));
+            sheet.addMergedRegion(new CellRangeAddress(1,1,11,13));
+
+            //4、插入数据
+            /**第一行表头**/
+            XSSFRow row1 = sheet.getRow(0);//获取第一行
+            Cell cell0 = row1.getCell(0);//获取第一行的第一个单元格
+            cell0.setCellValue(tableTitle);//插入数据
+            CellStyle cellStyle = wb.createCellStyle();//字体
+            cellStyle.setAlignment(HorizontalAlignment.CENTER);//文字水平居中
+            cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//文字垂直居中
+            cellStyle.setBorderBottom(BorderStyle.THIN);//边框加黑
+            cellStyle.setBorderLeft(BorderStyle.THIN);//边框加黑
+            cellStyle.setBorderRight(BorderStyle.THIN);//边框加黑
+            cellStyle.setBorderTop(BorderStyle.THIN);//边框加黑
+            Font font = wb.createFont();
+            font.setFontName("黑体");// 字体
+            font.setFontHeightInPoints((short) 16);// 字体高度
+            cellStyle.setFont(font);
+            row1.getCell(0).setCellStyle(cellStyle);
+
+            /**第二行字段列**/
+            XSSFRow row2 = sheet.getRow(1);//获取第二行
+            Cell cell2_1 = row2.getCell(0);//获取第二行的第一个单元格
+            cell2_1.setCellValue("辖区/行业");//插入数据
+            CellStyle cellStyle2_1 = wb.createCellStyle();//字体
+            cellStyle2_1.setWrapText(true);//自动换行
+            cellStyle2_1.setAlignment(HorizontalAlignment.CENTER);//文字水平居中
+            cellStyle2_1.setVerticalAlignment(VerticalAlignment.CENTER);//文字垂直居中
+            cellStyle2_1.setBorderBottom(BorderStyle.THIN);//边框加黑
+            cellStyle2_1.setBorderLeft(BorderStyle.THIN);//边框加黑
+            cellStyle2_1.setBorderRight(BorderStyle.THIN);//边框加黑
+            cellStyle2_1.setBorderTop(BorderStyle.THIN);//边框加黑
+            Font font2_1 = wb.createFont();
+            font2_1.setFontName("黑体");// 字体
+            font2_1.setFontHeightInPoints((short) 12);// 字体高度
+            cellStyle2_1.setFont(font2_1);
+            row2.getCell(0).setCellStyle(cellStyle2_1);
+
+            Cell cell2_2 = row2.getCell(1);//获取第二行的第二个单元格
+            CellStyle cellStyle2_2 = wb.createCellStyle();//字体
+            // 设置单元格样式为自动换行
+            cellStyle2_2.setAlignment(HorizontalAlignment.CENTER);//文字水平居中
+            cellStyle2_2.setVerticalAlignment(VerticalAlignment.CENTER);//文字垂直居中
+            cellStyle2_2.setBorderBottom(BorderStyle.THIN);//边框加黑
+            cellStyle2_2.setBorderLeft(BorderStyle.THIN);//边框加黑
+            cellStyle2_2.setBorderRight(BorderStyle.THIN);//边框加黑
+            cellStyle2_2.setBorderTop(BorderStyle.THIN);//边框加黑
+            Font font2_2 = wb.createFont();
+            font2_2.setFontName("黑体");// 字体
+            font2_2.setFontHeightInPoints((short) 14);// 字体高度
+            cellStyle2_2.setFont(font2_2);
+            cell2_2.setCellValue("账号情况");//插入数据
+            cell2_2.setCellStyle(cellStyle2_2);
+
+            Cell cell2_4 = row2.getCell(4);//获取第二行的第四个单元格
+            cell2_4.setCellValue("事件情况");//插入数据
+            cell2_4.setCellStyle(cellStyle2_2);
+
+            Cell cell2_11 = row2.getCell(11);//获取第二行的第十一个单元格
+            cell2_11.setCellValue("行业数据情况");//插入数据
+            cell2_11.setCellStyle(cellStyle2_2);
+
+            /**第三行字段列**/
+            XSSFRow row3 = sheet.getRow(2);//获取第三行
+            Cell cell3_1 = row3.getCell(1);//获取第三行的第二个单元格
+            cell3_1.setCellValue("账号数");
+            cell3_1.setCellStyle(cellStyle2_1);
+            Cell cell3_2 = row3.getCell(2);//获取第三行的第三个单元格
+            cell3_2.setCellValue("活跃数");
+            cell3_2.setCellStyle(cellStyle2_1);
+            Cell cell3_3 = row3.getCell(3);//获取第三行的第四个单元格
+            cell3_3.setCellValue("活跃率");
+            cell3_3.setCellStyle(cellStyle2_1);
+            Cell cell3_4 = row3.getCell(4);//获取第三行的第五个单元格
+            cell3_4.setCellValue("事件总数");
+            cell3_4.setCellStyle(cellStyle2_1);
+            Cell cell3_5 = row3.getCell(5);//获取第三行的第六个单元格
+            cell3_5.setCellValue("未签收");
+            cell3_5.setCellStyle(cellStyle2_1);
+            Cell cell3_6 = row3.getCell(6);//获取第三行的第七个单元格
+            cell3_6.setCellValue("处理中");
+            cell3_6.setCellStyle(cellStyle2_1);
+            Cell cell3_7 = row3.getCell(7);
+            cell3_7.setCellValue("办结归档数");
+            cell3_7.setCellStyle(cellStyle2_1);
+            Cell cell3_8 = row3.getCell(8);
+            cell3_8.setCellValue("办结归档率");
+            cell3_8.setCellStyle(cellStyle2_1);
+            Cell cell3_9 = row3.getCell(9);
+            cell3_9.setCellValue("当日办结、归档数");
+            cell3_9.setCellStyle(cellStyle2_1);
+            Cell cell3_10 = row3.getCell(10);
+            cell3_10.setCellValue("当日办结、归档率");
+            cell3_10.setCellStyle(cellStyle2_1);
+            Cell cell3_11 = row3.getCell(11);
+            cell3_11.setCellValue("数据总数");
+            cell3_11.setCellStyle(cellStyle2_1);
+            Cell cell3_12 = row3.getCell(12);
+            cell3_12.setCellValue("数据更新数");
+            cell3_12.setCellStyle(cellStyle2_1);
+            Cell cell3_13 = row3.getCell(13);
+            cell3_13.setCellValue("数据更新率");
+            cell3_13.setCellStyle(cellStyle2_1);
+            for (int i = 0; i < list.size(); i++) {
+                SysSystemUseReport ssur = list.get(i);
+                XSSFRow row = sheet.getRow(i+3);//获取第i行
+                row.getCell(0).setCellValue(ssur.getDeptName());
+                row.getCell(0).setCellStyle(cellStyle2_1);
+                row.getCell(1).setCellValue(ssur.getUser());
+                row.getCell(1).setCellStyle(cellStyle2_1);
+                row.getCell(2).setCellValue(ssur.getActive());
+                row.getCell(2).setCellStyle(cellStyle2_1);
+                row.getCell(3).setCellValue(ssur.getActiveRate());
+                row.getCell(3).setCellStyle(cellStyle2_1);
+                row.getCell(4).setCellValue(ssur.getEventCount());
+                row.getCell(4).setCellStyle(cellStyle2_1);
+                row.getCell(5).setCellValue(ssur.getEventQr());
+                row.getCell(5).setCellStyle(cellStyle2_1);
+                row.getCell(6).setCellValue(ssur.getEventQs());
+                row.getCell(6).setCellStyle(cellStyle2_1);
+                row.getCell(7).setCellValue(ssur.getEventBjgd());
+                row.getCell(7).setCellStyle(cellStyle2_1);
+                row.getCell(8).setCellValue(ssur.getEventBjgdRate());
+                row.getCell(8).setCellStyle(cellStyle2_1);
+                row.getCell(9).setCellValue(ssur.getEventTodayBjgd());
+                row.getCell(9).setCellStyle(cellStyle2_1);
+                row.getCell(10).setCellValue(ssur.getEventTodayBjgdRate());
+                row.getCell(10).setCellStyle(cellStyle2_1);
+                row.getCell(11).setCellValue(ssur.getCount());
+                row.getCell(11).setCellStyle(cellStyle2_1);
+                row.getCell(12).setCellValue(ssur.getUpdateCount());
+                row.getCell(12).setCellStyle(cellStyle2_1);
+                row.getCell(13).setCellValue(ssur.getUpdateRate());
+                row.getCell(13).setCellStyle(cellStyle2_1);
+            }
+            wb.write(response.getOutputStream());
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+}

src/main/java/com/ruoyi/system/controller/SysRoleController.java

@@ -0,0 +1,222 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 角色信息
+ *
+ * @author ruoyi
+ */
+@Api(tags = "角色信息控制器")
+@RestController
+@RequestMapping("/role")
+public class SysRoleController extends BaseController {
+
+    private final ISysRoleService roleService;
+
+    private final ISysUserService userService;
+
+    public SysRoleController(ISysRoleService roleService, ISysUserService userService) {
+        this.roleService = roleService;
+        this.userService = userService;
+    }
+    /**
+     * 获取角色列表
+     */
+    @ApiOperation(value = "获取角色列表", notes = "获取角色列表")
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRole role) {
+        startPage();
+        List<SysRole> list = roleService.selectRoleList(role);
+        return getDataTable(list);
+    }
+    /**
+     * 导出角色列表
+     */
+    @ApiOperation(value = "导出角色列表", notes = "导出角色列表")
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:role:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRole role) {
+        List<SysRole> list = roleService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<>(SysRole.class);
+        util.exportExcel(response, list, "角色数据");
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     */
+    @ApiOperation(value = "根据角色编号获取详细信息", notes = "根据角色编号获取详细信息")
+    @RequiresPermissions("system:role:query")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable Long roleId) {
+        roleService.checkRoleDataScope(roleId);
+        roleService.checkRoleDataScopevisu(roleId);
+        return AjaxResult.success(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @ApiOperation(value = "新增角色", notes = "新增角色")
+    @RequiresPermissions("system:role:add")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role) {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setCreateBy(SecurityUtils.getUsername());
+        /* sysRoleMenuvisuService.insertRoleMenu(role);*/
+        return toAjax(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @ApiOperation(value = "修改保存角色", notes = "修改保存角色")
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysRole role) {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(roleService.updateRole(role));
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @ApiOperation(value = "修改保存角色数据权限", notes = "修改保存角色数据权限")
+    @RequiresPermissions("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));
+    }
+
+    /**
+     * 状态修改
+     */
+    @ApiOperation(value = "角色状态修改", notes = "角色状态修改")
+    @RequiresPermissions("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(SecurityUtils.getUsername());
+        return toAjax(roleService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @ApiOperation(value = "删除角色", notes = "删除角色")
+    @RequiresPermissions("system:role:remove")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds) {
+        return toAjax(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @ApiOperation(value = "获取角色选择框列表", notes = "获取角色选择框列表")
+    @RequiresPermissions("system:role:query")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect() {
+        return AjaxResult.success(roleService.selectRoleAll());
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @ApiOperation(value = "查询已分配用户角色列表", notes = "查询已分配用户角色列表")
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo allocatedList(SysUser user) {
+        startPage();
+        List<SysUser> list = userService.selectAllocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @ApiOperation(value = "查询未分配用户角色列表", notes = "查询未分配用户角色列表")
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo unallocatedList(SysUser user) {
+        startPage();
+        List<SysUser> list = userService.selectUnallocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @ApiOperation(value = "取消授权用户", notes = "取消授权用户")
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
+        return toAjax(roleService.deleteAuthUser(userRole));
+    }
+
+    /**
+     * 批量取消授权用户
+     */
+    @ApiOperation(value = "批量取消授权用户", notes = "批量取消授权用户")
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) {
+        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     */
+    @ApiOperation(value = "批量选择用户授权", notes = "批量选择用户授权")
+    @RequiresPermissions("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));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysRoleEventtypeController.java

@@ -0,0 +1,109 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.SysRoleEventtype;
+import com.ruoyi.system.service.ISysRoleEventtypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 角色对应事件类型Controller
+ *
+ * @author ruoyi
+ * @date 2022-07-14
+ */
+@Api(tags = "角色对应事件类型控制器")
+@RestController
+@RequestMapping("/eventtype")
+public class SysRoleEventtypeController extends BaseController
+{
+    private final ISysRoleEventtypeService sysRoleEventtypeService;
+
+    public SysRoleEventtypeController(ISysRoleEventtypeService sysRoleEventtypeService) {
+        this.sysRoleEventtypeService = sysRoleEventtypeService;
+    }
+
+    /**
+     * 查询角色对应事件类型列表
+     */
+    @ApiOperation(value = "查询角色对应事件类型列表", notes = "查询角色对应事件类型列表")
+    @RequiresPermissions("system:eventtype:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRoleEventtype sysRoleEventtype)
+    {
+        startPage();
+        List<SysRoleEventtype> list = sysRoleEventtypeService.selectSysRoleEventtypeList(sysRoleEventtype);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出角色对应事件类型列表
+     */
+    @ApiOperation(value = "导出角色对应事件类型列表", notes = "导出角色对应事件类型列表")
+    @RequiresPermissions("system:eventtype:export")
+    @Log(title = "角色对应事件类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRoleEventtype sysRoleEventtype)
+    {
+        List<SysRoleEventtype> list = sysRoleEventtypeService.selectSysRoleEventtypeList(sysRoleEventtype);
+        ExcelUtil<SysRoleEventtype> util = new ExcelUtil<>(SysRoleEventtype.class);
+        util.exportExcel(response, list, "角色对应事件类型数据");
+    }
+
+    /**
+     * 获取角色对应事件类型详细信息
+     */
+    @ApiOperation(value = "获取角色对应事件类型详细信息", notes = "获取角色对应事件类型详细信息")
+    @RequiresPermissions("system:eventtype:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(sysRoleEventtypeService.selectSysRoleEventtypeById(id));
+    }
+
+    /**
+     * 新增角色对应事件类型
+     */
+    @ApiOperation(value = "新增角色对应事件类型", notes = "新增角色对应事件类型")
+    @RequiresPermissions("system:eventtype:add")
+    @Log(title = "角色对应事件类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysRoleEventtype sysRoleEventtype)
+    {
+        return toAjax(sysRoleEventtypeService.insertSysRoleEventtype(sysRoleEventtype));
+    }
+
+    /**
+     * 修改角色对应事件类型
+     */
+    @ApiOperation(value = "修改角色对应事件类型", notes = "修改角色对应事件类型")
+    @RequiresPermissions("system:eventtype:edit")
+    @Log(title = "角色对应事件类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysRoleEventtype sysRoleEventtype)
+    {
+        return toAjax(sysRoleEventtypeService.updateSysRoleEventtype(sysRoleEventtype));
+    }
+
+    /**
+     * 删除角色对应事件类型
+     */
+    @ApiOperation(value = "删除角色对应事件类型", notes = "删除角色对应事件类型")
+    @RequiresPermissions("system:eventtype:remove")
+    @Log(title = "角色对应事件类型", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(sysRoleEventtypeService.deleteSysRoleEventtypeByIds(ids));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysRoleMenuappController.java

@@ -0,0 +1,125 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.domain.SysRoleMenuapp;
+import com.ruoyi.system.service.ISysRoleMenuappService;
+import com.ruoyi.system.service.ISysRoleMenuappService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 角色和菜单关联Controller
+ *
+ * @author ruoyi
+ * @date 2022-05-24
+ */
+@Api(tags = "角色和菜单关联控制器")
+@RestController
+@RequestMapping("/menuapp")
+public class SysRoleMenuappController extends BaseController
+{
+    private final ISysRoleMenuappService sysRoleMenuappService;
+
+    public SysRoleMenuappController(ISysRoleMenuappService sysRoleMenuappService) {
+        this.sysRoleMenuappService = sysRoleMenuappService;
+    }
+
+    /**
+     * 查询角色和菜单关联列表
+     */
+    @ApiOperation(value = "查询角色和菜单关联列表", notes = "查询角色和菜单关联列表")
+    @RequiresPermissions("system:menuapp:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRoleMenuapp sysRoleMenuapp)
+    {
+        startPage();
+        List<SysRoleMenuapp> list = sysRoleMenuappService.selectSysRoleMenuappList(sysRoleMenuapp);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出角色和菜单关联列表
+     */
+    @ApiOperation(value = "导出角色和菜单关联列表", notes = "导出角色和菜单关联列表")
+    @RequiresPermissions("system:menuapp:export")
+    @Log(title = "角色和菜单关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRoleMenuapp sysRoleMenuapp)
+    {
+        List<SysRoleMenuapp> list = sysRoleMenuappService.selectSysRoleMenuappList(sysRoleMenuapp);
+        ExcelUtil<SysRoleMenuapp> util = new ExcelUtil<>(SysRoleMenuapp.class);
+        util.exportExcel(response, list, "角色和菜单关联数据");
+    }
+
+    /**
+     * 获取角色和菜单关联详细信息
+     */
+    @ApiOperation(value = "获取角色和菜单关联详细信息", notes = "获取角色和菜单关联详细信息")
+    @RequiresPermissions("system:menuapp:query")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable("roleId") Long roleId)
+    {
+        return AjaxResult.success(sysRoleMenuappService.selectSysRoleMenuappByRoleId(roleId));
+    }
+
+    /**
+     * 修改角色和菜单关联
+     */
+    @ApiOperation(value = "修改角色和菜单关联", notes = "修改角色和菜单关联")
+    @RequiresPermissions("system:menuapp:edit")
+    @Log(title = "角色和菜单关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysRoleMenuapp sysRoleMenuapp)
+    {
+        return toAjax(sysRoleMenuappService.updateSysRoleMenuapp(sysRoleMenuapp));
+    }
+
+    /**
+     * 删除角色和菜单关联
+     */
+    @ApiOperation(value = "删除角色和菜单关联", notes = "删除角色和菜单关联")
+    @RequiresPermissions("system:menuapp:remove")
+    @Log(title = "角色和菜单关联", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds)
+    {
+        return toAjax(sysRoleMenuappService.deleteSysRoleMenuappByRoleIds(roleIds));
+    }
+
+
+    /**
+     * 新增角色
+     */
+    @ApiOperation(value = "新增角色和菜单关联", notes = "新增角色和菜单关联")
+    @RequiresPermissions("system:menuapp:add")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(sysRoleMenuappService.checkRoleNameUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(sysRoleMenuappService.checkRoleKeyUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(sysRoleMenuappService.insertRoleMenu(role));
+
+    }
+}

src/main/java/com/ruoyi/system/controller/SysRoleMenuvisuController.java

@@ -0,0 +1,124 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.domain.SysRoleMenuvisu;
+import com.ruoyi.system.service.ISysRoleMenuvisuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 角色和菜单关联Controller
+ *
+ * @author ruoyi
+ * @date 2022-05-24
+ */
+@Api(tags = "角色和菜单关联控制器")
+@RestController
+@RequestMapping("/menuvisu")
+public class SysRoleMenuvisuController extends BaseController
+{
+    private final ISysRoleMenuvisuService sysRoleMenuvisuService;
+
+    public SysRoleMenuvisuController(ISysRoleMenuvisuService sysRoleMenuvisuService) {
+        this.sysRoleMenuvisuService = sysRoleMenuvisuService;
+    }
+
+    /**
+     * 查询角色和菜单关联列表
+     */
+    @ApiOperation(value = "查询角色和菜单关联列表", notes = "查询角色和菜单关联列表")
+    @RequiresPermissions("system:menuvisu:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRoleMenuvisu sysRoleMenuvisu)
+    {
+        startPage();
+        List<SysRoleMenuvisu> list = sysRoleMenuvisuService.selectSysRoleMenuvisuList(sysRoleMenuvisu);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出角色和菜单关联列表
+     */
+    @ApiOperation(value = "导出角色和菜单关联列表", notes = "导出角色和菜单关联列表")
+    @RequiresPermissions("system:menuvisu:export")
+    @Log(title = "角色和菜单关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRoleMenuvisu sysRoleMenuvisu)
+    {
+        List<SysRoleMenuvisu> list = sysRoleMenuvisuService.selectSysRoleMenuvisuList(sysRoleMenuvisu);
+        ExcelUtil<SysRoleMenuvisu> util = new ExcelUtil<>(SysRoleMenuvisu.class);
+        util.exportExcel(response, list, "角色和菜单关联数据");
+    }
+
+    /**
+     * 获取角色和菜单关联详细信息
+     */
+    @ApiOperation(value = "获取角色和菜单关联详细信息", notes = "获取角色和菜单关联详细信息")
+    @RequiresPermissions("system:menuvisu:query")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable("roleId") Long roleId)
+    {
+        return AjaxResult.success(sysRoleMenuvisuService.selectSysRoleMenuvisuByRoleId(roleId));
+    }
+
+    /**
+     * 修改角色和菜单关联
+     */
+    @ApiOperation(value = "修改角色和菜单关联", notes = "修改角色和菜单关联")
+    @RequiresPermissions("system:menuvisu:edit")
+    @Log(title = "角色和菜单关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysRoleMenuvisu sysRoleMenuvisu)
+    {
+        return toAjax(sysRoleMenuvisuService.updateSysRoleMenuvisu(sysRoleMenuvisu));
+    }
+
+    /**
+     * 删除角色和菜单关联
+     */
+    @ApiOperation(value = "删除角色和菜单关联", notes = "删除角色和菜单关联")
+    @RequiresPermissions("system:menuvisu:remove")
+    @Log(title = "角色和菜单关联", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds)
+    {
+        return toAjax(sysRoleMenuvisuService.deleteSysRoleMenuvisuByRoleIds(roleIds));
+    }
+
+
+    /**
+     * 新增角色
+     */
+    @ApiOperation(value = "新增角色和菜单关联", notes = "新增角色和菜单关联")
+    @RequiresPermissions("system:menuVisu:add")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(sysRoleMenuvisuService.checkRoleNameUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(sysRoleMenuvisuService.checkRoleKeyUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(sysRoleMenuvisuService.insertRoleMenu(role));
+
+    }
+}

src/main/java/com/ruoyi/system/controller/SysRolePartyController.java

@@ -0,0 +1,220 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.service.ISysRolePartyService;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 角色信息
+ *
+ * @author ruoyi
+ */
+@ApiIgnore
+@RestController
+@RequestMapping("/roleparty")
+public class SysRolePartyController extends BaseController
+{
+    private final ISysRolePartyService rolePartyService;
+
+    private final ISysUserService userService;
+
+    public SysRolePartyController(ISysRolePartyService rolePartyService, ISysUserService userService) {
+        this.rolePartyService = rolePartyService;
+        this.userService = userService;
+    }
+
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRole role)
+    {
+        startPage();
+        List<SysRole> list = rolePartyService.selectRoleList(role);
+        return getDataTable(list);
+    }
+
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:role:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRole role)
+    {
+        List<SysRole> list = rolePartyService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        util.exportExcel(response, list, "角色数据");
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     */
+    @RequiresPermissions("system:role:query")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable Long roleId)
+    {
+        rolePartyService.checkRoleDataScope(roleId);
+        return AjaxResult.success(rolePartyService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @RequiresPermissions("system:role:add")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(rolePartyService.checkRoleNameUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(rolePartyService.checkRoleKeyUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(rolePartyService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    {
+        rolePartyService.checkRoleAllowed(role);
+        rolePartyService.checkRoleDataScope(role.getRoleId());
+        if (UserConstants.NOT_UNIQUE.equals(rolePartyService.checkRoleNameUnique(role)))
+        {
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(rolePartyService.checkRoleKeyUnique(role)))
+        {
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(rolePartyService.updateRole(role));
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/dataScope")
+    public AjaxResult dataScope(@RequestBody SysRole role)
+    {
+        rolePartyService.checkRoleAllowed(role);
+        rolePartyService.checkRoleDataScope(role.getRoleId());
+        return toAjax(rolePartyService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysRole role)
+    {
+        rolePartyService.checkRoleAllowed(role);
+        rolePartyService.checkRoleDataScope(role.getRoleId());
+        role.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(rolePartyService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @RequiresPermissions("system:role:remove")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds)
+    {
+        return toAjax(rolePartyService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @RequiresPermissions("system:role:query")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        return AjaxResult.success(rolePartyService.selectRoleAll());
+    }
+    /**
+     * 查询已分配用户角色列表
+     */
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo allocatedList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectAllocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo unallocatedList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUnallocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
+    {
+        return toAjax(rolePartyService.deleteAuthUser(userRole));
+    }
+
+    /**
+     * 批量取消授权用户
+     */
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+    {
+        return toAjax(rolePartyService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     */
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    {
+        rolePartyService.checkRoleDataScope(roleId);
+        return toAjax(rolePartyService.insertAuthUsers(roleId, userIds));
+    }
+}

src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -0,0 +1,592 @@
+package com.ruoyi.system.controller;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.PassUtil;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.RemoteConfigService;
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.api.domain.SysDeptParty;
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.domain.PunchCardDto;
+import com.ruoyi.system.domain.PushMessageVO;
+import com.ruoyi.system.domain.SysMenuVisu;
+import com.ruoyi.system.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
+
+/**
+ * 用户信息
+ *
+ * @author ruoyi
+ */
+@Api(tags = "用户信息控制器")
+@RestController
+@RequestMapping("/user")
+public class SysUserController extends BaseController {
+    private final ISysUserService userService;
+
+    private final ISysRoleService roleService;
+
+    private final ISysPostService postService;
+
+    private final ISysPermissionService permissionService;
+
+    private final ISysConfigService configService;
+
+    private final ISysMenuVisuService menuVisuService;
+    @Resource
+    private RemoteConfigService remoteConfigService;
+
+
+    public SysUserController(ISysUserService userService, ISysRoleService roleService, ISysPostService postService, ISysPermissionService permissionService, ISysConfigService configService, ISysMenuVisuService menuVisuService) {
+        this.userService = userService;
+        this.roleService = roleService;
+        this.postService = postService;
+        this.permissionService = permissionService;
+        this.configService = configService;
+        this.menuVisuService = menuVisuService;
+    }
+
+    /**
+     * 获取用户列表
+     */
+    @ApiOperation(value = "获取用户列表", notes = "获取用户列表")
+    @RequiresPermissions("system:user:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysUser user) {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据条件分页查询用户列表-只查询部门本级
+     */
+    @ApiOperation(value = "根据条件分页查询用户列表-只查询部门本级", notes = "根据条件分页查询用户列表-只查询部门本级")
+    @GetMapping("/listUserOnlyThisLevel")
+    public TableDataInfo listUserOnlyThisLevel(SysUser user) {
+        startPage();
+        List<SysUser> list = userService.listUserOnlyThisLevel(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取用户列表
+     */
+    @ApiOperation(value = "远程获取用户列表", notes = "远程获取用户列表")
+    @PostMapping("/userFeginlist")
+    public R<List<SysUser>> userFeginlist(@RequestBody SysUser user) {
+        List<SysUser> list = userService.selectUserList(user);
+        return R.ok(list);
+    }
+
+    /**
+     * 获取用户列表(分页)
+     */
+    @ApiOperation(value = "远程获取用户列表", notes = "远程获取用户列表")
+    @PostMapping("/userFeginlistWithPage")
+    public List<SysUser> userFeginlistWithPage(@RequestBody SysUser user) {
+        List<SysUser> list = userService.selectUserListAll(user);
+        return list;
+    }
+
+    /**
+     * 获取用户部门列表
+     */
+    @ApiOperation(value = "远程获取用户部门列表", notes = "远程获取用户列表")
+    @GetMapping("/selectUserWithPostByDeptId")
+    public R<List<SysUser>> selectUserWithPostByDeptId(SysUser user) {
+        List<SysUser> list = userService.selectUserWithPostByDeptId(user);
+        return R.ok(list);
+    }
+
+    /**
+     * 导出获取用户列表
+     */
+    @ApiOperation(value = "导出获取用户列表", notes = "导出获取用户列表")
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:user:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysUser user) {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
+        util.exportExcel(response, list, "用户数据");
+    }
+    /**
+     * 导入获取用户数据
+     */
+    @ApiOperation(value = "导入获取用户数据", notes = "导入获取用户数据")
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @RequiresPermissions("system:user:import")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream());
+        String operName = SecurityUtils.getUsername();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return AjaxResult.success(message);
+    }
+    /**
+     * 导入模板
+     */
+    @ApiOperation(value = "导入模板", notes = "导入模板")
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response){
+        ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
+        util.importTemplateExcel(response, "用户数据");
+    }
+
+    /**
+     * 获取当前用户信息
+     */
+    @ApiOperation(value = "获取当前用户信息", notes = "获取当前用户信息")
+    @InnerAuth
+    @GetMapping("/info/{username}")
+    public R<LoginUser> info(@PathVariable("username") String username) {
+        SysUser sysUser = userService.selectUserByUserName(username);
+        if (StringUtils.isNull(sysUser)) {
+            return R.fail("用户名或密码错误");
+        }
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(sysUser.getUserId());
+        LoginUser sysUserVo = new LoginUser();
+        sysUserVo.setSysUser(sysUser);
+        sysUserVo.setRoles(roles);
+        sysUserVo.setPermissions(permissions);
+        sysUserVo.setUservisuList(userService.selectUservisu(sysUser.getRoles()));
+        sysUserVo.setUserappList(userService.selectUserapp(sysUser.getRoles()));
+        return R.ok(sysUserVo);
+    }
+
+
+    /**
+     * 获取可视化菜单信息
+     *
+     * @return 用户信息
+     */
+    @ApiOperation(value = "获取可视化菜单信息", notes = "获取可视化菜单信息")
+    @GetMapping("selectRoleMenuVisuTreest")
+    public AjaxResult selectRoleMenuVisuTreest() {
+//        String userName = SecurityUtils.getLoginUser().getUsername();
+//        if (userName.equals("admin")) {
+        if (SysUser.isAdmin(SecurityUtils.getUserId())) {
+            List<LoginUser> list = userService.selectAll();
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("list", list);
+            return ajax;
+        }
+        List<SysRole> sysRoleList = SecurityUtils.getLoginUser().getSysUser().getRoles();
+        AjaxResult ajax = AjaxResult.success();
+        List<LoginUser> loginUserList = new ArrayList<>();
+        if (sysRoleList != null && sysRoleList.size() > 0) {
+            loginUserList = userService.selectRoleMenuVisuTreest(sysRoleList);
+        }
+        ajax.put("list", loginUserList);
+        return ajax;
+    }
+
+
+    /**
+     * 注册用户信息
+     */
+    @ApiOperation(value = "注册用户信息", notes = "注册用户信息")
+    @InnerAuth
+    @PostMapping("/register")
+    public R<Boolean> register(@RequestBody SysUser sysUser) {
+        String username = sysUser.getUserName();
+        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
+            return R.fail("当前系统没有开启注册功能！");
+        }
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) {
+            return R.fail("保存用户'" + username + "'失败，注册账号已存在");
+        }
+        return R.ok(userService.registerUser(sysUser));
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @ApiOperation(value = "获取用户信息详细", notes = "获取用户信息详细")
+    @GetMapping("getInfo")
+    public AjaxResult getInfo(HttpServletRequest request) {
+        Long userId = SecurityUtils.getUserId();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(userId);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(userId);
+        AjaxResult ajax = AjaxResult.success();
+        SysUser user = userService.selectUserById(userId);
+        /**图片前缀**/
+        String uri = configService.selectConfigByKey("fileUrl");
+        if(StringUtils.isNotEmpty(user.getAvatar())){
+            user.setAvatar(uri+user.getAvatar());
+        }
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        ajax.put("release",release(request, user));
+        return ajax;
+    }
+
+    /**
+     * 判断用户是否具有该可视化权限
+     * 如果有则放行，没有返回false
+     *
+     * */
+    public JSONObject release(HttpServletRequest request, SysUser user){
+        JSONObject result = new JSONObject();
+        String referer = request.getHeader("Referer");
+        //全部可视化菜单
+        List<SysMenuVisu> allVisu = menuVisuService.selectSysMenuVisuList(new SysMenuVisu());
+        //用户拥有的可视化菜单
+        List<LoginUser.uservisu> userHasVisu = userService.selectUservisu(user.getRoles());
+        JSONArray allArray = JSONUtil.parseArray(allVisu);
+        JSONArray userHasArray = JSONUtil.parseArray(userHasVisu);
+        //如果访问的是可视化菜单内的 并且用户没有这个菜单 返回false
+        logger.info("访问路径 ==>{}, 访问路径是否在系统菜单里 ==>{}, 用户是否具有该路径权限 ==>{}",referer,contains(allArray,referer),contains(userHasArray,referer));
+        if(contains(allArray,referer) && !contains(userHasArray,referer)){
+            result.put("flag",false);
+            result.put("url",configService.selectConfigByKey("backToMainPage"));
+            return result;
+        }
+        result.put("flag",true);
+        return result;
+    }
+
+    public boolean contains(JSONArray jsonArray, String referer){
+        boolean flag = false;
+        for (int i = 0; i < jsonArray.size(); i++) {
+            Object url = null;
+            String type = JSONUtil.parseObj(jsonArray.get(i)).get("menuType").toString();
+            switch (type){
+                case "P" : url = JSONUtil.parseObj(jsonArray.get(i)).get("pageServerUrl");
+                case "ZC" : url = JSONUtil.parseObj(jsonArray.get(i)).get("pageRouterUrl");
+                case "FC" : url = JSONUtil.parseObj(jsonArray.get(i)).get("pageRouterUrl");
+                case "ZM": url = JSONUtil.parseObj(jsonArray.get(i)).get("componentUrl");
+                case "FM": url = JSONUtil.parseObj(jsonArray.get(i)).get("componentUrl");
+            }
+
+            if(url != null && referer.contains(url.toString())){
+                logger.info("Referer ==>{}, PageRouterUrl ==>{}",referer,url);
+                flag = true;
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @ApiOperation(value = "根据用户编号获取详细信息", notes = "根据用户编号获取详细信息")
+    @RequiresPermissions("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()));
+            ajax.put("deptIds", sysUser.getDepts().stream().map(SysDept::getDeptId).collect(Collectors.toList()));
+            ajax.put("partyIds", sysUser.getDeptParties().stream().map(SysDeptParty::getDeptId).collect(Collectors.toList()));
+        }
+        return ajax;
+    }
+
+    @ApiOperation(value = "根据用户编号获取详细信息远程接口", notes = "根据用户编号获取详细信息远程接口")
+    @RequestMapping(value = "/selectById/{userId}",method = GET)
+    public R<SysUser> selectById(@PathVariable("userId") Long userId) {
+        return R.ok(userService.selectUserById(userId));
+    }
+
+    /**
+     * 修改用户jg远程调用
+     */
+    @ApiOperation(value = "修改用户jg远程调用", notes = "修改用户jg远程调用")
+    @RequestMapping(value = "/updateUserJg/{userName}/{deviceid}",method = GET)
+    public R updateUserJg(@PathVariable("userName") String userName,@PathVariable("deviceid") String deviceid)
+    {
+        return R.ok(userService.updateUserJg(userName,deviceid));
+    }
+
+    /**
+     * 新增用户
+     */
+    @ApiOperation(value = "新增用户", notes = "新增用户")
+    @RequiresPermissions("system:user:add")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysUser user) {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        } else if (PassUtil.isStringPwd(user.getPassword()).equals("0")) {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，密码必须大于等于8位，包含特殊字符，数字，大小写字母");
+        }
+
+        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toAjax(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @ApiOperation(value = "修改用户", notes = "修改用户")
+    @RequiresPermissions("system:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysUser user) {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     */
+    @ApiOperation(value = "删除用户", notes = "删除用户")
+    @RequiresPermissions("system:user:remove")
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds) {
+        if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
+            return AjaxResult.error("当前用户不能删除");
+        }
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @ApiOperation(value = "重置密码", notes = "重置密码")
+    @RequiresPermissions("system:user:edit")
+    @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(SecurityUtils.getUsername());
+        return toAjax(userService.resetPwd(user));
+    }
+
+    /**
+     * 状态修改
+     */
+    @ApiOperation(value = "状态修改", notes = "状态修改")
+    @RequiresPermissions("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(SecurityUtils.getUsername());
+        return toAjax(userService.updateUserStatus(user));
+    }
+
+    /**
+     * 根据用户编号获取授权角色
+     */
+    @ApiOperation(value = "根据用户编号获取授权角色", notes = "根据用户编号获取授权角色")
+    @RequiresPermissions("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;
+    }
+
+    /**
+     * 用户授权角色
+     */
+    @ApiOperation(value = "用户授权角色", notes = "用户授权角色")
+    @RequiresPermissions("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();
+    }
+    /**
+     * 获取全部用户列表
+     */
+    @ApiOperation(value = "获取全部用户列表", notes = "获取全部用户列表")
+    @RequestMapping(value = "/userListAll",method = POST)
+    public R<Map<String, Object>> userListAll(@RequestBody List<PushMessageVO> message) {
+        Map<String, Object> map = new HashMap<>();
+        List<SysUser> userList = new ArrayList<>();
+        for (PushMessageVO vo : message) {
+            SysUser user = new SysUser();
+            user.setUserId(vo.getUserId());
+            List<SysUser> list = userService.selectUserList(user);
+            userList.addAll(list);
+        }
+        map.put("list", userList);
+        return R.ok(map);
+    }
+
+    /**
+     * 获取应急巡检人员列表
+     */
+    @ApiOperation(value = "获取应急巡检人员列表", notes = "获取应急巡检人员列表")
+    @GetMapping(value = "/findEmergencyUserByPost")
+    public AjaxResult findEmergencyUserByPost() {
+        return userService.findEmergencyUserByPost();
+    }
+
+    /**
+     * 根据部门获取接收短信人员
+     */
+    @ApiOperation(value = "根据部门获取接收短信人员", notes = "根据部门获取接收短信人员")
+    @PostMapping("/selectDeptAndUsersByIsShortmsg")
+    public R selectDeptAndUsersByIsShortmsg(@RequestBody SysUser user) {
+        if(user.getDeptIds() == null || user.getDeptIds().length == 0){
+            return  R.fail("缺少必要参数");
+        }
+        List<SysUser> users = userService.selectDeptAndUsersByIsShortmsg(user);
+        return R.ok(users);
+    }
+
+    /**
+     * 根据部门获取接收推送人员
+     */
+    @ApiOperation(value = "根据部门获取接收推送人员", notes = "根据部门获取接收推送人员")
+    @PostMapping("/selectDeptAndUsersByIsPushmsg")
+    public R selectDeptAndUsersByIsPushmsg(@RequestBody SysUser user) {
+        if(user.getDeptIds() == null || user.getDeptIds().length == 0){
+            return  R.fail("缺少必要参数");
+        }
+        List<SysUser> users = userService.selectDeptAndUsersByIsPushmsg(user);
+        return R.ok(users);
+    }
+    /**
+     *
+     * 维护中心首页-右上角五个数
+     * **/
+    @GetMapping("/selectMaintenanceCenter")
+    @ApiOperation(value = "维护中心首页-右上角五个数", notes = "查询全部账号的数量")
+    public AjaxResult selectMaintenanceCenter(SysUser sysUser) {
+        List<SysUser> list = userService.selectMaintenanceCenter(sysUser);
+        return AjaxResult.success(list);
+    }
+    /**
+     *
+     * 维护中心首页列表
+     * **/
+    @GetMapping("/selectMaintenanceCenterHomepageList")
+    @ApiOperation(value = "维护中心首页列表", notes = "查询全部部门下注册活跃用户")
+    public TableDataInfo selectMaintenanceCenterHomepageList(SysUser sysUser) {
+        List<SysUser> list = userService.selectMaintenanceCenterHomepageList(sysUser);
+        return getDataTable(list);
+    }
+    /**
+     *
+     * 维护中心首页总数与活跃数对比
+     * **/
+    @GetMapping("/selectMaintenanceCenterTotalanDactive")
+    @ApiOperation(value = "维护中心首页总数与活跃数对比", notes = "维护中心首页总数与活跃数对比")
+    public AjaxResult selectMaintenanceCenterTotalanDactive(SysUser sysUser) {
+        List<SysUser> list = userService.selectMaintenanceCenterTotalanDactive(sysUser);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     *
+     * 维护中心首页市直部门，三县两区注册数和活跃数对比
+     * **/
+    @GetMapping("/selectCountyanddistrictDactive")
+    @ApiOperation(value = "维护中心首页市直部门，三县两区注册数和活跃数对比", notes = "维护中心首页市直部门，三县两区注册数和活跃数对比")
+    public AjaxResult selectCountyanddistrictDactive(SysUser sysUser) {
+        List<SysUser> list = userService.selectCountyanddistrictDactive(sysUser);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 强制用户修改密码判断
+     */
+    @ApiOperation(value = "强制用户修改密码判断", notes = "强制用户修改密码判断")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @GetMapping("/forceUpdatePwd/{username}")
+    public AjaxResult forceUpdatePwd(@PathVariable("username") String username) {
+        Date currentTime = new Date();
+        SysUser sysUser = userService.selectUserByUserName(username);
+        if(sysUser.getUpdatePwdTime() == null){
+            return AjaxResult.success(true);
+        }
+        R<String> forceUpdatePwdTime = remoteConfigService.remotegetConfigKey("force_update_pwd_time");
+        if (ObjectUtils.isNotEmpty(sysUser)) {
+            // 获取当前日期
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(sysUser.getUpdatePwdTime());
+            // 将当前日期加上forceUpdatePwdTime天
+            calendar.add(Calendar.DAY_OF_YEAR, Integer.parseInt(forceUpdatePwdTime.getData()));
+            Date futureDate = calendar.getTime();
+            return AjaxResult.success(currentTime.compareTo(futureDate) >= 0);
+        } else {
+            return AjaxResult.error("未查询到用户信息");
+        }
+    }
+
+    @GetMapping("/punchCard")
+    public List<PunchCardDto> getPunchCardStatistics() {
+        List<PunchCardDto> punchCardStatistics = userService.getPunchCardStatistics();
+        return punchCardStatistics;
+    }
+
+}

src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java

@@ -0,0 +1,84 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.constant.CacheConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.domain.SysUserOnline;
+import com.ruoyi.system.service.ISysUserOnlineService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 在线用户监控
+ *
+ * @author ruoyi
+ */
+@Api(tags = "在线用户监控控制器")
+@RestController
+@RequestMapping("/online")
+public class SysUserOnlineController extends BaseController {
+    private final ISysUserOnlineService userOnlineService;
+
+    private final RedisService redisService;
+
+    public SysUserOnlineController(ISysUserOnlineService userOnlineService, RedisService redisService) {
+        this.userOnlineService = userOnlineService;
+        this.redisService = redisService;
+    }
+    /**
+     * 获取在线用户列表
+     */
+    @ApiOperation(value = "获取在线用户列表", notes = "获取在线用户列表")
+    @RequiresPermissions("monitor:online:list")
+    @GetMapping("/list")
+    public TableDataInfo list(String ipaddr, String userName) {
+        Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
+        List<SysUserOnline> userOnlineList = new ArrayList<>();
+        for (String key : keys) {
+            LoginUser user = redisService.getCacheObject(key);
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
+                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
+                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+                }
+            } else if (StringUtils.isNotEmpty(ipaddr)) {
+                if (StringUtils.equals(ipaddr, user.getIpaddr())) {
+                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+                }
+            } else if (StringUtils.isNotEmpty(userName)) {
+                if (StringUtils.equals(userName, user.getUsername())) {
+                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+                }
+            } else {
+                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+            }
+        }
+        Collections.reverse(userOnlineList);
+        userOnlineList.removeAll(Collections.singleton(null));
+        return getDataTable(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     */
+    @ApiOperation(value = "强退用户", notes = "强退用户")
+    @RequiresPermissions("monitor:online:forceLogout")
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @DeleteMapping("/{tokenId}")
+    public AjaxResult forceLogout(@PathVariable String tokenId) {
+        redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
+        return AjaxResult.success();
+    }
+}

src/main/java/com/ruoyi/system/controller/SysUtilsController.java

@@ -0,0 +1,57 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.ISysUtilsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
+
+@Api(tags = "系统工具类控制器")
+@RestController
+@RequestMapping("/sysutils")
+public class SysUtilsController {
+
+    @Resource
+    ISysUserService iSysUserService;
+
+    @Resource
+    ISysUtilsService iSysUtilsService;
+    /**
+     * 通过用户名查询用户
+     */
+    @ApiOperation(value = "通过用户名查询用户", notes = "通过用户名查询用户")
+    @RequestMapping(value = "deptselector",method = GET)
+    public AjaxResult deptselector(SysUser user){
+        SysUser sysUser =iSysUserService.selectUserByUserName(user.getUserName());
+        return AjaxResult.success(sysUser);
+    }
+
+    /**
+     * 获取通知公告集合
+     */
+    @ApiOperation(value = "获取通知公告集合", notes = "获取通知公告集合")
+    @RequestMapping(value = "getDataByDept",method = GET)
+    public AjaxResult getDataByDept(SysUser user){
+        List<SysNotice> sysUser =iSysUserService.getDataByDept(user.getUserName());
+        return AjaxResult.success(sysUser);
+    }
+
+    @ApiIgnore
+    @RequestMapping(value = "testTrans",method = POST)
+    public AjaxResult testTrans(@RequestBody SysUser user){
+        iSysUtilsService.insert_test(user);
+        return AjaxResult.success();
+    }
+}

src/main/java/com/ruoyi/system/domain/AppVersionBO.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+/**
+ * @program: ruoyi
+ * @description: yy
+ * @author: yy
+ * @create: 2022-06-16 13:27
+ **/
+@Data
+public class AppVersionBO {
+    private String id;
+    private String packageName;
+    private String versionCode;
+    private String versionName;
+    private String path;
+    private String context;
+    private String isForceupdate;
+    private String picUrl;
+}

src/main/java/com/ruoyi/system/domain/CentermessageTPushrecord.java

@@ -0,0 +1,197 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 消息推送对象 centermessage_t_pushrecord
+ *
+ * @author ruoyi
+ * @date 2022-07-05
+ */
+public class CentermessageTPushrecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 创建人姓名 */
+    @Excel(name = "创建人姓名")
+    private String createName;
+
+    /** 更新人姓名 */
+    @Excel(name = "更新人姓名")
+    private String updateName;
+
+    /** 数据状态(1-可用 2-不可用 ) */
+    @Excel(name = "数据状态(1-可用 2-不可用 )")
+    private String dataStatus;
+
+    /** 数据所属部门(政或党的id) */
+    @Excel(name = "数据所属部门(政或党的id)")
+    private Long dataDeptId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 消息标题 */
+    @Excel(name = "消息标题")
+    private String title;
+
+    /** 消息内容 */
+    @Excel(name = "消息内容")
+    private String content;
+
+    /** 是否已读（0-未读 1-已读） */
+    @Excel(name = "是否已读", readConverterExp = "0=-未读,1=-已读")
+    private String isRead;
+
+    /** 已读时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "已读时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date readTime;
+    /**关联事件code*/
+    private String eventCode;
+
+
+    public String getEventCode() {
+        return eventCode;
+    }
+
+    public void setEventCode(String eventCode) {
+        this.eventCode = eventCode;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setCreateName(String createName)
+    {
+        this.createName = createName;
+    }
+
+    public String getCreateName()
+    {
+        return createName;
+    }
+    public void setUpdateName(String updateName)
+    {
+        this.updateName = updateName;
+    }
+
+    public String getUpdateName()
+    {
+        return updateName;
+    }
+    public void setDataStatus(String dataStatus)
+    {
+        this.dataStatus = dataStatus;
+    }
+
+    public String getDataStatus()
+    {
+        return dataStatus;
+    }
+    public void setDataDeptId(Long dataDeptId)
+    {
+        this.dataDeptId = dataDeptId;
+    }
+
+    public Long getDataDeptId()
+    {
+        return dataDeptId;
+    }
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setIsRead(String isRead)
+    {
+        this.isRead = isRead;
+    }
+
+    public String getIsRead()
+    {
+        return isRead;
+    }
+    public void setReadTime(Date readTime)
+    {
+        this.readTime = readTime;
+    }
+
+    public Date getReadTime()
+    {
+        return readTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("createBy", getCreateBy())
+            .append("createName", getCreateName())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateName", getUpdateName())
+            .append("updateTime", getUpdateTime())
+            .append("dataStatus", getDataStatus())
+            .append("dataDeptId", getDataDeptId())
+            .append("userId", getUserId())
+            .append("userName", getUserName())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .append("remark", getRemark())
+            .append("isRead", getIsRead())
+            .append("readTime", getReadTime())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/JiGuangVo.java

@@ -0,0 +1,19 @@
+package com.ruoyi.system.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class JiGuangVo {
+    private String type;  // 1 事件   2 任务  3 会议  4 通知公告
+    private Long userId;  //推送用户id
+    private String userName;  //推送用户名称
+    private String deviceId;  //设备编号
+    private String eventCode; //事件Code
+    private String taskId; //任务ID
+    private String meetingCode; //会议号
+    private String noticeId; //通知公告ID
+    private String title; //标题
+    private String content; //内容
+}

src/main/java/com/ruoyi/system/domain/PunchCardDto.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+@Data
+public class PunchCardDto {
+
+    private String month;
+    private String punchedCount;
+    private String notPunchedCount;
+}

src/main/java/com/ruoyi/system/domain/PushMessageVO.java

@@ -0,0 +1,14 @@
+package com.ruoyi.system.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PushMessageVO extends CentermessageTPushrecord {
+
+    private String type;
+    private String value;
+    private String tag;
+
+}

src/main/java/com/ruoyi/system/domain/SysAppRetaion.java

@@ -0,0 +1,136 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * app主页轮播图对象 sys_app_retaion
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public class SysAppRetaion extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 图片地址 */
+    @Excel(name = "图片")
+    private String path;
+
+    /** 是否有链接(0-无 1-有) */
+    @Excel(name = "是否有链接", readConverterExp = "N=否,Y=是")
+    private String ishavelink;
+
+    /** 链接地址 */
+    @Excel(name = "链接地址")
+    private String linkaddress;
+
+    /** 创建人姓名 */
+    private String createName;
+
+    /** 更新人姓名 */
+    private String updateName;
+
+    /** 数据状态(1-可用 2-不可用 ) */
+    private String dataStatus;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    public String getPath()
+    {
+        return path;
+    }
+    public void setIshavelink(String ishavelink)
+    {
+        this.ishavelink = ishavelink;
+    }
+
+    public String getIshavelink()
+    {
+        return ishavelink;
+    }
+    public void setLinkaddress(String linkaddress)
+    {
+        this.linkaddress = linkaddress;
+    }
+
+    public String getLinkaddress()
+    {
+        return linkaddress;
+    }
+    public void setCreateName(String createName)
+    {
+        this.createName = createName;
+    }
+
+    public String getCreateName()
+    {
+        return createName;
+    }
+    public void setUpdateName(String updateName)
+    {
+        this.updateName = updateName;
+    }
+
+    public String getUpdateName()
+    {
+        return updateName;
+    }
+    public void setDataStatus(String dataStatus)
+    {
+        this.dataStatus = dataStatus;
+    }
+
+    public String getDataStatus()
+    {
+        return dataStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("path", getPath())
+            .append("ishavelink", getIshavelink())
+            .append("linkaddress", getLinkaddress())
+            .append("createBy", getCreateBy())
+            .append("createName", getCreateName())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateName", getUpdateName())
+            .append("updateTime", getUpdateTime())
+            .append("dataStatus", getDataStatus())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysAppVersion.java

@@ -0,0 +1,175 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.List;
+
+/**
+ * app版本对象 sys_app_version
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+@Data
+public class SysAppVersion extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 包名 */
+    @Excel(name = "包名")
+    private String packageName;
+
+    /** 版本号 */
+    @Excel(name = "版本号")
+    private String versionCode;
+
+    /** 版本名称 */
+    @Excel(name = "版本名称")
+    private String versionName;
+
+    /** 路径 */
+    @Excel(name = "路径")
+    private String path;
+
+    /** 内容注释 */
+    @Excel(name = "内容注释")
+    private String context;
+
+    /** 是否强制更新(0-不强制 1-强制) */
+    @Excel(name = "是否强制更新", readConverterExp = "N=否,Y=是")
+    private String isForceupdate;
+
+    /** 创建人姓名 */
+    private String createName;
+
+    /** 更新人姓名 */
+    private String updateName;
+
+    /** 数据状态(1-可用 2-不可用 ) */
+    @Excel(name = "数据状态", readConverterExp = "1=不可用,0=可用")
+    private String dataStatus;
+
+    private String picUrl;
+
+    /**文件名称*/
+    private String fileName;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setPackageName(String packageName)
+    {
+        this.packageName = packageName;
+    }
+
+    public String getPackageName()
+    {
+        return packageName;
+    }
+    public void setVersionCode(String versionCode)
+    {
+        this.versionCode = versionCode;
+    }
+
+    public String getVersionCode()
+    {
+        return versionCode;
+    }
+    public void setVersionName(String versionName)
+    {
+        this.versionName = versionName;
+    }
+
+    public String getVersionName()
+    {
+        return versionName;
+    }
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    public String getPath()
+    {
+        return path;
+    }
+    public void setContext(String context)
+    {
+        this.context = context;
+    }
+
+    public String getContext()
+    {
+        return context;
+    }
+    public void setIsForceupdate(String isForceupdate)
+    {
+        this.isForceupdate = isForceupdate;
+    }
+
+    public String getIsForceupdate()
+    {
+        return isForceupdate;
+    }
+    public void setCreateName(String createName)
+    {
+        this.createName = createName;
+    }
+
+    public String getCreateName()
+    {
+        return createName;
+    }
+    public void setUpdateName(String updateName)
+    {
+        this.updateName = updateName;
+    }
+
+    public String getUpdateName()
+    {
+        return updateName;
+    }
+    public void setDataStatus(String dataStatus)
+    {
+        this.dataStatus = dataStatus;
+    }
+
+    public String getDataStatus()
+    {
+        return dataStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("packageName", getPackageName())
+            .append("versionCode", getVersionCode())
+            .append("versionName", getVersionName())
+            .append("path", getPath())
+            .append("context", getContext())
+            .append("isForceupdate", getIsForceupdate())
+            .append("createBy", getCreateBy())
+            .append("createName", getCreateName())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateName", getUpdateName())
+            .append("updateTime", getUpdateTime())
+            .append("dataStatus", getDataStatus())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysAttendance.java

@@ -0,0 +1,52 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 考勤打卡对象 sys_attendance
+ *
+ * @author ruoyi
+ * @date 2022-08-01
+ */
+@Getter
+@Setter
+public class SysAttendance extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /** 用户Id */
+    @Excel(name = "用户Id")
+    private Long userId;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("longitude", getLongitude())
+                .append("createTime", getCreateTime())
+            .append("latitude", getLatitude())
+            .append("userId", getUserId())
+            .append("userName", getUserName())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysConfig.java

@@ -0,0 +1,112 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 参数配置表 sys_config
+ *
+ * @author ruoyi
+ */
+public class SysConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 参数主键 */
+    @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
+    private Long configId;
+
+    /** 参数名称 */
+    @Excel(name = "参数名称")
+    private String configName;
+
+    /** 参数键名 */
+    @Excel(name = "参数键名")
+    private String configKey;
+
+    /** 参数键值 */
+    @Excel(name = "参数键值")
+    private String configValue;
+
+    /** 系统内置（Y是 N否） */
+    @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
+    private String configType;
+
+    public Long getConfigId()
+    {
+        return configId;
+    }
+
+    public void setConfigId(Long configId)
+    {
+        this.configId = configId;
+    }
+
+    @NotBlank(message = "参数名称不能为空")
+    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
+    public String getConfigName()
+    {
+        return configName;
+    }
+
+    public void setConfigName(String configName)
+    {
+        this.configName = configName;
+    }
+
+    @NotBlank(message = "参数键名长度不能为空")
+    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
+    public String getConfigKey()
+    {
+        return configKey;
+    }
+
+    public void setConfigKey(String configKey)
+    {
+        this.configKey = configKey;
+    }
+
+    @NotBlank(message = "参数键值不能为空")
+    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
+    public String getConfigValue()
+    {
+        return configValue;
+    }
+
+    public void setConfigValue(String configValue)
+    {
+        this.configValue = configValue;
+    }
+
+    public String getConfigType()
+    {
+        return configType;
+    }
+
+    public void setConfigType(String configType)
+    {
+        this.configType = configType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("configId", getConfigId())
+            .append("configName", getConfigName())
+            .append("configKey", getConfigKey())
+            .append("configValue", getConfigValue())
+            .append("configType", getConfigType())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysDahuaOperLogCount.java

@@ -0,0 +1,108 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+public class SysDahuaOperLogCount extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer deptId;
+
+    private String deptName;
+
+    private Integer parentId;
+
+    private String ancestors;
+
+    private String time;
+
+    private Integer sysOperCount = 0;
+
+    private Integer dhOperCount = 0;
+
+    private String[] dateRange;
+
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getAncestors() {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors) {
+        this.ancestors = ancestors;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public Integer getSysOperCount() {
+        return sysOperCount;
+    }
+
+    public void setSysOperCount(Integer sysOperCount) {
+        this.sysOperCount = sysOperCount;
+    }
+
+    public Integer getDhOperCount() {
+        return dhOperCount;
+    }
+
+    public void setDhOperCount(Integer dhOperCount) {
+        this.dhOperCount = dhOperCount;
+    }
+
+
+    public String[] getDateRange() {
+        return dateRange;
+    }
+
+    public void setDateRange(String[] dateRange) {
+        this.dateRange = dateRange;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("deptId", getDeptId())
+                .append("deptName", getDeptName())
+                .append("parentId", getParentId())
+                .append("ancestors", getAncestors())
+                .append("time", getTime())
+                .append("sysOperCount", getSysOperCount())
+                .append("dhOperCount", getDhOperCount())
+                .toString();
+    }
+
+}

src/main/java/com/ruoyi/system/domain/SysFontConfig.java

@@ -0,0 +1,36 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+@Data
+@Getter
+@Setter
+public class SysFontConfig  extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 配置主键 */
+    private Long configId;
+
+    /** 前端名称 */
+    private String fontName;
+
+    /** 前端标识 */
+    private String fontKey;
+
+    /** 主标题 */
+    private String fontTitle;
+
+    /** 副标题 */
+    private String subTitle;
+
+    /** 图片ID */
+    private String picId;
+
+    /** 图片地址 */
+    private String picUrl;
+
+}

src/main/java/com/ruoyi/system/domain/SysLoginActive.java

@@ -0,0 +1,31 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 参数配置表 sys_config
+ *
+ * @author ruoyi
+ */
+@Data
+public class SysLoginActive extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "访问次数")
+    private Long ct;
+    @Excel(name = "用户账号")
+    private String userName;
+    @Excel(name = "所属部门")
+    private String deptName;
+
+
+}

src/main/java/com/ruoyi/system/domain/SysMenu.java

@@ -0,0 +1,294 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 菜单权限表 sys_menu
+ *
+ * @author ruoyi
+ */
+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>();
+
+    /**对应前端类型*/
+    private String frontType;
+
+    private String[] frontTypes;
+
+
+    public String[] getFrontTypes() {
+        return frontTypes;
+    }
+
+    public void setFrontTypes(String[] frontTypes) {
+        this.frontTypes = frontTypes;
+    }
+
+    /**用户id*/
+    private Long userId;
+
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getFrontType() {
+        return frontType;
+    }
+
+    public void setFrontType(String frontType) {
+        this.frontType = frontType;
+    }
+
+    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();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysMenuApp.java

@@ -0,0 +1,244 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.system.api.domain.SysMenuEventType;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 手机端菜单管理对象 sys_menu_app
+ *
+ * @author ruoyi
+ * @date 2023-06-09
+ */
+public class SysMenuApp extends BaseEntity
+        {
+private static final long serialVersionUID = 1L;
+
+    /** 菜单ID */
+    private Long menuId;
+
+    /** 菜单名称 */
+            @Excel(name = "菜单名称")
+    private String menuName;
+
+    /** 父菜单ID */
+            @Excel(name = "父菜单ID")
+    private Long parentId;
+
+    /** 显示顺序 */
+            @Excel(name = "显示顺序")
+    private Integer orderNum;
+
+    /** 路由地址 */
+            @Excel(name = "路由地址")
+    private String path;
+
+    /** 组件路径 */
+            @Excel(name = "组件路径")
+    private String component;
+
+    /** 路由参数 */
+            @Excel(name = "路由参数")
+    private String query;
+
+            /** 是否为外链（0是 1否） */
+            private String isFrame;
+
+    /** 菜单状态（0显示 1隐藏） */
+            @Excel(name = "菜单状态", readConverterExp = "0=显示,1=隐藏")
+    private String visible;
+
+    /** 菜单状态（0正常 1停用） */
+            @Excel(name = "菜单状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 权限标识 */
+            @Excel(name = "权限标识")
+    private String perms;
+
+    /** 菜单图标 */
+            @Excel(name = "菜单图标")
+    private String icon;
+
+    /** 菜单类型（M目录 C菜单 F按钮） */
+            @Excel(name = "菜单类型", readConverterExp = "M=目录,C=菜单,F=按钮")
+    private String menuType;
+
+     private List<SysMenuEventType> sysMenuEventTypes;
+
+            /**用户id*/
+            private Long userId;
+
+            /** 子菜单 */
+            private List<SysMenuApp> children = new ArrayList<SysMenuApp>();
+
+            public List<SysMenuApp> getChildren() {
+                return children;
+            }
+
+            public void setChildren(List<SysMenuApp> children) {
+                this.children = children;
+            }
+
+    public void setMenuId(Long menuId)
+            {
+            this.menuId = menuId;
+            }
+
+    public Long getMenuId()
+            {
+            return menuId;
+            }
+    public void setMenuName(String menuName)
+            {
+            this.menuName = menuName;
+            }
+
+    public String getMenuName()
+            {
+            return menuName;
+            }
+    public void setParentId(Long parentId)
+            {
+            this.parentId = parentId;
+            }
+
+    public Long getParentId()
+            {
+            return parentId;
+            }
+    public void setOrderNum(Integer orderNum)
+            {
+            this.orderNum = orderNum;
+            }
+
+    public Integer getOrderNum()
+            {
+            return orderNum;
+            }
+    public void setPath(String path)
+            {
+            this.path = path;
+            }
+
+    public String getPath()
+            {
+            return path;
+            }
+    public void setComponent(String component)
+            {
+            this.component = component;
+            }
+
+    public String getComponent()
+            {
+            return component;
+            }
+    public void setQuery(String query)
+            {
+            this.query = query;
+            }
+            public String getIsFrame()
+            {
+                return isFrame;
+            }
+
+            public void setIsFrame(String isFrame)
+            {
+                this.isFrame = isFrame;
+            }
+
+            public Long getUserId() {
+                return userId;
+            }
+
+            public void setUserId(Long userId) {
+                this.userId = userId;
+            }
+
+    public String getQuery()
+            {
+            return query;
+            }
+    public void setVisible(String visible)
+            {
+            this.visible = visible;
+            }
+
+    public String getVisible()
+            {
+            return visible;
+            }
+    public void setStatus(String status)
+            {
+            this.status = status;
+            }
+
+    public String getStatus()
+            {
+            return status;
+            }
+    public void setPerms(String perms)
+            {
+            this.perms = perms;
+            }
+
+    public String getPerms()
+            {
+            return perms;
+            }
+    public void setIcon(String icon)
+            {
+            this.icon = icon;
+            }
+
+    public String getIcon()
+            {
+            return icon;
+            }
+    public void setMenuType(String menuType)
+            {
+            this.menuType = menuType;
+            }
+
+    public String getMenuType()
+            {
+            return menuType;
+            }
+
+            public List<SysMenuEventType> getSysMenuEventTypes() {
+                return sysMenuEventTypes;
+            }
+
+            public void setSysMenuEventTypes(List<SysMenuEventType> sysMenuEventTypes) {
+                this.sysMenuEventTypes = sysMenuEventTypes;
+            }
+
+@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("query", getQuery())
+                .append("isFrame", getIsFrame())
+            .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("menuType", getMenuType())
+        .toString();
+        }
+        }

src/main/java/com/ruoyi/system/domain/SysMenuVisu.java

@@ -0,0 +1,338 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.system.api.domain.SysMenuEventType;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 可视化菜单权限对象 sys_menu_visu
+ *
+ * @author ruoyi
+ * @date 2022-05-24
+ */
+@Getter
+@Setter
+public class SysMenuVisu extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 菜单ID */
+    private Long menuId;
+
+    /** 菜单名称 */
+    @Excel(name = "菜单名称")
+    private String menuName;
+
+    /** 父菜单ID */
+    @Excel(name = "父菜单ID")
+    private Long parentId;
+
+    /** 显示顺序 */
+    @Excel(name = "显示顺序")
+    private Integer orderNum;
+
+    /** 菜单类型（M目录 C菜单 F按钮） */
+    @Excel(name = "菜单类型", readConverterExp = "M=目录,C=菜单,F=按钮")
+    private String menuType;
+
+    /** 页面服务地址（服务名及端口） */
+    @Excel(name = "页面服务地址", readConverterExp = "服=务名及端口")
+    private String pageServerUrl;
+
+    /** 页面路由携带参数 */
+    @Excel(name = "页面路由携带参数")
+    private String pageServerParams;
+
+    /** 菜单路径 */
+    @Excel(name = "菜单路径")
+    private String pageRouterUrl;
+
+    /** 菜单路径携带参数 */
+    @Excel(name = "菜单路径携带参数")
+    private String pageRouterParams;
+
+    /** 菜单样式 */
+    @Excel(name = "菜单样式")
+    private String menuStyle;
+
+    /** 组件路径 */
+    @Excel(name = "组件路径")
+    private String componentUrl;
+
+    /** 组件路径携带参数 */
+    @Excel(name = "组件路径携带参数")
+    private String componentParams;
+
+    /** 组件样式 */
+    @Excel(name = "组件样式")
+    private String componentStyle;
+
+    /** 是否为外链（0是 1否） */
+    @Excel(name = "是否为外链", readConverterExp = "0=是,1=否")
+    private Integer isFrame;
+
+    /** 是否缓存（0缓存 1不缓存） */
+    @Excel(name = "是否缓存", readConverterExp = "0=缓存,1=不缓存")
+    private Integer isCache;
+
+    /** 菜单状态（0显示 1隐藏）23231312312312312 */
+    @Excel(name = "菜单状态", readConverterExp = "0=显示,1=隐藏")
+    private String visible;
+
+    /** 权限标识 */
+    @Excel(name = "权限标识")
+    private String perms;
+
+    /** 菜单状态（0正常 1停用） */
+    @Excel(name = "菜单状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 图片id */
+    @Excel(name = "图片id")
+    private String imageId;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    private String imageUrl;
+
+    private List<SysMenuEventType> sysMenuEventTypes;
+
+    /**用户id*/
+    private Long userId;
+    private String icon;
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    /** 子菜单 */
+    private List<SysMenuVisu> children = new ArrayList<SysMenuVisu>();
+
+    public List<SysMenuVisu> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<SysMenuVisu> children) {
+        this.children = children;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public void setMenuId(Long menuId)
+    {
+        this.menuId = menuId;
+    }
+
+    public Long getMenuId()
+    {
+        return menuId;
+    }
+    public void setMenuName(String menuName)
+    {
+        this.menuName = menuName;
+    }
+
+    public String getMenuName()
+    {
+        return menuName;
+    }
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+    public void setOrderNum(Integer orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+
+    public Integer getOrderNum()
+    {
+        return orderNum;
+    }
+    public void setMenuType(String menuType)
+    {
+        this.menuType = menuType;
+    }
+
+    public String getMenuType()
+    {
+        return menuType;
+    }
+    public void setPageServerUrl(String pageServerUrl)
+    {
+        this.pageServerUrl = pageServerUrl;
+    }
+
+    public String getPageServerUrl()
+    {
+        return pageServerUrl;
+    }
+    public void setPageServerParams(String pageServerParams)
+    {
+        this.pageServerParams = pageServerParams;
+    }
+
+    public String getPageServerParams()
+    {
+        return pageServerParams;
+    }
+    public void setPageRouterUrl(String pageRouterUrl)
+    {
+        this.pageRouterUrl = pageRouterUrl;
+    }
+
+    public String getPageRouterUrl()
+    {
+        return pageRouterUrl;
+    }
+    public void setPageRouterParams(String pageRouterParams)
+    {
+        this.pageRouterParams = pageRouterParams;
+    }
+
+    public String getPageRouterParams()
+    {
+        return pageRouterParams;
+    }
+    public void setMenuStyle(String menuStyle)
+    {
+        this.menuStyle = menuStyle;
+    }
+
+    public String getMenuStyle()
+    {
+        return menuStyle;
+    }
+    public void setComponentUrl(String componentUrl)
+    {
+        this.componentUrl = componentUrl;
+    }
+
+    public String getComponentUrl()
+    {
+        return componentUrl;
+    }
+    public void setComponentParams(String componentParams)
+    {
+        this.componentParams = componentParams;
+    }
+
+    public String getComponentParams()
+    {
+        return componentParams;
+    }
+    public void setComponentStyle(String componentStyle)
+    {
+        this.componentStyle = componentStyle;
+    }
+
+    public String getComponentStyle()
+    {
+        return componentStyle;
+    }
+    public void setIsFrame(Integer isFrame)
+    {
+        this.isFrame = isFrame;
+    }
+
+    public Integer getIsFrame()
+    {
+        return isFrame;
+    }
+    public void setIsCache(Integer isCache)
+    {
+        this.isCache = isCache;
+    }
+
+    public Integer getIsCache()
+    {
+        return isCache;
+    }
+    public void setVisible(String visible)
+    {
+        this.visible = visible;
+    }
+
+    public String getVisible()
+    {
+        return visible;
+    }
+    public void setPerms(String perms)
+    {
+        this.perms = perms;
+    }
+
+    public String getPerms()
+    {
+        return perms;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public List<SysMenuEventType> getSysMenuEventTypes() {
+        return sysMenuEventTypes;
+    }
+
+    public void setSysMenuEventTypes(List<SysMenuEventType> sysMenuEventTypes) {
+        this.sysMenuEventTypes = sysMenuEventTypes;
+    }
+
+    @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("menuType", getMenuType())
+            .append("pageServerUrl", getPageServerUrl())
+            .append("pageServerParams", getPageServerParams())
+            .append("pageRouterUrl", getPageRouterUrl())
+            .append("pageRouterParams", getPageRouterParams())
+            .append("menuStyle", getMenuStyle())
+            .append("componentUrl", getComponentUrl())
+            .append("componentParams", getComponentParams())
+            .append("componentStyle", getComponentStyle())
+            .append("isFrame", getIsFrame())
+            .append("isCache", getIsCache())
+            .append("visible", getVisible())
+            .append("perms", getPerms())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysMenuVisuImage.java

@@ -0,0 +1,51 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 可视化前端配置表对象 sys_menu_visu_image
+ *
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+public class SysMenuVisuImage extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 图片主键
+     */
+    private Integer id;
+
+    /**
+     * 图片地址
+     */
+    @Excel(name = "图片地址")
+    private String imageUrl;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("imageUrl", getImageUrl())
+                .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysMenuVisuMap.java

@@ -0,0 +1,52 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class SysMenuVisuMap  extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    //部门ID
+    private int deptId;
+    //图层名称
+    private String name;
+    //注释
+    private String note;
+    //路径
+    private String path;
+    //图层ID
+    private Integer mapId;
+    //可视化ID
+    private Integer visuId;
+    //父级ID
+    private String parentId;
+    //排序
+    private int sort;
+    //部门名称
+    private String deptName;
+    //属性
+    private String type;
+    //比例尺
+    private String scale;
+    //坐标
+    private String coordinate;
+    //主题图层名称（别名）
+    private String parentName;
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    //菜单名称
+    private String menuName;
+    //菜单ID
+    private String menuId;
+
+
+}

src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -0,0 +1,71 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.core.xss.Xss;
+import com.ruoyi.system.api.domain.SysDept;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+/**
+ * 通知公告表 sys_notice
+ *
+ * @author ruoyi
+ */
+@Data
+public class SysNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 公告ID */
+    private Long noticeId;
+
+    /** 公告标题 */
+    private String noticeTitle;
+
+    /** 公告类型（1通知 2公告） */
+    private String noticeType;
+
+    /** 公告内容 */
+    private String noticeContent;
+
+    /** 公告状态（0正常 1关闭） */
+    private String status;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 部门ID组 新增修改时用 */
+    private Long[] deptIds;
+
+    /** 附件 */
+    private String noticeFile;
+
+    public void setNoticeTitle(String noticeTitle)
+    {
+        this.noticeTitle = noticeTitle;
+    }
+
+    @Xss(message = "公告标题不能包含脚本字符")
+    @NotBlank(message = "公告标题不能为空")
+    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
+    public String getNoticeTitle()
+    {
+        return noticeTitle;
+    }
+
+
+    public Integer pageNum;
+
+    public Integer pageSize;
+
+    /**
+     * 部门对象
+     */
+    private List<SysNoticeDept> depts;
+
+}

src/main/java/com/ruoyi/system/domain/SysNoticeDept.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+@Data
+public class SysNoticeDept {
+
+    private String id;
+    private Long noticeId;
+    private Long deptId;
+}

src/main/java/com/ruoyi/system/domain/SysPicFontConfig.java

@@ -0,0 +1,22 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+@Data
+@Getter
+@Setter
+public class SysPicFontConfig extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /** 图片ID */
+    private Long id;
+
+    /** 图片地址 */
+    private String picUrl;
+
+}

src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -0,0 +1,124 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 岗位表 sys_post
+ *
+ * @author ruoyi
+ */
+public class SysPost extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 岗位序号 */
+    @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
+    private Long postId;
+
+    /** 岗位编码 */
+    @Excel(name = "岗位编码")
+    private String postCode;
+
+    /** 岗位名称 */
+    @Excel(name = "岗位名称")
+    private String postName;
+
+    /** 岗位排序 */
+    @Excel(name = "岗位排序")
+    private String postSort;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 用户是否存在此岗位标识 默认不存在 */
+    private boolean flag = false;
+
+    public Long getPostId()
+    {
+        return postId;
+    }
+
+    public void setPostId(Long postId)
+    {
+        this.postId = postId;
+    }
+
+    @NotBlank(message = "岗位编码不能为空")
+    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
+    public String getPostCode()
+    {
+        return postCode;
+    }
+
+    public void setPostCode(String postCode)
+    {
+        this.postCode = postCode;
+    }
+
+    @NotBlank(message = "岗位名称不能为空")
+    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
+    public String getPostName()
+    {
+        return postName;
+    }
+
+    public void setPostName(String postName)
+    {
+        this.postName = postName;
+    }
+
+    @NotBlank(message = "显示顺序不能为空")
+    public String getPostSort()
+    {
+        return postSort;
+    }
+
+    public void setPostSort(String postSort)
+    {
+        this.postSort = postSort;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public boolean isFlag()
+    {
+        return flag;
+    }
+
+    public void setFlag(boolean flag)
+    {
+        this.flag = flag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("postId", getPostId())
+            .append("postCode", getPostCode())
+            .append("postName", getPostName())
+            .append("postSort", getPostSort())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysReport.java

@@ -0,0 +1,34 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * report对象 sys_report
+ *
+ * @author limeng
+ * @date 2023-08-09
+ */
+@Data
+public class SysReport extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 文件地址
+     */
+    private String fileUrl;
+
+}

src/main/java/com/ruoyi/system/domain/SysReportData.java

@@ -0,0 +1,56 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * report对象 sys_report
+ *
+ * @author limeng
+ * @date 2023-08-09
+ */
+@Data
+public class SysReportData extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 平台调用设备数据
+     */
+    private String platformDevice;
+
+    /**
+     * 视频数据存储量
+     */
+    private String videoData;
+
+    /**
+     * 软件功能性调整次数
+     */
+    private String adjustNum;
+
+    /**
+     * 硬件点位调整次数
+     */
+    private String hardwareNum;
+
+    /**
+     * 前台上报和回显的的时间范围数组
+     */
+    private String[] dateRange;
+
+    /**
+     * 后台存储的开始时间
+     */
+    private String startTime;
+
+    /**
+     * 后台存储的结束时间
+     */
+    private String endTime;
+
+}

src/main/java/com/ruoyi/system/domain/SysRoleDept.java

@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和部门关联 sys_role_dept
+ * 
+ * @author ruoyi
+ */
+public class SysRoleDept
+{
+    /** 角色ID */
+    private Long roleId;
+    
+    /** 部门ID */
+    private Long deptId;
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysRoleDeptParty.java

@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和部门关联 sys_role_party
+ *
+ * @author ruoyi
+ */
+public class SysRoleDeptParty
+{
+    /** 角色ID */
+    private Long roleId;
+
+    /** 党组ID */
+    private Long partyId;
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getPartyId()
+    {
+        return partyId;
+    }
+
+    public void setPartyId(Long partyId)
+    {
+        this.partyId = partyId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("partyId", getPartyId())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysRoleEventtype.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色对应事件类型对象 sys_role_eventtype
+ *
+ * @author ruoyi
+ * @date 2022-07-14
+ */
+public class SysRoleEventtype extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+
+    /** 角色id */
+    @Excel(name = "角色id")
+    private Long roleId;
+
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    private String roleName;
+
+    /** 事件类型key */
+    @Excel(name = "事件类型key")
+    private String eventType;
+
+    /** 事件类型value */
+    @Excel(name = "事件类型value")
+    private String eventTypeName;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+    public void setRoleName(String roleName)
+    {
+        this.roleName = roleName;
+    }
+
+    public String getRoleName()
+    {
+        return roleName;
+    }
+    public void setEventType(String eventType)
+    {
+        this.eventType = eventType;
+    }
+
+    public String getEventType()
+    {
+        return eventType;
+    }
+    public void setEventTypeName(String eventTypeName)
+    {
+        this.eventTypeName = eventTypeName;
+    }
+
+    public String getEventTypeName()
+    {
+        return eventTypeName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("roleId", getRoleId())
+            .append("roleName", getRoleName())
+            .append("eventType", getEventType())
+            .append("eventTypeName", getEventTypeName())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和菜单关联 sys_role_menu
+ * 
+ * @author ruoyi
+ */
+public class SysRoleMenu
+{
+    /** 角色ID */
+    private Long roleId;
+    
+    /** 菜单ID */
+    private Long menuId;
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getMenuId()
+    {
+        return menuId;
+    }
+
+    public void setMenuId(Long menuId)
+    {
+        this.menuId = menuId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("menuId", getMenuId())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysRoleMenuapp.java

@@ -0,0 +1,49 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和菜单关联对象 sys_role_menuvisu
+ *
+ * @author ruoyi
+ * @date 2022-05-24
+ */
+public class SysRoleMenuapp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 角色ID */
+    private Long roleId;
+
+    /** 菜单ID */
+    private Long menuId;
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+    public void setMenuId(Long menuId)
+    {
+        this.menuId = menuId;
+    }
+
+    public Long getMenuId()
+    {
+        return menuId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("menuId", getMenuId())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysRoleMenuvisu.java

@@ -0,0 +1,49 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和菜单关联对象 sys_role_menuvisu
+ *
+ * @author ruoyi
+ * @date 2022-05-24
+ */
+public class SysRoleMenuvisu extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 角色ID */
+    private Long roleId;
+
+    /** 菜单ID */
+    private Long menuId;
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+    public void setMenuId(Long menuId)
+    {
+        this.menuId = menuId;
+    }
+
+    public Long getMenuId()
+    {
+        return menuId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("menuId", getMenuId())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysSystemUseReport.java

@@ -0,0 +1,234 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class SysSystemUseReport extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** list **/
+    @Excel(name = "辖区/行业")
+    private String deptName;
+    @Excel(name = "账号数")
+    private Integer user;
+    @Excel(name = "活跃数")
+    private Integer active;
+    @Excel(name = "活跃率")
+    private String activeRate;
+    @Excel(name = "事件总数")
+    private Integer eventCount;
+    @Excel(name = "未签收")
+    private Integer eventQr;
+    @Excel(name = "处理中")
+    private Integer eventQs;
+    @Excel(name = "办结归档数")
+    private Integer eventBjgd;
+    @Excel(name = "办结归档率")
+    private String eventBjgdRate;
+    @Excel(name = "当日办结、归档数")
+    private Integer eventTodayBjgd;
+    @Excel(name = "当日办结归、档率")
+    private String eventTodayBjgdRate;
+    @Excel(name = "数据总数")
+    private String count;
+    @Excel(name = "数据更新数")
+    private String updateCount;
+    @Excel(name = "数据更新率")
+    private String updateRate;
+//
+//    /**铁东区**/
+//    //事件总数
+//    private Integer count3;
+//    //未签收
+//    private Integer qr3;
+//    //处理中
+//    private Integer qs3;
+//    //办结归档数
+//    private Integer bjgd3;
+//    //办结归档率
+//    private Integer bjgdRate3;
+//    //当日办结归档数
+//    private Integer today_bjgd3;
+//    //当日办结归档率
+//    private String today_bjgdRate3;
+//
+//    /**铁西区**/
+//    //事件总数
+//    private Integer count4;
+//    //未签收
+//    private Integer qr4;
+//    //处理中
+//    private Integer qs4;
+//    //办结归档数
+//    private Integer bjgd4;
+//    //办结归档率
+//    private Integer bjgdRate4;
+//    //当日办结归档数
+//    private Integer today_bjgd4;
+//    //当日办结归档率
+//    private String today_bjgdRate4;
+//
+//    /**梨树县**/
+//    //事件总数
+//    private Integer count;
+//    //未签收
+//    private Integer qr;
+//    //处理中
+//    private Integer qs;
+//    //办结归档数
+//    private Integer bjgd;
+//    //办结归档率
+//    private Integer bjgdRate;
+//    //当日办结归档数
+//    private Integer today_bjgd;
+//    //当日办结归档率
+//    private String today_bjgdRate;
+//
+//    /**双辽市**/
+//    //事件总数
+//    private Integer count2;
+//    //未签收
+//    private Integer qr2;
+//    //处理中
+//    private Integer qs2;
+//    //办结归档数
+//    private Integer bjgd2;
+//    //办结归档率
+//    private Integer bjgdRate2;
+//    //当日办结归档数
+//    private Integer today_bjgd2;
+//    //当日办结归档率
+//    private String today_bjgdRate2;
+//
+//    /**伊通县**/
+//    //事件总数
+//    private Integer count1;
+//    //未签收
+//    private Integer qr1;
+//    //处理中
+//    private Integer qs1;
+//    //办结归档数
+//    private Integer bjgd1;
+//    //办结归档率
+//    private Integer bjgdRate1;
+//    //当日办结归档数
+//    private Integer today_bjgd1;
+//    //当日办结归档率
+//    private String today_bjgdRate1;
+//
+//    /**农业**/
+//    //事件总数
+//    private Integer ny;
+//    //未签收
+//    private Integer nyqr;
+//    //处理中
+//    private Integer nyqs;
+//    //办结归档数
+//    private Integer nybjgd;
+//    //办结归档率
+//    private Integer nybjgdRate;
+//    //当日办结归档数
+//    private Integer today_nybjgd;
+//    //当日办结归档率
+//    private String today_nybjgdRate;
+//
+//    /**林业**/
+//    //事件总数
+//    private Integer ly;
+//    //未签收
+//    private Integer lyqr;
+//    //处理中
+//    private Integer lyqs;
+//    //办结归档数
+//    private Integer lybjgd;
+//    //办结归档率
+//    private Integer lybjgdRate;
+//    //当日办结归档数
+//    private Integer today_lybjgd1;
+//    //当日办结归档率
+//    private String today_lybjgdRate;
+//
+//    /**环保**/
+//    //事件总数
+//    private Integer hb;
+//    //未签收
+//    private Integer hbqr;
+//    //处理中
+//    private Integer hbqs;
+//    //办结归档数
+//    private Integer hbbjgd;
+//    //办结归档率
+//    private Integer hbbjgdRate;
+//    //当日办结归档数
+//    private Integer today_hbbjgd1;
+//    //当日办结归档率
+//    private String today_hbbjgdRate;
+//
+//    /**资源**/
+//    //事件总数
+//    private Integer zy;
+//    //未签收
+//    private Integer zyqr;
+//    //处理中
+//    private Integer zyqs;
+//    //办结归档数
+//    private Integer zybjgd;
+//    //办结归档率
+//    private Integer zybjgdRate;
+//    //当日办结归档数
+//    private Integer today_zybjgd1;
+//    //当日办结归档率
+//    private String today_zybjgdRate;
+//
+//    /**交通**/
+//    //事件总数
+//    private Integer jt;
+//    //未签收
+//    private Integer jtqr;
+//    //处理中
+//    private Integer jtqs;
+//    //办结归档数
+//    private Integer jtbjgd;
+//    //办结归档率
+//    private Integer jtbjgdRate;
+//    //当日办结归档数
+//    private Integer today_jtbjgd1;
+//    //当日办结归档率
+//    private String today_jtbjgdRate;
+//
+//    /**消防**/
+//    //事件总数
+//    private Integer xf;
+//    //未签收
+//    private Integer xfqr;
+//    //处理中
+//    private Integer xfqs;
+//    //办结归档数
+//    private Integer xfbjgd;
+//    //办结归档率
+//    private Integer xfbjgdRate;
+//    //当日办结归档数
+//    private Integer today_xfbjgd1;
+//    //当日办结归档率
+//    private String today_xfbjgdRate;
+//
+//    /**应急**/
+//    //事件总数
+//    private Integer yj;
+//    //未签收
+//    private Integer yjqr;
+//    //处理中
+//    private Integer yjqs;
+//    //办结归档数
+//    private Integer yjbjgd;
+//    //办结归档率
+//    private Integer yjbjgdRate;
+//    //当日办结归档数
+//    private Integer today_yjbjgd1;
+//    //当日办结归档率
+//    private String today_yjbjgdRate;
+
+
+}

src/main/java/com/ruoyi/system/domain/SysUserDept.java

@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和部门关联 sys_user_dept
+ *
+ * @author ruoyi
+ */
+public class SysUserDept
+{
+    /** 用户ID */
+    private Long userId;
+
+    /** 角色ID */
+    private Long deptId;
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("userId", getUserId())
+                .append("deptId", getDeptId())
+                .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysUserOnline.java

@@ -0,0 +1,100 @@
+package com.ruoyi.system.domain;
+
+/**
+ * 当前在线会话
+ * 
+ * @author ruoyi
+ */
+public class SysUserOnline
+{
+    /** 会话编号 */
+    private String tokenId;
+
+    /** 用户名称 */
+    private String userName;
+
+    /** 登录IP地址 */
+    private String ipaddr;
+
+    /** 登录地址 */
+    private String loginLocation;
+
+    /** 浏览器类型 */
+    private String browser;
+
+    /** 操作系统 */
+    private String os;
+
+    /** 登录时间 */
+    private Long loginTime;
+
+    public String getTokenId()
+    {
+        return tokenId;
+    }
+
+    public void setTokenId(String tokenId)
+    {
+        this.tokenId = tokenId;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    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 getLoginTime()
+    {
+        return loginTime;
+    }
+
+    public void setLoginTime(Long loginTime)
+    {
+        this.loginTime = loginTime;
+    }
+}

src/main/java/com/ruoyi/system/domain/SysUserParty.java

@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和党组关联 sys_user_party
+ *
+ * @author ruoyi
+ */
+public class SysUserParty
+{
+    /** 用户ID */
+    private Long userId;
+
+    /** 党组ID */
+    private Long partyId;
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getPartyId()
+    {
+        return partyId;
+    }
+
+    public void setPartyId(Long partyId)
+    {
+        this.partyId = partyId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("userId", getUserId())
+                .append("partyId", getPartyId())
+                .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysUserPost.java

@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和岗位关联 sys_user_post
+ * 
+ * @author ruoyi
+ */
+public class SysUserPost
+{
+    /** 用户ID */
+    private Long userId;
+    
+    /** 岗位ID */
+    private Long postId;
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getPostId()
+    {
+        return postId;
+    }
+
+    public void setPostId(Long postId)
+    {
+        this.postId = postId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("postId", getPostId())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysUserRole.java

@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和角色关联 sys_user_role
+ * 
+ * @author ruoyi
+ */
+public class SysUserRole
+{
+    /** 用户ID */
+    private Long userId;
+    
+    /** 角色ID */
+    private Long roleId;
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    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("roleId", getRoleId())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/system/domain/SysuserVisu.java

@@ -0,0 +1,22 @@
+package com.ruoyi.system.domain;
+
+public class SysuserVisu {
+    private String roleId;
+    private String parentId;
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+}

src/main/java/com/ruoyi/system/domain/dto/AppResetPwd.java

@@ -0,0 +1,12 @@
+package com.ruoyi.system.domain.dto;
+
+
+import lombok.Data;
+
+@Data
+public class AppResetPwd {
+
+    private String un;
+    private String op;
+    private String np;
+}

src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

@@ -0,0 +1,106 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.common.core.utils.StringUtils;
+
+/**
+ * 路由显示信息
+ * 
+ * @author ruoyi
+ */
+public class MetaVo
+{
+    /**
+     * 设置该路由在侧边栏和面包屑中展示的名字
+     */
+    private String title;
+
+    /**
+     * 设置该路由的图标，对应路径src/assets/icons/svg
+     */
+    private String icon;
+
+    /**
+     * 设置为true，则不会被 <keep-alive>缓存
+     */
+    private boolean noCache;
+
+    /**
+     * 内链地址（http(s)://开头）
+     */
+    private String link;
+
+    public MetaVo()
+    {
+    }
+
+    public MetaVo(String title, String icon)
+    {
+        this.title = title;
+        this.icon = icon;
+    }
+
+    public MetaVo(String title, String icon, boolean noCache)
+    {
+        this.title = title;
+        this.icon = icon;
+        this.noCache = noCache;
+    }
+
+    public MetaVo(String title, String icon, String link)
+    {
+        this.title = title;
+        this.icon = icon;
+        this.link = link;
+    }
+
+    public MetaVo(String title, String icon, boolean noCache, String link)
+    {
+        this.title = title;
+        this.icon = icon;
+        this.noCache = noCache;
+        if (StringUtils.ishttp(link))
+        {
+            this.link = link;
+        }
+    }
+
+    public boolean isNoCache()
+    {
+        return noCache;
+    }
+
+    public void setNoCache(boolean noCache)
+    {
+        this.noCache = noCache;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getIcon()
+    {
+        return icon;
+    }
+
+    public void setIcon(String icon)
+    {
+        this.icon = icon;
+    }
+
+    public String getLink()
+    {
+        return link;
+    }
+
+    public void setLink(String link)
+    {
+        this.link = link;
+    }
+}

src/main/java/com/ruoyi/system/domain/vo/PartyTreeSelect.java

@@ -0,0 +1,78 @@
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.domain.SysMenu;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Treeselect树结构实体类
+ *
+ * @author ruoyi
+ */
+public class PartyTreeSelect implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<PartyTreeSelect> children;
+
+    public PartyTreeSelect()
+    {
+
+    }
+
+    public PartyTreeSelect(SysDept dept)
+    {
+        this.id = dept.getDeptId();
+        this.label = dept.getDeptName();
+        this.children = dept.getChildren().stream().map(PartyTreeSelect::new).collect(Collectors.toList());
+    }
+
+    public PartyTreeSelect(SysMenu menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(PartyTreeSelect::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<PartyTreeSelect> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<PartyTreeSelect> children)
+    {
+        this.children = children;
+    }
+}

src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -0,0 +1,149 @@
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.List;
+
+/**
+ * 路由配置信息
+ *
+ * @author ruoyi
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class RouterVo
+{
+    /**
+     * 路由名字
+     */
+    private String name;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
+     */
+    private boolean hidden;
+
+    /**
+     * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
+     */
+    private String redirect;
+
+    /**
+     * 组件地址
+     */
+    private String component;
+
+    /**
+     * 路由参数：如 {"id": 1, "name": "ry"}
+     */
+    private String query;
+
+    /**
+     * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
+     */
+    private Boolean alwaysShow;
+
+    /**
+     * 其他元素
+     */
+    private MetaVo meta;
+
+    /**
+     * 子路由
+     */
+    private List<RouterVo> children;
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getPath()
+    {
+        return path;
+    }
+
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    public boolean getHidden()
+    {
+        return hidden;
+    }
+
+    public void setHidden(boolean hidden)
+    {
+        this.hidden = hidden;
+    }
+
+    public String getRedirect()
+    {
+        return redirect;
+    }
+
+    public void setRedirect(String redirect)
+    {
+        this.redirect = redirect;
+    }
+
+    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 Boolean getAlwaysShow()
+    {
+        return alwaysShow;
+    }
+
+    public void setAlwaysShow(Boolean alwaysShow)
+    {
+        this.alwaysShow = alwaysShow;
+    }
+
+    public MetaVo getMeta()
+    {
+        return meta;
+    }
+
+    public void setMeta(MetaVo meta)
+    {
+        this.meta = meta;
+    }
+
+    public List<RouterVo> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<RouterVo> children)
+    {
+        this.children = children;
+    }
+}

src/main/java/com/ruoyi/system/domain/vo/SysMassage.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.api.domain.SysUser;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Data
+public class SysMassage {
+
+    private List<SysUser> s;
+
+    public List<SysUser> getS(){
+        if(Objects.isNull(s)){
+            this.s = new ArrayList<SysUser>();
+        }
+        return this.s;
+    }
+}

src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java

@@ -0,0 +1,128 @@
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.api.domain.SysParty;
+import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.domain.SysMenuApp;
+import com.ruoyi.system.domain.SysMenuVisu;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Treeselect树结构实体类
+ *
+ * @author ruoyi
+ */
+public class TreeSelect implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 经度 */
+    private String deptLongitude;
+
+    /** 纬度 */
+    private String deptLatitude;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeSelect> children;
+
+    public TreeSelect()
+    {
+
+    }
+
+    public TreeSelect(SysDept dept)
+    {
+        this.id = dept.getDeptId();
+        this.label = dept.getDeptName();
+        this.deptLongitude = dept.getDeptLongitude();
+        this.deptLatitude = dept.getDeptLatitude();
+        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 TreeSelect(SysMenuVisu menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+    public TreeSelect(SysMenuApp menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+    public TreeSelect(SysParty party)
+    {
+        this.id = party.getPartyId();
+        this.label = party.getPartyName();
+        this.children = party.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 String getDeptLongitude() {
+        return deptLongitude;
+    }
+
+    public void setDeptLongitude(String deptLongitude) {
+        this.deptLongitude = deptLongitude;
+    }
+
+    public String getDeptLatitude() {
+        return deptLatitude;
+    }
+
+    public void setDeptLatitude(String deptLatitude) {
+        this.deptLatitude = deptLatitude;
+    }
+
+    public List<TreeSelect> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<TreeSelect> children)
+    {
+        this.children = children;
+    }
+}

src/main/java/com/ruoyi/system/domain/vo/TreeSelectParty.java

@@ -0,0 +1,86 @@
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.system.api.domain.SysDeptParty;
+import com.ruoyi.system.api.domain.SysParty;
+import com.ruoyi.system.domain.SysMenu;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Treeselect树结构实体类
+ *
+ * @author ruoyi
+ */
+public class TreeSelectParty implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeSelectParty> children;
+
+    public TreeSelectParty()
+    {
+
+    }
+
+    public TreeSelectParty(SysDeptParty dept)
+    {
+        this.id = dept.getDeptId();
+        this.label = dept.getDeptName();
+        this.children = dept.getChildren().stream().map(TreeSelectParty::new).collect(Collectors.toList());
+    }
+
+    public TreeSelectParty(SysMenu menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(TreeSelectParty::new).collect(Collectors.toList());
+    }
+
+    public TreeSelectParty(SysParty party)
+    {
+        this.id = party.getPartyId();
+        this.label = party.getPartyName();
+        this.children = party.getChildren().stream().map(TreeSelectParty::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<TreeSelectParty> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<TreeSelectParty> children)
+    {
+        this.children = children;
+    }
+}

src/main/java/com/ruoyi/system/mapper/SysAppRetaionMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysAppRetaion;
+
+import java.util.List;
+
+/**
+ * app主页轮播图Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public interface SysAppRetaionMapper
+{
+    /**
+     * 查询app主页轮播图
+     *
+     * @param id app主页轮播图主键
+     * @return app主页轮播图
+     */
+    public SysAppRetaion selectSysAppRetaionById(String id);
+
+    /**
+     * 查询app主页轮播图列表
+     *
+     * @param sysAppRetaion app主页轮播图
+     * @return app主页轮播图集合
+     */
+    public List<SysAppRetaion> selectSysAppRetaionList(SysAppRetaion sysAppRetaion);
+
+    /**
+     * 新增app主页轮播图
+     *
+     * @param sysAppRetaion app主页轮播图
+     * @return 结果
+     */
+    public int insertSysAppRetaion(SysAppRetaion sysAppRetaion);
+
+    /**
+     * 修改app主页轮播图
+     *
+     * @param sysAppRetaion app主页轮播图
+     * @return 结果
+     */
+    public int updateSysAppRetaion(SysAppRetaion sysAppRetaion);
+
+    /**
+     * 删除app主页轮播图
+     *
+     * @param id app主页轮播图主键
+     * @return 结果
+     */
+    public int deleteSysAppRetaionById(String id);
+
+    /**
+     * 批量删除app主页轮播图
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysAppRetaionByIds(String[] ids);
+}

src/main/java/com/ruoyi/system/mapper/SysAppVersionMapper.java

@@ -0,0 +1,68 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.common.datascope.base.util.database.DynamicDataSourceSwitcher;
+import com.ruoyi.common.datascope.base.util.database.MyDataSource;
+import com.ruoyi.system.domain.AppVersionBO;
+import com.ruoyi.system.domain.SysAppVersion;
+
+import java.util.List;
+
+/**
+ * app版本Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public interface SysAppVersionMapper
+{
+    /**
+     * 查询app版本
+     *
+     * @param id app版本主键
+     * @return app版本
+     */
+    public SysAppVersion selectSysAppVersionById(String id);
+
+    /**
+     * 查询app版本列表
+     *
+     * @param sysAppVersion app版本
+     * @return app版本集合
+     */
+    public List<SysAppVersion> selectSysAppVersionList(SysAppVersion sysAppVersion);
+
+    /**
+     * 新增app版本
+     *
+     * @param sysAppVersion app版本
+     * @return 结果
+     */
+    public int insertSysAppVersion(SysAppVersion sysAppVersion);
+
+    /**
+     * 修改app版本
+     *
+     * @param sysAppVersion app版本
+     * @return 结果
+     */
+    public int updateSysAppVersion(SysAppVersion sysAppVersion);
+
+    /**
+     * 删除app版本
+     *
+     * @param id app版本主键
+     * @return 结果
+     */
+    public int deleteSysAppVersionById(String id);
+
+    /**
+     * 批量删除app版本
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysAppVersionByIds(String[] ids);
+
+    @MyDataSource(value= DynamicDataSourceSwitcher.dbSystem)
+    AppVersionBO selectMaxVersion(String packageName);
+}

src/main/java/com/ruoyi/system/mapper/SysAttendanceMapper.java

@@ -0,0 +1,52 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysAttendance;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 考勤打卡Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-08-01
+ */
+@Repository
+public interface SysAttendanceMapper
+{
+
+    /**
+     * 查询考勤打卡列表
+     *
+     * @param sysAttendance 考勤打卡
+     * @return 考勤打卡集合
+     */
+    List<SysAttendance> selectSysAttendanceList(SysAttendance sysAttendance);
+
+    /**
+     * 新增考勤打卡
+     *
+     * @param sysAttendance 考勤打卡
+     * @return 结果
+     */
+    int insertSysAttendance(SysAttendance sysAttendance);
+
+    /**
+     * 新增考勤打卡
+     *
+     * @param sysAttendance 考勤打卡
+     * @return 结果
+     */
+    List<SysAttendance> selectSysAttendanceListAll(SysAttendance sysAttendance);
+
+    /**
+     * 大数据统计考勤用
+     *
+     * @return 结果
+     */
+    List<Map<String,Object>> bigFindAttend();
+
+
+
+}

src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java

@@ -0,0 +1,69 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysConfig;
+
+import java.util.List;
+
+/**
+ * 参数配置 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysConfigMapper
+{
+    /**
+     * 查询参数配置信息
+     *
+     * @param config 参数配置信息
+     * @return 参数配置信息
+     */
+    public SysConfig selectConfig(SysConfig config);
+
+    /**
+     * 查询参数配置列表
+     *
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    public List<SysConfig> selectConfigList(SysConfig config);
+
+    /**
+     * 根据键名查询参数配置信息
+     *
+     * @param configKey 参数键名
+     * @return 参数配置信息
+     */
+    public SysConfig checkConfigKeyUnique(String configKey);
+
+    /**
+     * 新增参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int insertConfig(SysConfig config);
+
+    /**
+     * 修改参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int updateConfig(SysConfig config);
+
+    /**
+     * 删除参数配置
+     *
+     * @param configId 参数ID
+     * @return 结果
+     */
+    public int deleteConfigById(Long configId);
+
+    /**
+     * 批量删除参数信息
+     *
+     * @param configIds 需要删除的参数ID
+     * @return 结果
+     */
+    public int deleteConfigByIds(Long[] configIds);
+}

src/main/java/com/ruoyi/system/mapper/SysDahuaOperLogCountMapper.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.mapper;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.domain.SysDahuaOperLogCount;
+
+import java.util.List;
+
+
+public interface SysDahuaOperLogCountMapper {
+
+
+    List<SysDahuaOperLogCount> selectSysDahuaOperLogCountList(JSONObject jsonObject);
+
+
+    List<SysDahuaOperLogCount> selectSysDahuaOperLogCount(JSONObject jsonObject);
+
+
+    List<Long> selectSysDahuaOperLogCountDeptId(JSONObject jsonObject);
+}

src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -0,0 +1,241 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysDept;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 部门管理 数据层
+ *
+ * @author ruoyi
+ */
+@Repository
+public interface SysDeptMapper {
+    /**
+     * 查询部门数据列表（带数据权限）
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectDeptList(SysDept dept);
+
+    /**
+     * 根据DEPT_ID查询下级的乡镇或区县部门列表，如果传入市级部门则查询区县，如果传入区县部门则查询乡镇街道（不带数据权限）
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectChildrenCountyOrVillagesDeptListByDeptId(SysDept dept);
+
+    /**
+     * 查询部门管理数据(本部门及以下)
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectDeptBelowList(SysDept dept);
+
+    /**
+     * 查询部门管理数据
+     *
+     * @param deptName 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectDeptListImportExcel(String[] deptName);
+
+    /**
+     * 查询全部部门管理数据
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectDeptAllList(SysDept dept);
+
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId            角色ID
+     * @param deptCheckStrictly 部门树选择项是否关联显示
+     * @return 选中部门列表
+     */
+    public List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+
+    /**
+     * 根据部门ID查询信息
+     *
+     * @param deptId 部门ID
+     * @return 部门信息
+     */
+    public SysDept selectDeptById(Long deptId);
+
+    /**
+     * 根据部门ID查询信息
+     *
+     * @param deptIdList 部门ID集合
+     * @return 部门信息
+     */
+    public List<SysDept> selectDeptByIds(@Param("deptIdList") List<Long> deptIdList);
+
+    /**
+     * 根据ID查询所有子部门
+     *
+     * @param deptId 部门ID
+     * @return 部门列表
+     */
+    public List<SysDept> selectChildrenDeptById(Long deptId);
+
+    /**
+     * 根据ID查询所有子部门
+     *
+     * @param deptId 部门ID
+     * @param postId 岗位ID
+     * @return 部门列表
+     */
+    public List<SysDept> selectChildrenDeptByIdAndPostId(@Param("deptId") String deptId, @Param("postId") String postId);
+
+    /**
+     * 根据ID查询所有子部门
+     *
+     * @return 部门列表
+     */
+    List<SysDept> userAllDeptSelectIncludeChildren(List<SysDept> list);
+
+    /**
+     * 根据ID查询所有子部门
+     *
+     * @param deptIds 部门ID
+     * @return 部门列表
+     */
+    List<SysDept> selectChildrenDeptByIds(Long[] deptIds);
+
+    /**
+     * 根据POSTID查询所有子部门
+     *
+     * @param postId 部门类型
+     * @return 部门列表
+     */
+    List<SysDept> getDeptsByPostId(Long postId);
+
+    /**
+     * 根据DeptType查询所有子部门
+     *
+     * @param sysDept 部门类
+     * @return 部门列表
+     */
+    List<SysDept> getDeptsByDeptType(SysDept sysDept);
+
+    /**
+     * 根据ID查询所有子部门（正常状态）
+     *
+     * @param deptId 部门ID
+     * @return 子部门数
+     */
+    public int selectNormalChildrenDeptById(Long deptId);
+
+    /**
+     * 是否存在子节点
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int hasChildByDeptId(Long deptId);
+
+    /**
+     * 查询部门是否存在用户
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int checkDeptExistUser(Long deptId);
+
+    /**
+     * 校验部门名称是否唯一
+     *
+     * @param deptName 部门名称
+     * @param parentId 父部门ID
+     * @return 结果
+     */
+    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
+
+    /**
+     * 新增部门信息
+     *
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public int insertDept(SysDept dept);
+
+    /**
+     * 修改部门信息
+     *
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public int updateDept(SysDept dept);
+
+    /**
+     * 修改所在部门正常状态
+     *
+     * @param deptIds 部门ID组
+     */
+    public void updateDeptStatusNormal(Long[] deptIds);
+
+    /**
+     * 修改子元素关系
+     *
+     * @param depts 子元素
+     * @return 结果
+     */
+    public int updateDeptChildren(@Param("depts") List<SysDept> depts);
+
+    /**
+     * 删除部门管理信息
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int deleteDeptById(Long deptId);
+
+    /**
+     * 获取当前登录人父ID的兄弟IDList
+     */
+    List<SysDept> selectParentSiblingsDeptsById(Long deptId);
+
+    /**
+     * 根据DEPTID获取指挥中心
+     */
+    SysDept getCommandCenter(@Param("deptId") String deptId, @Param("postId") String postId);
+
+    /**
+     * 根据DEPTID获取区级指挥中心对象
+     */
+    SysDept selectDistrictDeptByAnyDeptId(Long deptId);
+
+    /**
+     * 判断DEPT上级中是否有除消防支队外的行管局
+     */
+    Integer deptParentsHasBureau(Long deptId);
+
+    /**
+     * 获取行管部门下可接收短信人员
+     */
+    List<SysDept> selectDeptAndUsersByDeptType(SysDept sysDept);
+
+    /**
+     * 根据子deptId和父级类型递归获取上级部门
+     */
+    List<Long> findParentIdByChildDeptIdAndParentType(@Param("deptId") Long deptId, @Param("deptType") String[] deptType);
+
+    /**
+     * 判断DEPT_ID是否是PARENT_ID的子节点
+     */
+    Integer thisDeptIdIsParentIdChild(@Param("deptId") Long deptId, @Param("parentId") Long parentId);
+
+    /**
+     * 根据用户名查询dept_id, parent_id, ancestors, dept_name
+     */
+    SysDept findDeptIdByUserName(@Param("userName") String userName);
+
+}

src/main/java/com/ruoyi/system/mapper/SysDeptPartyMapper.java

@@ -0,0 +1,120 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.api.domain.SysDeptParty;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 部门管理 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysDeptPartyMapper
+{
+    /**
+     * 查询部门管理数据
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDeptParty> selectDeptList(SysDeptParty dept);
+
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId 角色ID
+     * @param deptCheckStrictly 部门树选择项是否关联显示
+     * @return 选中部门列表
+     */
+    public List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+
+    /**
+     * 根据部门ID查询信息
+     *
+     * @param deptId 部门ID
+     * @return 部门信息
+     */
+    public SysDeptParty selectDeptById(Long deptId);
+
+    /**
+     * 根据ID查询所有子部门
+     *
+     * @param deptId 部门ID
+     * @return 部门列表
+     */
+    public List<SysDeptParty> selectChildrenDeptById(Long deptId);
+
+    /**
+     * 根据ID查询所有子部门（正常状态）
+     *
+     * @param deptId 部门ID
+     * @return 子部门数
+     */
+    public int selectNormalChildrenDeptById(Long deptId);
+
+    /**
+     * 是否存在子节点
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int hasChildByDeptId(Long deptId);
+
+    /**
+     * 查询部门是否存在用户
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int checkDeptExistUser(Long deptId);
+
+    /**
+     * 校验部门名称是否唯一
+     *
+     * @param deptName 部门名称
+     * @param parentId 父部门ID
+     * @return 结果
+     */
+    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
+
+    /**
+     * 新增部门信息
+     *
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public int insertDept(SysDeptParty dept);
+
+    /**
+     * 修改部门信息
+     *
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public int updateDept(SysDeptParty dept);
+
+    /**
+     * 修改所在部门正常状态
+     *
+     * @param deptIds 部门ID组
+     */
+    public void updateDeptStatusNormal(Long[] deptIds);
+
+    /**
+     * 修改子元素关系
+     *
+     * @param depts 子元素
+     * @return 结果
+     */
+    public int updateDeptChildren(@Param("depts") List<SysDeptParty> depts);
+
+    /**
+     * 删除部门管理信息
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int deleteDeptById(Long deptId);
+}

src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

@@ -0,0 +1,107 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysDictData;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典表 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysDictDataMapper
+{
+    /**
+     * 根据条件分页查询字典数据
+     *
+     * @param dictData 字典数据信息
+     * @return 字典数据集合信息
+     */
+    public List<SysDictData> selectDictDataList(SysDictData dictData);
+
+    /**
+     * 根据字典类型查询字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据集合信息
+     */
+    public List<SysDictData> selectDictDataByType(String dictType);
+    public List<SysDictData> selectDictDataByDevice(@Param("dictType") String dictType,@Param("deptId") Long deptId);
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType 字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType 字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    public String selectDictLabels(@Param("param")Map param);
+
+    /**
+     * 根据字典数据ID查询信息
+     *
+     * @param dictCode 字典数据ID
+     * @return 字典数据
+     */
+    public SysDictData selectDictDataById(Long dictCode);
+
+    /**
+     * 查询字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据
+     */
+    public int countDictDataByType(String dictType);
+
+    /**
+     * 通过字典ID删除字典数据信息
+     *
+     * @param dictCode 字典数据ID
+     * @return 结果
+     */
+    public int deleteDictDataById(Long dictCode);
+
+    /**
+     * 批量删除字典数据信息
+     *
+     * @param dictCodes 需要删除的字典数据ID
+     * @return 结果
+     */
+    public int deleteDictDataByIds(Long[] dictCodes);
+
+    /**
+     * 新增字典数据信息
+     *
+     * @param dictData 字典数据信息
+     * @return 结果
+     */
+    public int insertDictData(SysDictData dictData);
+
+    /**
+     * 修改字典数据信息
+     *
+     * @param dictData 字典数据信息
+     * @return 结果
+     */
+    public int updateDictData(SysDictData dictData);
+
+    /**
+     * 同步修改字典类型
+     *
+     * @param oldDictType 旧字典类型
+     * @param newDictType 新旧字典类型
+     * @return 结果
+     */
+    public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
+}

src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java

@@ -0,0 +1,86 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysDictType;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 字典表 数据层
+ *
+ * @author ruoyi
+ */
+@Mapper
+public interface SysDictTypeMapper
+{
+    /**
+     * 根据条件分页查询字典类型
+     *
+     * @param dictType 字典类型信息
+     * @return 字典类型集合信息
+     */
+    public List<SysDictType> selectDictTypeList(SysDictType dictType);
+
+    /**
+     * 根据所有字典类型
+     *
+     * @return 字典类型集合信息
+     */
+    public List<SysDictType> selectDictTypeAll();
+
+    /**
+     * 根据字典类型ID查询信息
+     *
+     * @param dictId 字典类型ID
+     * @return 字典类型
+     */
+    public SysDictType selectDictTypeById(Long dictId);
+
+    /**
+     * 根据字典类型查询信息
+     *
+     * @param dictType 字典类型
+     * @return 字典类型
+     */
+    public SysDictType selectDictTypeByType(String dictType);
+
+    /**
+     * 通过字典ID删除字典信息
+     *
+     * @param dictId 字典ID
+     * @return 结果
+     */
+    public int deleteDictTypeById(Long dictId);
+
+    /**
+     * 批量删除字典类型信息
+     *
+     * @param dictIds 需要删除的字典ID
+     * @return 结果
+     */
+    public int deleteDictTypeByIds(Long[] dictIds);
+
+    /**
+     * 新增字典类型信息
+     *
+     * @param dictType 字典类型信息
+     * @return 结果
+     */
+    public int insertDictType(SysDictType dictType);
+
+    /**
+     * 修改字典类型信息
+     *
+     * @param dictType 字典类型信息
+     * @return 结果
+     */
+    public int updateDictType(SysDictType dictType);
+
+    /**
+     * 校验字典类型称是否唯一
+     *
+     * @param dictType 字典类型
+     * @return 结果
+     */
+    public SysDictType checkDictTypeUnique(String dictType);
+}

src/main/java/com/ruoyi/system/mapper/SysFontConfigMapper.java

@@ -0,0 +1,66 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysDictType;
+import com.ruoyi.system.domain.SysAppRetaion;
+import com.ruoyi.system.domain.SysFontConfig;
+
+import java.util.List;
+
+public interface SysFontConfigMapper {
+
+    /**
+     * 查询前端配置列表
+     *
+     * @param config 配置信息
+     * @return 配置集合
+     */
+    List<SysFontConfig> selectConfigList(SysFontConfig config);
+
+    /**
+     * 查询前端配置详情
+     *
+     * @param configId 配置信息
+     * @return 配置集合
+     */
+    public SysFontConfig selectFontConfigById(Long configId);
+
+    /**
+     * 新增前端配置
+     *
+     * @param config 配置信息
+     * @return 配置集合
+     */
+    public int insertFontConfig(SysFontConfig config);
+
+    /**
+     * 修改前端配置
+     *
+     * @param config 配置信息
+     * @return 配置集合
+     */
+    public int updateFontConfig(SysFontConfig config);
+
+    /**
+     * 删除前端配置
+     *
+     * @param configId 配置信息
+     *      * @return 配置集合
+     */
+    public int deleteFontConfigByconfigId(Long configId);
+
+    /**
+     * 批量删除删除前端配置
+     *
+     * @param configIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFontConfigByconfigIds(Long[] configIds);
+
+    /**
+     * 前端接口获取数据
+     *
+     * @param config 配置信息
+     * @return 配置集合
+     */
+    public SysFontConfig getSysFontConfig(String config);
+}

src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java

@@ -0,0 +1,55 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysLogininfor;
+import com.ruoyi.system.domain.SysLoginActive;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 系统访问日志情况信息 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysLogininforMapper
+{
+    /**
+     * 新增系统登录日志
+     *
+     * @param logininfor 访问日志对象
+     */
+    public int insertLogininfor(SysLogininfor logininfor);
+
+    public Map getUserAndActiveCount();
+
+    /**
+     * 查询系统登录日志集合
+     *
+     * @param logininfor 访问日志对象
+     * @return 登录记录集合
+     */
+    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
+
+    /**
+     * 查询活跃排名集合
+     *
+     * @param logininfor 访问日志对象
+     * @return 登录记录集合
+     */
+    public List<SysLoginActive> selectLogininforActiveList(SysLogininfor logininfor);
+
+    /**
+     * 批量删除系统登录日志
+     *
+     * @param infoIds 需要删除的登录日志ID
+     * @return 结果
+     */
+    public int deleteLogininforByIds(Long[] infoIds);
+
+    /**
+     * 清空系统登录日志
+     *
+     * @return 结果
+     */
+    public int cleanLogininfor();
+}

src/main/java/com/ruoyi/system/mapper/SysMenuAppMapper.java

@@ -0,0 +1,124 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.domain.SysMenuApp;
+import com.ruoyi.system.domain.SysMenuApp;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 手机端菜单管理Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-06-09
+ */
+public interface SysMenuAppMapper
+{
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param sysMenuApp 菜单信息
+     * @return 菜单列表
+     */
+    public List<SysMenuApp> selectMenuListByUserId(SysMenuApp sysMenuApp);
+
+    /**
+     * 查询系统菜单列表
+     *
+     * @param sysMenuApp 菜单信息
+     * @return 菜单列表
+     */
+    public List<SysMenuApp> selectMenuList(SysMenuApp sysMenuApp);
+
+    /**
+     * 查询手机端菜单管理
+     *
+     * @param menuId 手机端菜单管理主键
+     * @return 手机端菜单管理
+     */
+    public SysMenuApp selectSysMenuAppByMenuId(Long menuId);
+
+    /**
+     * 查询手机端菜单管理列表
+     *
+     * @param sysMenuApp 手机端菜单管理
+     * @return 手机端菜单管理集合
+     */
+    public List<SysMenuApp> selectSysMenuAppList(SysMenuApp sysMenuApp);
+
+    /**
+     * 根据父级ID获取子级菜单或按钮
+     */
+    public List<SysMenuApp> getAppChildrenMenuOrButtonByParentId(SysMenuApp sysMenuApp);
+
+
+    /**
+     * 新增手机端菜单管理
+     *
+     * @param sysMenuApp 手机端菜单管理
+     * @return 结果
+     */
+    public int insertSysMenuApp(SysMenuApp sysMenuApp);
+
+
+    /**
+     * 修改手机端菜单管理
+     *
+     * @param sysMenuApp 手机端菜单管理
+     * @return 结果
+     */
+    public int updateSysMenuApp(SysMenuApp sysMenuApp);
+
+    /**
+     * 删除手机端菜单管理
+     *
+     * @param menuId 手机端菜单管理主键
+     * @return 结果
+     */
+    public int deleteSysMenuAppByMenuId(Long menuId);
+
+    /**
+     * 批量删除手机端菜单管理
+     *
+     * @param menuIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysMenuAppByMenuIds(Long[] menuIds);
+
+    /**
+     * 校验菜单名称是否唯一
+     *
+     * @param menuName 菜单名称
+     * @param parentId 父菜单ID
+     * @return 结果
+     */
+    public SysMenuApp checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
+
+    /**
+     * 是否存在菜单子节点
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int hasChildByMenuId(Long menuId);
+
+    /**
+     * 根据角色ID查询菜单树信息
+     *
+     * @param roleId 角色ID
+     * @param menuAppCheckStrictly 菜单树选择项是否关联显示
+     * @return 选中菜单列表
+     */
+    public List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuAppCheckStrictly") boolean menuAppCheckStrictly);
+
+    /**
+     * 根据父级ID和角色ID查询菜单树信息
+     *
+     * @param roles 角色
+     * @param parentId 父级ID
+     * @return 选中菜单列表
+     */
+    public List<SysMenuApp> selectMenuListByParentIdAndRole(@Param("parentId") Long parentId, @Param("roleIds") List<Long> roleIds);
+}

src/main/java/com/ruoyi/system/mapper/SysMenuEventTypeMapper.java

@@ -0,0 +1,72 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.api.domain.SysMenuEventType;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-04-10
+ */
+public interface SysMenuEventTypeMapper
+{
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public SysMenuEventType selectSysMenuEventTypeById(String id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param sysMenuEventType 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<SysMenuEventType> selectSysMenuEventTypeList(SysMenuEventType sysMenuEventType);
+
+    public List<SysMenuEventType> selectByMenuIds(String[] ids);
+
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param sysMenuEventType 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertSysMenuEventType(SysMenuEventType sysMenuEventType);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param sysMenuEventType 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateSysMenuEventType(SysMenuEventType sysMenuEventType);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteSysMenuEventTypeById(String id);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param menuId 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteSysMenuEventTypeByMenuId(String menuId);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysMenuEventTypeByIds(String[] ids);
+}

src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -0,0 +1,118 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysMenu;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 菜单表 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysMenuMapper
+{
+    /**
+     * 查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuList(SysMenu menu);
+
+    /**
+     * 根据用户所有权限
+     *
+     * @return 权限列表
+     */
+    public List<String> selectMenuPerms();
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuListByUserId(SysMenu menu);
+
+    /**
+     * 根据用户ID查询权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    public List<String> selectMenuPermsByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuTreeAll(SysMenu sysMenu);
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuTreeByUserId(SysMenu sysMenu);
+
+    /**
+     * 根据角色ID查询菜单树信息
+     *
+     * @param roleId 角色ID
+     * @param menuCheckStrictly 菜单树选择项是否关联显示
+     * @return 选中菜单列表
+     */
+    public List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+
+    /**
+     * 根据菜单ID查询信息
+     *
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    public SysMenu selectMenuById(Long menuId);
+
+    /**
+     * 是否存在菜单子节点
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int hasChildByMenuId(Long menuId);
+
+    /**
+     * 新增菜单信息
+     *
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public int insertMenu(SysMenu menu);
+
+    /**
+     * 修改菜单信息
+     *
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public int updateMenu(SysMenu menu);
+
+    /**
+     * 删除菜单管理信息
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int deleteMenuById(Long menuId);
+
+    /**
+     * 校验菜单名称是否唯一
+     *
+     * @param menuName 菜单名称
+     * @param parentId 父菜单ID
+     * @return 结果
+     */
+    public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
+}

src/main/java/com/ruoyi/system/mapper/SysMenuVisuImageMapper.java

@@ -0,0 +1,81 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.SysFontConfig;
+import com.ruoyi.system.domain.SysMenuVisu;
+import com.ruoyi.system.domain.SysMenuVisuImage;
+import com.ruoyi.system.domain.SysPicFontConfig;
+
+/**
+ * 可视化前端配置表Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+public interface SysMenuVisuImageMapper
+{
+    /**
+     * 查询可视化前端配置表
+     *
+     * @param id 可视化前端配置表主键
+     * @return 可视化前端配置表
+     */
+    public SysMenuVisuImage selectSysMenuVisuImageById(Integer id);
+
+    /**
+     * 查询可视化前端配置表列表
+     *
+     * @param sysMenuVisuImage 可视化前端配置表
+     * @return 可视化前端配置表集合
+     */
+    public List<SysMenuVisuImage> selectSysMenuVisuImageList(SysMenuVisuImage sysMenuVisuImage);
+
+    /**
+     * 新增可视化前端配置表
+     *
+     * @param sysMenuVisuImage 可视化前端配置表
+     * @return 结果
+     */
+    public int insertSysMenuVisuImage(SysMenuVisuImage sysMenuVisuImage);
+
+    /**
+     * 批量新增前端配置
+     *
+     * @param list 配置信息
+     * @return 配置集合
+     */
+    public int batchInsertMenuVisuImage(List<SysMenuVisuImage> list);
+
+    /**
+     * 修改可视化前端配置表
+     *
+     * @param sysMenuVisuImage 可视化前端配置表
+     * @return 结果
+     */
+    public int updateSysMenuVisuImage(SysMenuVisuImage sysMenuVisuImage);
+
+    /**
+     * 删除可视化前端配置表
+     *
+     * @param id 可视化前端配置表主键
+     * @return 结果
+     */
+    public int deleteSysMenuVisuImageById(Integer id);
+
+    /**
+     * 批量删除可视化前端配置表
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysMenuVisuImageByIds(Integer[] ids);
+
+    /**
+     * 修改设为当前
+     *
+     * @param sysMenuVisuImage 配置信息
+     * @return 配置集合
+     */
+    public int updateCurrentImage(SysMenuVisu sysMenuVisuImage);
+}

src/main/java/com/ruoyi/system/mapper/SysMenuVisuMapMapper.java

@@ -0,0 +1,59 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysMenuVisuMap;
+
+import java.util.List;
+
+public interface SysMenuVisuMapMapper {
+
+
+     List<SysMenuVisuMap> queryMap(SysMenuVisuMap sysMenuVisuMap);
+
+
+    /**
+     * 查询可视化前端配置图层列表
+     *
+     */
+     List<SysMenuVisuMap> getMap(SysMenuVisuMap sysMenuVisuMap);
+
+    /**
+     * 查询可视化前端配置图层列表下拉框
+     *
+     */
+    List<SysMenuVisuMap> getMaps(SysMenuVisuMap sysMenuVisuMap);
+    /**
+     * 新增可视化前端配置地图表详细信息
+     */
+    int insertSysMenuMapVisuImage(SysMenuVisuMap sysMenuVisuMap);
+
+    /**
+     * 修改可视化前端配置地图表详细信息
+     */
+    int modifyMap(SysMenuVisuMap sysMenuVisuMap);
+
+    /**
+     * 查询设置标签修改页
+     */
+    List<SysMenuVisuMap> queryModificationPage(Integer id);
+
+    /**
+     * 查询可视化前端图层连接底图池
+     */
+    List<SysMenuVisuMap> getmaping(SysMenuVisuMap sysMenuVisuMap);
+
+    /**
+     * 删除可视化前端配置图层表详细信息
+     */
+     int deleteSysMenuMapVisuImageByIds(Integer[] id);
+     int countMappingByIds(Integer[] id);
+     List<SysMenuVisuMap> getMenuNamesByMenuIds(Integer id);
+    /**
+     * 移入地图图层
+     */
+    int insertSysMenuMapVisuImages(SysMenuVisuMap sysMenuVisuMap);
+
+    /**
+     * 移入地图图层
+     */
+    Integer deleteSysMenuMapVisuImageByIdss(SysMenuVisuMap sysMenuVisuMap);
+}

src/main/java/com/ruoyi/system/mapper/SysMenuVisuMapper.java

@@ -0,0 +1,110 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysMenuVisu;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 可视化菜单权限Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-05-24
+ */
+public interface SysMenuVisuMapper
+{
+
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+    public List<SysMenuVisu> selectMenuListByUserId(SysMenuVisu sysMenuVisu);
+
+    /**
+     * 查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+    public List<SysMenuVisu> selectMenuList(SysMenuVisu sysMenuVisu);
+    /**
+     * 查询可视化菜单权限
+     *
+     * @param menuId 可视化菜单权限主键
+     * @return 可视化菜单权限
+     */
+    public SysMenuVisu selectSysMenuVisuByMenuId(Long menuId);
+
+    /**
+     * 查询可视化菜单权限列表
+     *
+     * @param sysMenuVisu 可视化菜单权限
+     * @return 可视化菜单权限集合
+     */
+    public List<SysMenuVisu> selectSysMenuVisuList(SysMenuVisu sysMenuVisu);
+
+    /**
+     * 新增可视化菜单权限
+     *
+     * @param sysMenuVisu 可视化菜单权限
+     * @return 结果
+     */
+    public int insertSysMenuVisu(SysMenuVisu sysMenuVisu);
+
+    /**
+     * 修改可视化菜单权限
+     *
+     * @param sysMenuVisu 可视化菜单权限
+     * @return 结果
+     */
+    public int updateSysMenuVisu(SysMenuVisu sysMenuVisu);
+
+    /**
+     * 删除可视化菜单权限
+     *
+     * @param menuId 可视化菜单权限主键
+     * @return 结果
+     */
+    public int deleteSysMenuVisuByMenuId(Long menuId);
+
+    /**
+     * 批量删除可视化菜单权限
+     *
+     * @param menuIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysMenuVisuByMenuIds(Long[] menuIds);
+
+
+    /**
+     * 校验菜单名称是否唯一
+     *
+     * @param menuName 菜单名称
+     * @param parentId 父菜单ID
+     * @return 结果
+     */
+    public SysMenuVisu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
+
+
+    /**
+     * 是否存在菜单子节点
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int hasChildByMenuId(Long menuId);
+
+
+    /**
+     * 根据角色ID查询菜单树信息
+     *
+     * @param roleId 角色ID
+     * @param menuVisuCheckStrictly 菜单树选择项是否关联显示
+     * @return 选中菜单列表
+     */
+    public List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuVisuCheckStrictly") boolean menuVisuCheckStrictly);
+
+}

src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.domain.SysNoticeDept;
+import com.ruoyi.system.domain.SysUserDept;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 通知公告表 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysNoticeMapper
+{
+    /**
+     * 查询公告信息
+     *
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    public SysNotice selectNoticeById(Long noticeId);
+
+    /**
+     * 查询公告列表
+     *
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    public List<SysNotice> selectNoticeList(SysNotice notice);
+
+    /**
+     * 按部门获取通知公告列表
+     */
+    public List<SysNotice> listNoticeByDeptId(SysNotice notice);
+
+    /**
+     * 获取最新一条通知公告
+     * limeng
+     */
+    public SysNotice getLatestNotice(SysNotice notice);
+
+
+    public int batchNoticeDept(List<SysNoticeDept> sysNoticeList);
+
+    public int delNoticeDeptById(Long noticeId);
+
+    /**
+     * 新增公告
+     *
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int insertNotice(SysNotice notice);
+
+    /**
+     * 修改公告
+     *
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int updateNotice(SysNotice notice);
+
+    /**
+     * 批量删除公告
+     *
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    public int deleteNoticeById(Long noticeId);
+
+    /**
+     * 批量删除公告信息
+     *
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    public int deleteNoticeByIds(Long[] noticeIds);
+
+    /**
+     * 根据部门id查公告
+     * @return 结果
+     */
+    List<SysNotice> listNotice(List<SysDept> list);
+
+    /**
+     * 根据公告id查详情
+     * @param noticeId  需要传入的公告id
+     * @return 结果
+     */
+    SysNotice details(Integer noticeId);
+}

src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java

@@ -0,0 +1,60 @@
+package com.ruoyi.system.mapper;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.system.api.domain.SysOperLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 操作日志 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysOperLogMapper {
+    /**
+     * 新增操作日志
+     *
+     * @param operLog 操作日志对象
+     */
+    public int insertOperlog(@Param("currentYear") int currentYear, @Param("operLog") SysOperLog operLog);
+
+    /**
+     * 查询系统操作日志集合
+     *
+     * @param operLog 操作日志对象
+     * @return 操作日志集合
+     */
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
+
+    /**
+     * 批量删除系统操作日志
+     *
+     * @param operIds 需要删除的操作日志ID
+     * @return 结果
+     */
+    public int deleteOperLogByIds(Long[] operIds);
+
+    /**
+     * 查询操作日志详细
+     *
+     * @param operId 操作ID
+     * @return 操作日志对象
+     */
+    public SysOperLog selectOperLogById(Long operId);
+
+    /**
+     * 清空操作日志
+     */
+    public void cleanOperLog();
+
+    int updateFourField(@Param("year") String year,@Param("list")List<Long> operIds);
+
+    LinkedHashMap<String, Object> selectOperLogCount(JSONObject jsonObject);
+
+
+    List<Long> selectOperLogLimit(@Param("year") String year);
+
+}

src/main/java/com/ruoyi/system/mapper/SysPartyMapper.java

@@ -0,0 +1,119 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysParty;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 部门管理 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysPartyMapper
+{
+    /**
+     * 查询党组管理数据
+     *
+     * @param party 党组信息
+     * @return 党组信息集合
+     */
+    public List<SysParty> selectPartyList(SysParty party);
+
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId 角色ID
+     * @param deptCheckStrictly 部门树选择项是否关联显示
+     * @return 选中部门列表
+     */
+    public List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+
+    /**
+     * 根据党组ID查询信息
+     *
+     * @param partyId 党组ID
+     * @return 党组信息
+     */
+    public SysParty selectPartyById(Long partyId);
+
+    /**
+     * 根据ID查询所有子组织
+     *
+     * @param partyId 党组ID
+     * @return 党组列表
+     */
+    public List<SysParty> selectChildrenPartyById(Long partyId);
+
+    /**
+     * 根据ID查询所有子组织（正常状态）
+     *
+     * @param partyId 组织ID
+     * @return 子组织数
+     */
+    public int selectNormalChildrenPartyById(Long partyId);
+
+    /**
+     * 是否存在子节点
+     *
+     * @param partyId 组织ID
+     * @return 结果
+     */
+    public int hasChildByPartyId(Long partyId);
+
+    /**
+     * 查询组织是否存在用户
+     *
+     * @param partyId 组织ID
+     * @return 结果
+     */
+    public int checkPartyExistUser(Long partyId);
+
+    /**
+     * 校验党组名称是否唯一
+     *
+     * @param partyName 党组名称
+     * @param parentId 父党组ID
+     * @return 结果
+     */
+    public SysParty checkPartyNameUnique(@Param("partyName") String partyName, @Param("parentId") Long parentId);
+
+    /**
+     * 新增保存组织信息
+     *
+     * @param party 组织信息
+     * @return 结果
+     */
+    public int insertParty(SysParty party);
+
+    /**
+     * 修改党组信息
+     *
+     * @param party 党组信息
+     * @return 结果
+     */
+    public int updateParty(SysParty party);
+
+    /**
+     * 修改所在党组正常状态
+     *
+     * @param partyIds 党组ID组
+     */
+    public void updatePartyStatusNormal(Long[] partyIds);
+
+    /**
+     * 修改子元素关系
+     *
+     * @param parties 子元素
+     * @return 结果
+     */
+    public int updatePartyChildren(@Param("parties") List<SysParty> parties);
+
+    /**
+     * 删除党组管理信息
+     *
+     * @param partyId 党组ID
+     * @return 结果
+     */
+    public int deletePartyById(Long partyId);
+}

src/main/java/com/ruoyi/system/mapper/SysPicFontConfigMapper.java

@@ -0,0 +1,73 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysFontConfig;
+import com.ruoyi.system.domain.SysPicFontConfig;
+
+import java.util.List;
+
+public interface SysPicFontConfigMapper {
+
+    /**
+     * 查询前端配置列表
+     *
+     * @param picFontConfig 配置信息
+     * @return 配置集合
+     */
+    List<SysPicFontConfig> selectPicConfigList(SysPicFontConfig picFontConfig);
+
+    /**
+     * 查询前端配置详情
+     *
+     * @param id 配置信息
+     * @return 配置集合
+     */
+    public SysPicFontConfig selectPicFontConfigById(Long id);
+
+    /**
+     * 新增前端配置
+     *
+     * @param picFontConfig 配置信息
+     * @return 配置集合
+     */
+    public int insertPicFontConfig(SysPicFontConfig picFontConfig);
+
+    /**
+     * 批量新增前端配置
+     *
+     * @param list 配置信息
+     * @return 配置集合
+     */
+    public int batchInsertPicFontConfig(List<SysPicFontConfig> list);
+
+    /**
+     * 修改前端配置
+     *
+     * @param picFontConfig 配置信息
+     * @return 配置集合
+     */
+    public int updatePicFontConfig(SysPicFontConfig picFontConfig);
+
+    /**
+     * 修改设为当前
+     *
+     * @param picFontConfig 配置信息
+     * @return 配置集合
+     */
+    public int updateCurrentFontConfig(SysFontConfig picFontConfig);
+
+    /**
+     * 删除前端配置
+     *
+     * @param id 配置信息
+     *      * @return 配置集合
+     */
+    public int deletePicFontConfigByconfigId(Long id);
+
+    /**
+     * 批量删除删除前端配置
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePicFontConfigByconfigIds(Long[] ids);
+}

src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

@@ -0,0 +1,114 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.domain.SysPost;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 岗位信息 数据层
+ *
+ * @author ruoyi
+ */
+@Repository
+public interface SysPostMapper
+{
+    /**
+     * 查询岗位数据集合
+     *
+     * @param post 岗位信息
+     * @return 岗位数据集合
+     */
+    public List<SysPost> selectPostList(SysPost post);
+
+    /**
+     * 查询所有岗位
+     *
+     * @return 岗位列表
+     */
+    public List<SysPost> selectPostAll();
+
+    /**
+     * 通过岗位ID查询岗位信息
+     *
+     * @param postId 岗位ID
+     * @return 角色对象信息
+     */
+    public SysPost selectPostById(Long postId);
+
+    /**
+     * 根据用户ID获取岗位选择框列表
+     *
+     * @param userId 用户ID
+     * @return 选中岗位ID列表
+     */
+    public List<Long> selectPostListByUserId(Long userId);
+
+    /**
+     * 根据部门ID获取岗位选择框列表
+     *
+     * @param deptId 部门ID
+     * @return 选中岗位ID列表
+     */
+    public List<Long> selectPostListByDeptId(Long deptId);
+
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userName 用户名
+     * @return 结果
+     */
+    public List<SysPost> selectPostsByUserName(String userName);
+
+    /**
+     * 删除岗位信息
+     *
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    public int deletePostById(Long postId);
+
+    /**
+     * 批量删除岗位信息
+     *
+     * @param postIds 需要删除的岗位ID
+     * @return 结果
+     */
+    public int deletePostByIds(Long[] postIds);
+
+    /**
+     * 修改岗位信息
+     *
+     * @param post 岗位信息
+     * @return 结果
+     */
+    public int updatePost(SysPost post);
+
+    /**
+     * 新增岗位信息
+     *
+     * @param post 岗位信息
+     * @return 结果
+     */
+    public int insertPost(SysPost post);
+
+    /**
+     * 校验岗位名称
+     *
+     * @param postName 岗位名称
+     * @return 结果
+     */
+    public SysPost checkPostNameUnique(String postName);
+
+    /**
+     * 校验岗位编码
+     *
+     * @param postCode 岗位编码
+     * @return 结果
+     */
+    public SysPost checkPostCodeUnique(String postCode);
+
+    public List<String> selectDeptCodeByDepts(@Param(value = "depts") List<SysDept> depts);
+}

src/main/java/com/ruoyi/system/mapper/SysReportMapper.java

@@ -0,0 +1,129 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.system.domain.SysReport;
+import com.ruoyi.system.domain.SysReportData;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * reportMapper接口
+ *
+ * @author limeng
+ * @date 2023-08-09
+ */
+public interface SysReportMapper
+{
+    /**
+     * 查询report
+     *
+     * @param id report主键
+     * @return report
+     */
+    public SysReport selectSysReportById(String id);
+
+    /**
+     * 查询report列表
+     *
+     * @param sysReport report
+     * @return report集合
+     */
+    public List<SysReport> selectSysReportList(SysReport sysReport);
+    /**
+     * 查询report列表
+     *
+     * @return report集合
+     */
+    public SysReportData selectSysReportData();
+
+    /**
+     * 新增report
+     *
+     * @param sysReport report
+     * @return 结果
+     */
+    public int insertSysReport(SysReport sysReport);
+    /**
+     * 新增report
+     *
+     * @param sysReportData report
+     * @return 结果
+     */
+    public int insertSysReportData(SysReportData sysReportData);
+
+    /**
+     * 修改report
+     *
+     * @param sysReport report
+     * @return 结果
+     */
+    public int updateSysReport(SysReport sysReport);
+    /**
+     * 修改report
+     *
+     * @param sysReportData report
+     * @return 结果
+     */
+    public int updateSysReportData(SysReportData sysReportData);
+
+    /**
+     * 删除report
+     *
+     * @param id report主键
+     * @return 结果
+     */
+    public int deleteSysReportById(String id);
+
+    /**
+     * 批量删除report
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysReportByIds(String[] ids);
+
+    /**
+     * 查询领导账号数
+     */
+    public Map selectLeaderAccountCount();
+
+    /**
+     * 查询注册账号数
+     */
+    public Map selectRegisterAccountCount();
+
+    /**
+     * 查询活跃账号数
+     */
+    public Map selectActiveAccountCount();
+
+    /**
+     * 查询各类传感器数
+     */
+    public Map selectDeviceCountGroupByType();
+
+    /**
+     * 查询传感器上报数据数
+     */
+    public Map selectDeviceDataCount();
+
+    /**
+     * 查询平台操作日志数
+     */
+    public Map selectOperateCount();
+
+    public List<String> selectTableName();
+
+    /**
+     * 查询各区县各类传感器数
+     */
+    public List<Map<String,Object>> selectDeviceCountGroupByTypeAndQx();
+
+    /**
+     * 查询系统使用情况注册用户、活跃用户、活跃率
+     */
+    public Map<String,Object> selectUserActiveAndRate(@Param("timeArr") String timeArr);
+
+
+}