init

.gitignore

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

LICENSE

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

bin/clean.bat

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

bin/package.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [��Ϣ] ���Web���̣�����war/jar���ļ���
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean package -Dmaven.test.skip=true
+
+pause-655

bin/run-auth.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Auth工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-auth/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar
+
+cd bin
+pause

bin/run-gateway.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Gateway工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-gateway/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar
+
+cd bin
+pause

bin/run-modules-file.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Modules-File工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-modules/ruoyi-file/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar
+
+cd bin
+pause

bin/run-modules-gen.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Modules-Gen工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-modules/ruoyi-gen/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar
+
+cd bin
+pause

bin/run-modules-job.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Modules-Job工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-modules/ruoyi-job/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar
+
+cd bin
+pause

bin/run-modules-system.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Modules-System工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-modules/ruoyi-system/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar
+
+cd bin
+pause

bin/run-monitor.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Monitor工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-visual/ruoyi-monitor/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar
+
+cd bin
+pause

docker/copy.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# 复制项目的文件到对应docker路径，便于一键生成镜像。
+usage() {
+	echo "Usage: sh copy.sh"
+	exit 1
+}
+
+
+# copy sql
+echo "begin copy sql "
+cp ../sql/ry_20210908.sql ./mysql/db
+cp ../sql/ry_config_20220114.sql ./mysql/db
+
+# copy html
+echo "begin copy html "
+cp -r ../ruoyi-ui/dist/** ./nginx/html/dist
+
+
+# copy jar
+echo "begin copy ruoyi-gateway "
+cp ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/gateway/jar
+
+echo "begin copy ruoyi-auth "
+cp ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/auth/jar
+
+echo "begin copy ruoyi-visual "
+cp ../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar  ./ruoyi/visual/monitor/jar
+
+echo "begin copy ruoyi-modules-system "
+cp ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/modules/system/jar
+
+echo "begin copy ruoyi-modules-file "
+cp ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/modules/file/jar
+
+echo "begin copy ruoyi-modules-job "
+cp ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/modules/job/jar
+
+echo "begin copy ruoyi-modules-gen "
+cp ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar
+

docker/deploy.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# 使用说明，用来提示输入参数
+usage() {
+	echo "Usage: sh 执行脚本.sh [port|base|modules|stop|rm]"
+	exit 1
+}
+
+# 开启所需端口
+port(){
+	firewall-cmd --add-port=80/tcp --permanent
+	firewall-cmd --add-port=8080/tcp --permanent
+	firewall-cmd --add-port=8848/tcp --permanent
+	firewall-cmd --add-port=9848/tcp --permanent
+	firewall-cmd --add-port=9849/tcp --permanent
+	firewall-cmd --add-port=6379/tcp --permanent
+	firewall-cmd --add-port=3306/tcp --permanent
+	firewall-cmd --add-port=9100/tcp --permanent
+	firewall-cmd --add-port=9200/tcp --permanent
+	firewall-cmd --add-port=9201/tcp --permanent
+	firewall-cmd --add-port=9202/tcp --permanent
+	firewall-cmd --add-port=9203/tcp --permanent
+	firewall-cmd --add-port=9300/tcp --permanent
+	service firewalld restart
+}
+
+# 启动基础环境（必须）
+base(){
+	docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos
+}
+
+# 启动程序模块（必须）
+modules(){
+	docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system
+}
+
+# 关闭所有环境/模块
+stop(){
+	docker-compose stop
+}
+
+# 删除所有环境/模块
+rm(){
+	docker-compose rm
+}
+
+# 根据输入参数，选择执行对应方法，不输入则执行使用说明
+case "$1" in
+"port")
+	port
+;;
+"base")
+	base
+;;
+"modules")
+	modules
+;;
+"stop")
+	stop
+;;
+"rm")
+	rm
+;;
+*)
+	usage
+;;
+esac

docker/docker-compose.yml

@@ -0,0 +1,140 @@
+version : '3.8'
+services:
+  ruoyi-nacos:
+    container_name: ruoyi-nacos
+    image: nacos/nacos-server
+    build:
+      context: ./nacos
+    environment:
+      - MODE=standalone
+    volumes:
+      - ./nacos/logs/:/home/nacos/logs
+      - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
+    ports:
+      - "8848:8848"
+      - "9848:9848"
+      - "9849:9849"
+    depends_on:
+      - ruoyi-mysql
+  ruoyi-mysql:
+    container_name: ruoyi-mysql
+    image: mysql:5.7
+    build:
+      context: ./mysql
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./mysql/conf:/etc/mysql/conf.d
+      - ./mysql/logs:/logs
+      - ./mysql/data:/var/lib/mysql
+    command: [
+          'mysqld',
+          '--innodb-buffer-pool-size=80M',
+          '--character-set-server=utf8mb4',
+          '--collation-server=utf8mb4_unicode_ci',
+          '--default-time-zone=+8:00',
+          '--lower-case-table-names=1'
+        ]
+    environment:
+      MYSQL_DATABASE: 'ry-cloud'
+      MYSQL_ROOT_PASSWORD: password
+  ruoyi-redis:
+    container_name: ruoyi-redis
+    image: redis
+    build:
+      context: ./redis
+    ports:
+      - "6379:6379"
+    volumes:
+      - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf
+      - ./redis/data:/data
+    command: redis-server /home/ruoyi/redis/redis.conf
+  ruoyi-nginx:
+    container_name: ruoyi-nginx
+    image: nginx
+    build:
+      context: ./nginx
+    ports:
+      - "80:80"
+    volumes:
+      - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui
+      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx/logs:/var/log/nginx
+      - ./nginx/conf.d:/etc/nginx/conf.d
+    depends_on:
+      - ruoyi-gateway
+    links:
+      - ruoyi-gateway
+  ruoyi-gateway:
+    container_name: ruoyi-gateway
+    build:
+      context: ./ruoyi/gateway
+      dockerfile: dockerfile
+    ports:
+      - "8080:8080"
+    depends_on:
+      - ruoyi-redis
+    links:
+      - ruoyi-redis
+  ruoyi-auth:
+    container_name: ruoyi-auth
+    build:
+      context: ./ruoyi/auth
+      dockerfile: dockerfile
+    ports:
+      - "9200:9200"
+    depends_on:
+      - ruoyi-redis
+    links:
+      - ruoyi-redis
+  ruoyi-modules-system:
+    container_name: ruoyi-modules-system
+    build:
+      context: ./ruoyi/modules/system
+      dockerfile: dockerfile
+    ports:
+      - "9201:9201"
+    depends_on:
+      - ruoyi-redis
+      - ruoyi-mysql
+    links:
+      - ruoyi-redis
+      - ruoyi-mysql
+  ruoyi-modules-gen:
+    container_name: ruoyi-modules-gen
+    build:
+      context: ./ruoyi/modules/gen
+      dockerfile: dockerfile
+    ports:
+      - "9202:9202"
+    depends_on:
+      - ruoyi-mysql
+    links:
+      - ruoyi-mysql
+  ruoyi-modules-job:
+    container_name: ruoyi-modules-job
+    build:
+      context: ./ruoyi/modules/job
+      dockerfile: dockerfile
+    ports:
+      - "9203:9203"
+    depends_on:
+      - ruoyi-mysql
+    links:
+      - ruoyi-mysql
+  ruoyi-modules-file:
+    container_name: ruoyi-modules-file
+    build:
+      context: ./ruoyi/modules/file
+      dockerfile: dockerfile
+    ports:
+      - "9300:9300"
+    volumes:
+    - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
+  ruoyi-visual-monitor:
+    container_name: ruoyi-visual-monitor
+    build:
+      context: ./ruoyi/visual/monitor
+      dockerfile: dockerfile
+    ports:
+      - "9100:9100"

docker/mysql/db/readme.txt

@@ -0,0 +1 @@
+存放sql目录下的所有脚本，用于docker自动执行。

docker/mysql/dockerfile

@@ -0,0 +1,7 @@
+# 基础镜像
+FROM mysql:5.7
+# author
+MAINTAINER ruoyi
+
+# 执行sql脚本
+ADD ./db/*.sql /docker-entrypoint-initdb.d/

docker/nacos/conf/application.properties

@@ -0,0 +1,32 @@
+spring.datasource.platform=mysql
+db.num=1
+db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
+db.user=root
+db.password=password
+
+nacos.naming.empty-service.auto-clean=true
+nacos.naming.empty-service.clean.initial-delay-ms=50000
+nacos.naming.empty-service.clean.period-time-ms=30000
+
+management.endpoints.web.exposure.include=*
+
+management.metrics.export.elastic.enabled=false
+management.metrics.export.influx.enabled=false
+
+server.tomcat.accesslog.enabled=true
+server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
+
+server.tomcat.basedir=
+
+nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
+
+nacos.core.auth.system.type=nacos
+nacos.core.auth.enabled=false
+nacos.core.auth.default.token.expire.seconds=18000
+nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
+nacos.core.auth.caching.enabled=true
+nacos.core.auth.enable.userAgentAuthWhite=false
+nacos.core.auth.server.identity.key=serverIdentity
+nacos.core.auth.server.identity.value=security
+
+nacos.istio.mcp.server.enabled=false

docker/nacos/dockerfile

@@ -0,0 +1,7 @@
+# 基础镜像
+FROM nacos/nacos-server
+# author
+MAINTAINER ruoyi
+
+# 复制conf文件到路径
+COPY ./conf/application.properties /home/nacos/conf/application.properties

docker/nginx/conf/nginx.conf

@@ -0,0 +1,36 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+		location / {
+            root   /home/ruoyi/projects/ruoyi-ui;
+			try_files $uri $uri/ /index.html;
+            index  index.html index.htm;
+        }
+		
+		location /prod-api/{
+			proxy_set_header Host $http_host;
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header REMOTE-HOST $remote_addr;
+			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_pass http://ruoyi-gateway:8080/;
+		}
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
+}# requirepass 123456

docker/nginx/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM nginx
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi/projects/ruoyi-ui
+# 创建目录
+RUN mkdir -p /home/ruoyi/projects/ruoyi-ui
+# 指定路径
+WORKDIR /home/ruoyi/projects/ruoyi-ui
+# 复制conf文件到路径
+COPY ./conf/nginx.conf /etc/nginx/nginx.conf
+# 复制html文件到路径
+COPY ./html/dist /home/ruoyi/projects/ruoyi-ui

docker/redis/conf/redis.conf

@@ -0,0 +1 @@
+# requirepass 123456

docker/redis/dockerfile

@@ -0,0 +1,13 @@
+# 基础镜像
+FROM redis
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi/redis
+# 创建目录
+RUN mkdir -p /home/ruoyi/redis
+# 指定路径
+WORKDIR /home/ruoyi/redis
+# 复制conf文件到路径
+COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf

docker/ruoyi/auth/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar
+# 启动认证服务
+ENTRYPOINT ["java","-jar","ruoyi-auth.jar"]

docker/ruoyi/auth/jar/readme.txt

@@ -0,0 +1 @@
+存放认证中心打包好的jar文件，用于docker启动应用。

docker/ruoyi/gateway/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar
+# 启动网关服务
+ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"]

docker/ruoyi/gateway/jar/readme.txt

@@ -0,0 +1 @@
+存放网关模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/file/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar
+# 启动文件服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"]

docker/ruoyi/modules/file/jar/readme.txt

@@ -0,0 +1 @@
+存放文件服务打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/gen/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar
+# 启动代码生成服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"]

docker/ruoyi/modules/gen/jar/readme.txt

@@ -0,0 +1 @@
+存放代码生成打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/job/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar
+# 启动定时任务服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"]

docker/ruoyi/modules/job/jar/readme.txt

@@ -0,0 +1 @@
+存放定时任务打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/system/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"]

docker/ruoyi/modules/system/jar/readme.txt

@@ -0,0 +1 @@
+存放系统模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/visual/monitor/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"]

docker/ruoyi/visual/monitor/jar/readme.txt

@@ -0,0 +1 @@
+存放监控中心打包好的jar文件，用于docker启动应用。

pom.xml

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
+    <version>3.4.0</version>
+
+    <name>ruoyi</name>
+    <url>http://www.ruoyi.vip</url>
+    <description>若依微服务系统</description>
+
+    <properties>
+        <ruoyi.version>3.4.0</ruoyi.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <spring-boot.version>2.6.4</spring-boot.version>
+        <spring-cloud.version>2021.0.1</spring-cloud.version>
+        <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+        <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
+        <spring-boot-admin.version>2.6.2</spring-boot-admin.version>
+        <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
+        <swagger.fox.version>3.0.0</swagger.fox.version>
+        <swagger.core.version>1.6.2</swagger.core.version>
+        <mybatis-plus.version>3.3.2</mybatis-plus.version>
+        <tobato.version>1.27.2</tobato.version>
+        <kaptcha.version>2.3.2</kaptcha.version>
+        <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
+        <druid.version>1.2.8</druid.version>
+        <dynamic-ds.version>3.5.0</dynamic-ds.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <commons.fileupload.version>1.4</commons.fileupload.version>
+        <velocity.version>2.3</velocity.version>
+        <fastjson.version>1.2.83</fastjson.version>
+        <jjwt.version>0.9.1</jjwt.version>
+        <minio.version>8.2.2</minio.version>
+        <poi.version>4.1.2</poi.version>
+        <commons-collections.version>3.2.2</commons-collections.version>
+        <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+    </properties>
+
+    <!-- 依赖声明 -->
+    <dependencyManagement>
+        <dependencies>
+
+            <!-- SpringCloud 微服务 -->
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- SpringCloud Alibaba 微服务 -->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>${spring-cloud-alibaba.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- Alibaba Nacos 配置 -->
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-client</artifactId>
+                <version>${alibaba.nacos.version}</version>
+            </dependency>
+
+            <!-- SpringBoot 依赖配置 -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!--  SpringBoot 监控客户端 -->
+            <dependency>
+                <groupId>de.codecentric</groupId>
+                <artifactId>spring-boot-admin-starter-client</artifactId>
+                <version>${spring-boot-admin.version}</version>
+            </dependency>
+
+            <!-- FastDFS 分布式文件系统 -->
+            <dependency>
+                <groupId>com.github.tobato</groupId>
+                <artifactId>fastdfs-client</artifactId>
+                <version>${tobato.version}</version>
+            </dependency>
+
+            <!-- Mybatis 依赖配置 -->
+            <dependency>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${spring-boot.mybatis}</version>
+            </dependency>
+
+            <!-- Swagger 依赖配置 -->
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-models</artifactId>
+                <version>${swagger.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${swagger.core.version}</version>
+            </dependency>
+
+            <!-- 验证码 -->
+            <dependency>
+                <groupId>com.github.penggle</groupId>
+                <artifactId>kaptcha</artifactId>
+                <version>${kaptcha.version}</version>
+            </dependency>
+
+            <!-- pagehelper 分页插件 -->
+            <dependency>
+                <groupId>com.github.pagehelper</groupId>
+                <artifactId>pagehelper-spring-boot-starter</artifactId>
+                <version>${pagehelper.boot.version}</version>
+            </dependency>
+
+            <!-- io常用工具类 -->
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+
+            <!-- excel工具 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <!-- 文件上传工具类 -->
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${commons.fileupload.version}</version>
+            </dependency>
+
+            <!-- 代码生成使用模板 -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity-engine-core</artifactId>
+                <version>${velocity.version}</version>
+            </dependency>
+
+            <!-- Collection 增强Java集合框架 -->
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons-collections.version}</version>
+            </dependency>
+
+            <!-- JSON 解析器和生成器 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <!-- JWT -->
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>${jjwt.version}</version>
+            </dependency>
+
+            <!-- 线程传递值 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>transmittable-thread-local</artifactId>
+                <version>${transmittable-thread-local.version}</version>
+            </dependency>
+
+            <!-- 核心模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>sooka-sponest-common-core</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 接口模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>sooka-sponest-common-swagger</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 安全模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>sooka-sponest-common-security</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 权限范围 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>sooka-sponest-common-datascope</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 多数据源 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>sooka-sponest-common-datasource</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 日志记录 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>sooka-sponest-common-log</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 缓存服务 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>sooka-sponest-common-redis</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 系统接口 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>sooka-sponest-api-system</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>sooka-sponest-auth</module>
+        <module>sooka-sponest-gateway</module>
+        <module>sooka-sponest-visual</module>
+        <module>sooka-sponest-modules</module>
+        <module>sooka-sponest-api</module>
+        <module>sooka-sponest-common</module>
+    </modules>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <!-- bootstrap 启动器 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!--  maven仓库配置 deploy时可推送到对应的配置仓库中 -->
+    <distributionManagement>
+        <repository>
+            <id>maven-releases</id>
+            <name>Nexus Releases Repository Pro</name>
+            <url>http://116.142.80.13:43000/repository/maven-releases/</url> <!--  正式版推送到这 -->
+        </repository>
+
+        <snapshotRepository>
+            <id>maven-snapshots</id>
+            <name>Nexus Snapshots Repository Pro</name>
+            <url>http://116.142.80.13:43000/repository/maven-snapshots/</url> <!--  测试版推送到这    -->
+        </snapshotRepository>
+    </distributionManagement>
+</project>

sooka-sponest-api/pom.xml

@@ -0,0 +1,29 @@
+<?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</artifactId>
+        <version>3.4.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <modules>
+        <module>sooka-sponest-api-data</module>
+        <module>sooka-sponest-api-evaluation</module>
+        <module>sooka-sponest-api-message</module>
+        <module>sooka-sponest-api-monitor</module>
+        <module>sooka-sponest-api-system</module>
+        <module>sooka-sponest-api-comprehensive</module>
+        <module>sooka-sponest-api-exchange</module>
+        <module>sooka-sponest-api-lawenforcement</module>
+    </modules>
+
+    <artifactId>sooka-sponest-api</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        sooka-sponest-api系统接口
+    </description>
+
+</project>

sooka-sponest-api/sooka-sponest-api-comprehensive/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>sooka-sponest-api</artifactId>
+        <version>3.4.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>sooka-sponest-api-comprehensive</artifactId>
+
+    <description>
+        sooka-sponest-api-comprehensive 数字综治中心
+    </description>
+
+    <dependencies>
+
+        <!-- RuoYi Common Core-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>sooka-sponest-common-core</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.0</version>
+        </dependency>
+
+        <!-- es springboot连接es-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
+
+    </dependencies>
+</project>

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/base/BaseEntity.java

@@ -0,0 +1,110 @@
+package com.sooka.sponest.comprehensive.api.base;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.GeoPointField;
+import org.springframework.data.elasticsearch.core.geo.GeoPoint;
+
+import java.io.Serializable;
+import java.time.ZonedDateTime;
+import java.util.List;
+
+/**
+ * Entity基类
+ *
+ * @author ruoyi
+ */
+@Data
+public class BaseEntity implements Serializable {
+
+    /**
+     * 主键id
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @Id
+    private String id;
+
+    /**
+     * 经度
+     */
+    @JsonProperty(value = "经度", index = 0)
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @JsonProperty(value = "纬度", index = 1)
+    private String latitude;
+
+    /**
+     * 位置 - geo_point索引
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @GeoPointField
+    private GeoPoint location;
+
+    /**
+     * 设备id集合
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> deviceList;
+
+    /**
+     * 所属部门id
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private Long deptId;
+
+    /**
+     * 所属部门名称
+     */
+    @JsonProperty(value = "所属部门", index = 101)
+    private String deptName;
+
+    /**
+     * 创建人id
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String createBy;
+
+    /**
+     * 创建人名称
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @JsonSerialize(using = ZonedDateTimeSerialize.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field(type = FieldType.Date, format = {}, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd'T'HH:mm:ss'+08:00' || strict_date_optional_time || epoch_millis")
+    private ZonedDateTime createTime;
+
+    /**
+     * 修改人id
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String updateBy;
+
+    /**
+     * 修改人名称
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String updateName;
+
+    /**
+     * 修改时间
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @JsonSerialize(using = ZonedDateTimeSerialize.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field(type = FieldType.Date, format = {}, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd'T'HH:mm:ss'+08:00' || strict_date_optional_time || epoch_millis")
+    private ZonedDateTime updateTime;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/base/ZonedDateTimeDeserializer.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.comprehensive.api.base;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class ZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {
+
+    @Override
+    public ZonedDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate localDate = LocalDate.parse(jsonParser.getText(), dateTimeFormatter);
+        return localDate.atStartOfDay(ZoneOffset.UTC);
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/base/ZonedDateTimeSerialize.java

@@ -0,0 +1,25 @@
+package com.sooka.sponest.comprehensive.api.base;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+
+public class ZonedDateTimeSerialize extends JsonSerializer<ZonedDateTime> {
+
+    @Override
+    public void serialize(ZonedDateTime zonedDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+        SimpleDateFormat sdf = null;
+        if (Arrays.asList("创建时间", "修改时间").contains(jsonGenerator.getOutputContext().getCurrentName())) {
+            sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        } else {
+            sdf = new SimpleDateFormat("yyyy-MM-dd");
+        }
+        jsonGenerator.writeString(sdf.format(Date.from(zonedDateTime.toInstant())));
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveActualPeople/domain/ComprehensiveRhfOverseasPersonInfo.java

@@ -0,0 +1,190 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import com.sooka.sponest.comprehensive.api.base.ZonedDateTimeSerialize;
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.time.ZonedDateTime;
+
+/**
+ * 境外人员对象 comprehensive_rhf_overseas_person_info
+ *
+ * @author 韩福成
+ * @date 2023-08-22
+ */
+@Data
+@Document(indexName = "comprehensive_rhf_overseas_person_info")
+public class ComprehensiveRhfOverseasPersonInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 外文姓
+     */
+    @JsonProperty(value = "外文姓",index = 10)
+    private String lastName;
+
+    /**
+     * 外文名
+     */
+    @JsonProperty(value = "外文名",index = 15)
+    private String firstName;
+
+    /**
+     * 中文姓名
+     */
+    @JsonProperty(value = "中文姓名",index = 20)
+    private String chineseName;
+
+    /**
+     * 性别
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String gender;
+
+    @JsonProperty(value = "性别",index = 25)
+    private String genderLabel;
+
+    /**
+     * 出生日期
+     */
+    @JsonProperty(value = "出生日期",index = 30)
+    @JsonSerialize(using = ZonedDateTimeSerialize.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field(type = FieldType.Date, format = {}, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd'T'HH:mm:ss'+08:00' || strict_date_optional_time || epoch_millis")
+    private ZonedDateTime birthDate;
+
+    /**
+     * 国籍（地区）
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String nativePlace;
+
+    @JsonProperty(value = "国籍（地区）",index = 35)
+    private String nativePlaceLabel;
+
+    /**
+     * 宗教信仰
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String religiousBelief;
+
+    @JsonProperty(value = "宗教信仰",index = 40)
+    private String religiousBeliefLabel;
+
+    /**
+     * 证件代码
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String identityCode;
+
+    @JsonProperty(value = "证件代码",index = 45)
+    private String identityCodeLabel;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty(value = "证件号码",index = 50)
+    private String identityNumber;
+
+    /**
+     * 证件有效期开始时间
+     */
+    @JsonProperty(value = "证件有效期开始时间",index = 55)
+    @JsonSerialize(using = ZonedDateTimeSerialize.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field(type = FieldType.Date, format = {}, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd'T'HH:mm:ss'+08:00' || strict_date_optional_time || epoch_millis")
+    private ZonedDateTime certificateStartDate;
+
+    /**
+     * 证件有效期结束时间
+     */
+    @JsonProperty(value = "证件有效期结束时间",index = 60)
+    @JsonSerialize(using = ZonedDateTimeSerialize.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field(type = FieldType.Date, format = {}, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd'T'HH:mm:ss'+08:00' || strict_date_optional_time || epoch_millis")
+    private ZonedDateTime certificateEndDate;
+
+    /**
+     * 联系方式
+     */
+    @JsonProperty(value = "联系方式",index = 65)
+    private String phone;
+
+    /**
+     * 来华目的
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String purposeComingChina;
+
+    @JsonProperty(value = "来华目的",index = 70)
+    private String purposeComingChinaLabel;
+
+    /**
+     * 职业类别
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String occupationalCategory;
+
+    @JsonProperty(value = "职业类别",index = 75)
+    private String occupationalCategoryLabel;
+
+    /**
+     * 职业
+     */
+    @JsonProperty(value = "职业",index = 80)
+    private String occupation;
+
+    /**
+     * 服务处所
+     */
+    @JsonProperty(value = "服务处所",index = 85)
+    private String serviceSpace;
+
+    /**
+     * 现住地
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String currentResidencePlace;
+
+    @JsonProperty(value = "现住地",index = 90)
+    private String currentResidencePlaceLabel;
+
+    /**
+     * 现住门（楼）详址
+     */
+    @JsonProperty(value = "现住门（楼）详址",index = 92)
+    private String currentResidenceAddress;
+
+    /**
+     * 抵达日期
+     */
+    @JsonProperty(value = "抵达日期",index = 94)
+    @JsonSerialize(using = ZonedDateTimeSerialize.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field(type = FieldType.Date, format = {}, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd'T'HH:mm:ss'+08:00' || strict_date_optional_time || epoch_millis")
+    private ZonedDateTime arrivalDate;
+
+    /**
+     * 预计离开日期
+     */
+    @JsonProperty(value = "预计离开日期",index = 96)
+    @JsonSerialize(using = ZonedDateTimeSerialize.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field(type = FieldType.Date, format = {}, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd'T'HH:mm:ss'+08:00' || strict_date_optional_time || epoch_millis")
+    private ZonedDateTime departureDate;
+
+    /**
+     * 是否重点关注人员
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private Integer focusPeople;
+
+    @JsonProperty(value = "是否重点关注人员",index = 94)
+    private String focusPeopleLabel;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveActualPeople/domain/ComprehensiveRhfRentalHousing.java

@@ -0,0 +1,119 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.Document;
+
+import java.math.BigDecimal;
+
+/**
+ * 出租房对象 comprehensive_rhf_rental_housing
+ *
+ * @author 韩福成
+ * @date 2023-08-22
+ */
+@Data
+@Document(indexName = "comprehensive_rfh_rental_housing")
+public class ComprehensiveRhfRentalHousing extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房屋编号
+     */
+    @JsonProperty(value = "房屋编号",index = 10)
+    private String houseNumber;
+
+    private String roomId;
+
+    /**
+     * 房屋地址
+     */
+    @JsonProperty(value = "房屋地址",index = 15)
+    private String houseAddress;
+
+    /**
+     * 建筑用途
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String buildingUse;
+
+    @JsonProperty(value = "建筑用途",index = 20)
+    private String buildingUseLabel;
+
+    /**
+     * 建筑面积（平方米）
+     */
+    @JsonProperty(value = "建筑面积（平方米）",index = 25)
+    private BigDecimal buildingArea;
+
+    /**
+     * 房主姓名
+     */
+    @JsonProperty(value = "房主姓名",index = 30)
+    private String name;
+
+    /**
+     * 房主联系方式
+     */
+    @JsonProperty(value = "房主联系方式",index = 35)
+    private String phone;
+
+    /**
+     * 证件代码
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String identityCode;
+
+    @JsonProperty(value = "证件代码",index = 40)
+    private String identityCodeLabel;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty(value = "证件号码",index = 45)
+    private String identityNumber;
+
+    /**
+     * 房主现居详址
+     */
+    @JsonProperty(value = "房主现居详址",index = 50)
+    private String currentResidenceAddress;
+
+    /**
+     * 出租用途
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String rentalUse;
+
+    @JsonProperty(value = "出租用途",index = 55)
+    private String rentalUseLabel;
+
+    /**
+     * 隐患类型
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String hiddenDangerType;
+
+    @JsonProperty(value = "隐患类型",index = 60)
+    private String hiddenDangerTypeLabel;
+
+    /**
+     * 承租人姓名
+     */
+    @JsonProperty(value = "承租人姓名",index = 65)
+    private String lesseeName;
+
+    /**
+     * 承租人联系方式
+     */
+    @JsonProperty(value = "承租人联系方式",index = 70)
+    private String lesseePhone;
+
+    /**
+     * 承租人公民身份号码
+     */
+    @JsonProperty(value = "承租人公民身份号码",index = 75)
+    private String lesseeIdentityNumber;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveActualPeople/factory/RemoteOverseasPersonInfoServiceFactory.java

@@ -0,0 +1,50 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.service.RemoteOverseasPersonInfoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteOverseasPersonInfoServiceFactory implements FallbackFactory<RemoteOverseasPersonInfoService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteOverseasPersonInfoServiceFactory.class);
+
+    @Override
+    public RemoteOverseasPersonInfoService create(Throwable cause) {
+
+        log.error("境外人员-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteOverseasPersonInfoService() {
+
+            @Override
+            public AjaxResult insertComprehensiveRhfOverseasPersonInfo(String comprehensiveRhfOverseasPersonInfo) {
+                return AjaxResult.error("境外人员-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveRhfOverseasPersonInfo(String comprehensiveRhfRentalHousing) {
+                return AjaxResult.error("境外人员-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveRhfOverseasPersonInfoByIds(String[] ids) {
+                return AjaxResult.error("境外人员-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensiveRhfOverseasPersonInfoList(Integer pageNum, Integer pageSize, String identityNumber, String phone) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("境外人员-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult selectComprehensiveRhfOverseasPersonInfoById(String id) {
+                return AjaxResult.error("境外人员-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveActualPeople/factory/RemoteRentalHousingServiceFactory.java

@@ -0,0 +1,50 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.service.RemoteRentalHousingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteRentalHousingServiceFactory implements FallbackFactory<RemoteRentalHousingService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteRentalHousingServiceFactory.class);
+
+    @Override
+    public RemoteRentalHousingService create(Throwable cause) {
+
+        log.error("出租房-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteRentalHousingService() {
+
+            @Override
+            public AjaxResult insertComprehensiveRhfRentalHousing(String comprehensiveRhfRentalHousing) {
+                return AjaxResult.error("出租房-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveRhfRentalHousing(String comprehensiveRhfRentalHousing) {
+                return AjaxResult.error("出租房-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveRhfRentalHousingByIds(String[] ids) {
+                return AjaxResult.error("出租房-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensiveRhfRentalHousingList(Integer pageNum, Integer pageSize, String name, String houseNumber, String phone) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("出租房-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult selectComprehensiveRhfRentalHousingById(String id) {
+                return AjaxResult.error("出租房-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveActualPeople/service/RemoteOverseasPersonInfoService.java

@@ -0,0 +1,66 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.service;
+
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.factory.RemoteOverseasPersonInfoServiceFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(
+        contextId = "RemoteOverseasPersonInfoService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteOverseasPersonInfoServiceFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteOverseasPersonInfoService {
+
+    /**
+     * 查询境外人员列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param identityNumber
+D     * @param phone
+     * @return
+     */
+    @GetMapping("/info/list")
+    TableDataInfo selectComprehensiveRhfOverseasPersonInfoList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize, @RequestParam("identityNumber") String identityNumber, @RequestParam("phone") String phone);
+
+    /**
+     * 获取境外人员详细信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/info/{id}")
+    AjaxResult selectComprehensiveRhfOverseasPersonInfoById(@PathVariable("id") String id);
+
+    /**
+     * 新增境外人员
+     *
+     * @param comprehensiveRhfOverseasPersonInfo
+     * @return
+     */
+    @PostMapping(value = "/info", headers = {"Content-Type=application/json"})
+    AjaxResult insertComprehensiveRhfOverseasPersonInfo(@RequestBody String comprehensiveRhfOverseasPersonInfo);
+
+    /**
+     * 修改境外人员
+     *
+     * @param comprehensiveRhfOverseasPersonInfo
+     * @return
+     */
+    @PutMapping(value = "/info", headers = {"Content-Type=application/json"})
+    AjaxResult updateComprehensiveRhfOverseasPersonInfo(@RequestBody String comprehensiveRhfOverseasPersonInfo);
+
+    /**
+     * 删除境外人员
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/info/{ids}")
+    AjaxResult deleteComprehensiveRhfOverseasPersonInfoByIds(@PathVariable("ids") String[] ids);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveActualPeople/service/RemoteRentalHousingService.java

@@ -0,0 +1,67 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.service;
+
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.factory.RemoteRentalHousingServiceFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(
+        contextId = "RemoteRentalHousingService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteRentalHousingServiceFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteRentalHousingService {
+
+    /**
+     * 查询出租房列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param name
+     * @param houseNumber
+     * @param phone
+     * @return
+     */
+    @GetMapping("/housing/list")
+    TableDataInfo selectComprehensiveRhfRentalHousingList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize, @RequestParam("name") String name, @RequestParam("houseNumber") String houseNumber, @RequestParam("phone") String phone);
+
+    /**
+     * 获取出租房详细信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/housing/{id}")
+    AjaxResult selectComprehensiveRhfRentalHousingById(@PathVariable("id") String id);
+
+    /**
+     * 新增出租房
+     *
+     * @param comprehensiveRhfRentalHousing
+     * @return
+     */
+    @PostMapping(value = "/housing", headers = {"Content-Type=application/json"})
+    AjaxResult insertComprehensiveRhfRentalHousing(@RequestBody String comprehensiveRhfRentalHousing);
+
+    /**
+     * 修改出租房
+     *
+     * @param comprehensiveRhfRentalHousing
+     * @return
+     */
+    @PutMapping(value = "/housing", headers = {"Content-Type=application/json"})
+    AjaxResult updateComprehensiveRhfRentalHousing(@RequestBody String comprehensiveRhfRentalHousing);
+
+    /**
+     * 删除出租房
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/housing/{ids}")
+    AjaxResult deleteComprehensiveRhfRentalHousingByIds(@PathVariable("ids") String[] ids);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveConflictDefuse/domain/ConflictResolution.java

@@ -0,0 +1,173 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 矛盾纠纷排查化解对象
+ * comprehensive_conflict_resolution
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ConflictResolution extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+    /**
+     * 发生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date occurDate;
+    /**
+     * 发生日期搜索条件
+     */
+    private List<String> temp;
+
+    /**
+     * 发生地点
+     */
+    private String occurAddress;
+
+    /**
+     * 事件规模
+     */
+    private String eventScale;
+    private String eventScaleLabel;
+
+    /**
+     * 事件类别
+     */
+    private String eventCategory;
+    private String eventCategoryLabel;
+
+    /**
+     * 涉及人数
+     */
+    private Long involvedPersonCount;
+
+    /**
+     * 事件简述
+     */
+    private String eventDesc;
+
+    /**
+     * 涉及单位
+     */
+    private String involvedUnit;
+
+    /**
+     * 主要当事人证件代码不能为空
+     */
+    private String mainPersonIdCode;
+    private String mainPersonIdCodeLabel;
+
+    /**
+     * 主要当事人证件号码
+     */
+    private String mainPersonIdNumber;
+
+    /**
+     * 主要当事人姓名
+     */
+    private String mainPersonName;
+
+    /**
+     * 主要当事人性别
+     */
+    private String mainPersonGender;
+    private String mainPersonGenderLabel;
+
+    /**
+     * 主要当事人民族
+     */
+    private String mainPersonNationality;
+    private String mainPersonNationalityLabel;
+
+    /**
+     * 主要当事人学历
+     */
+    private String mainPersonEducation;
+    private String mainPersonEducationLabel;
+
+    /**
+     * 主要当事人人员类别
+     */
+    private String mainPersonCategory;
+    private String mainPersonCategoryLabel;
+
+    /**
+     * 主要当事人居住详址
+     */
+    private String mainPersonAddress;
+
+    /**
+     * 化解时限
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date resolutionDeadline;
+
+    /**
+     * 化解方式
+     */
+    private String resolutionMethod;
+    private String resolutionMethodLabel;
+
+    /**
+     * 化解组织
+     */
+    private String resolutionOrganization;
+
+    /**
+     * 化解责任人姓名
+     */
+    private String resolutionResponsibleName;
+
+    /**
+     * 化解责任人联系方式
+     */
+    private String resolutionResponsiblePhone;
+
+    /**
+     * 化解是否成功,0=否,1=是
+     */
+    private String resolutionSuccess;
+    private String resolutionSuccessLabel;
+
+    /**
+     * 化解情况
+     */
+    private String resolutionStatus;
+
+    /**
+     * 考评日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date evaluationDate;
+
+    /**
+     * 考评意见
+     */
+    private String evaluationOpinion;
+
+    private BigDecimal longitude;
+
+    private BigDecimal latitude;
+
+    private Long deptId;
+
+    private String deptName;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveConflictDefuse/factory/RemoteConflictResolutionServiceFallbackFactory.java

@@ -0,0 +1,55 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.domain.ConflictResolution;
+import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.service.RemoteConflictResolutionService;
+import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.factory.RemoteRoadCaseServiceFallbackFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class RemoteConflictResolutionServiceFallbackFactory implements FallbackFactory<RemoteConflictResolutionService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteRoadCaseServiceFallbackFactory.class);
+
+    @Override
+    public RemoteConflictResolutionService create(Throwable cause) {
+
+        log.error("矛盾纠纷排查化解-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteConflictResolutionService() {
+
+            @Override
+            public AjaxResult insertConflictResolution(String conflictResolution) {
+                return AjaxResult.error("矛盾纠纷排查化解-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateConflictResolution(String conflictResolution) {
+                return AjaxResult.error("矛盾纠纷排查化解-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteConflictResolutionByIds(String[] ids) {
+                return AjaxResult.error("矛盾纠纷排查化解-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectConflictResolutionList(Integer pageNum, Integer pageSize, List<String> temp, String eventName, String mainPersonName, String resolutionResponsibleName) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("矛盾纠纷排查化解-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public R<ConflictResolution> selectConflictResolutionById(String id) {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveConflictDefuse/service/RemoteConflictResolutionService.java

@@ -0,0 +1,63 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.domain.ConflictResolution;
+import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.factory.RemoteConflictResolutionServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@FeignClient(
+        contextId = "RemoteConflictResolutionService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteConflictResolutionServiceFallbackFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteConflictResolutionService {
+
+    /**
+     * 查询矛盾纠纷排查化解列表
+     */
+    @GetMapping("/conflictResolution/list")
+    TableDataInfo selectConflictResolutionList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize,  @RequestParam("temp[]")List<String> temp,@RequestParam("eventName")String eventName,@RequestParam("mainPersonName")String mainPersonName,@RequestParam("resolutionResponsibleName")String resolutionResponsibleName);
+
+    /**
+     * 获取矛盾纠纷排查化解详细信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/conflictResolution/{id}")
+    R<ConflictResolution> selectConflictResolutionById(@PathVariable("id") String id);
+
+    /**
+     * 新增矛盾纠纷排查化解
+     *
+     * @param conflictResolution
+     * @return
+     */
+    @PostMapping(value = "/conflictResolution", headers = {"Content-Type=application/json"})
+    AjaxResult insertConflictResolution(@RequestBody String conflictResolution);
+
+    /**
+     * 修改矛盾纠纷排查化解
+     *
+     * @param conflictResolution
+     * @return
+     */
+    @PutMapping(value = "/conflictResolution", headers = {"Content-Type=application/json"})
+    AjaxResult updateConflictResolution(@RequestBody String conflictResolution);
+
+    /**
+     * 删除矛盾纠纷排查化解
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/conflictResolution/{ids}")
+    AjaxResult deleteConflictResolutionByIds(@PathVariable("ids") String[] ids);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/domain/ZhsqEvent.java

@@ -0,0 +1,117 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 事件信息对象 zhsq_event
+ *
+ * @author sooka
+ * @date 2022-05-09
+ */
+@Data
+public class ZhsqEvent extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    public void eventDTO(Long eventId, String eventState, String eventSbsj){
+        this.eventId = eventId;
+        this.eventState = eventState;
+        this.eventSbsj = eventSbsj;
+    }
+
+    public void eventAssessmentDTO(Long eventId,String eventState, Long eventHcr, String eventHcsj, String eventHcyj){
+        this.eventId = eventId;
+        this.eventState = eventState;
+        this.eventHcr = eventHcr;
+        this.eventHcsj = eventHcsj;
+        this.eventHcyj = eventHcyj;
+    }
+
+    /** 事件主键ID */
+    private Long eventId;
+
+    /** 事件分类主键ID */
+    private Long eventTypeId;
+
+    private String postId;
+
+    /** 事件标题 */
+    private String eventTitle;
+
+    /** 事件内容 */
+    private String eventContent;
+
+    /** 事件来源 */
+    private String eventLaliyuan;
+
+    /** 事件照片 */
+    private String eventFile;
+
+    /** 事件位置 */
+    private String eventPosition;
+
+    /** 上报人ID */
+    private Long eventSbrId;
+
+    /** 上报人姓名 */
+    private String eventSbrName;
+
+    /** 上报时间 */
+    private String eventSbsj;
+
+    /** 事件状态 */
+    private String eventState;
+
+    /** 数据删除状态 */
+    private Long delFlag;
+
+    /** 核查人ID */
+    private Long eventHcr;
+
+    /** 核查意见 */
+    private String eventHcyj;
+
+    /** 核查时间 */
+    private String eventHcsj;
+
+    /** 上报人部门ID */
+    private Long eventSbrDeptId;
+
+    /** 上报人部门 */
+    private String eventSbrDeptName;
+
+    /*********************事件处置字段*************************/
+    /** 事件处置表部门ID */
+    private Long  sjczDeptId;
+
+    /** 事件处置表部门名称 */
+    private String  sjczDeptName;
+
+    /** 事件下发时间（拒签时间） */
+    private String  sjczXfsj;
+
+    /** 事件处签收时间 */
+    private String  sjczQssj;
+
+    /** 事件处置预计完成时间 */
+    private String  sjczYjwcsj;
+
+    /** 事件处置实际完成时间 */
+    private String  sjczSjwcsj;
+
+    /** 事件处置ID */
+    private String  sjczId;
+
+    /** 状态 */
+    private String sjczCzzt;
+
+    /*********************特殊字段*************************/
+
+    /** 部门组 */
+    private Long[] deptIds;
+
+    /** 事件日志记录人ID */
+    private Long eventlogUserId;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/domain/ZhsqSjcz.java

@@ -0,0 +1,117 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 事件处置信息对象 zhsq_sjcz
+ *
+ * @author lei
+ * @date 2021-10-26
+ */
+@Data
+public class ZhsqSjcz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    public void sjczDTO(Long eventId,Long sjczDeptId,String sjczDeptName,
+                        String sjczXfsj,String sjczQssj,String sjczCzzt) {
+        this.eventId = eventId;
+        this.sjczDeptId = sjczDeptId;
+        this.sjczDeptName = sjczDeptName;
+        this.sjczXfsj = sjczXfsj;
+        this.sjczQssj = sjczQssj;
+        this.sjczCzzt = sjczCzzt;
+    }
+
+    public void sjczSignForDTO(Long eventId,Long sjczId,Long sjczUserId,String sjczUserName,
+                               String sjczQssj,String sjczYjwcsj,String sjczCzzt,String postId) {
+        this.eventId = eventId;
+        this.sjczId = sjczId;
+        this.sjczUserId = sjczUserId;
+        this.sjczUserName = sjczUserName;
+        this.sjczQssj = sjczQssj;
+        this.sjczYjwcsj = sjczYjwcsj;
+        this.sjczCzzt = sjczCzzt;
+        this.postId = postId;
+    }
+
+    public void sjczRefusedDTO(Long eventId,Long sjczId,Long sjczUserId,String sjczUserName,
+                               String sjczXfsj,String sjczYjwcsj,String sjczCzzt) {
+        this.eventId = eventId;
+        this.sjczId = sjczId;
+        this.sjczUserId = sjczUserId;
+        this.sjczUserName = sjczUserName;
+        this.sjczXfsj = sjczXfsj;
+        this.sjczYjwcsj = sjczYjwcsj;
+        this.sjczCzzt = sjczCzzt;
+    }
+
+    public void sjczCompleteDTO(Long eventId,Long sjczId,Long sjczUserId,String sjczUserName,
+                                String sjczSjwcsj,String sjczCzzt,String sjczCzjg) {
+        this.eventId = eventId;
+        this.sjczId = sjczId;
+        this.sjczUserId = sjczUserId;
+        this.sjczUserName = sjczUserName;
+        this.sjczSjwcsj = sjczSjwcsj;
+        this.sjczCzzt = sjczCzzt;
+        this.sjczCzjg = sjczCzjg;
+    }
+
+    /** 事件处置信息主键ID */
+    private Long sjczId;
+
+    /** 事件主键ID */
+    @Excel(name = "事件主键ID")
+    private Long eventId;
+
+    /** 处置部门ID */
+    @Excel(name = "处置部门ID")
+    private Long sjczDeptId;
+
+    /** 处置部门名称 */
+    @Excel(name = "处置部门名称")
+    private String sjczDeptName;
+
+    /** 处置人ID */
+    @Excel(name = "处置人ID")
+    private Long sjczUserId;
+
+    /** 处置人姓名 */
+    @Excel(name = "处置人姓名")
+    private String sjczUserName;
+
+    /** 下发时间 */
+    @Excel(name = "下发时间")
+    private String sjczXfsj;
+
+    /** 签收时间 */
+    @Excel(name = "签收时间")
+    private String sjczQssj;
+
+    /** 处理开始时间 */
+    @Excel(name = "预计完成时间")
+    private String sjczYjwcsj;
+
+    /** 处理结束时间 */
+    @Excel(name = "实际完成时间")
+    private String sjczSjwcsj;
+
+    /** 处理结果 */
+    @Excel(name = "处理结果")
+    private String sjczCzjg;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String sjczCzzt;
+
+    /** 部门组 */
+    private Long[] deptIds;
+
+    /** 状态组 */
+    private String[] sjczCzztArr;
+
+    private String postId;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/factory/RemoteEventCompletedServiceFallbackFactory.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory;
+
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventCompletedService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteEventCompletedServiceFallbackFactory implements FallbackFactory<RemoteEventCompletedService> {
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public RemoteEventCompletedService create(Throwable cause) {
+        return new RemoteEventCompletedService() {
+            @Override
+            public TableDataInfo getList(String pageNum, String pageSize) {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/factory/RemoteEventDistributeServiceFallbackFactory.java

@@ -0,0 +1,33 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventDistributeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteEventDistributeServiceFallbackFactory implements FallbackFactory<RemoteEventDistributeService> {
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public RemoteEventDistributeService create(Throwable cause) {
+        return new RemoteEventDistributeService() {
+            @Override
+            public TableDataInfo getList(String pageNum, String pageSize) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult redistribute(ZhsqEvent zhsqEvent) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult reportDistrict(String eventId, String sjczId) {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/factory/RemoteEventFileServiceFallbackFactory.java

@@ -0,0 +1,22 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory;
+
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventCompletedService;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventFileService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteEventFileServiceFallbackFactory implements FallbackFactory<RemoteEventFileService> {
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public RemoteEventFileService create(Throwable cause) {
+        return new RemoteEventFileService() {
+            @Override
+            public TableDataInfo getList(String pageNum, String pageSize) {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/factory/RemoteEventServiceFallbackFactory.java

@@ -0,0 +1,56 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+public class RemoteEventServiceFallbackFactory implements FallbackFactory<RemoteEventService> {
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public RemoteEventService create(Throwable cause) {
+        return new RemoteEventService() {
+
+            @Override
+            public AjaxResult add(@RequestBody ZhsqEvent event) {
+                return null;
+            }
+
+            @Override
+            public TableDataInfo getList(String pageNum, String pageSize) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult getEdit(@PathVariable("eventId") String eventId) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult put(@RequestBody ZhsqEvent zhsqEvent) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult del(@PathVariable("ids") String[] ids) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult reportEventId(@PathVariable("eventId") String eventId) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult getEventLog(String eventId) {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/factory/RemoteEventTodoServiceFallbackFactory.java

@@ -0,0 +1,43 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqSjcz;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventService;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventTodoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+public class RemoteEventTodoServiceFallbackFactory implements FallbackFactory<RemoteEventTodoService> {
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public RemoteEventTodoService create(Throwable cause) {
+        return new RemoteEventTodoService() {
+
+            @Override
+            public TableDataInfo getList(String pageNum, String pageSize) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult signFor(String eventId, String sjczId) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult refused(String eventId, String sjczId, String postId) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult complete(ZhsqSjcz zhsqSjcz) {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/factory/RemoteEventTypeServiceFallbackFactory.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory;
+
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventTypeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteEventTypeServiceFallbackFactory implements FallbackFactory<RemoteEventTypeService> {
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public RemoteEventTypeService create(Throwable cause) {
+        return new RemoteEventTypeService() {
+            @Override
+            public TableDataInfo getList() {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/factory/RemoteEventVerfiedServiceFallbackFactory.java

@@ -0,0 +1,38 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventVerfiedService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteEventVerfiedServiceFallbackFactory implements FallbackFactory<RemoteEventVerfiedService> {
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public RemoteEventVerfiedService create(Throwable cause) {
+        return new RemoteEventVerfiedService() {
+            @Override
+            public TableDataInfo getList(String pageNum, String pageSize) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult eventFile(String eventId) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult verificationPassed(Long eventSbrDeptId, String eventSbrDeptName, Long eventId, Long eventTypeId, String eventHcyj) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult reHandle(Long eventSbrDeptId, String eventSbrDeptName, Long eventId, Long eventTypeId, String eventHcyj) {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/service/RemoteEventCompletedService.java

@@ -0,0 +1,19 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventCompletedServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+        contextId = "RemoteEventCompletedService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteEventCompletedServiceFallbackFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteEventCompletedService {
+    @GetMapping("/eventCompleted/list")
+    TableDataInfo getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/service/RemoteEventDistributeService.java

@@ -0,0 +1,26 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventDistributeServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(
+        contextId = "RemoteEventDistributeService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteEventDistributeServiceFallbackFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteEventDistributeService {
+    @GetMapping("/eventDistribute/list")
+    TableDataInfo getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize);
+
+    @PostMapping("/eventDistribute/redistribute")
+    AjaxResult redistribute(@RequestBody ZhsqEvent zhsqEvent);
+
+    @GetMapping("/eventDistribute/reportDistrict/{eventId}/{sjczId}")
+    AjaxResult reportDistrict(@PathVariable("eventId") String eventId, @PathVariable("sjczId") String sjczId);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/service/RemoteEventFileService.java

@@ -0,0 +1,19 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventFileServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+        contextId = "RemoteEventFileService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteEventFileServiceFallbackFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteEventFileService {
+    @GetMapping("/eventFile/list")
+    TableDataInfo getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/service/RemoteEventService.java

@@ -0,0 +1,44 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(
+        contextId = "RemoteEventService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteEventServiceFallbackFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteEventService {
+    @PostMapping("/event")
+    AjaxResult add(@RequestBody ZhsqEvent event);
+
+    /**
+     * 查询事件列表（分页）
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/event/list")
+    TableDataInfo getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize);
+
+    @GetMapping("/event/{eventId}")
+    AjaxResult getEdit(@PathVariable("eventId") String eventId);
+
+    @PutMapping("/event")
+    AjaxResult put(@RequestBody ZhsqEvent zhsqEvent);
+
+    @DeleteMapping("/event/{ids}")
+    AjaxResult del(@PathVariable("ids") String[] ids);
+
+    @PostMapping("/event/report/{eventId}")
+    AjaxResult reportEventId(@PathVariable("eventId") String eventId);
+
+    @GetMapping("/event/eventLog/{eventId}")
+    AjaxResult getEventLog(@PathVariable("eventId") String eventId);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/service/RemoteEventTodoService.java

@@ -0,0 +1,31 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqSjcz;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventServiceFallbackFactory;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventTodoServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(
+        contextId = "RemoteEventTodoService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteEventTodoServiceFallbackFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteEventTodoService {
+    @GetMapping("/eventTodo/list")
+    TableDataInfo getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize);
+
+    @GetMapping("/eventTodo/signFor/{eventId}/{sjczId}")
+    AjaxResult signFor(@PathVariable("eventId") String eventId, @PathVariable("sjczId") String sjczId);
+
+    @GetMapping("/eventTodo/refused/{eventId}/{sjczId}/{postId}")
+    AjaxResult refused(@PathVariable("eventId") String eventId, @PathVariable("sjczId") String sjczId, @PathVariable("postId") String postId);
+
+    @PutMapping("/eventTodo/complete")
+    AjaxResult complete(@RequestBody ZhsqSjcz zhsqSjcz);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/service/RemoteEventTypeService.java

@@ -0,0 +1,19 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventTypeServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+        contextId = "RemoteEventTypeService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteEventTypeServiceFallbackFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteEventTypeService {
+    @GetMapping("/evenType/list")
+    TableDataInfo getList();
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveEvent/service/RemoteEventVerfiedService.java

@@ -0,0 +1,32 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveEvent.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventServiceFallbackFactory;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.factory.RemoteEventVerfiedServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+        contextId = "RemoteEventVerfiedService",
+        value = ServiceNameConstants.COMPREHENSIVE_SERVICE,
+        fallbackFactory = RemoteEventVerfiedServiceFallbackFactory.class
+        , url = "${sooka.service.comprehensive}"
+)
+public interface RemoteEventVerfiedService {
+    @GetMapping("/eventVerfied/list")
+    TableDataInfo getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize);
+
+    @GetMapping("/eventVerfied/eventFile/{eventId}")
+    AjaxResult eventFile(@PathVariable("eventId") String eventId);
+
+    @GetMapping("/eventVerfied/verificationPassed")
+    AjaxResult verificationPassed(@RequestParam("eventSbrDeptId") Long eventSbrDeptId, @RequestParam("eventSbrDeptName") String eventSbrDeptName, @RequestParam("eventId") Long eventId, @RequestParam("eventTypeId") Long eventTypeId, @RequestParam("eventHcyj") String eventHcyj);
+
+    @GetMapping("/eventVerfied/reHandle")
+    AjaxResult reHandle(@RequestParam("eventSbrDeptId") Long eventSbrDeptId, @RequestParam("eventSbrDeptName") String eventSbrDeptName, @RequestParam("eventId") Long eventId, @RequestParam("eventTypeId") Long eventTypeId, @RequestParam("eventHcyj") String eventHcyj);
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveBuilding.java

@@ -0,0 +1,48 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 楼栋管理
+ *
+ */
+@Data
+public class ComprehensiveBuilding extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String estateId;
+
+    private String estateName;
+
+    private String buildName;
+
+    private BigDecimal buildArea;
+
+    private Long floorNum;
+
+    private Long unitNum;
+
+    private Long householdNum;
+
+    private Long personNum;
+
+
+    private String buildingId;
+
+    private Long deptId;
+
+    private String deptName;
+
+    private String datasetName;
+
+    private Boolean isEdit;
+
+    private BigDecimal longitude;
+
+    private BigDecimal latitude;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveBuildingLeader.java

@@ -0,0 +1,69 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ComprehensiveBuildingLeader extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String estateId;
+
+    private String estateName;
+
+    private String userName;
+
+    private String userId;
+
+    private String gender;
+
+    private String genderLabel;
+
+    private String nation;
+
+    private String nationLabel;
+
+    private String politicalOutlook;
+
+    private String politicalOutlookLabel;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthDate;
+
+
+    private String education;
+
+    private String educationLabel;
+
+    private String cellphone;
+
+
+    private String telephone;
+
+
+    private String currentResidencePlace;
+
+
+    private String currentResidencePlaceLabel;
+
+
+
+    private String currentResidenceAddress;
+
+
+    private String buildingId;
+
+    private Long deptId;
+
+    private String deptName;
+
+    private String buildingName;
+    private Boolean isEdit;;
+
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveHousingEstate.java

@@ -0,0 +1,23 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class ComprehensiveHousingEstate extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String estateName;
+
+    private String estateAddress;
+
+    private Long deptId;
+
+    private String deptName;
+
+    private Boolean isEdit;;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveInstitutions.java

@@ -0,0 +1,32 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 综治机构  comprehensive_institutions
+ *
+ * @author zhaozhan
+ * @date 2023/8/21
+ */
+@Data
+public class ComprehensiveInstitutions extends BaseEntity {
+
+    private String id;
+
+    private String institutionName;
+
+    private String institutionType;
+    private String institutionTypeLabel;
+
+    private String level;
+    private String levelLabel;
+
+    private Long deptId;
+
+    private String deptName;
+
+    private Boolean isEdit;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveLeadership.java

@@ -0,0 +1,50 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 综治领导责任制对象
+ *
+ * @author hanfucheng
+ * @date 2023/9/21 11:23
+ */
+@ApiModel(description = "综治领导责任制")
+@Data
+public class ComprehensiveLeadership extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 被实施地区
+     */
+    private String implementedArea;
+
+    /**
+     * 被实施主体层级
+     */
+    private String implementedLevel;
+
+    private String implementedLevelLabel;
+
+    /**
+     * 实施主体名称
+     */
+    private String implementPrincipal;
+
+    /**
+     * 实施主体层级
+     */
+    private String implementLevel;
+
+    private String implementLevelLabel;
+
+    /**
+     * 政策种类
+     */
+    private String policyType;
+
+    private String policyTypelabel;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveManagementCenter.java

@@ -0,0 +1,23 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author zhaozhan
+ * @date 2023/9/14
+ */
+@Data
+public class ComprehensiveManagementCenter  extends BaseEntity {
+    private String id;
+    private String centerName;
+    private String centerPhone;
+    private String level;
+    private String levelLabel;
+    private String principalName;
+    private String principalPhone;
+    private String component;
+    private String place;
+    private String placeLabel;
+    private String address;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveNonPublicEconomicOrganizations.java

@@ -0,0 +1,68 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author zhaozhan
+ * @date 2023/9/14
+ */
+@Data
+public class ComprehensiveNonPublicEconomicOrganizations extends BaseEntity {
+
+    private String id;
+    private String enterpriseName;
+    private String registrationNumbe;
+    private String enterpriseCategory;
+    private String enterpriseCategoryLabel;
+    private String enterpriseAdress;
+    private String enterprisePhone;
+
+    private Long enterprisePersonNumber;
+
+    private String legalPersonIdCode;
+    private String legalPersonIdCodeLabel;
+
+    private String legalPersonIdNumber;
+
+    private String legalPersonName;
+
+    private String legalPersonPhone;
+
+    private String communitySafetyName;
+
+    private String communitySafetyPhone;
+
+    private Long hazardousIndustry;
+    private String hazardousIndustryLabel;
+
+    private String safetyHazardsType;
+    private String safetyHazardsTypeLabel;
+
+    private String attentiveness;
+    private String attentivenessLabel;
+
+    private Long conditionsEstablishment;
+    private String conditionsEstablishmentLabel;
+
+    private Long communistOrganization;
+    private String communistOrganizationLabel;
+
+    private Long partyMemberNumber;
+
+    private Long tradeUnion;
+    private String tradeUnionLabel;
+
+    private Long unionMembersNumber;
+
+    private Long communistYouthLeague;
+    private String communistYouthLeagueLabel;
+
+    private Long leagueMemberNumber;
+
+    private Long womenFederation;
+    private String womenFederationLabel;
+
+    private Long womenNumber;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensivePublicSafetyMonitoring.java

@@ -0,0 +1,80 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 城乡社区公共安全视频监控
+ *
+ */
+@Data
+public class ComprehensivePublicSafetyMonitoring extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 数据所属部门(政或党的id)
+     */
+    private Long deptId;
+
+    /**
+     * 数据所属部门名称
+     */
+    private String deptName;
+
+    /**
+     * 城乡社区名称
+     */
+    private String communityName;
+
+    /**
+     * 城乡社区联系方式
+     */
+    private String communityPhone;
+
+    /**
+     * 城乡社区面积（平方米）
+     */
+    private BigDecimal communityArea;
+
+    /**
+     * 城乡社区人口
+     */
+    private String communityPopulation;
+
+    /**
+     * 公共安全视频监控摄像机总数
+     */
+    private String publicSafetyCameraNumber;
+
+    /**
+     * 高淸摄像机数量
+     */
+    private String highDefinitionCamera;
+
+    /**
+     * 与乡镇（街道）视联网信息中心联网摄像机数量
+     */
+    private String townshipCamera;
+
+    /**
+     * 24小时值守摄像机数量
+     */
+    private String dutyCamera;
+
+    /**
+     * 每平方公里视频监控摄像机数量
+     */
+    private String squareKilometerCamera;
+
+    /**
+     * 每百人视频监控摄像机数量
+     */
+    private String hundredPeopleCamera;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveRfhGridLeader.java

@@ -0,0 +1,118 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import com.sooka.sponest.comprehensive.api.base.ZonedDateTimeSerialize;
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.math.BigDecimal;
+import java.time.ZonedDateTime;
+
+/**
+ * 网格长管理对象 comprehensive_rfh_grid_leader
+ *
+ * @author 韩福成
+ * @date 2023-08-22
+ */
+@Data
+public class ComprehensiveRfhGridLeader extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格长id
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private Long userId;
+
+    /**
+     * 网格长姓名
+     */
+    @JsonProperty(value = "网格长姓名",index = 10)
+    private String userName;
+
+    /**
+     * 网格员名称
+     */
+    @JsonProperty(value = "网格员名称",index = 15)
+    private String memberName;
+
+    /**
+     * 性别
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String gender;
+
+    @JsonProperty(value = "性别",index = 20)
+    private String genderLabel;
+
+    /**
+     * 民族
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String nation;
+
+    @JsonProperty(value = "民族",index = 25)
+    private String nationLabel;
+
+    /**
+     * 政治面貌
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String politicalOutlook;
+
+    @JsonProperty(value = "政治面貌",index = 30)
+    private String politicalOutlookLabel;
+
+    /**
+     * 出生日期
+     */
+    @JsonProperty(value = "出生日期",index = 35)
+    @JsonSerialize(using = ZonedDateTimeSerialize.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field(type = FieldType.Date, format = {}, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd'T'HH:mm:ss'+08:00' || strict_date_optional_time || epoch_millis")
+    private ZonedDateTime birthDate;
+
+    /**
+     * 学历
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String education;
+
+    @JsonProperty(value = "学历",index = 40)
+    private String educationLabel;
+
+    /**
+     * 手机号码
+     */
+    @JsonProperty(value = "手机号码",index = 45)
+    private String cellphone;
+
+    /**
+     * 固定电话
+     */
+    @JsonProperty(value = "固定电话",index = 50)
+    private String telephone;
+
+    /**
+     * 网格员数量
+     */
+    @JsonProperty(value = "网格员数量",index = 55)
+    private Integer gridMemberNum;
+
+    /**
+     * 网格户数
+     */
+    @JsonProperty(value = "网格户数",index = 60)
+    private Integer gridHouseholdNum;
+
+    /**
+     * 网格面积（平方米）
+     */
+    @JsonProperty(value = "网格面积（平方米）",index = 65)
+    private BigDecimal gridArea;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveRoom.java

@@ -0,0 +1,93 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class ComprehensiveRoom extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String name;
+
+    private String estateId;
+
+    private String code;
+
+    private String estateName;
+
+    private String buildingId;
+
+    private String buildingName;
+
+
+    private String unitId;
+
+    private String unitLabel;
+
+    private String roomFloor;
+
+    private String roomSfpf;
+
+    private String roomSfydxs;
+
+    private String roomSfzr;
+
+    private String roomSffw;
+
+    private String roomGlfs;
+
+    private String roomGlfsLabel;
+
+    private String roomWyh;
+
+    private String roomWyhLabel;
+
+    private String roomWfjz;
+
+    private String roomSfcw;
+
+    private String roomSfgz;
+
+    private String roomSfmsf;
+
+    private String roomShlx;
+
+    private String roomShlxLabel;
+
+    private String roomSfgkpy;
+
+    private String roomSfjhq;
+
+    private String roomSfslz;
+
+    private String roomType;
+
+    private String roomTypeLabel;
+
+
+    private Long unitNum;
+
+    private Long deptId;
+
+    private String personNum;
+
+    private String deptName;
+
+    private Boolean isEdit;
+
+
+    private String roomSfpfLabel;
+    private String roomSfydxsLabel;
+    private String roomSfzrLabel;
+    private String roomSffwLabel;
+    private String roomWfjzLabel;
+    private String roomSfcwLabel;
+    private String roomSfgzLabel;
+    private String roomSfmsfLabel;
+    private String roomSfgkpyLabel;
+    private String roomSfjhqLabel;
+    private String roomSfslzLabel;
+
+    private Integer total;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveSocialOrganization.java

@@ -0,0 +1,54 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhaozhan
+ * @date 2023/9/14
+ */
+@Data
+public class ComprehensiveSocialOrganization extends BaseEntity {
+    private String id;
+    private String socialOrganizationName;
+    private String registrationNumbe;
+    private String certificateNumber;
+    private String agencyCode;
+    private String legalName;
+    private String adress;
+    private Date approvalDate;
+    private String socialOrganizationType;
+    private String socialOrganizationTypeLabel;
+    private Long status;
+    private Long statusLabel;
+    private String principalIdCode;
+    private String principalIdCodeLabel;
+    private String principalIdNumber;
+    private String principalName;
+    private String principalPhone;
+    private String officeAddress;
+    private String communitySafetyName;
+    private String communitySafetyPhone;
+
+    private String attentiveness;
+    private String attentivenessLabel;
+    private Long conditionsEstablishment;
+    private String conditionsEstablishmentLabel;
+    private Long communistOrganization;
+    private String communistOrganizationLabel;
+    private Long partyMemberNumber;
+    private Long tradeUnion;
+    private String tradeUnionLabel;
+    private Long unionMembersNumber;
+    private Long communistYouthLeague;
+    private String communistYouthLeagueLabel;
+    private Long leagueMemberNumber;
+    private Long womenFederation;
+    private String womenFederationLabel;
+    private Long womenNumber;
+    private String fundSource;
+    private Long overseasBackground;
+    private String overseasBackgroundLabel;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveTGrossCase.java

@@ -0,0 +1,77 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 重特大案（事）件 comprehensive_gross_case
+ *
+ * @author zhaozhan
+ * @date 2023-09-18
+ */
+@Data
+public class ComprehensiveTGrossCase extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 数据所属部门(政或党的id)
+     */
+    private Long deptId;
+
+    /**
+     * 数据所属部门名称
+     */
+    private String deptName;
+
+    /**
+     * 案（事）件名称
+     */
+    private String eventName;
+
+    /**
+     * 案（事）件分级（字典项目）
+     */
+    private String eventLevel;
+    private String eventLevelLabel;
+
+    /**
+     * 案（事）件类型（字典项目）
+     */
+    private String eventType;
+    private String eventTypeLabel;
+
+    /**
+     * 案（事）件情况
+     */
+    private String eventDesc;
+
+    /**
+     * 发生日期
+     */
+    private Date occurDate;
+
+    /**
+     * 发生地
+     */
+    private Long occurPlace;
+
+    /**
+     * 发生地2260
+     */
+    private String occurPlaceLabel;
+
+    /**
+     * 发生地详址
+     */
+    private String occurAddress;
+
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveTPreventionOrganization.java

@@ -0,0 +1,73 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import lombok.Data;
+
+/**
+ * 群防群治组织 comprehensive_governance_organization
+ *
+ * @author zhaozhan
+ * @date 2023-09-18
+ */
+@Data
+public class ComprehensiveTPreventionOrganization  extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 数据所属部门(政或党的id)
+     */
+    private Long deptId;
+
+    /**
+     * 数据所属部门名称
+     */
+    private String deptName;
+
+    /**
+     * 组织Id
+     */
+    private String organizationId;
+
+    /**
+     * 组织名称
+     */
+    private String organizationName;
+
+    /**
+     * 组织类型（字典项目）
+     */
+    private String organizationType;
+
+    private String organizationTypeLabel;
+
+    /**
+     * 组织层级（字典项目）
+     */
+    private String level;
+    private String levelLabel;
+
+    /**
+     * 业务指导部门
+     */
+    private String guidanceDepartment;
+
+    /**
+     * 人员数量
+     */
+    private Long personnel;
+
+    /**
+     * 主要职能
+     */
+    private String functions;
+
+    private Boolean isEdit;;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveTPreventionTeam.java

@@ -0,0 +1,113 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 群防群治队伍 comprehensive_governance_team
+ *
+ * @author zhaozhan
+ * @date 2023-09-18
+ */
+@Data
+public class ComprehensiveTPreventionTeam extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 数据所属部门(政或党的id)
+     */
+    private Long deptId;
+
+    /**
+     * 数据所属部门名称
+     */
+    private String deptName;
+
+    /**
+     * 组织名称Id
+     */
+    private String organizationId;
+
+    /**
+     * 队伍名称
+     */
+    private String organizationName;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 性别（字典项目）
+     */
+    private String gender;
+    private String genderLabel;
+
+    /**
+     * 民族（字典项目）
+     */
+    private String nation;
+    private String nationLabel;
+
+    /**
+     * 政治面貌（字典项目）
+     */
+    private String politicalOutlook;
+    private String politicalOutlookLabel;
+
+    /**
+     * 证件代码（字典项目）
+     */
+    private String code;
+    private String codeLabel;
+
+    /**
+     * 证件号码
+     */
+    private String identityNumber;
+
+    /**
+     * 出生日期
+     */
+    private Date birthDate;
+
+    /**
+     * 职务
+     */
+    private String duties;
+
+    /**
+     * 专业特长（字典项目）
+     */
+    private List speciality = new ArrayList();
+    private String specialityLabel;
+    private String specialityList;
+
+    /**
+     * 学历（字典项目）
+     */
+    private String education;
+    private String educationLabel;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 固定电话
+     */
+    private String telephone;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveTeam.java

@@ -0,0 +1,61 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.sooka.sponest.comprehensive.api.base.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 综治队伍 comprehensive_team
+ *
+ * @author zhaozhan
+ * @date 2023/8/22
+ */
+@Data
+public class ComprehensiveTeam extends BaseEntity {
+    private String id;
+
+    private String name;
+
+    private String gender;
+
+    private String genderLabel;
+
+    private String institutionName;
+
+    private String institutionId;
+
+    private String nation;
+
+    private String nationLabel;
+
+    private String politicalOutlook;
+
+    private String politicalOutlookLabel;
+
+    private String identityNumber;
+
+    private Date birthDate;
+
+    private String level;
+
+    private String levelLabel;
+
+    private String duties;
+
+    private String dutiesLabel;
+
+    private String speciality;
+
+    private List<String> specialityList;
+
+    private String education;
+
+    private String educationLabel;
+
+    private String phone;
+
+    private String telephone;
+
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/domain/ComprehensiveVideoNetworking.java

@@ -0,0 +1,98 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 综治视联网信息中心
+ *
+ */
+@Data
+public class ComprehensiveVideoNetworking extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+    /**
+     * 数据所属部门(政或党的id)
+     */
+    private Long deptId;
+
+    /**
+     * 数据所属部门名称
+     */
+    private String deptName;
+
+    /**
+     * 中心名称
+     */
+    private String centerName;
+
+    /**
+     * 中心联系方式
+     */
+    private String centerPhone;
+
+    /**
+     * 中心层级（字典项目）
+     */
+    private String level;
+
+    private String levelLabel;
+    /**
+     * 中心负责人姓名
+     */
+    private String principalName;
+
+    /**
+     * 专职工作人员数量
+     */
+    private String staffNumber;
+
+    /**
+     * 办公用房面积（平方米）
+     */
+    private String spaceArea;
+
+    /**
+     * 年度运行经费（元）
+     */
+    private String annualOperationCost;
+
+    /**
+     * 联网公共安全视频监控摄像机数量
+     */
+    private String cameraNumber;
+
+    /**
+     * 是否24小时有人值守
+     */
+    private String manned;
+
+    private String mannedLabel;
+
+    /**
+     * 所在地（字典项目）
+     */
+    private Long place;
+
+    private String placeLabel;
+
+    /**
+     * 所在地详址
+     */
+    private String address;
+    /**
+     * 经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal latitude;
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/ComprehensiveManagementCenterServiceFactory.java

@@ -0,0 +1,50 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveManagementCenterService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ComprehensiveManagementCenterServiceFactory implements FallbackFactory<ComprehensiveManagementCenterService> {
+    private static final Logger log = LoggerFactory.getLogger(ComprehensiveManagementCenterServiceFactory.class);
+
+    @Override
+    public ComprehensiveManagementCenterService create(Throwable cause) {
+
+        log.error("综治中心-服务调用失败:{}", cause.getMessage());
+
+        return new ComprehensiveManagementCenterService() {
+
+            @Override
+            public AjaxResult add(String comprehensiveManagementCenter) {
+                return AjaxResult.error("综治中心-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult getInfo(String comprehensiveManagementCenter) {
+                return AjaxResult.error("综治中心-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult remove(String[] ids) {
+                return AjaxResult.error("综治中心-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo list(Integer pageNum,  Integer pageSize,  String centerName,  String principalName,  String level) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("综治中心-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult edit(String id) {
+                return AjaxResult.error("综治中心-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/ComprehensiveNonPublicEconomicOrganizationsServiceFactory.java

@@ -0,0 +1,50 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveNonPublicEconomicOrganizationsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ComprehensiveNonPublicEconomicOrganizationsServiceFactory implements FallbackFactory<ComprehensiveNonPublicEconomicOrganizationsService> {
+    private static final Logger log = LoggerFactory.getLogger(ComprehensiveNonPublicEconomicOrganizationsServiceFactory.class);
+
+    @Override
+    public ComprehensiveNonPublicEconomicOrganizationsService create(Throwable cause) {
+
+        log.error("非公有制经济组织-服务调用失败:{}", cause.getMessage());
+
+        return new ComprehensiveNonPublicEconomicOrganizationsService() {
+
+            @Override
+            public AjaxResult add(String comprehensiveManagementCenter) {
+                return AjaxResult.error("非公有制经济组织-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult getInfo(String comprehensiveManagementCenter) {
+                return AjaxResult.error("非公有制经济组织-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult remove(String[] ids) {
+                return AjaxResult.error("非公有制经济组织-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo list(Integer pageNum,Integer pageSize,String enterpriseName,String registrationNumbe,String legalPersonIdNumber) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("非公有制经济组织-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult edit(String id) {
+                return AjaxResult.error("非公有制经济组织-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/ComprehensiveSocialOrganizationServiceFactory.java

@@ -0,0 +1,50 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveSocialOrganizationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ComprehensiveSocialOrganizationServiceFactory implements FallbackFactory<ComprehensiveSocialOrganizationService> {
+    private static final Logger log = LoggerFactory.getLogger(ComprehensiveSocialOrganizationServiceFactory.class);
+
+    @Override
+    public ComprehensiveSocialOrganizationService create(Throwable cause) {
+
+        log.error("社会组织-服务调用失败:{}", cause.getMessage());
+
+        return new ComprehensiveSocialOrganizationService() {
+
+            @Override
+            public AjaxResult add(String comprehensiveSocialOrganization) {
+                return AjaxResult.error("社会组织-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult getInfo(String comprehensiveSocialOrganization) {
+                return AjaxResult.error("社会组织-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult remove(String[] ids) {
+                return AjaxResult.error("社会组织-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo list(Integer pageNum,Integer pageSize, String socialOrganizationName,String registrationNumbe,String principalIdNumber) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("社会组织-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult edit(String id) {
+                return AjaxResult.error("社会组织-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/ComprehensiveTGrossCaseFactory.java

@@ -0,0 +1,52 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTGrossCaseService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+/**
+ * @author zhaozhan
+ * @date 2023/9/18
+ */
+public class ComprehensiveTGrossCaseFactory implements FallbackFactory<ComprehensiveTGrossCaseService> {
+    private static final Logger log = LoggerFactory.getLogger(ComprehensiveTGrossCaseFactory.class);
+
+    @Override
+    public ComprehensiveTGrossCaseService create(Throwable cause) {
+
+        log.error("重特大案（事）件-服务调用失败:{}", cause.getMessage());
+
+        return new ComprehensiveTGrossCaseService() {
+
+            @Override
+            public AjaxResult add(String comprehensiveTPreventionOrganization) {
+                return AjaxResult.error("重特大案（事）件-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult getInfo(String id) {
+                return AjaxResult.error("重特大案（事）件-详情服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult remove(String[] ids) {
+                return AjaxResult.error("重特大案（事）件-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo list(Integer pageNum,Integer pageSize,String eventName){
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("重特大案（事）件-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult edit(String comprehensiveTPreventionOrganization) {
+                return AjaxResult.error("重特大案（事）件-修改服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/ComprehensiveTPreventionOrganizationFactory.java

@@ -0,0 +1,61 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveTPreventionOrganization;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTPreventionOrganizationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+import java.util.List;
+
+/**
+ * @author zhaozhan
+ * @date 2023/9/18
+ */
+public class ComprehensiveTPreventionOrganizationFactory implements FallbackFactory<ComprehensiveTPreventionOrganizationService> {
+    private static final Logger log = LoggerFactory.getLogger(ComprehensiveTPreventionOrganizationFactory.class);
+
+    @Override
+    public ComprehensiveTPreventionOrganizationService create(Throwable cause) {
+
+        log.error("群防群治组织-服务调用失败:{}", cause.getMessage());
+
+        return new ComprehensiveTPreventionOrganizationService() {
+
+            @Override
+            public AjaxResult add(String comprehensiveTPreventionOrganization) {
+                return AjaxResult.error("群防群治组织-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public R<ComprehensiveTPreventionOrganization> getInfo(String id) {
+                return R.fail("群防群治组织-详情服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult remove(String[] ids) {
+                return AjaxResult.error("群防群治组织-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo list(Integer pageNum,Integer pageSize,String organizationName,String organizationType,String level,String guidanceDepartment,Long personnel,String functions) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("群防群治组织-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public List<ComprehensiveTPreventionOrganization> getComprehensiveTPreventionOrganization() {
+                return null;
+            }
+
+            @Override
+            public AjaxResult edit(String comprehensiveTPreventionOrganization) {
+                return AjaxResult.error("群防群治组织-修改服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/ComprehensiveTPreventionTeamFactory.java

@@ -0,0 +1,54 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveTPreventionTeam;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTPreventionTeamService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+/**
+ * @author zhaozhan
+ * @date 2023/9/18
+ */
+public class ComprehensiveTPreventionTeamFactory implements FallbackFactory<ComprehensiveTPreventionTeamService> {
+    private static final Logger log = LoggerFactory.getLogger(ComprehensiveTPreventionTeamFactory.class);
+
+    @Override
+    public ComprehensiveTPreventionTeamService create(Throwable cause) {
+
+        log.error("群防群治队伍-服务调用失败:{}", cause.getMessage());
+
+        return new ComprehensiveTPreventionTeamService() {
+
+            @Override
+            public AjaxResult add(String comprehensiveTPreventionOrganization) {
+                return AjaxResult.error("群防群治队伍-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public R<ComprehensiveTPreventionTeam> getInfo(String id) {
+                return R.fail("群防群治队伍-详情服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult remove(String[] ids) {
+                return AjaxResult.error("群防群治队伍-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo list(Integer pageNum,Integer pageSize,String name) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("群防群治队伍-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult edit(String json) {
+                return AjaxResult.error("群防群治队伍-修改服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/RemoteBuildingLeaderServiceFactory.java

@@ -0,0 +1,60 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveBuildingLeader;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteBuildingLeaderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@Component
+public class RemoteBuildingLeaderServiceFactory implements FallbackFactory<RemoteBuildingLeaderService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteBuildingLeaderServiceFactory.class);
+
+    @Override
+    public RemoteBuildingLeaderService create(Throwable cause) {
+
+        log.error("楼栋管理长-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteBuildingLeaderService() {
+
+            @Override
+            public AjaxResult insertComprehensiveBuildingLeader(String ComprehensiveBuildingLeader) {
+                return AjaxResult.error("楼栋管理长-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveBuildingLeader(String ComprehensiveBuildingLeader) {
+                return AjaxResult.error("楼栋管理长-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveBuildingLeaderByIds(String[] ids) {
+                return AjaxResult.error("楼栋管理长-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensiveBuildingLeaderList(Integer pageNum, Integer pageSize, String name) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("楼栋管理长-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult listAll() {
+                return null;
+            }
+
+            @Override
+            public R<ComprehensiveBuildingLeader> selectComprehensiveBuildingLeaderById(String id) {
+                return R.fail("楼栋管理长-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/RemoteBuildingServiceFactory.java

@@ -0,0 +1,57 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveBuilding;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteBuildingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteBuildingServiceFactory implements FallbackFactory<RemoteBuildingService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteBuildingServiceFactory.class);
+
+    @Override
+    public RemoteBuildingService create(Throwable cause) {
+
+        log.error("楼栋管理-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteBuildingService() {
+
+            @Override
+            public AjaxResult insertComprehensiveBuilding(String ComprehensiveBuilding) {
+                return AjaxResult.error("楼栋管理-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveBuilding(String ComprehensiveBuilding) {
+                return AjaxResult.error("楼栋管理-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveBuildingByIds(String[] ids) {
+                return AjaxResult.error("楼栋管理-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult getbuilding(String estateId) {
+                return AjaxResult.error("楼栋管理-下拉选服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensiveBuildingList(Integer pageNum, Integer pageSize, String buildName, String estateId) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("楼栋管理-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public R<ComprehensiveBuilding> selectComprehensiveBuildingById(String id) {
+                return R.fail("楼栋管理-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/RemoteHousingEstateServiceFactory.java

@@ -0,0 +1,61 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveHousingEstate;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteHousingEstateService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Component
+public class RemoteHousingEstateServiceFactory implements FallbackFactory<RemoteHousingEstateService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteHousingEstateServiceFactory.class);
+
+    @Override
+    public RemoteHousingEstateService create(Throwable cause) {
+
+        log.error("小区管理-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteHousingEstateService() {
+
+            @Override
+            public AjaxResult insertComprehensiveHousingEstater(String ComprehensiveHousingEstater) {
+                return AjaxResult.error("小区管理-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveHousingEstater(String ComprehensiveHousingEstater) {
+                return AjaxResult.error("小区管理-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveHousingEstaterByIds(String[] ids) {
+                return AjaxResult.error("小区管理-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult getHousingEstate(@RequestParam("estateName") String estateName) {
+                return AjaxResult.error("小区管理-小区下拉选服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensiveHousingEstaterList(Integer pageNum, Integer pageSize, String estateName) {
+                return null;
+            }
+
+            @Override
+            public R<ComprehensiveHousingEstate> selectComprehensiveHousingEstaterById(String id) {
+                return R.fail("小区管理-详情服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult getDeptInfo() {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/RemoteInstitutionsServiceFactory.java

@@ -0,0 +1,59 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveInstitutions;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteInstitutionsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class RemoteInstitutionsServiceFactory implements FallbackFactory<RemoteInstitutionsService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteInstitutionsServiceFactory.class);
+
+    @Override
+    public RemoteInstitutionsService create(Throwable cause) {
+
+        log.error("综治机构-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteInstitutionsService() {
+
+            @Override
+            public AjaxResult insertComprehensiveInstitutions(String comprehensiveInstitutions) {
+                return AjaxResult.error("综治机构-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveInstitutions(String comprehensiveInstitutions) {
+                return AjaxResult.error("综治机构-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveInstitutionsByIds(String[] ids) {
+                return AjaxResult.error("综治机构-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensiveInstitutionsList(Integer pageNum, Integer pageSize, String institutionName, String institutionType, String level) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("综治机构-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public List<ComprehensiveInstitutions> comprehensiveInstitutionsfList() {
+                return null;
+            }
+
+            @Override
+            public R<ComprehensiveInstitutions> selectComprehensiveInstitutionsById(String id) {
+                return null;
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/RemoteLeadershipServiceFactory.java

@@ -0,0 +1,50 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteLeadershipService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteLeadershipServiceFactory implements FallbackFactory<RemoteLeadershipService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteLeadershipServiceFactory.class);
+
+    @Override
+    public RemoteLeadershipService create(Throwable cause) {
+
+        log.error("综治领导责任制-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteLeadershipService() {
+
+            @Override
+            public AjaxResult insertComprehensiveLeadership(String comprehensiveLeadership) {
+                return AjaxResult.error("综治领导责任制-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveLeadership(String comprehensiveLeadership) {
+                return AjaxResult.error("综治领导责任制-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveLeadershipByIds(String[] ids) {
+                return AjaxResult.error("综治领导责任制-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensiveLeadershipList(Integer pageNum, Integer pageSize, String implementPrincipal) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("综治领导责任制-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult selectComprehensiveLeadershipById(String id) {
+                return AjaxResult.error("综治领导责任制-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/RemotePublicSafetyMonitoringServiceFactory.java

@@ -0,0 +1,52 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensivePublicSafetyMonitoring;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemotePublicSafetyMonitoringService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemotePublicSafetyMonitoringServiceFactory implements FallbackFactory<RemotePublicSafetyMonitoringService> {
+    private static final Logger log = LoggerFactory.getLogger(RemotePublicSafetyMonitoringServiceFactory.class);
+
+    @Override
+    public RemotePublicSafetyMonitoringService create(Throwable cause) {
+
+        log.error("城乡社区公共安全视频监控-服务调用失败:{}", cause.getMessage());
+
+        return new RemotePublicSafetyMonitoringService() {
+
+            @Override
+            public AjaxResult insertComprehensivePublicSafetyMonitoring(String ComprehensivePublicSafetyMonitoring) {
+                return AjaxResult.error("城乡社区公共安全视频监控-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensivePublicSafetyMonitoring(String ComprehensivePublicSafetyMonitoring) {
+                return AjaxResult.error("城乡社区公共安全视频监控-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensivePublicSafetyMonitoringByIds(String[] ids) {
+                return AjaxResult.error("城乡社区公共安全视频监控-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensivePublicSafetyMonitoringList(Integer pageNum, Integer pageSize, String communityName) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("城乡社区公共安全视频监控-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public R<ComprehensivePublicSafetyMonitoring> selectComprehensivePublicSafetyMonitoringById(String id) {
+                return R.fail("城乡社区公共安全视频监控-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/RemoteRfhGridLeaderServiceFactory.java

@@ -0,0 +1,58 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRfhGridLeader;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteRfhGridLeaderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class RemoteRfhGridLeaderServiceFactory implements FallbackFactory<RemoteRfhGridLeaderService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteRfhGridLeaderServiceFactory.class);
+
+    @Override
+    public RemoteRfhGridLeaderService create(Throwable cause) {
+
+        log.error("网格长管理-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteRfhGridLeaderService() {
+
+            @Override
+            public AjaxResult insertComprehensiveRfhGridLeader(String comprehensiveRfhGridLeader) {
+                return AjaxResult.error("网格长管理-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveRfhGridLeader(String comprehensiveRfhGridLeader) {
+                return AjaxResult.error("网格长管理-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveRfhGridLeaderByIds(String[] ids) {
+                return AjaxResult.error("网格长管理-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public TableDataInfo selectComprehensiveRfhGridLeaderList(Integer pageNum, Integer pageSize, String userName, String memberName) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("网格长管理-列表服务调用失败:" + cause.getMessage());
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult listAll() {
+                return null;
+            }
+
+            @Override
+            public AjaxResult selectComprehensiveRfhGridLeaderById(String id) {
+                return AjaxResult.error("网格长管理-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}

sooka-sponest-api/sooka-sponest-api-comprehensive/src/main/java/com/sooka/sponest/comprehensive/api/comprehensiveOrganizationAndInstitution/factory/RemoteRoomServiceFactory.java

@@ -0,0 +1,72 @@
+package com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRoom;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteRoomService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteRoomServiceFactory implements FallbackFactory<RemoteRoomService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteRoomServiceFactory.class);
+
+    @Override
+    public RemoteRoomService create(Throwable cause) {
+
+        log.error("房间管理-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteRoomService() {
+
+            @Override
+            public AjaxResult insertComprehensiveRoom(String ComprehensiveRoom) {
+                return AjaxResult.error("房间管理-新增服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult updateComprehensiveRoom(String ComprehensiveRoom) {
+                return AjaxResult.error("房间管理-修改服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult deleteComprehensiveRoomByIds(String[] ids) {
+                return AjaxResult.error("房间管理-删除服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult getunitList(String num) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult getAllUserInfo(String id) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult addRoomBindPerson(String personBindRoomV) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult selectComprehensiveRoomList(Integer pageNum, Integer pageSize, String name,String estateId, Integer total) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setMsg("房间管理-列表服务调用失败:" + cause.getMessage());
+                return null;
+            }
+
+            @Override
+            public AjaxResult selectComprehensiveLet() {
+                return null;
+            }
+
+            @Override
+            public R<ComprehensiveRoom> selectComprehensiveRoomById(String id) {
+                return R.fail("房间管理-详情服务调用失败:" + cause.getMessage());
+            }
+        };
+    }
+}