From de8c43f70bd87ed93092e60faa6d8d80e49c68b5 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 30 Oct 2023 11:24:59 +0800 Subject: [PATCH 01/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 50 ++++ .../META-INF/spring-devtools.properties | 1 - .../target/classes/application-dev.yml | 191 -------------- .../target/classes/application-druid-dev.yml | 59 ----- .../target/classes/application-druid-test.yml | 59 ----- .../classes/application-druid-zhishiku.yml | 59 ----- .../target/classes/application-test.yml | 249 ------------------ .../target/classes/application-zhishiku.yml | 244 ----------------- shuili-admin/target/classes/application.yml | 5 - shuili-admin/target/classes/banner.txt | 24 -- .../classes/com/kms/TianhuiApplication.class | Bin 1462 -> 0 bytes .../com/kms/TianhuiServletInitializer.class | Bin 850 -> 0 bytes .../com/kms/sync/ExportProperties.class | Bin 2143 -> 0 bytes .../com/kms/sync/SynchronizedConstants.class | Bin 454 -> 0 bytes .../classes/com/kms/web/api/AppApi.class | Bin 5427 -> 0 bytes .../controller/cms/CmsContentController.class | Bin 4290 -> 0 bytes .../controller/common/CaptchaController.class | Bin 3761 -> 0 bytes .../controller/common/CommonController.class | Bin 6567 -> 0 bytes .../controller/monitor/ServerController.class | Bin 1204 -> 0 bytes .../monitor/SysLogininforController.class | Bin 3804 -> 0 bytes .../monitor/SysOperlogController.class | Bin 5227 -> 0 bytes .../monitor/SysUserOnlineController.class | Bin 4149 -> 0 bytes .../system/CmsDataSourceController.class | Bin 8866 -> 0 bytes .../system/CmsMaterialEntityController.class | Bin 4438 -> 0 bytes .../controller/system/CmsTagController.class | Bin 5937 -> 0 bytes .../system/CmsUserCollectController.class | Bin 4811 -> 0 bytes .../web/controller/system/RelationView.class | Bin 2534 -> 0 bytes .../system/SysConfigController.class | Bin 5410 -> 0 bytes .../controller/system/SysDeptController.class | Bin 7203 -> 0 bytes .../system/SysDictDataController.class | Bin 4790 -> 0 bytes .../system/SysDictTypeController.class | Bin 5978 -> 0 bytes .../system/SysExceptionLogController.class | Bin 3762 -> 0 bytes .../controller/system/SysInfoController.class | Bin 3655 -> 0 bytes .../system/SysLoginController.class | Bin 6548 -> 0 bytes .../controller/system/SysMenuController.class | Bin 5784 -> 0 bytes .../system/SysModuleController.class | Bin 4527 -> 0 bytes .../system/SysNoticeController.class | Bin 5340 -> 0 bytes .../controller/system/SysPostController.class | Bin 5131 -> 0 bytes .../system/SysProfileController.class | Bin 4392 -> 0 bytes .../controller/system/SysRoleController.class | Bin 6429 -> 0 bytes .../system/SysUploadController.class | Bin 1348 -> 0 bytes .../controller/system/SysUserController.class | Bin 11785 -> 0 bytes .../web/controller/system/SysUserView.class | Bin 8625 -> 0 bytes .../kms/web/controller/system/TemView.class | Bin 1413 -> 0 bytes .../controller/tool/SwaggerController.class | Bin 921 -> 0 bytes .../web/controller/tool/TestController.class | Bin 3950 -> 0 bytes .../kms/web/controller/tool/UserEntity.class | Bin 1715 -> 0 bytes .../kms/web/core/config/SwaggerConfig.class | Bin 5671 -> 0 bytes .../kms/web/utils/view/AttributeView.class | Bin 2342 -> 0 bytes .../com/kms/web/utils/view/DataView.class | Bin 4308 -> 0 bytes .../com/kms/web/utils/view/EventView.class | Bin 2563 -> 0 bytes .../com/kms/web/utils/view/HtmlJson.class | Bin 2203 -> 0 bytes .../com/kms/web/utils/view/InitLabel.class | Bin 5674 -> 0 bytes .../com/kms/web/utils/view/LabelViews.class | Bin 2906 -> 0 bytes .../kms/web/utils/view/RelationProView.class | Bin 1835 -> 0 bytes .../com/kms/web/utils/view/RelationView.class | Bin 3921 -> 0 bytes .../target/classes/com/slsoft/App.class | Bin 535 -> 0 bytes .../target/classes/i18n/messages.properties | 36 --- shuili-admin/target/classes/logback.xml | 93 ------- .../target/classes/mybatis/mybatis-config.xml | 15 -- .../shuili/common/utils/file/FileUtils.class | Bin 4079 -> 4079 bytes .../shuili/common/utils/http/HttpHelper.class | Bin 2520 -> 2520 bytes .../shuili/common/utils/http/HttpUtils.class | Bin 8444 -> 8444 bytes .../framework/aspectj/DataSourceAspect.class | Bin 2769 -> 2773 bytes .../shuili/common/utils/FileBasicUtils.class | Bin 2167 -> 2167 bytes .../shuili/common/utils/poi/ExcelUtil.class | Bin 31680 -> 31680 bytes .../kms/system/base/analysis/FileUtils.class | Bin 37280 -> 37284 bytes .../kms/system/service/upload/FileUtils.class | Bin 37158 -> 37162 bytes 68 files changed, 50 insertions(+), 1035 deletions(-) create mode 100644 .gitignore delete mode 100644 shuili-admin/target/classes/META-INF/spring-devtools.properties delete mode 100644 shuili-admin/target/classes/application-dev.yml delete mode 100644 shuili-admin/target/classes/application-druid-dev.yml delete mode 100644 shuili-admin/target/classes/application-druid-test.yml delete mode 100644 shuili-admin/target/classes/application-druid-zhishiku.yml delete mode 100644 shuili-admin/target/classes/application-test.yml delete mode 100644 shuili-admin/target/classes/application-zhishiku.yml delete mode 100644 shuili-admin/target/classes/application.yml delete mode 100644 shuili-admin/target/classes/banner.txt delete mode 100644 shuili-admin/target/classes/com/kms/TianhuiApplication.class delete mode 100644 shuili-admin/target/classes/com/kms/TianhuiServletInitializer.class delete mode 100644 shuili-admin/target/classes/com/kms/sync/ExportProperties.class delete mode 100644 shuili-admin/target/classes/com/kms/sync/SynchronizedConstants.class delete mode 100644 shuili-admin/target/classes/com/kms/web/api/AppApi.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/cms/CmsContentController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/common/CaptchaController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/common/CommonController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/monitor/ServerController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/monitor/SysLogininforController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/monitor/SysOperlogController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/monitor/SysUserOnlineController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/CmsDataSourceController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/CmsMaterialEntityController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/CmsTagController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/CmsUserCollectController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/RelationView.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysConfigController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysDeptController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysDictDataController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysDictTypeController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysExceptionLogController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysInfoController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysLoginController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysMenuController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysModuleController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysNoticeController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysPostController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysProfileController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysRoleController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysUploadController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysUserController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/SysUserView.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/system/TemView.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/tool/SwaggerController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/tool/TestController.class delete mode 100644 shuili-admin/target/classes/com/kms/web/controller/tool/UserEntity.class delete mode 100644 shuili-admin/target/classes/com/kms/web/core/config/SwaggerConfig.class delete mode 100644 shuili-admin/target/classes/com/kms/web/utils/view/AttributeView.class delete mode 100644 shuili-admin/target/classes/com/kms/web/utils/view/DataView.class delete mode 100644 shuili-admin/target/classes/com/kms/web/utils/view/EventView.class delete mode 100644 shuili-admin/target/classes/com/kms/web/utils/view/HtmlJson.class delete mode 100644 shuili-admin/target/classes/com/kms/web/utils/view/InitLabel.class delete mode 100644 shuili-admin/target/classes/com/kms/web/utils/view/LabelViews.class delete mode 100644 shuili-admin/target/classes/com/kms/web/utils/view/RelationProView.class delete mode 100644 shuili-admin/target/classes/com/kms/web/utils/view/RelationView.class delete mode 100644 shuili-admin/target/classes/com/slsoft/App.class delete mode 100644 shuili-admin/target/classes/i18n/messages.properties delete mode 100644 shuili-admin/target/classes/logback.xml delete mode 100644 shuili-admin/target/classes/mybatis/mybatis-config.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c1958501 --- /dev/null +++ b/.gitignore @@ -0,0 +1,50 @@ +###################################################################### +# 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/ +nbdist/ +.nb-gradle/ + +###################################################################### +# Others +*.log +*.xml.versionsBackup +*.swp + +!*/build/*.java +!*/build/*.html +!*/build/*.xml + +.flattened-pom.xml +application-local.yml +application-local.yaml + diff --git a/shuili-admin/target/classes/META-INF/spring-devtools.properties b/shuili-admin/target/classes/META-INF/spring-devtools.properties deleted file mode 100644 index 2b23f85a..00000000 --- a/shuili-admin/target/classes/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.json=/com.alibaba.fastjson.*.jar \ No newline at end of file diff --git a/shuili-admin/target/classes/application-dev.yml b/shuili-admin/target/classes/application-dev.yml deleted file mode 100644 index 158b89db..00000000 --- a/shuili-admin/target/classes/application-dev.yml +++ /dev/null @@ -1,191 +0,0 @@ -# 项目相关配置 -shuili: - # 名称 - name: 天汇重构 - #系统别名 英文/汉语拼音 做缓存的前缀 每个模块的配置必须一样 - nameKey: tianhui_lyj - # 版本 - version: 1.0 - # 版权年份 - copyrightYear: 2023 - # 实例演示开关 - demoEnabled: true - # 临时文件地址 - profile: E:/tianhui - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数组计算 char 字符验证 - captchaType: math - #数据库配置 参考枚举类DbType - dbType: mysql - #初始话数据的位置 采集的文献的导入 - initData: E:\\199it - init: true - #导入TNT 数据 - initTntData: C:\Users\liuyanjun\Desktop\人物-政党导出V1\人物-政党导出V1 -#neo4j的一个from -database: tianhui_lyj -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 18082 - servlet: - # 应用的访问路径 - context-path: /tianhui-admin-web - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # tomcat最大线程数，默认为200 - max-threads: 800 - # Tomcat启动初始化的线程数，默认值25 - min-spare-threads: 30 -# 日志配置 -logging: - level: - com.kms: debug - org.springframework: warn -# Spring配置 -spring: - mongodb: - uri: mongodb://192.168.1.20:27017/tianhui - field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages - profiles: - active: druid-dev - session: - store-type: redis - redis: - flush-mode: immediate - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 1000MB - # 设置总上传的文件大小 - max-request-size: 20000MB - # 服务模块 - devtools: - restart: - # 热部署开关 - enabled: true - # redis 配置 - redis: - # 地址 - host: 192.168.1.20 -# cluster: -# nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006 -# max-redirects: 3 - # 端口，默认为6379 - port: 6379 - # 密码 - password: - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 16 - # 连接池中的最大空闲连接 - max-idle: 32 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms -# password: password -sa-token: - # token名称 (同时也是cookie名称) - token-name: shuili - # token有效期，单位s 默认30天, -1代表永不过期 - timeout: -1 - # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 - activity-timeout: 1800 - # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) - is-concurrent: true - # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) - is-share: false - # token风格 - token-style: uuid - # 是否输出操作日志 - is-log: true - isReadCookie: false - tokenSessionCheckLogin: false - #是否在初始化配置时打印版本字符画 - isV: false - #token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) 参考：token前缀 - tokenPrefix: water - # 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作) - autoRenew: true - #是否尝试从header里读取token - isReadHead: true -#mybatis-plus配置 -mybatis-plus: - configuration: - #下划线驼峰命名 - map-underscore-to-camel-case: true - auto-mapping-behavior: full - #开启日志打印 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - #配置Mapper映射文件 - mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.kms.**.domain - -# Swagger配置 -swagger: - # 是否开启swagger - enabled: true - # 请求前缀 - pathMapping: / -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludes: /system/notice/* - # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/* -fdfs: - soTimeout: 1500 - connectTimeout: 600 - thumbImage: #缩略图生成参数 - width: 150 - height: 150 - #预览的地址 - showFileUrl: 192.168.1.20:9080 - #使用的是http 还是https - urlAgreement: http - trackerList: #TrackerList参数,支持多个 - - 192.168.1.20:22122 -ignored: - /v2/*,/favicon.ico,/swagger-resources/**,/druid/**,/swagger-ui.html,/webjars/**, - /app/login,/initTnt/**, - /doc.html, - /chunk/*, - /error, - /login, - /captchaImage, - /system/file/**, - /system/user/exportExcel, - /system/kaptcha/render, - /test/** -# http请求连接池 -http: - pool: - # 连接超时 - connectTimeout: 5000000 - connectionRequestTimeout: 5000000 - defaultMaxPerRoute: 20 - # 最大连接数 - maxTotal: 100 - # 服务器返回数据(response)的时间 - socketTimeout: 5000000 - validateAfterInactivity: 5000000 -#算法配置 -algorithm: - #图片ocr服务 - entity: http://192.168.0.14:17856/analyze_text - # 自动打抽取摘要 - summary: http://192.168.0.210:12343 - ocr: http://192.168.0.62:12340/ExtractServer?WSDL diff --git a/shuili-admin/target/classes/application-druid-dev.yml b/shuili-admin/target/classes/application-druid-dev.yml deleted file mode 100644 index c9d93913..00000000 --- a/shuili-admin/target/classes/application-druid-dev.yml +++ /dev/null @@ -1,59 +0,0 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource -# driverClassName: com.mysql.jdbc.Driver - driverClassName: org.gjt.mm.mysql.Driver - druid: - # 主库数据源 - master: - url: jdbc:mysql://192.168.12.20:23306/tianhui_lyj1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: 123456 - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: - login-password: - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - diff --git a/shuili-admin/target/classes/application-druid-test.yml b/shuili-admin/target/classes/application-druid-test.yml deleted file mode 100644 index 9479d191..00000000 --- a/shuili-admin/target/classes/application-druid-test.yml +++ /dev/null @@ -1,59 +0,0 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver -# driverClassName: org.gjt.mm.mysql.Driver - druid: - # 主库数据源 - master: - url: jdbc:mysql://rm-7xv36ek6qb84h9utmfo.mysql.rds.aliyuncs.com:3333/ruoyi_mybatisplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: shuili - password: wuxukgdvJ1!@! - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: - login-password: - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - diff --git a/shuili-admin/target/classes/application-druid-zhishiku.yml b/shuili-admin/target/classes/application-druid-zhishiku.yml deleted file mode 100644 index 1ebf6d30..00000000 --- a/shuili-admin/target/classes/application-druid-zhishiku.yml +++ /dev/null @@ -1,59 +0,0 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource -# driverClassName: com.mysql.jdbc.Driver - driverClassName: org.gjt.mm.mysql.Driver - druid: - # 主库数据源 - master: - url: jdbc:mysql://192.168.101.61:13306/tianhui_chonggou?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: 123456 - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: - login-password: - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - diff --git a/shuili-admin/target/classes/application-test.yml b/shuili-admin/target/classes/application-test.yml deleted file mode 100644 index 4dddde6f..00000000 --- a/shuili-admin/target/classes/application-test.yml +++ /dev/null @@ -1,249 +0,0 @@ -# 项目相关配置 -shuili: - # 名称 - name: 天汇重构01 - #系统别名 英文/汉语拼音 做缓存的前缀 每个模块的配置必须一样 - nameKey: tianhui_cg - # 版本 - version: 1.0 - # 版权年份 - copyrightYear: 2023 - # 实例演示开关 - demoEnabled: true - # 临时文件地址 -# profile: /home/project/tianhui-chonggou - profile: E:/tianhui - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数组计算 char 字符验证 - captchaType: math - #数据库配置 参考枚举类DbType - dbType: mysql - #初始话数据的位置 - initData: /home/project/tianhui-chonggou/data - init: true - #上传类型 - uploadType: disk -#neo4j的一个from -database: tianhui_cg -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 18082 - servlet: - # 应用的访问路径 - context-path: /tianhui-admin-web - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # tomcat最大线程数，默认为200 - max-threads: 800 - # Tomcat启动初始化的线程数，默认值25 - min-spare-threads: 30 -# 日志配置 -logging: - level: - com.kms: debug - org.springframework: warn -#thrift: -# host: 192.168.0.61 -# port: 9710 -# timeOut: 60000 -# maxActive: 20000 -# max-total: 50 -# max-idle: 10 -# min-idle: 5 -# max-wait-millis: 200 -# indexName: tianhui_cg -# indexType: doc -# esEntity: com.kms.system.es.EsEntity -# Spring配置 -spring: -# kafka: -# autoStartup: false -# topics: tianhui -# # kafka信息 http://182.92.86.163:9092/ -# bootstrap-servers: 106.2.224.58:8021 -# #bootstrap-servers: 182.92.86.163:9092 -# producer: # 生产者配置 -# retries: 3 # 设置大于0的值，则客户端会将发送失败的记录重新发送 -# batch-size: 33554432 #32M -# buffer-memory: 33554432 #32M -# acks: 1 -# # 指定消息key和消息体的编解码方式 -# key-serializer: org.apache.kafka.common.serialization.StringSerializer -# value-serializer: org.apache.kafka.common.serialization.StringSerializer -# consumer: -# session: -# timeout: 200000000 # 链接超时时间 -# group-id: shuilikeji # 消费者组 -# enable-auto-commit: false # 关闭自动提交 -# auto-offset-reset: earliest # 当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费 -# key-deserializer: org.apache.kafka.common.serialization.StringDeserializer -# value-deserializer: org.apache.kafka.common.serialization.StringDeserializer -# listener: -# # 当每一条记录被消费者监听器（ListenerConsumer）处理之后提交 -# # RECORD -# # 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后提交 -# # BATCH -# # 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后，距离上次提交时间大于TIME时提交 -# # TIME -# # 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后，被处理record数量大于等于COUNT时提交 -# # COUNT -# # TIME |　COUNT　有一个条件满足时提交 -# # COUNT_TIME -# # 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后, 手动调用Acknowledgment.acknowledge()后提交 -# # MANUAL -# # 手动调用Acknowledgment.acknowledge()后立即提交，一般使用这种 -# # MANUAL_IMMEDIATE -# ack-mode: manual_immediate -# data: -# neo4j: -# uri: bolt://192.168.0.61:7687 -# username: neo4j -# password: password -# mongodb: -# uri: mongodb://192.168.0.61:27017/tianhui_cg -# field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages - profiles: - active: druid-test - session: - store-type: redis - redis: - flush-mode: immediate - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 1000MB - # 设置总上传的文件大小 - max-request-size: 20000MB - # 服务模块 - devtools: - restart: - # 热部署开关 - enabled: true - # redis 配置 - redis: - # 地址 - host: 127.0.0.1 -# cluster: -# nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006 -# max-redirects: 3 - # 端口，默认为6379 - port: 6379 - # 密码 - password: - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 16 - # 连接池中的最大空闲连接 - max-idle: 32 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms -# password: password -sa-token: - # token名称 (同时也是cookie名称) - token-name: shuili - # token有效期，单位s 默认30天, -1代表永不过期 - timeout: -1 - # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 - activity-timeout: 1800 - # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) - is-concurrent: true - # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) - is-share: false - # token风格 - token-style: uuid - # 是否输出操作日志 - is-log: true - isReadCookie: false - tokenSessionCheckLogin: false - #是否在初始化配置时打印版本字符画 - isV: false - #token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) 参考：token前缀 - tokenPrefix: water - # 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作) - autoRenew: true - #是否尝试从header里读取token - isReadHead: true -#mybatis-plus配置 -mybatis-plus: - configuration: - #下划线驼峰命名 - map-underscore-to-camel-case: true - auto-mapping-behavior: full - #开启日志打印 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - #配置Mapper映射文件 - mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.kms.**.domain - -# Swagger配置 -swagger: - # 是否开启swagger - enabled: true - # 请求前缀 - pathMapping: / -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludes: /system/notice/* - # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/* -fdfs: - soTimeout: 1500 - connectTimeout: 600 - thumbImage: #缩略图生成参数 - width: 150 - height: 150 - #预览的地址 - showFileUrl: 192.168.0.61:8888 - #使用的是http 还是https - urlAgreement: http - trackerList: #TrackerList参数,支持多个 - - 192.168.0.61:22122 -ignored: - /v2/*,/favicon.ico,/swagger-resources/**,/druid/**,/swagger-ui.html,/webjars/**, - /app/login, - /doc.html, - /chunk/*, - /error, - /login, - /captchaImage, - /system/file/**, - /system/user/exportExcel, - /system/kaptcha/render, - /test/** -# http请求连接池 -http: - pool: - # 连接超时 - connectTimeout: 5000000 - connectionRequestTimeout: 5000000 - defaultMaxPerRoute: 20 - # 最大连接数 - maxTotal: 100 - # 服务器返回数据(response)的时间 - socketTimeout: 5000000 - validateAfterInactivity: 300000 -#算法配置 -#algorithm: -# #图片ocr服务 -# entity: http://192.168.0.14:17856/analyze_text -# # 自动打抽取摘要 -# summary: http://192.168.0.210:12343 -# ocr: http://192.168.0.62:12340/ExtractServer?WSDL -# #内容是文件类型识别 -# fielTypeAndContent: http://192.168.0.42:8089/detect diff --git a/shuili-admin/target/classes/application-zhishiku.yml b/shuili-admin/target/classes/application-zhishiku.yml deleted file mode 100644 index 3a396d5b..00000000 --- a/shuili-admin/target/classes/application-zhishiku.yml +++ /dev/null @@ -1,244 +0,0 @@ -# 项目相关配置 -shuili: - # 名称 - name: 天汇重构 - #系统别名 英文/汉语拼音 做缓存的前缀 每个模块的配置必须一样 - nameKey: tianhui_chonggou - # 版本 - version: 1.0 - # 版权年份 - copyrightYear: 2023 - # 实例演示开关 - demoEnabled: true - # 临时文件地址 - profile: E:/tianhui - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数组计算 char 字符验证 - captchaType: math - #数据库配置 参考枚举类DbType - dbType: mysql - #初始话数据的位置 - initData: E:\\199it - init: false -#neo4j的一个from -database: tianhui_chonggou -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 18080 - servlet: - # 应用的访问路径 - context-path: /tianhui-admin-web - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # tomcat最大线程数，默认为200 - max-threads: 800 - # Tomcat启动初始化的线程数，默认值25 - min-spare-threads: 30 -# 日志配置 -logging: - level: - com.kms: debug - org.springframework: warn -thrift: - host: 192.168.0.61 - port: 9710 - timeOut: 60000 - maxActive: 20000 - max-total: 50 - max-idle: 10 - min-idle: 5 - max-wait-millis: 200 - indexName: tianhui-chonggou - indexType: doc - esEntity: com.kms.system.es.EsEntity -# Spring配置 -spring: - kafka: - autoStartup: true - topics: hangtian - # kafka信息 http://182.92.86.163:9092/ - bootstrap-servers: 106.2.224.58:8021 - #bootstrap-servers: 182.92.86.163:9092 - producer: # 生产者配置 - retries: 3 # 设置大于0的值，则客户端会将发送失败的记录重新发送 - batch-size: 33554432 #32M - buffer-memory: 33554432 #32M - acks: 1 - # 指定消息key和消息体的编解码方式 - key-serializer: org.apache.kafka.common.serialization.StringSerializer - value-serializer: org.apache.kafka.common.serialization.StringSerializer - consumer: - session: - timeout: 200000000 # 链接超时时间 - group-id: shuilikeji # 消费者组 - enable-auto-commit: false # 关闭自动提交 - auto-offset-reset: earliest # 当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费 - key-deserializer: org.apache.kafka.common.serialization.StringDeserializer - value-deserializer: org.apache.kafka.common.serialization.StringDeserializer - listener: - # 当每一条记录被消费者监听器（ListenerConsumer）处理之后提交 - # RECORD - # 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后提交 - # BATCH - # 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后，距离上次提交时间大于TIME时提交 - # TIME - # 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后，被处理record数量大于等于COUNT时提交 - # COUNT - # TIME |　COUNT　有一个条件满足时提交 - # COUNT_TIME - # 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后, 手动调用Acknowledgment.acknowledge()后提交 - # MANUAL - # 手动调用Acknowledgment.acknowledge()后立即提交，一般使用这种 - # MANUAL_IMMEDIATE - ack-mode: manual_immediate - data: - neo4j: - uri: bolt://192.168.0.61:7687 - username: neo4j - password: password - mongodb: - uri: mongodb://192.168.0.61:27017/tianhui - field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages - profiles: - active: druid-zhishiku - session: - store-type: redis - redis: - flush-mode: immediate - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 1000MB - # 设置总上传的文件大小 - max-request-size: 20000MB - # 服务模块 - devtools: - restart: - # 热部署开关 - enabled: true - # redis 配置 - redis: - # 地址 - host: 192.168.0.61 -# cluster: -# nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006 -# max-redirects: 3 - # 端口，默认为6379 - port: 6379 - # 密码 - password: - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 16 - # 连接池中的最大空闲连接 - max-idle: 32 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms -# password: password -sa-token: - # token名称 (同时也是cookie名称) - token-name: shuili - # token有效期，单位s 默认30天, -1代表永不过期 - timeout: -1 - # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 - activity-timeout: 1800 - # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) - is-concurrent: true - # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) - is-share: false - # token风格 - token-style: uuid - # 是否输出操作日志 - is-log: true - isReadCookie: false - tokenSessionCheckLogin: false - #是否在初始化配置时打印版本字符画 - isV: false - #token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) 参考：token前缀 - tokenPrefix: water - # 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作) - autoRenew: true - #是否尝试从header里读取token - isReadHead: true -#mybatis-plus配置 -mybatis-plus: - configuration: - #下划线驼峰命名 - map-underscore-to-camel-case: true - auto-mapping-behavior: full - #开启日志打印 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - #配置Mapper映射文件 - mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.kms.**.domain - -# Swagger配置 -swagger: - # 是否开启swagger - enabled: true - # 请求前缀 - pathMapping: / -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludes: /system/notice/* - # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/* -fdfs: - soTimeout: 1500 - connectTimeout: 600 - thumbImage: #缩略图生成参数 - width: 150 - height: 150 - #预览的地址 - showFileUrl: 192.168.61:8888 - #使用的是http 还是https - urlAgreement: http - trackerList: #TrackerList参数,支持多个 - - 192.168.0.61:22122 -ignored: - /v2/*,/favicon.ico,/swagger-resources/**,/druid/**,/swagger-ui.html,/webjars/**, - /app/login, - /doc.html, - /chunk/*, - /error, - /login, - /captchaImage, - /system/file/**, - /system/user/exportExcel, - /system/kaptcha/render, - /test/** -# http请求连接池 -http: - pool: - # 连接超时 - connectTimeout: 5000000 - connectionRequestTimeout: 5000000 - defaultMaxPerRoute: 20 - # 最大连接数 - maxTotal: 100 - # 服务器返回数据(response)的时间 - socketTimeout: 5000000 - validateAfterInactivity: 5000000 -#算法配置 -algorithm: - #图片ocr服务 - entity: http://192.168.0.14:17856/analyze_text - # 自动打抽取摘要 - summary: http://192.168.0.210:12343 - ocr: http://192.168.0.62:12340/ExtractServer?WSDL diff --git a/shuili-admin/target/classes/application.yml b/shuili-admin/target/classes/application.yml deleted file mode 100644 index dcd83f55..00000000 --- a/shuili-admin/target/classes/application.yml +++ /dev/null @@ -1,5 +0,0 @@ -spring: - profiles: -# include: dev,druid-dev - include: test,druid-test -# include: zhishiku,druid-zhishiku diff --git a/shuili-admin/target/classes/banner.txt b/shuili-admin/target/classes/banner.txt deleted file mode 100644 index ed77e146..00000000 --- a/shuili-admin/target/classes/banner.txt +++ /dev/null @@ -1,24 +0,0 @@ -Application Version: ${kms.version} -Spring Boot Version: ${spring-boot.version} -//////////////////////////////////////////////////////////////////// -// _ooOoo_ // -// o8888888o // -// 88" . "88 // -// (| ^_^ |) // -// O\ = /O // -// ____/`---'\____ // -// .' \\| |// `. // -// / \\||| : |||// \ // -// / _||||| -:- |||||- \ // -// | | \\\ - /// | | // -// | \_| ''\---/'' | | // -// \ .-\__ `-` ___/-. / // -// ___`. .' /--.--\ `. . ___ // -// ."" '< `.___\_<|>_/___.' >'"". // -// | | : `- \`.;`\ _ /`;.`/ - ` : | | // -// \ \ `-. \_ __\ /__ _/ .-` / / // -// ========`-.____`-.___\_____/___.-`____.-'======== // -// `=---=' // -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 佛祖保佑 永不宕机 永无BUG // -//////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/shuili-admin/target/classes/com/kms/TianhuiApplication.class b/shuili-admin/target/classes/com/kms/TianhuiApplication.class deleted file mode 100644 index 94314b4a487295d79ad07aeb9d87fee959724a95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1462 zcma)6OKTKC5U$xg)*W|EOiWDTYg}KuQFnYHfry|HL0ENhB@lAZp4oQoWM+DqhmV`! zMLl^FJ@_~X-b4`<4-q{26TBIS*Zc$V>)uVW;wm=uqpG^9zUr##uRlL65YaI@YEqhZ zrYUdIF4~=;J+yZn?K7!B#Wal@)O$h%B0gzQSD`pnOX%-4ax0v1WbrBh~wd_jYp7$gBvS7jWM4W0gJmIof$Y2sSeI^2fh6}UhId+5D z9t-MrH4a5kpVU5CScjFt4r0Ix6X>2O%dl=o4W)A}WIn$s!+G14LCkN(_LK~+iFy($ zWNog&R$?G9t1<~)epaYRHvb8-q;MHDdMOEF;qz$`31un>WUPY#x|1CdI8w$oOJWHq z8UnYg8supR+MobKn%{E0L_O}g|1~vNb6ooji&+!?Dfn3pwe_~gJK6#o{V;4b0=$vm zkO2?ks>@VTvJQ)Qg}L*r&JkV~87xIeohM4Dii{$WP<0;HF8tdLo+4`Hz;3gAo;4ag zY?2@yo?W&lm4}##&rnxWByc z)UtqM>EY|82d{qId${!AnPpku?>;GfdH3zbRUB{)cT8(S4Qs}MSdUtz$(pb-S~Ou< zHLH@(I}_krYUWIJQ4vb3re@Q5wwf5qtsX1jW>8BSvzFz|oSCLWSvpKd4C-I&n~TmIcVlFwQ$y%-Y!+Z! z@fqY4+B$E_V^K8Oq1lT6tfke;`&*N>fvnz+V(z1PWdf)}P3J<|74&b6&gaZW2@dM0 zerKakRR6>tntrGq_3D2?J1K=PO^p;8s?e~Spls|0_MY(%WW3Sh^;ml~a}#B8&NeSl zjy8bGP#^V!qm;`qmcrgYkQ)C;UFEmbJ<#)>de`i1pf1Qq;5rYzqP92O)S-!=*9Wg7el{N=39SqV2Q;qy-VkUp{=5E&u=k diff --git a/shuili-admin/target/classes/com/kms/TianhuiServletInitializer.class b/shuili-admin/target/classes/com/kms/TianhuiServletInitializer.class deleted file mode 100644 index 939e00838a3e1e92326e23d37b4bfe8a087290e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 850 zcmbu7%SyvQ6o&t4W20@YTJINx;-)G%8#huBtRM(M7ZpKVP2#kUrkOBFRD3GkCkc>F_8tD(JM0=*kCe?zpRU%-ux!*V6D-mOKnYUwI-{ zI%xJ1jm;5y8A{@p$j}&xRcz_Rc=A}K3at+ue&<%)i!utZN!irrz6d(}$QKc*R~ssx zjpZ^{u*z^UP_+l?@~9^}kCHIdChjZPBvJn_gkf(WYuE-D>?j+Y{{F0f<@_0Gqy?dd zJiXKO%YmLJY&ys3#>q0WV_R=vFIjqm&O#O}p-6tYSAY_EfQ3m^D3Ufe37I2X*|t8A iyUbVftyfsj6v^S2GM!NtdX;?&^Z?C>E%ZhJ diff --git a/shuili-admin/target/classes/com/kms/sync/ExportProperties.class b/shuili-admin/target/classes/com/kms/sync/ExportProperties.class deleted file mode 100644 index 90af8870395c587d344089712ec6e61a7cc75b6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2143 zcma)7QBxaL6#j0qn=I*4AT*RHSZYy20^O>u+62%RXbT3)fHI>`E@2@H$!^@;DE%w` z0D0j-XOzz9jH54g#^2DN(MN0j?q;D)*l`?~d%k<_Irp6NopZB){qxIj0B&MEgCWfK zLBYpz`6P`y8OpnIS&(Oo5-mw|FOB;dWH7Jcft1S{Ry2GnVKt3afo$8iyhSrGmkwL5 z7p$8>oyzLI`Hg8bOlQy73_RP}s|e`(zU$nx8`hfHv;L9)O^B`1R1^!Dz$ zoFIYxM%xMOrnP1JHrs#4aooTRY}X;5#j5M=8GcL7*RIE*`quRh3_q|u%MBj2EMviK zwp_<@0uI7btns$%21d4aDEo%bgbba=WlxA zRmSJor70aBU|eAEWq{6zu?Vx(vYZ`(nYeL2H{nr66i;p3G49!Nlrb4BTJh9#}z-xG&J0Ypz+U@)k5Y-RP*$glCs4yJL27N9OIexu6BqKz6AT?epUEpHNS|70WtApcIh9wX zP3j4zKq_%rJ*dyv^<REa!lalEP`MjcQp3+aHcX_ZftIUOTjSW`nBug7C9U(n)g1)b$UMnl|Ag@Fxnxv3N zWAW77?A#i~PU1tni}x5)#Vx!~l;HRB2EV+Lnrm$7Eg~hPVFk(yDiqQn1WShyFKF~~ zpOA_i)Kh~~8>L%CGsfdPk1E|@O!@K(zasO+V_eAUC+L?2Q)Dl8uqN>UmlF*3K9N@+ aXCbO9!MY^#AK^CT08yE;!Z@=&=Kcjq@uKel diff --git a/shuili-admin/target/classes/com/kms/sync/SynchronizedConstants.class b/shuili-admin/target/classes/com/kms/sync/SynchronizedConstants.class deleted file mode 100644 index c1a884bc55997968b6bb149fea442534bc6900a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 454 zcmaiw%}&Bl5QWe1*McC3zu-#aLS0xj?ldl_H8ClWP-K58H*m4sCT%g%w{m6T!Uyo7 zj8meKg^7zfx!+{&$(i~1e0v9Qf!z|a*fg+ZV4G0%?pvPSyK6awx;qt*!U}{QTV4_= zJ-#GV>`=#v(8)jqb7^9SVAx&Pb?m;01{?GoyW4I%of{KPLg7kjm0T0DhercK&JIVC zP<54-o%w7iqrMmh+^M^vFM@%HRLbAYTryEH;lTC7ne{M>t@ug%md7%QLam0k9>KnQorV(Qzz*{Wt34N?Eh~{sQq4`JDf^CAW-92A- diff --git a/shuili-admin/target/classes/com/kms/web/api/AppApi.class b/shuili-admin/target/classes/com/kms/web/api/AppApi.class deleted file mode 100644 index a94ae955d0f0beb0ece87beedba4b0736bb04c3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5427 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/common/CaptchaController.class b/shuili-admin/target/classes/com/kms/web/controller/common/CaptchaController.class deleted file mode 100644 index 9ac9c0030d76e9b54db2c2196554f52f63db3807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3761 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/monitor/SysLogininforController.class b/shuili-admin/target/classes/com/kms/web/controller/monitor/SysLogininforController.class deleted file mode 100644 index 984c921b22b66bc8ca62782b5f06beb96f12ae11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3804 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/monitor/SysUserOnlineController.class b/shuili-admin/target/classes/com/kms/web/controller/monitor/SysUserOnlineController.class deleted file mode 100644 index 37a09cefcfff5929e5baca5ba79a61a54859eec9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4149 zcmbVPYjYb{8Gcrgz3ygHyUvBW1QSv>u^ro+HX#jm2(g`{b&wrnB~FuaJCcs=jig<5 z&#n_uN`cZ+XrTqlrBLpd<|BNG(_{wt#tg%s-~;qebQqqqlC6~`x1QQF+H>~2_sjF1 z{pbJg{uRJ++_LZxo-%Q@gIoP)SxDhp7oN88d3?db7x5(%U$$@`p6ccC(oQU6Mbo&N z;JSq(N_ti9f@i@;#l$lv0=-lg_8_#d8wCR*tHwP?jB%=o2SfRhKuDPZ;Q1h`i7(%SBhYxssgpJUwC(;$&4Q?JE{`6 z-ttl)%JPOE6rG$Do^qB%KJ`rakhEaz|FALyrgk{#KJkfW#Mcc(8=rK=7LmFNtZ>+Wkno}v);^+=rbzQ z4lxb76YT%Ib?e=`e|z_hTmOA|joVzL*ept2Vu}qMY9mT|5#eDfL8rx?zql}c&cH*P zyliss@omTctSre;Ho|W?&&G+JDLhC2nlWcyXlw~(&;&jwwykSkge&VvKu^rNA{Jap zlye0!pffda)W9S4>@@nYwe>XW^eV=WNuR1_Yl|5sWuUcS>SRt<)aj_bOJk63djn%_ zVjn|A`%W@oW&Mc7bl%l@-QNV*4U`(wy|ooKw`&8|R@h*tiS1#%J?k?Oxf^Nh-oVgW z6WI6!4jLHOfZG-tKMz4@t)pW#g#KgTZ&ocM5~$iUGp zj7f~MDWPN|u?)>-)NQh{7QT+b3m0^W?{7g|6;?RvDwjE_(54jKd@&v_gROy0)@NgmkV!@KUD2MA!P>=T z>$-06QQO{S8P>DjgnlQJ30RNu_7L%4YpK;xwSk+w?oltNRa-5MvaV;I$WHR1QPXoFfm160P8ywe`5J%e7_h~IFe^PPX^N^p*S!M{442XU0w~#o)li8B-KET zaiVoNCEheK>RF#8-~M4u<@@v2n&nQVDJBiAx}S3mRAOV81{~qL5sdPG9LF$;6R}Ch zsdkhfc*8tTYXj=W>6NBt0pW3s(Yq979Kuo3?ZBg?+{ZUH&d11EJ3Gd+<2>udj`y(F z#3#>~IPo5aP0G;G?C1GOK0igd<4?m-n82xx^{2Tyjn9xqhvW=*DL%W7+`;{K(5?MS z#eV7UR?veqreYtoC8XQ1yo^ym%-{lPZJo%^ z>X!87&>9!?dYqcBJ=#+vxo}cF&F8!=9@nx3PB(`)=bS!=vxu!4$4E zs$gH7-7)?;=w=Z68Nx$&EH;0*CNfR|WwSPF=6A5PE@GaBcjG~P4hsxS8d*}La4B}K jm#fR%FK#$+1;6Ls;{LbzBYww{7ToK)%aJ>e0_6VzkN3As diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/CmsDataSourceController.class b/shuili-admin/target/classes/com/kms/web/controller/system/CmsDataSourceController.class deleted file mode 100644 index 41d01269e46e285935a8c89e38bc3ef3530d2152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8866 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/CmsMaterialEntityController.class b/shuili-admin/target/classes/com/kms/web/controller/system/CmsMaterialEntityController.class deleted file mode 100644 index 95add6e436fac81524000a99f5997b05138bad8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4438 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 CaeKW0 diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/CmsUserCollectController.class b/shuili-admin/target/classes/com/kms/web/controller/system/CmsUserCollectController.class deleted file mode 100644 index 02121c35650f03efca1738813bd59be0132b6a97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4811 zcmbtXYjYFV8GhCl5*7;>CqQWvl2Qo10887DkeZPAM&d@;ie(^y-d554}QLJ?f1y(Qf~!hJAB2+p{X-yd|xCS&Z4XSDblEj4 zV##r@8hK&b(zt9EJjbmYX5)Y{R`Z-C%N0e6O`fuB%R8;1cW~&uhQx$ZB)Xj$%N8@W zN?y40Cbel8$T$VFeBN{|H4hgP-h$<;k8D{Id86Rio~x{NBhy+u$O+ReEM!d@H#+3+&6`feDmpczQqPkISuNLOaHJwU zvuJvzF`YF_f=YU1Rl`UZ8Z_)_HMd@kOwM&K=9IrR=Hk$nRysyc6JcM@D%qx2bIJ6L zF1YAeMc162Xd6<>zj@0p#-l0gNbjs!tupp#$(BX4T%#3RjKH&pGL~b=C9_mwJTzla z8e>&!wkljdgn3S1yR-b@?(Nl^cOU%r4;l`%M!WBL;R&}T>^sLeCtj-w>5V(ZI&~$* zwW{MX?B)WhKh{M7dz(k+*cJ2IoRGD$N9j9SGhV|JoyCEM{>&9~(KKqFRW>rr3kpl9 ziH5^%qE5Y$M%A&5scQvMKF28!oLncP;|S3(+nJIsBpzrZu^9tK#_=P@vpiK{q6qll zZ>w*A$Z5VNS%jpVXYxfPwz@#rHP+AZ*goalsaLYIbMqQfM&#yHNqE!tWk^Om55b^vmUbl*G zXn3mQ<5|;Ni0U%!?=_2rsIT4sX!X|n0VI+#J(HVKq$CTbUGUjnz5U+W^37;NLKH0~ zMCgNm{o{{ocmB%V=dzPy^HbdzldZ*!NxGuqEYf?=4PM&FSyx%rYZZCZJk&-^1NG|7 z_y2wGcSJoom6=kgpYE8$Nl|8XX;!hM@`9ur(mAK*7Q`7#arS6yZEUD07-^c!Bd?GDOZI^#qq%4(7HNJzx1gabG+_v7z_)Q zBHIXiNA`LwRvWH}hvPMEqHIbzsyexCLG|koA=aA2wo8CYr|mq;pfE5>OWLPzn%zmbtE7< zHAG&HFcCIdxaswqu2tFDiy-j&o2fA7x@KL~G*hbJX5DJJa3V)+OrCAQ4HahHzIc|z zv+g23%}>6){CecqgsPPsKgn5=;cX+dTy^?hoN4ma*mR zM@YUpkh+hpGe?gM^erRZ#JGd|fk_%TMaItfScd}%4Xpe54Ss@JbPUk&r-*3}8GITi zc~;?9wgvB=X}tRa-zmlqa~$RBDT!xsTHrZ6AG2sIvgq0M7L8+qCzVCd^RyyZ4=viZ z0$t&cJ1HCESa0CgY1b5SD;$c+ki9c_fr|m9FZz0Q#pJYFlsuy0iw!!b2|_8~HL`;3 z!y$ql%h=gOkoGs!$=UT7id_v9yF&I9ipQF4ycDpJAsdL0y|kW%vkf3GQi}r8?_*d& z|1x%6Si!)095?8RH)A;Z8#wx7IAUIzY2t`TIUC`bS&wJ7foCivra{U>Eu;jw^G*!N z_6CscF(8VN&@I_0PO<@_moZ0skMkD`^c?1SLWRX-2%tak$_gG{#_l#4?!_>~$vB7e z^mG)WA%+VPh6@3PSMaKe3P1ZUHnB`oe-AGC|6lTD>?fKpbN-da_OIe=d^Y`~`Tqi! C&`TNs diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/RelationView.class b/shuili-admin/target/classes/com/kms/web/controller/system/RelationView.class deleted file mode 100644 index 364e31a138c17650415a8180979cb209f86e3ca5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2534 zcma)7-)|IE6#nk+%+Bm~`fF_qtEiw=+TE5FM1?Iy0RanbsV!7NM5oKx4(#sK*;y*D zB*uiK3D5Y#lYJougO*4Wqc52Fe?a{sMEvgD*|ytmB1wDix#!2d-}%m&vw!{j@HYVa z@kI(ViEx>-c$l-I6~t?~ZwwozjHw%{zW@o%iV1>{87UXnFGR*55a8tls$5<&#?A z$(P$!zyI;co$uE5mhY6pSH|r!gRIBj-e0}H^7z)`>e4+TKIB&1;IKfvuYa1C9OGL8 z?W1nR8LyRR9RI9Ms4^k1XqTpK-<9V`sReT`u@8(Ey>k9)xtd>aX7WX^68K)J#5}6k ztASI_PeuTyU1x#tle126BI2p5ufG{n23^jE>9kX-$EyUA)%Ec1zOB(R4TC;WJf+6? zg!6UHE)jM^@R^w_PB9qjzaSvI#`;Aj^6mw5j!)iY+P(EsTcLLCm<)}o7Aa*?htAN@ zSd6rCXjHaN1$Oc3m^~k|%(e_$%PiWJ;}W@mIcHbrRH0b45dxc-92q-KQ>~Q( zak8EUtUH{jgEUfk9!OG*CcT|H} zcojP>bfd?@OLBP`Jp$S1?-UD%khkzAc3apZr9LV3%VijB*lnA?u%k7%bXnG?Ya{+X zRi|MKpW_l)8Q3Yw7-o+T?A%BPHKO0baqJf8Sif2opS0TZ^G=1|*I=`j+tP&*mLcro z_~_!$i6bVt0CDrw!hJjcGgZ7u1Nqr%*g*q1+iG|v3@5uZ?c!y5?t;6XeE{(jg&1Dr znh2E!UZ-p+2lV0%o`fWoYh&=wh~3*1Y&8vL9hwBkHwU*h4QBnC1Z$gvJDLV(k&A*0 zOfn{u%;tVUta;Ks$|Fiz5~2#gfz|w;`19VQ>cw7YevkIN_o(s;+1@HIae$bU%xf{1 z{Qkp9`48F* z6rQ5Tz!3jT@f6#YnA|AxYL1JjI}UP}-JwhRB>JsiglZ0b4ZTjx61|YaMO`EIFfPI9 za~(s6wBeBQ9UVh+B;4%CEx{OEM$4B{pDbw7kkKNGDa)Wtse&GwSb;Fe%;=$MM{`mS zs|O=kaZKWU(!>dm2^^smLkg#Hlu+aRLiXVpC5?c$;X_J#NZSGuHyn-HW5LOi4U z`Z*>Q-O%d}bsw!!6}crgxUG9`*3y|UIXxA3xJ0OODD7W?b^ZZb({0OWmlSeKcPKe2 mK)NB#pLD$>CK diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/SysConfigController.class b/shuili-admin/target/classes/com/kms/web/controller/system/SysConfigController.class deleted file mode 100644 index c841b853da0d8e0660e65055efc882f9e2aa452e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5410 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/SysDictTypeController.class b/shuili-admin/target/classes/com/kms/web/controller/system/SysDictTypeController.class deleted file mode 100644 index 4ff2d3fc17f2620fd5175c125001db98cf41b004..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5978 zcmbtY`F|8=8UGI1WH*}$goT0>Z7miE2{3Ibg%YIXf<~9HWfLe+p_AR0WXSH!c4juP z)>5xpTdMV-msZr;YCWicxTK{PwVw4p{sdF~&HuoU-*;w@NwSd*{;>Pr&+~krd-t9H zyzv%*JMs4@I&mtDM~t7Uh4Hy4 zTJiY^hUECP-2XxtUyR^Oa{A>c&fu9ao{eHTPDSvX9G{P3Azp~!D{}EwN$$lczJ{~% z!Plc?_KgU>DR*9yJKu`pWxOJ1-LuI?I^=_uG5x9m~P z$=QZEdd$|d;)G?7Ya>E89qpK&axJ@{>6Hgsciy#57`8~0Y}0nbG~68u8rs+GR}kv8 z(iCk`+%UypK06}pA)VY5#Nt*;&+ON2L#|7kA$QCm`^^;~C&Y-BvP{>uG8ti)aRu=7 zRu0KKlrbDv!QpoAy)%|KG6tV#vzE!h7FycM>V~N$g>I+D5;~D}t@G}V=vLN9TX`*8 z7@-oJTqf`MPqM<*)4Ho`0||XpkV&Mh_p-w4jmND~!z7f= zHCUu_O$Nf`pJF5$!Axt532@UnRcc*p#`nCg!o*C%u>?;06Rs)ay9a-m>t4RZ3t(Q=ld z^`A_M%rKXH&^Lp|b@?|FOnnTmllrO})C0+ufj}gUjB}Yr)v0sOO+7aG&kI+k&YtFS zB=0cOI*u$13f9yhCCof4L{H!z$u;%gpV+%^h-o?K*H$miDlJ{)mFbL75mKc0s{ib^CZicgMVMwG6a%vh* z^mPyQ&&VSFS^e>v$Oq%q7Flb8R=%hG@N5;%D$;4AWyZDM!mzc4+2kD#NpFD^GT5`*Rv zgo@j6yMlGHiJLoy0=*0E;xJ+NFdRZ@;iOdj0OwdYEITc1x!aP@(K*FY+2*NOj}2kG zrs9X#s$vVyhjBs0Mf^y`CHz>y>e+m2BvA#o&Au1xt!CE-iL0pMGA32LjyDvv*P>uL zu5P;8Fnd<2*jv!5%Izwy;LR|8qT(%FRj_@l_SSz}qT*iNj(1O2x178x_CBRTb~x zcclA|tFOI#=Jg8Q-^=4a;A$9uRPiVLS;b%QR}~H@>P6hE;%_*wV3WisTk&~xuygA+ zRq1lI9^DaDA7neq?Bw+w3ht|sk^_lh@5pgR%{7yBz`^L@o;TL@lY#;4cyTHFWM&HX zEVBxBP0LsN@@f}DFLv^&6bspmN>e9@DkWlw`EvD@l7-(>^<7t!GYiqupw4?Uy5n@o zpFJ&p!Ss3$1%staGM@b2C1958shu+r^%P_s-4zt2PO7t`mHJx344fJ-t83Uan7Taj zwc@sFy&AMiE-<~cx6KS;<}o(DdWN>XA&8-D>qET2K3TAzOLXIx0cav*LZTvm>>|FYb~cpRWiyaIgF=o|1LAYaLCqczSeoXEL~j|7LXZ?-hmrrm*U8+{jfE zM~!2YBP$)h@8C+~sBmoTxD4e2CkwEN-|{lBmjBQIs(%5SaTiw#Yu8qUyvGI_cpq5V z8Ec4zifBC08EcA#<)q^hBArDvpXYIdM{*%YaMnzsF%pxcm-)|2q)7;OV;fm?@yur{ zceZoqgWOqw9UhXKNa-G~cXGe`Fcb$p=&j8A(9g55gtdzk1-o%CpGvTsxsteAq;y3@ zC($D13qsx&fZS4&OKNW+9}e*2^V`kYhw$MN*~ckQh<8?&K&yMMp!HyE;bklu+^{~@ zR>b0&YUrgJ`mlteN;P!&&!?#&P8Q8n)E4X^nK2k;Tnk`k27 zQ&rcI0QaL+^E}AQ3UunxXa598$$n>SX-R+^idgmnR$amJgO~B1*oq=1LE(jh`$pfkP1(cdjk~B!?C8O zCer~df*ON|r$xrvF)n>eGX&jl7 zo%%|4YV!r0#Ofl}lw=IX(y4%4Z53U&Aq%tQDz%-}3W$> vp9!d=wWN*+8gYUVUQK!aPJ%nL)6PjUDv;FzeAGLQarQ9RALDI5F+K8M1cI4& diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/SysExceptionLogController.class b/shuili-admin/target/classes/com/kms/web/controller/system/SysExceptionLogController.class deleted file mode 100644 index d80715156b27897e562a4ca8c5b0d3ee6f322d53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3762 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/SysLoginController.class b/shuili-admin/target/classes/com/kms/web/controller/system/SysLoginController.class deleted file mode 100644 index b4029e01adb56c8abdd4f4df4828348eaadf7712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6548 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/SysMenuController.class b/shuili-admin/target/classes/com/kms/web/controller/system/SysMenuController.class deleted file mode 100644 index 5a8cfb6980bdd02ae3dc382e14aa373d137811da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5784 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 jJxbn3Sc|#Y&5qv4?4))UpQ(WDW{1`IL=JM zOJDu}^Zx?ahf8VPj6w>F3fd7c4G@pr*Q^W8a*iMnVo`@LM06Y&ve1n zqtfeM8b0RJSio8RSxwW`XZ7s4G@i!`diG)pFQxD@L$9i;38&~=Vn(?0vLG0C=L$~Q zJX2OC?RlbXs&L1gX*fE>uw~k}Jy{mVrIL9|4BNKjaZft7V%VQ^+>)s(uCz<1TwWFn zj(f(;3vMg(6fby=TQzy@f;sGa&VqDBk;HZ$khb&=GPL*aKF-iF>J$msbvbE^Nxz&I z?kp#544Ir$;MQ^OO8p%zc6f7=)bFjCu^{qh!LdEpu`J=nR@JN-t!l61LTc5E74VHTY-m$o@0xLcT;;$+uQ=&(F@%ChMAX1SUt7pRKmtME!$c)Z9x zZjMj!k{~5*s=_e11`Q0Gms?t`#MVx>F6KbZBT-;uTjID59VBqwGqPlJ&v(hcFRsB2 ztw>+9r|xUYAsx`Xw2MjlOgYM%;FSuIjf_|~&n=$}SZ9Xu+?A7#sTO#tLgmB1+gkWyX=jIUU376H`Z~XBkpv9L)wMUH)?Ejn8Sn zB)oC^l*4eaKXjGF?UFg;=_DB?k`}|;CW|@&1~E$tX(aKtm;ZV7mDd>dwfvMG6Umok zJ|~MWFx=nr^(pSn#VMJ5)6R}p_@#4y`|g8(5csid zE~~*m(6R%^ghkn&RpK^&5rx;Hf`V0URYtX6rOWlc&J-m?1Fyl6MS z8f39L%nfm6EeHJs!!19MbcYOV$8FSX=w4%W#wW@wJs!s`3U{PRbWxNs4g3nfCI{=e zUTo*8U|=h5N#PX(ucFVuYk1wj8#u?XYo(qh8H{0jL+{g=f;H?nNoi=Kfw%A*1HZ-F zDg4gB@9|Cw?;7|6{%GJmyl>zy!44T3o3i-8rrg({WIu z7$%eQf)bZ-!H>zoI-P5*3XtNy8YJk*$qfCggfb#qy^0g(m0u`O zL24)%Eyk-ZiNbYz94;DlI~(#}b0$kYyjMM@D>}6e6<3Vg6idp-d#=_0)o%yx?oeFk z*&C96YG=<42j@P}QOR|#_`S2~>Z%$H^OSoKP}tPe{< z#Ir3)UL<*T0z2q$r<>_dGius(YN7E~`s$={8;vO%DUH$Z4*D`_WHhcD_!R6vG-<<5 z`qhVl0sMr1jqm_&$1eJ!4g-DY2rf&s(|KU)V5U9Ov50k#4`wC|t z+XImsXapWWH})fg2LsWY!|Rb~5`=#2CKUs8GE}Qq25IF^T4}?cz>*tjb{DOgC&3i% z#yxtja4+`Kp_H~~A59qU!~LXFTlp4^9W-u>V5Jwae&P!lPiA^P#fHf}cV@0zL~kS3 zEMYi=&3G)pIuJ^zVckZy>?bV-S#t;3(?%z|@DPSbm&UJc3-=Dx_8z7^9g99157O!* z3Xft~U<9KHi^gJ$vW*rUA}parkJ4@JdLy!E;}v8y{$%)$CVXtva2xn3#tFB^p*SSA4U)ByA}0EpZ$-4K@<%o36Y zVjaWrC=6o}fZhW0l!!1q*?{2$i0DyheqP5iLBQI` Z#rpT@K*m-=^9%a^W$ideUeAeU-vc^>4cPzy diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/SysNoticeController.class b/shuili-admin/target/classes/com/kms/web/controller/system/SysNoticeController.class deleted file mode 100644 index 7d16431d3bd1a0fc1a345b36328c0bbf5001b09f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5340 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/SysProfileController.class b/shuili-admin/target/classes/com/kms/web/controller/system/SysProfileController.class deleted file mode 100644 index 51ea78a87a41b08a7034185e76dd50ed6a39d993..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4392 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 diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/SysUserView.class b/shuili-admin/target/classes/com/kms/web/controller/system/SysUserView.class deleted file mode 100644 index d62bf68490df5748202936ab8c3a4c4dedbe1c98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8625 zcmd5>d3;pW6+U+|%bP8k8OZX;3JxV9!Qj%?K14-~HWrWq(xPp3NS`(SB&o5 zH?n2#*v%USm1XpGf~uurbi=^Nrn{QQw(os)!^V-@A85gJrS(`h=4Oqa&g$uob$x;+ z&z=iL+c9&&XghZ9=*~OGZn_;4h1to*@C2nVmdUJ5r7>r-jVV|eOZCRPQ~m9|>sMlO zGJT2uOyNu{i(%?ckL!tUOhb`QYe=jm@KX-#Rih#3S9f6XVBV!?WkgP9B`miP2yJ64rF@ylG_5 zjUxlwFyjc@6-#$7O5s@t_uVzT|G>d}FrPl8ODvu3)stB;4qdYA(Dl2p#(k*_w-0W- za^&(`un2wW)CGEmGcd*rHoX6;;eA&O4{aMB+QE-ZC3N}7%7X*f9K7uQ=8@ZW3=iGe zHnQo`Lp!$PP2DHPlkx0HSik0$<%mB&)r}mgSP)O@i;RUf=9H5*)rDk_A>}d0W~VdT z6US_{8WX#^H`BgWUx@@wX7SvFo^H>q&t&!9_ND7HXCn!h$Mv;5p{w-lY35d#+}vWf z8T_EILcTh;7Ufb^L90WiXF1^F!jyEQV=1R0KVzPmMJ!*OOCgX2l|gHtd(vi~3^;togXHowf2py(>GXF!VV75q-AG}dIcTF1mX2{t9x(~yI?b2NWrFpRxsD+6u50ze zSf5cGaDsb;10|>{mh9l10qluodSrb;vFSugEMC&Numd>*>`v>M{sc;!CzlM~Xnx(j z(fks-qvnDJqT?3M88sHl6SY>w8_h3(Cu+^MH=3VVPt=-4KR-4%gRZEov%%>2`U-7s zyh=7DPjA%frK$dO7fzl8YG!RKF#JcY#yKoaoiW*WKP8$rJJ|;q=H#!mb-m!K$Hn5DnMJ4wXk!I zmbJ8KDQ!*0;sTbpH5Du`I^1ndSYQBeTa#R3U<9)kS$gC$OOLhC(j%7|IM~*dUu?8J zh=I)jQ~^|w_2@x-Yst|PEdhF(dIdF4ypeUK(t3M$3P)42{nS`S@4$U7i)%+HKS#0{ zVkEJ?K0S$R%`CeUV#1+ePU;+*iaYEHxJ`y=3Vnz)5;O-b2c3vtq!-$!pzX)!Jp7)T zq4{timfv2Gd(GwsYXX4w>lq1RU5k6CIy|13PJ=<9s-< zyCynT!hsz((a}vup%eQWb`=KKj!%J4*UY^n?lVT)1M4@OBiw-uvy+lT|j;u*GL z)O;Ipuvpw;E5=!2BQ7r%x7vzv#@L7}ip8^R#We$Q!6xWS_Hlfr#*wF>piAxJ_)Co= z&r3mHwvQ7iHI6)91#PmA6D&23JdFiiW*?`#)Hw3+7Ie9NoQhK8$g^J174~sLrN)t0 z1Hsp7SvQf{1ay;ccQy;h}G zGO5ZWRjO45qz0`Tqz0`(Ts&xgVsaicqQ?&-Qo=FWRsa|a;AWhR6L7JvDsf|o(GD(eUlSOjw#vxQjMR!TD zKqi@W^f)@{D%ye+taKbtTXDa1P}DJV|pdh^>dT1w5 zIjU(VeGRBWxW#p+u5ik_!ifht8m zJxjL%Rf+BN5Zw+`Eq2g7bO%t4co<_G08+(cCTdwmieX&K?*yuIl;JDR zT|o5?FTNP<25N9LW9IG#YIGb;wX_GQ32_O(vpvdNRPLdB-=-=L-G?7VyiGL{djH=b zmJ{FXW!1rVL1ElQTwHEAV;sd9L-MlXvN8rauoYwH!w+BNWf=GK&_(do*$P(}Mz~gjxs4Gi#8JI-mP1H77e%r|D6+Y)My@<}zHUScXVZU6!j_a~m#q&V@QA zRW+K&aG`{mDv#w-HN|i#ITs3>R87&mh6^>#RCz5|t>!aazMKn{PO9oOzu`iWGgW@e zRj&mMS0LvKSgr;wXt+@IOjXcwHEQLCt32mIEtJn{(kcuW%Al#Luv}BMkl_mDTqurG zHBAc}F4RR+6*gRTw#9&OrtqSfOIs$c!Y_5wM`C$`WKmb;9O5^LyTASaz9 z&ZT`oE?OZ@q5VK^%8Kdq2#|-i2p=5)Qm~a?r$>Rj^lfa)$AEnFGGaUq1yqhQwUC|!st~K_Sm?PJTujyU6i}GAopTj697cx|+fE2gpwixLk-ImF*>j&UdW?tcN+tNX$L diff --git a/shuili-admin/target/classes/com/kms/web/controller/system/TemView.class b/shuili-admin/target/classes/com/kms/web/controller/system/TemView.class deleted file mode 100644 index 232d386e5476a37ad479af943c365c5d2dd4ee56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1413 zcma)5T~8BH5IuK4x=UH0R0o&xcLkw+Flq11+`Thr&bf1c{QmeEz$_kw(TkZbh`6EPW|-_P zzRdFN+kCmB;BFWyW>nncc231Sw>bq13{u^2%M8)Nj`7maD@JWwUw0j=ww+@LEm$?n zz0V*fQ=4>j(cUr{`U+OfTy0j1rn6xbE3^|W*d?Q~X*d>-gH6dTTMdTELdmY`yVZui zXBPF6U2`3~QZXI9@v7mPRei&(Zd&FZp()#@yXG}BkW6)IM``>$5KFdy=N*R37fqu= zsAmp5F7B8mHDTaBmVxhN1I!`><(Mwm99M04~WH=QZR(x6M)-vWPQ8 zPV;=Bh=@_Io3$;5Y^N(|yOjVahfx~IUYb`1f%73xA)n~cdVwOHEF&wYkHFrMBVd5m zkiUr-`C8x)Vu&KfNz!^Y`8|ZgbIEGQ^2mKT9p?O=J1Miqb z4(c4z8JX%VX3}pVO9z>+5Z^!+4>DgMu1uv{ki3u_d3B1Gc`5rH-Erv~`uCw_<5CMD z?}T(fWyCiAvwr!LCKho8BLp79G_H~+0>&vGrN4+YX>*M{31d_%hLEEEM6ZJJUl>#{ zK|ht=Gar_q`#G{)1(~OjM>kf}GYEgk$0@5iQ1u5*Rxs?x(T9 wcy~0)L3c}3f)82Z6V#_i=!%A0=;lq5iE6a8&~tu#kP=>Px# diff --git a/shuili-admin/target/classes/com/kms/web/controller/tool/SwaggerController.class b/shuili-admin/target/classes/com/kms/web/controller/tool/SwaggerController.class deleted file mode 100644 index 9bc169cbf38534194755eff7460e0523a776e8b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 921 zcmb7C%We}f6g_T|CWMr>p#;La8`K812DJ-R5E4{^&45sYy6MW9ToRKRJJ_BC{t7lA zvET#vD8!v4N&~HgSlIXB`#RU>=dbTS0PJJ4iW06@aHEPMZkBPYjN1asPqfkDsX$?C z`&giOXuBk^8finXv$R9*t?DG~sYfI>^C^oW7qrE-pRj>mxQqA9GTOIZ(9z?dM4Hw#vtm{cX%zOXhFq$>=c#f)Bb8*lru7{1fuBM?7-<>{RNFRlF}=|F9vf%Yv70YI z;QqOz`aq6s_%tN>#{wUn8=bHJZ(v9CAtS#4Ze{u{vl(kxMpb s>CJ`o@+^IoV;U%6jpaI@Iv2cr0^za2xmP9?8pxySY+q%0Z64A54Xi);kpKVy diff --git a/shuili-admin/target/classes/com/kms/web/controller/tool/TestController.class b/shuili-admin/target/classes/com/kms/web/controller/tool/TestController.class deleted file mode 100644 index 984c269ccd2e6a9305107dd2ca09172b6add56cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3950 zcmb7H{dW}Q6@F&Fvka0fLIj~&K6FW_BML}OipBt%x)LM_3Tkn(J8Xu`&Mfnhm|APC zt_acLg+u?>GRIa?#_lKXR|-dymR08z4v+Uz3;v6 ze)s+LZvgDXr7Sk$cn3D%^(<73r%}wHl!2DPi7XN*ufPQK3{GY+nT8?0Dp|-dv#?MV zpQpsb77r%_SBSkVrZ6pbzmdU=nEAO7znR7_vRIGfX}p!jFC`>BN3$IXs|qL8DOK@Y z-B4aot9=qWM)b0&x}L2`C^XOZ2cL#&mX#sX)ykUPS14K)WwPQZ)7rRFv`p8w3`4UO z*Rl*{j7IjGuI|qC?WO8ezi#U8UJ3F1wj&Y}gI0+~RuyzpJLpx$HG5PYHz>&!tfFch zQEgp(hr)zAp%d`-B@K>hjyqTfL6aH5v!FXJcjmYGdz}eSH*{jHR4kJ(TT@C_Mb%AZ z;H3J-Va@RjmpeNn+=T*));8mssn)PPxoB;~3j&7> z?c>naPI%NBzi5OdE<0j*c2PT^i-NYgxh_2-YOaJ0OC&OLAs0op z@UJTiA2Ip&w2h60thp2}XX`1CyBoZ+ipy_BL|?`xY?ko@JdnoQGJb`3Bs|n!4`4}A zOBLPZq4VE69(!EEiXFT5)P6$uuhV!}#&7Uj2{C)dpWj{k(UFaAHDKH7j3~@9-oyK1 z>*+LpC*$|{gNzSwM#hIYE8`=4%oY>6a_-FhXBX%Ha#hAB_+uL9Wc*32Igbkx?hV!q z?YlX5=JvZ^-<-R?@ac6K7xA&s*(0I5VVfOmQY$^DIurDfgr24NH-}!rqhfK39u(=F z&!~>p=wcGOe9O_cDakqz zi5eLmKdBYnsK!td1sIBW9q=iz%iYJ$+)zF!E)Yf00C@=3h3fqaN@PX=%HPG4cXV@l z%khdu&7rNmE$}X@h^BRCf2Ha&HF=9U#sn3CL#>dyq1M_^PN5tu5^?@*_aqJ61sEHGYodRu-A(gy`~nGXyP#>DO;;pQyPBA zi|aLm!=$VD|AH))Kh~GfssCeg+xl}Gai_A52 z#PJemli{p*=dzq#QJ?*{uYN0^Io@wUlL;ExL?cgQD;}am4h-R81YV z!!?fxO#)88f)-BGf z;5@xf;Nv{LMIME61axm5bZ>KRZC#vOV@v1OkvjH8xs{=#YUN_HpIN|)8(4pI7We-b nF>&zuUx?2X-yp;oy(((WQ6Itm4Dm6c+rcY%l@qVk4gKu@2d_99 diff --git a/shuili-admin/target/classes/com/kms/web/controller/tool/UserEntity.class b/shuili-admin/target/classes/com/kms/web/controller/tool/UserEntity.class deleted file mode 100644 index 4803623be32dd8d83e66483fb983157a45dcbd5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1715 zcma)*TTc@~6vxlB+ZIX{3-J;o ziM(hGG0{X`L`-Z*Nc02vITXHy@jtuUb}dWfp)<2Hr~mW&pE>jM&*l#z8l=HE#i*~5 zqSP-2Sq$gJa3Mw)V>G}hTC%t~I?bppJEP1gvZm+-c~rM~ft!~Yb>1xLwp!#q-&3t-jn7wyEj`{3YRr{$6^y{b?QHvx;TS8zxXICtnt~-!H&I(a5P9WW4>Y zXD_ziZDRkjs;l-8qi`xc#Yh?f6Qky=s`KlmVvd`W3M`52MqbgT6jK%7-lk;VR^c&~ z%^OAePSKL*c}~t7x@{Vo2EVppX!0#MxQhBX7PBdzi%JE3Tb{AK>}xSNht z+V{7LHe#$=Ofo3F5Nh&-+)}syBULSSlc(ecb@;Wsn2OYR^%}%~YF~nP%)1D|RawU; zjFOq>*PI(_o8*=~QmtaYXgNkF|JO*qZdhCS_5F2%Iw+Z-25L;uerit80Wq{uGo$Xk z-4~;lTD#xK&G5WUC-5#}cs3G+gfuaVF({uP!=jUA&{guXK+`LSSPB1vsmn1O zc2>fn1dgM0%%hPpyLP@&XdOYWov5?>e#4ZyTy0~xFts+=|)vC zqaG$2icWc2evoiI$Z{aaX*v@G60Qe%1CY17fVf@4=xiW}R1dNe2+|!4BGrR@0LaH( vK-{imbS@AiQV+5k2$Bj0@pY7YHJ<^pwhM^+3PO~2njuqtT0N*Wo>uQ)%Hcpw diff --git a/shuili-admin/target/classes/com/kms/web/core/config/SwaggerConfig.class b/shuili-admin/target/classes/com/kms/web/core/config/SwaggerConfig.class deleted file mode 100644 index ddd26169dd584f3eb846582c483a397e91e4c158..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5671 zcmb_g`+F4C8Ga`rnayUnErN=Q1tKJYWHAMbB%%q1cnOzgX)vhJ$!4+{*vzamvkAd# zTPvU~U`wqcwIa1@Ybjc~39Mr87kj_j`&AP8ssBNrzGr5#yRcc3K%YFBbN0+R-+90H zyPWULJO4d>2EcOsJBT$fWSC`0;Qkc_;akBit{nE*a3Bp(t#J|`Ye%lLc%&jj#n5EVEqHdS_f~Gz`;G9o;l+39DL7 zD;BmBmTttlEwxwcH?5uFPE9rJaJL$DOlu&lW)_4SlaAT1TUr;z%9^24T$coCtAyo~ z6V$H8lNyDT^ofpyP{jjwzZ#2aR;@4gAqnLP)#+KUCK3e4DXlxyJ~bRy4Ql8Jz+68k zyDn!k*OoTuhVHD9P+VEnE@8@Avy0nIZ`BQLL$bG1vo;IxLaG^66sJcg zIUdF2JlwB!l3Yv6FzjK?P&_qiX{w{OX|~gt&?T&>tZMa1HFt%(%xJP#Gd$9LvR#ph zcrvDw>D$ccPR*e@HDj_!vpU)?C)W^7v=HY{x3y@}(w%`wv`6dJh&jZaU7nJT9uK$b zwh$Xs6Z&1+fcPb0M*jOb=aVpy7$su$1#=q;Yo%FzdQ=NjeeP7hhP#$U^q8SKNsBZ$ z6SQvdGJddoE2{Xq4hMty{A+BPzV9dEzAd1dsBXk>WDj zG8twsDoLg*-(hr{5|&VA!5GVWqnIp0AYvx1sJ2dbgFccQzqKM>B&?ih?9pYIWs{a` zLW;h*Fbr>-x}3IZ{gbtzJoIgzKe*0 zkDy&VzNg?m(YsIdZpR(s@qIdDHt954mg?u4MFq9W8i?tF>DoKU*y+*KF3l23{XoVK z75oT4mhp~)pWvqoK8ki3KU1LL=MtuEtGs2tx2~$TxA*@N$&Joa8Xy?uE9OJ@%p8-9Av z@X=!mevfx0R16?oYBlx?MH8;+i!ofrrc${W{A$jpt%lwl)f4ZYTNZy zZp|Ar%~)KNVs6dbsoGk26H8J($_h-R<3dQh@$)iizA7vg)r2ViqLt%sHYwio_afNZ zLSQqrZDI|aLsqeBFkM#AVj_ITp`t|8#MGt4mB!=Tr!-p|PD+DJnc9+T8ow65G)Xs& zAt}e~zU=%F5n|J_M~+w77OP#njm*v!>1B-iD&9~U3Q=uOpp@fv$G3uZ6StN-Qm=?Gia`3=2%e0R!EpB^;POs9$D0O$PU^muVrIX7Ly* zk3j<6@Xj%2UQ!J%e7eNZ9Z{i@@oiY??Ucg7=I~m|C+(5t{H>nd}vwM4N`@6 z7FDj^0mt;9Q#ICeVi5EBEoKcrG!^qJ5Q`f~XymU_woPn{L_O_~m9uT;|2i8je8HMG z|HYl|N>=iGwVvz4Y$diO)q{{;cLi?XQ-}u^U?ZQ3HvyaQVg8cPh6tsL#fJz=%xg-c zsN)S34`NF7NtC2eN@;QmffUL@!6B5VpbTMZ3e!@U&Q~*1n8_xT!Yt0eB8Ax}D5VHu z=USBWxf0W`3L&iKN3I53M*MppL<4N#$3h?(9 z+)WNT_)hTTjcjG_9*z{@UjFkI!l&SCuWLkLQ3k;ft|JliQn)_!fg#LKVL=KD^N=i{ zTyT#7wxW!Zr&8{0%Do2LFppyu*q(!KQ3l;S&N&~Q7}=IVx1G3nQ}NL~j}lDbKFiXm z=m^~qS~SQHOH@}e+$uVWW+tvj6kWt|9cJ;)bT@e#Wz-w#=7`5=jI(%g|J!k-I$99`JwY+I@}|Swmw%GFD#mUWs0b(F!)Y4I>i^;IDhv7{{!Bc>$d;^ diff --git a/shuili-admin/target/classes/com/kms/web/utils/view/AttributeView.class b/shuili-admin/target/classes/com/kms/web/utils/view/AttributeView.class deleted file mode 100644 index f1e28814c10e644a9a3a4dcdcbc2569b1420d5b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2342 zcma)6ZBrXn6n<{9uVI0Z0&OfRDAte!q7}6!fR+jsArzs-(QzD?utT;D2_~DOKcauY zA0S`&pfgHmbjHyyb;jRht>^6Bgk;$d%w*0z_uS{4eeQEk?mz$i_6LA@e4fB4mQAR* z!{%c)D>_yawBBX&2?N&H`;^T(Z#Q(56R@ysV3XH-2DS`*W?-9lJ38(QShnXi-MzNw ztUKQeq&6PfkL^Out{)V3=%9X35*X}aHtj=4Kx;MH%?djUZr$~k1mc;QT><4zW1phK z8*bg%Y#;79&HMIVjUuUyM#Zk}+D(`DK~V9kZcE_CMx}9Bcy!n*96Ni3w&&Jbg~zUQ zT)5pKwo5x=F?`^7-Iz~yG&2)LH`xo6j7Ojn)oBWhumsaxb!7+qvv9B(J}PuGa**7jO?h3-PW)^u9!nnwc> zqBnHDmn8J*&KC`@A?HXSA%$CY{gLRllG{7SQ)eNKmn@87+`?5h*Dx+HeVOsF@E&F? zOk&DHhP~I=d!5buxFv8kJk`r>x3^`Fe{2W`0s$kbFU( z`w&xvJO7C6G%02u9Xa)Vf!U}LyD)VDs}iQ@FFZ!VKrH+8_{**m#xFy;5u(c*HJE8hr7vj zXllt)JH##GY|_1+4+qi^QP6qVV(F_2cCVdMnX zY+5;k(LtC+l^|wOORJ30o*{LD!L*vzdO(SyPM}25Nb3wT0+60IIw0kg2*nYesjno_ zuDnl>MUJj9hVPK4Ig4Q$E@mkfr;`fi$Ww3^t2D4V8u2nd!dv8NsL@QkO`eV>iExuV z1Mko`bFg&dUkvG(e~xh-@6yi@&v8wc^YLuNR}3qMPKrXWT{Gm8_C=W^w~2Ee8X|GsPI8r2~G@dgFH$URsV=O z;3pYr)jyhu7IjH}FrXF3Hr=I2bX07iL|zODtYd+w#_5H-iAC}hEYbV0M4sx)b`0$W z1r(A^2$Bjyyde1bKE{DDs2xBDqx6RYnAQV3M~0&WCYtmVO6~A9QRPQz{&!ekJjGyY o=nTUwAuXw-^iB3hq@Q3vMdl1w!jFO4^BBwr(g>O!?(6OU0g4WnmjD0& diff --git a/shuili-admin/target/classes/com/kms/web/utils/view/DataView.class b/shuili-admin/target/classes/com/kms/web/utils/view/DataView.class deleted file mode 100644 index 281ddddd69b6199e54a9d899f04787983d857c2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4308 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 wux~uYpV!X1(}B$(V3U!pJI z1IQnK=#0{tI^*b{I^#20>)Q9+@Dc8eoyqL8&e?mPyY|{U=kI@?{0?9mpQq7}`4miC z6LVe6f{n#A*BfG%Bw$(4O)RWX7tW;|LYHMfH zZ`|=VtKn7kl2^UwH7c@?4vnB(X(|k_ldj`o z#;>Nf{a`7g)jv8GN6co(YRFB{^^jhwd7L&ddNxZq+l-0wh;*Lif7kM=M&Okm6usS0 zI(9kilvDC*3&K>vDSOSbR-dg{CXu!E<>CUF5?c+w*{TMt^@xHwqQ7X4=nptSUAI^v zy-{y9O8#O+8rR)!!j#N{iws_NF@QlA7sOn|pu(m9>7R=aFy`VihFy#bdR@>PVm`!G zg$tcyHs7jLw?xI>_SZ+XlCv)ELV7lFS?JG(ND3fQy!c}bGwJv`-4+Vq?e6-uErrRr zAviM^(f11&=KrRj|F$F&QZ!LQ>JC?y&b13lG@*TkyBt@=)f|5e^>Y|DL~H3oyh`jw z_%&SOPKheCr;~p{;-`+}RBSSZj7d&*CcCl8Y(Px1(V5&6n>>OyqvSj_Nl207*27h?=6+Tk-cKU-Ta7hTQXZ{5{5t-Xq;zbk5XQn&^?dk1&ob%NW4-nBbfxFoFsu zd6uN7gef8eH?YWo&2q$x_yq3|S*UU*-X*fppa@rp9K6SGX5re-KR9P&`WXgoyw9Jb zp5dZ~sgsab^Z%|@#7A6ZI!uvI*eA}g*TZ2Ru{X(C*eiJ*^fhXVc^0$p_7-N0*--MK z-a?szJH6R`*pr9o`c}?Uc|#l-Bl0-X2JK4c&CtaTgh@`u3|&LYptmiy1D4SB03Q9d^`0+j=2LmwM0qq#$ z^idRMod`RQ>^x;KY4R!5+Tm+bl}Bm%H@IIsMt9%2L-dG*T>5%7P6p_jYzOAp!l`?@MO>@4f$h zz5nbZZ|vC%;8bDgNTL`+uZArew(6)spN4nnh~k}c@h%PT)=`V1j`!fQ7~Wfl_u>6@ z_y9gAAD8P0;|d)g!j%%?!*!U0k7)R)jLoGb{%)&?mFCqdo}EAKnP!z2qlTSOVaO_?E5wB(J&w|DwTCR%&t{dq1R4X0#n;k zPBzh#brWu%>si@^TRus&1o7qx#4jl3JUeTxv0b|}V=c<%9MAM@C+7;B(dHDo5^la= z=ejl)%&fJ=DfA>dEi>mPHkv8VDfA`GDnVjV(Q~%g1uIRq(fM}H_7(`#Oq;$&Al%}l zsnzHGy4Q)=!%&ajBwp{z0VXxb!_(@e8wpg8sqGxB^M6YdaNwku6 zo7rh)D5zG-Q40#q$W2n7P^I*(Pdi!D&iTfZN-JZ|CVk#4SUImXO|pizO=ho|$e6jV z#41l(Ed?mlHIyqbxytt-jg$fs$CVTt?SkvApuYrk*Gf6Lba_$hbr)bX34d$vQ8C&9iYsBhi3_41FB~{$QskIm(7D!NjF!Ms+mE`P)nvv%E@G`6rrYoCPOVa zq~I|bGuxRqrwsC)!rYrXEx<`esA|EX(@R!Uv|Q{gE>~vJ2+W%V7EG&h8&R$4hd*Yr zICR7+r&vf?%WPSzM^x)>mP{;x#u57i+fBi8JSI@0#mVNK9LsB-frU6*AlZ`Ku$ryN z-H@@1eP(V`F}Gof<@R_^e#7%O-22?+_wU=YW8d!W&s}-N3p)pzo0{h|oj!Z^tgRV$ ztH4RJrM+pD2u!TBzC(IZYV$RLqg8#_PD0w(n#&hGW|C!Qg(GsA-0QC#AkW!Py4pVZMf+8hA>|{uzF5 z;1_tzz|(lfz%M2AD?C=QJkaPCv-hN}f`Mo8YceOx-$>-&O5`!h1q!*^Fbw=o#xrr4 zc>0mN{Jxj2yZgm^u2w-b(2actp2PEOUyEsx>lMs=yXAE|X?JuKFVy3i(Gk2@kCzPm z9xrq25A~qS|7hS(__Kz;7_jkIR`Ot27?OJYjhL_0<5dH%;qM0ifqxqK7hX58Uz+i6 z>8J@6*B+D>)vTsUgO;xB+@y*vix~(3~sbC`AuGo0%QH+R(@;An65id z*6vZkZNG8J{W_baQt(u>=Z)ZFF*gHwId6KPUr5nxX_KW@BNauNx4bvlB6Qnb;do24 zd9ROGez5Jdl)IX|1E#MRh}l&G#!U-~s~AR+TDR%0u(r~0Uhbp`=hR|s1z%ZQ_8+m0 zF3Vdscp(nO@*TjIW^FE-Qqv*+@tH^=L-s3v<9;10#N*xWo@>!G&9(fCw~o+x{?$$; z0xJrs%@_fC+N+m7)svL1pqLHrI%N|(6Cc(id7(`#mzfuHaEq0WpDy)|9tQn8NqM9qBO%5i^YkWs};0X527ez7w+G0!P)m05Ol+XY{- z(Q@izKjeMcQ8495*-(jZaNvl#s$&X_A97mWl|vNU={z0(!5ea1Js{Bhrq|M74VG1- zni1NUVR%m*B4lGRmy*LvVwn$6(3xyr7(ZB#z9N2>I|Vu`;yG*?0v86$U^uTpsSQ62 zR>r|1sBigVQGW7IX$n2T*&!%&80CmDACmc%)LJ7=6)JNo`Fl`X3yh>{W-wE7))SZ& z)Ibg$L0hVp%A2N`wF)#w+vpUQnyGGf&>-n>R4Jyu)AUl^tMh5ovzC~iNq>(CQmL*b z>se2!L-%QblP8NB4mgfp&243JGXS!6tYW{GF`_r+H-;waI42GB)JT@`E9vlfn8>f&B)>;FW5}_B z@3Xjy^1XoX2;ZFP_*}$Qf^QB)h&1kk*hwIS#e7O+pdKxJ8f645!BVaSmQ{$uF@DaD zB1v6CsBHi>>l(tl5NV$=fatnYc0ns4wqgLa>vlm;hG*_Z-8S)bgOQBzKgxe?W3_vEAz*9S0#`kfRvN|@>& zPHi}uixQ@ds9?0JpeDIbR|?*wK&8dC3QTGguK5bSC$6cZ-k^dEfv@0%|69S~ZqzDT z?s#M24#e6{DdCizGFd{QP=vpbgjFg%jM+?^ar`;wXeP@sI2LhC=CcvwF$>3`8OP%^ zoPZ8YK!&;NViGPR#+CfR7u#!-e+CPf(2x+LHF6R^C%y( zmNQ{(a)^-6hDs0^0zU}shUFln23=3ea+j2@mjzJfwyDbPVsaa$c&KnF9x@y<2>iu! zKQ2}Ntk>n;Nv|&AzDHlz@I8_Bb-JqYcq74TMYqq82PK>#+jotsxdsXZE+)%MSaFv! z3p$m7G8>LT3|Sf%k}Q>h1PJArjY26>12KUb@Cx@en8CLoQmFA>`3&3;7X@yJ5H^!7 wD7v7q-0HRC@!F6Xp+ktUs1*^mfZMp1>U@#^JMblZ*@y06k;}cW;6B{{U#Cz3%m4rY diff --git a/shuili-admin/target/classes/com/kms/web/utils/view/LabelViews.class b/shuili-admin/target/classes/com/kms/web/utils/view/LabelViews.class deleted file mode 100644 index 3d3bed8a95b087f590508a48de09a2707456b4e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2906 zcma)7Yi|@)7=F&~+;(<)p;BNJ6{KpftfHc9DHgC?q%GKD6}&Os4&7<@Qg>%T6TfQw zBF4nT#KdpLCI%Hyi;=|W7fk#e67@fb_?(&9OS_{XY2SG-&-_)1^Om)J6S*b#vu~@J#LZ zAHE8ee%`CpmA9^Z7%25+_w9@2$^w0Ez5DH7AAkMlHy;RS`@NFq9}r0P56m(A;qn5r z@0#>V?sTm&N+oSr{YODQYt)$sqYF>UoKWN7v1?x&G!n`%mvTAn3;6u z-NGEXDl@khUH?e4L7V#r;#wq8v(1vEc)D4PN%2Iz46C{>U~hkWJXw;2wML}a8j)fn zqUOF?a|*0zU96MyOK#2|9XKl>%IhZ^nFQ3bpLZ()ow6f+Eql-v7+N(Uq-AUoq(u`# z7^*(R2-2dlf`b|(?Ff%)%Co+cTb^=Of=O}7g9SBmPH94xC}8BBYCaq`Cx4t3oSHd4 zHNg_eYZbRzEBFFtYvN{KONwS+OEN}Z<6y%thwDz~*>bItbB}m(f4Z8xuv^{?3w?Ol z!Zz3z9*|^*BoDzB*eNf<|8A3o3GB5ngkcL$Np3`PyCum;as)>Owr;$Dhj_IXJFQqiU_wj#w75CG?hP4|Wq=8LrH|(T=jcqsVLI;(c1L-3? zCBv`aR~@_#ag|I0kCJMEQbRv^D+FKwgOr3E0qJ_@?~u5%!P$&;=G0=GlN+6_SZ7W< z##!0u+!^c4Es1efH#&F6IzNWTBj+qTl#m@79Qq!K_>OG}5mCovH^Z?C?1_()yxTb8 z76?2MA4j>{IN{O={!GT!rQU6vaL0takzs$tJFGp;{#+Xx`~s?SdFU5tpF&Mu9{L&D z)bQXM^gtwIOb?S}m62bOww0UMv_ zN@opQmmnho>9)}Vva%_HtgLCLB*=_FDch`rl*`OI*|z;FVKt3eUc=LPhPC$MGwkDy zNboXULYBHDrS~yPPQg(uV?Q|+Q*bdxPD6oj)B$ojDj3JJ|d50W!+ zh|6qACU&&}w_wg$?Rh1)<#kF7Ua8cDpaVkra z#R>VGhGE2e^wa6R(mlFg84Jd?y?Zpzp&8vntI$W*&~Z-c&8#8~wh~zkIm*zK&Z>cl zQw*F8TdkX{tQMHGhKaMK*Y@~v91C-aGESn1V>r%CRW|&2atSu@JWjBRBzCd+ljIb( zeGhp#jx&5|r^#tSo4$p6)ellB40LrzhmO*qeIp3Hh|-H;23>`CgJW UY}xquwLbXcQI7>q1-tXYza}~Xa{vGU diff --git a/shuili-admin/target/classes/com/kms/web/utils/view/RelationProView.class b/shuili-admin/target/classes/com/kms/web/utils/view/RelationProView.class deleted file mode 100644 index 674aa6163659919a91ed34fea0868f4d62d8ea31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1835 zcma)7+in|G6kW%jo1IDPxVhAjLP|sHOI#Odf!Il)m$XfZ(<(uc=u;=oD4xc#gFSBl zg%2Pvc>oDq2_ytBMdBOy3?3=%+B4&XIDV)SowN2nd!N1b+CKJQ|NZhCfa~}wi80J4 zprI^F#l%9A`=TsMa`uIwF9qE+aVv==<}KWo{f>oY3wH(HGjU(R@H$ney{nL3ed;`O zN)4yEQ`+#`UUR3Spf#O6mq80&)AN@U;@R9Ly|-K2^qyVyn(kV6Z_90e?QAvZNw2nQ zPGi$)dtygU&98eMh3smrwO88R>y)0mTcxh=H9Dndp8LGC?lv6XYc(IWTbs05HL>IR zD-o^nY;G7alObyXw?yYScp`f`RtTGn38M}7+pg0fofDxCx1PE+zmj{bpjs!Th>jHW zmS1<<3M10aY+p4y@E)0o;4l;|86Jhk=!WmqcB{^QAPNT-h;P-L=CTk{u-X(Nqu zHpX#I;qu$f#Ku)zvN4SdHa-yao}d!0DNGH1YHoGC#CUv z$PRNhKE(xv)bU-R?Cjjx-*=na3dLcgJvHs9cm)^v0LJ)OV*F#f0bJQyBCMw6Mx%#L`b=Z9|f+W#6PTMa<3Qi-$U093x7cS z4to5s@H@2XT)qcAFbRycIWA?b_$Nj(+DnWbz%FLA9?X7(Rn{3|m5q!pF~&=z4=|e1 zGe$p1J7ldm1}AktYbW|CWCo)jr z{WD0I*1tGoV(t|tO%(ZWsaH53!UVquoY5g#(zy9uiN)ZA-Vf-j`CHO3t9#Vr(ME~Ct$wqxC_9e=H{stPk BFvb7? diff --git a/shuili-admin/target/classes/com/kms/web/utils/view/RelationView.class b/shuili-admin/target/classes/com/kms/web/utils/view/RelationView.class deleted file mode 100644 index 2630a6869c3aea6e007a18188b611a307a29482c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3921 zcmb7GTXR!Y6#hgg0{1YI4>s*>NJq%^0UHjW>eQRaywbtIrAOHRM z3xFN?D2{t^G6oaVB4$LCM4S>aE23;*F3zNxj#VB%D9(i!YIra-AK zA6(zWF|9f?#hL<38sD`vDHqGMH}ny^lCzE^>;2+#SQTx z>)c~u5_}EQjTF4mV}T3v^To=Pf`PCbxZ+a!IrD*A#t&xvmV8#)XQ=Z6`=d+sSM~NJ*cR$R-1ldO5VN zUwCy{n&0af!5&tv1OMV#zC#gy$NYu8)J6G}{fT`Qa@-FFGbz#`gDh~BbQF=SQWV#-K)ri87zCQg&LPT-$2if?cXFY|mFzQ%E) z2%Gj5Ug6oJ{MB&*uM(+z24?UYk;Yn#;slWnhrcKaL4A$63M9~2)AOswBxyq;MO|%BHRqKUrG#NfM_D_k00;Wpnf7UtOSy``D% ztT%u0cvFS*thvIeI`R`TN3UW{X6+(6WVpCw)_It>zaz8W!wJC~Jj@HCzQZT;5PQ}tjjf`^JAf_MljRO-RgHeKtMO|~Sd;Lp;7f(L(q zKT4dWLMe0)Gdpi)-n`lU`ThC^aDoFHC9GMfqhVs*#s)SGY#G>QD4oerCg%+K_F<2q zaH$7^q3p>}+)RSLi0*k`5mNQE&sC2{GL8SiLh>wQhKlFwz>QU`pAz?CJnj%rz-7qL zXg_)*{=!|w!=c+vA{h=l*&H4Xsk62q&0u%+B=W_TOb44pc${)LFkl+kaj=U$2IpER zrJD~rQiGO(eFsgn7*^(`kht0W+x|%S$sE*ujS~^j_Ig5z`c$mc?j0#jNUz`lZBxrQ z=3xe7oE9lsv)*2`C0Z!byQe1yDu+qdqR1uB$QO@3!QQg8O}3PQ2A1gVObf^_Q)FQU mWkS;C(~OL;cjT)14-{quHl;xACbi8-EL5;cIQ=2n9BO~wK5kh6 diff --git a/shuili-admin/target/classes/i18n/messages.properties b/shuili-admin/target/classes/i18n/messages.properties deleted file mode 100644 index d63aa1f8..00000000 --- a/shuili-admin/target/classes/i18n/messages.properties +++ /dev/null @@ -1,36 +0,0 @@ -#错误消息 -not.null=* 必须填写 -user.jcaptcha.error=验证码错误 -user.jcaptcha.expire=验证码已失效 -user.not.exists=用户不存在/密码错误 -user.password.not.match=用户不存在/密码错误 -user.password.retry.limit.count=密码输入错误{0}次 -user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟 -user.password.delete=对不起，您的账号已被删除 -user.blocked=用户已封禁，请联系管理员 -role.blocked=角色已封禁，请联系管理员 -user.logout.success=退出成功 - -length.not.valid=长度必须在{min}到{max}个字符之间 - -user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 -user.password.not.valid=* 5-50个字符 - -user.email.not.valid=邮箱格式错误 -user.mobile.phone.number.not.valid=手机号格式错误 -user.login.success=登录成功 -user.notfound=请重新登录 -user.forcelogout=管理员强制退出，请重新登录 -user.unknown.error=未知错误，请重新登录 - -##文件上传消息 -upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ -upload.filename.exceed.length=上传的文件名最长{0}个字符 - -##权限 -no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] -no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] -no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] -no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] -no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] -no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] diff --git a/shuili-admin/target/classes/logback.xml b/shuili-admin/target/classes/logback.xml deleted file mode 100644 index 46589e16..00000000 --- a/shuili-admin/target/classes/logback.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/sys-info.log - - - - ${log.path}/sys-info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/sys-error.log - - - - ${log.path}/sys-error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - ${log.path}/sys-user.log - - - ${log.path}/sys-user.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/shuili-admin/target/classes/mybatis/mybatis-config.xml b/shuili-admin/target/classes/mybatis/mybatis-config.xml deleted file mode 100644 index e8b52be8..00000000 --- a/shuili-admin/target/classes/mybatis/mybatis-config.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - diff --git a/shuili-common/target/classes/com/shuili/common/utils/file/FileUtils.class b/shuili-common/target/classes/com/shuili/common/utils/file/FileUtils.class index e80a12c1ce2a6f02fb2303139ddeb93f4d6e390b..3aa1b21b19aca5fa16bd846d0ffccbccf7c74f11 100644 GIT binary patch delta 14 VcmaDa|6YDWB{yT><|^(|763081yle4 delta 14 VcmaDa|6YDWB{!r0<|^(|762~{1yTS2 diff --git a/shuili-common/target/classes/com/shuili/common/utils/http/HttpHelper.class b/shuili-common/target/classes/com/shuili/common/utils/http/HttpHelper.class index 0ac7373893c80a07dbb9f5d6cd6d058fc2670f58..1e9b3fa79241d8b6e14f1421046845430fc2e277 100644 GIT binary patch delta 14 Vcmca1d_#D{91cda&2u@d838OW1oi*` delta 14 Vcmca1d_#D{91cd4&2u@d838OK1oQv^ diff --git a/shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils.class b/shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils.class index 1bc306e31bb7938aa827ccd96dd3e1d192f3dd54..90ab2713329cabb08f9aeea183c4d2867e810210 100644 GIT binary patch delta 21 dcmez4_{VWWohW0*=6X>nHpY#cXGtfq0sv+&2oC@N delta 21 dcmez4_{VWWohW1a=6X>nHpUH`XGtfq0sv+l2n_%L diff --git a/shuili-framework/target/classes/com/kms/framework/aspectj/DataSourceAspect.class b/shuili-framework/target/classes/com/kms/framework/aspectj/DataSourceAspect.class index 2d8bd8c4843340f81c64e7c0da0c670a5537e3b3..34d924bfdf58c0248490e190b2932e09a9c34dfd 100644 GIT binary patch delta 30 mcmca8dR26TD<|X1$!?r}%t{O#lc#gaGHWrIZ{Ex)#|QwBYX}$s delta 26 icmcaAdQo(PD<|X9$!?r}%yJCulc#gaZr;Hu%Lo8;wg;~O diff --git a/shuili-framework/target/classes/com/shuili/common/utils/FileBasicUtils.class b/shuili-framework/target/classes/com/shuili/common/utils/FileBasicUtils.class index fca73b46c39564b1bbb5e08139099cf0e305dc26..ec368fcd7801818b470b29a7912e70e9c9f5c186 100644 GIT binary patch delta 20 ccmew^@LgcT6IMo*%}-fpF*4dsZeafo09_FXRR910 delta 20 ccmew^@LgcT6IMp0%}-fpF*4drZeafo09@|~Q2+n{ diff --git a/shuili-framework/target/classes/com/shuili/common/utils/poi/ExcelUtil.class b/shuili-framework/target/classes/com/shuili/common/utils/poi/ExcelUtil.class index 263770bb78a101fb867172b3c17d890e3e2ebb1c..52a74108cd2709c4d5be093d380f5cb044a0105c 100644 GIT binary patch delta 23 fcmX@`o$s0h_bwMZ6*bpR=ZD-v|LKvxaeo4*@N+4S`((17ZMJvu%S} U0RyfDSF^>0i3s0hzPuMZ6*bowKHB-v|LJvxaeo4*@B&4S`((16}}Evu%S} Q0kg`4hzkKCvr~{!0nua@lK=n! diff --git a/shuili-system/target/classes/com/kms/system/service/upload/FileUtils.class b/shuili-system/target/classes/com/kms/system/service/upload/FileUtils.class index 4bc3e1362d4226758e48273e8693fb3acbbb14cf..ec1d22173afab1b8f9441da897448296fb04ebe6 100644 GIT binary patch delta 62 zcmV-E0KxyJq5`U-0EKL;wH) From c03c1a588357b718ae63b80ad4330bc6585a14de Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 1 Nov 2023 11:45:30 +0800 Subject: [PATCH 02/35] =?UTF-8?q?feat:=20=E6=95=B0=E5=85=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-druid-sy.yml | 58 ++++++ .../src/main/resources/application-sy.yml | 193 ++++++++++++++++++ .../src/main/resources/application.yml | 2 +- 3 files changed, 252 insertions(+), 1 deletion(-) create mode 100644 shuili-admin/src/main/resources/application-druid-sy.yml create mode 100644 shuili-admin/src/main/resources/application-sy.yml diff --git a/shuili-admin/src/main/resources/application-druid-sy.yml b/shuili-admin/src/main/resources/application-druid-sy.yml new file mode 100644 index 00000000..b95f44dd --- /dev/null +++ b/shuili-admin/src/main/resources/application-druid-sy.yml @@ -0,0 +1,58 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://mysql:3306/?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + username: root + password: mysql123456 + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: + login-password: + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + diff --git a/shuili-admin/src/main/resources/application-sy.yml b/shuili-admin/src/main/resources/application-sy.yml new file mode 100644 index 00000000..cf2b2cd8 --- /dev/null +++ b/shuili-admin/src/main/resources/application-sy.yml @@ -0,0 +1,193 @@ +# 项目相关配置 +shuili: + # 名称 + name: 天汇重构 + #系统别名 英文/汉语拼音 做缓存的前缀 每个模块的配置必须一样 + nameKey: tianhui_lyj + # 版本 + version: 1.0 + # 版权年份 + copyrightYear: 2023 + # 实例演示开关 + demoEnabled: true + # 临时文件地址 + profile: E:/tianhui + # 获取ip地址开关 + addressEnabled: false + # 验证码类型 math 数组计算 char 字符验证 + captchaType: math + #数据库配置 参考枚举类DbType + dbType: mysql + #初始话数据的位置 采集的文献的导入 + initData: E:\\199it + init: true + #导入TNT 数据 + initTntData: C:\Users\liuyanjun\Desktop\人物-政党导出V1\人物-政党导出V1 +#neo4j的一个from +database: tianhui_lyj +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 18082 + servlet: + # 应用的访问路径 + context-path: /tianhui-admin-web + tomcat: + # tomcat的URI编码 + uri-encoding: UTF-8 + # tomcat最大线程数，默认为200 + max-threads: 800 + # Tomcat启动初始化的线程数，默认值25 + min-spare-threads: 30 +# 日志配置 +logging: + level: + com.kms: debug + org.springframework: warn +# Spring配置 +spring: + application: + name: shuili-admin + mongodb: + uri: mongodb://mongo:mongo12345@mongodb:27017/tianhui + field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + profiles: + active: druid-dev + session: + store-type: redis + redis: + flush-mode: immediate + # 文件上传 + servlet: + multipart: + # 单个文件大小 + max-file-size: 1000MB + # 设置总上传的文件大小 + max-request-size: 20000MB + # 服务模块 + devtools: + restart: + # 热部署开关 + enabled: true + # redis 配置 + redis: + # 地址 + host: redis +# cluster: +# nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006 +# max-redirects: 3 + # 端口，默认为6379 + port: 6379 + # 密码 + password: redis12345 + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 16 + # 连接池中的最大空闲连接 + max-idle: 32 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms +# password: password +sa-token: + # token名称 (同时也是cookie名称) + token-name: shuili + # token有效期，单位s 默认30天, -1代表永不过期 + timeout: -1 + # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 + activity-timeout: 1800 + # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) + is-concurrent: true + # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) + is-share: false + # token风格 + token-style: uuid + # 是否输出操作日志 + is-log: true + isReadCookie: false + tokenSessionCheckLogin: false + #是否在初始化配置时打印版本字符画 + isV: false + #token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) 参考：token前缀 + tokenPrefix: water + # 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作) + autoRenew: true + #是否尝试从header里读取token + isReadHead: true +#mybatis-plus配置 +mybatis-plus: + configuration: + #下划线驼峰命名 + map-underscore-to-camel-case: true + auto-mapping-behavior: full + #开启日志打印 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #配置Mapper映射文件 + mapper-locations: classpath*:mapper/**/*Mapper.xml + type-aliases-package: com.kms.**.domain + +# Swagger配置 +swagger: + # 是否开启swagger + enabled: true + # 请求前缀 + pathMapping: / +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接（多个用逗号分隔） + excludes: /system/notice/* + # 匹配链接 + urlPatterns: /system/*,/monitor/*,/tool/* +fdfs: + soTimeout: 1500 + connectTimeout: 600 + thumbImage: #缩略图生成参数 + width: 150 + height: 150 + #预览的地址 + showFileUrl: 192.168.1.20:9080 + #使用的是http 还是https + urlAgreement: http + trackerList: #TrackerList参数,支持多个 + - 192.168.1.20:22122 +ignored: + /v2/*,/favicon.ico,/swagger-resources/**,/druid/**,/swagger-ui.html,/webjars/**, + /app/login,/initTnt/**, + /doc.html, + /chunk/*, + /error, + /login, + /captchaImage, + /system/file/**, + /system/user/exportExcel, + /system/kaptcha/render, + /test/** +# http请求连接池 +http: + pool: + # 连接超时 + connectTimeout: 5000000 + connectionRequestTimeout: 5000000 + defaultMaxPerRoute: 20 + # 最大连接数 + maxTotal: 100 + # 服务器返回数据(response)的时间 + socketTimeout: 5000000 + validateAfterInactivity: 5000000 +#算法配置 +algorithm: + #图片ocr服务 + entity: http://192.168.0.14:17856/analyze_text + # 自动打抽取摘要 + summary: http://192.168.0.210:12343 + ocr: http://192.168.0.62:12340/ExtractServer?WSDL diff --git a/shuili-admin/src/main/resources/application.yml b/shuili-admin/src/main/resources/application.yml index dcd83f55..743fe37a 100644 --- a/shuili-admin/src/main/resources/application.yml +++ b/shuili-admin/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: # include: dev,druid-dev - include: test,druid-test + include: sy,druid-sy # include: zhishiku,druid-zhishiku From 190ff49873b4bd7e974a8ee83ab3b46a6f7cfec3 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 1 Nov 2023 11:53:13 +0800 Subject: [PATCH 03/35] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-admin/src/main/resources/logback.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-admin/src/main/resources/logback.xml b/shuili-admin/src/main/resources/logback.xml index 46589e16..3fd9921e 100644 --- a/shuili-admin/src/main/resources/logback.xml +++ b/shuili-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + From 293ac5490ee1c81fbb67b20833a325c451e54771 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Fri, 10 Nov 2023 18:11:33 +0800 Subject: [PATCH 04/35] =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/base/Response.java | 81 +++++++++++++ .../df/controller/CheckingController.java | 91 ++++++++++++++ .../yxgh/df/controller/PlanController.java | 87 ++++++++++++++ .../yxgh/df/controller/TraceController.java | 108 +++++++++++++++++ .../df/domain/dto/DfCheckingDetailDto.java | 45 +++++++ .../yxgh/df/domain/dto/DfPlanDetailDto.java | 62 ++++++++++ .../df/domain/dto/SimpleDfCheckingDto.java | 23 ++++ .../kms/yxgh/df/domain/entity/DfChecking.java | 60 ++++++++++ .../yxgh/df/domain/entity/DfCheckingItem.java | 65 ++++++++++ .../com/kms/yxgh/df/domain/entity/DfPlan.java | 81 +++++++++++++ .../yxgh/df/domain/entity/DfPlanOperator.java | 60 ++++++++++ .../kms/yxgh/df/domain/entity/DfPoint.java | 70 +++++++++++ .../kms/yxgh/df/domain/entity/DfRecord.java | 65 ++++++++++ .../yxgh/df/domain/entity/DfRecordItem.java | 75 ++++++++++++ .../kms/yxgh/df/domain/entity/DfTrace.java | 59 ++++++++++ .../yxgh/df/mapper/DfCheckingItemMapper.java | 16 +++ .../kms/yxgh/df/mapper/DfCheckingMapper.java | 16 +++ .../com/kms/yxgh/df/mapper/DfPlanMapper.java | 16 +++ .../yxgh/df/mapper/DfPlanOperatorMapper.java | 16 +++ .../com/kms/yxgh/df/mapper/DfPointMapper.java | 16 +++ .../yxgh/df/mapper/DfRecordItemMapper.java | 16 +++ .../kms/yxgh/df/mapper/DfRecordMapper.java | 16 +++ .../com/kms/yxgh/df/mapper/DfTraceMapper.java | 16 +++ .../df/service/DfCheckingItemService.java | 17 +++ .../yxgh/df/service/DfCheckingService.java | 17 +++ .../df/service/DfPlanOperatorService.java | 17 +++ .../kms/yxgh/df/service/DfPlanService.java | 17 +++ .../kms/yxgh/df/service/DfPointService.java | 17 +++ .../yxgh/df/service/DfRecordItemService.java | 17 +++ .../kms/yxgh/df/service/DfRecordService.java | 17 +++ .../kms/yxgh/df/service/DfTraceService.java | 17 +++ .../sz/controller/SzCheckingController.java | 111 ++++++++++++++++++ .../controller/SzCheckingItemController.java | 111 ++++++++++++++++++ .../yxgh/sz/controller/SzPlanController.java | 111 ++++++++++++++++++ .../controller/SzPlanOperatorController.java | 111 ++++++++++++++++++ .../yxgh/sz/controller/SzPointController.java | 111 ++++++++++++++++++ .../sz/controller/SzRecordController.java | 111 ++++++++++++++++++ .../sz/controller/SzRecordItemController.java | 111 ++++++++++++++++++ .../yxgh/sz/controller/SzTraceController.java | 111 ++++++++++++++++++ .../sz/controller/df/CheckingController.java | 54 +++++++++ .../kms/yxgh/sz/domain/entity/SzChecking.java | 60 ++++++++++ .../yxgh/sz/domain/entity/SzCheckingItem.java | 65 ++++++++++ .../com/kms/yxgh/sz/domain/entity/SzPlan.java | 81 +++++++++++++ .../yxgh/sz/domain/entity/SzPlanOperator.java | 60 ++++++++++ .../kms/yxgh/sz/domain/entity/SzPoint.java | 70 +++++++++++ .../kms/yxgh/sz/domain/entity/SzRecord.java | 65 ++++++++++ .../yxgh/sz/domain/entity/SzRecordItem.java | 75 ++++++++++++ .../kms/yxgh/sz/domain/entity/SzTrace.java | 59 ++++++++++ .../yxgh/sz/mapper/SzCheckingItemMapper.java | 15 +++ .../kms/yxgh/sz/mapper/SzCheckingMapper.java | 15 +++ .../com/kms/yxgh/sz/mapper/SzPlanMapper.java | 15 +++ .../yxgh/sz/mapper/SzPlanOperatorMapper.java | 15 +++ .../com/kms/yxgh/sz/mapper/SzPointMapper.java | 15 +++ .../yxgh/sz/mapper/SzRecordItemMapper.java | 15 +++ .../kms/yxgh/sz/mapper/SzRecordMapper.java | 15 +++ .../com/kms/yxgh/sz/mapper/SzTraceMapper.java | 15 +++ .../sz/service/SzCheckingItemService.java | 15 +++ .../yxgh/sz/service/SzCheckingService.java | 15 +++ .../sz/service/SzPlanOperatorService.java | 15 +++ .../kms/yxgh/sz/service/SzPlanService.java | 15 +++ .../kms/yxgh/sz/service/SzPointService.java | 15 +++ .../yxgh/sz/service/SzRecordItemService.java | 15 +++ .../kms/yxgh/sz/service/SzRecordService.java | 15 +++ .../kms/yxgh/sz/service/SzTraceService.java | 15 +++ 64 files changed, 3013 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/Response.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/CheckingController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/PlanController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/TraceController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/SimpleDfCheckingDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingItemController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanOperatorController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPointController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordItemController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/df/CheckingController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/Response.java b/shuili-system/src/main/java/com/kms/yxgh/base/Response.java new file mode 100644 index 00000000..dccbb49f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/Response.java @@ -0,0 +1,81 @@ +package com.kms.yxgh.base; + +import java.io.Serializable; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 响应信息主体 + * + * @author Lion Li + */ +@Data +@NoArgsConstructor +public class Response implements Serializable { + + /** + * 成功 + */ + public static final String SUCCESS = "200"; + /** + * 失败 + */ + public static final String FAIL = "500"; + + /** + * 消息状态码 + */ + private Long code; + + /** + * 消息内容 + */ + private String msg; + + /** + * 数据对象 + */ + private T data; + + public static Response ok() { + return restResult(null, SUCCESS, "操作成功"); + } + + public static Response ok(T data) { + return restResult(data, SUCCESS, "操作成功"); + } + + public static Response ok(String msg, T data) { + return restResult(data, SUCCESS, msg); + } + + public static Response fail() { + return restResult(null, FAIL, "操作失败"); + } + + + public static Response fail(String code, String msg) { + return restResult(null, code, msg); + } + + private static Response restResult(T data, String code, String msg) { + Response response = new Response<>(); + response.setCode(code); + response.setData(data); + response.setMsg(msg); + return response; + } + + public void setCode(String code) { + this.code = Long.valueOf(code); + } + + public void setCode(Long code) { + this.code = code; + } + + public Boolean isSuccess() { + return (this.getCode() + "").equals(SUCCESS); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/CheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/CheckingController.java new file mode 100644 index 00000000..d0d35d45 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/CheckingController.java @@ -0,0 +1,91 @@ +package com.kms.yxgh.df.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; +import com.kms.yxgh.df.domain.dto.SimpleDfCheckingDto; +import com.kms.yxgh.df.domain.entity.DfChecking; +import com.kms.yxgh.df.service.DfCheckingService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName: CheckingController + * @Description: TODO + * @Date: 2023/11/10 上午11:16 * + * @author: hxh + * @version: 1.0 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/checking") +@Api(tags = "堤防巡视检查") +public class CheckingController { + + + private final DfCheckingService dfCheckingService; + + /** + * 查询堤防巡视检查列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查列表") + public IPage list(@RequestBody SearchParam sp) { + return dfCheckingService.selectPage(sp); + } + + @PostMapping("/list-simple") + @ApiOperation("堤防巡视检查列表-简略信息") + public Response> listSimple(@RequestBody SearchParam sp) { + return Response.ok(); + } + + + /** + * 获取堤防巡视检查详细信息 + */ + @ApiOperation(" 堤防巡视检查详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") Long id) { + // return Response.ok(dfCheckingService.getById(id)); + return Response.ok(); + } + + + /** + * 修改堤防巡视检查 + */ + @ApiOperation("堤防巡视检查修改") + @Log(title = "堤防巡视检查修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody DfCheckingDetailDto dfChecking) { + // dfCheckingService.updateById(dfChecking); + return Response.ok(); + } + + /** + * 删除堤防巡视检查 + */ + @ApiOperation("堤防巡视检查删除") + @Log(title = "堤防巡视检查删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response remove(@PathVariable Long[] ids) { + // dfCheckingService.removeByIds(Arrays.asList(ids)); + return Response.ok(); + } + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/PlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/PlanController.java new file mode 100644 index 00000000..11e8656f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/PlanController.java @@ -0,0 +1,87 @@ +package com.kms.yxgh.df.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.domain.entity.DfPlan; +import com.kms.yxgh.df.service.DfPlanService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 堤防巡视检查计划Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/plan") +@Api(tags = "堤防巡视检查计划") +public class PlanController { + + private final DfPlanService dfPlanService; + + /** + * 查询堤防巡视检查计划列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查计划列表") + public IPage list(@RequestBody SearchParam sp) { + return dfPlanService.selectPage(sp); + } + + + /** + * 获取堤防巡视检查计划详细信息 + */ + @ApiOperation(" 堤防巡视检查计划详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") Long id) { + return Response.ok(); + } + + /** + * 新增堤防巡视检查计划 + */ + @Log(title = "堤防巡视检查计划新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防巡视检查计划新增") + public Response add(@RequestBody DfPlan dfPlan) { + BaseEntityUtils.preInsert(dfPlan); + return Response.ok(); + } + + /** + * 修改堤防巡视检查计划 + */ + @ApiOperation("堤防巡视检查计划修改") + @Log(title = "堤防巡视检查计划修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody DfPlan dfPlan) { + return Response.ok(); + } + + /** + * 删除堤防巡视检查计划 + */ + @ApiOperation("堤防巡视检查计划删除") + @Log(title = "堤防巡视检查计划删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response remove(@PathVariable Long[] ids) { + return Response.ok(); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/TraceController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/TraceController.java new file mode 100644 index 00000000..8819c808 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/TraceController.java @@ -0,0 +1,108 @@ +package com.kms.yxgh.df.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.df.domain.entity.DfTrace; +import com.kms.yxgh.df.service.DfTraceService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.Arrays; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 堤防巡视检查检查记录轨迹Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/df/trace") +@Api(tags = "堤防巡视检查检查记录轨迹") +public class TraceController extends BaseController +{ + @Autowired + private DfTraceService dfTraceService; + + /** + * 查询堤防巡视检查检查记录轨迹列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查检查记录轨迹列表") + public IPage list(@RequestBody SearchParam sp) + { + return dfTraceService.selectPage(sp); + } + + /** + * 导出堤防巡视检查检查记录轨迹列表 + */ + @Log(title = "堤防巡视检查检查记录轨迹导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("堤防巡视检查检查记录轨迹导出") + public AjaxResult export(@RequestBody DfTrace dfTrace) + { + List list = dfTraceService.listByIds(dfTrace.getIds()); + ExcelUtil util = new ExcelUtil<>(DfTrace.class); + return util.exportExcel(list, "trace"); + } + + /** + * 获取堤防巡视检查检查记录轨迹详细信息 + */ + @ApiOperation(" 堤防巡视检查检查记录轨迹详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(dfTraceService.getById(id)); + } + + /** + * 新增堤防巡视检查检查记录轨迹 + */ + @Log(title = "堤防巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防巡视检查检查记录轨迹新增") + public AjaxResult add(@RequestBody DfTrace dfTrace) + { + BaseEntityUtils.preInsert(dfTrace); + return toAjax(dfTraceService.save(dfTrace)); + } + + /** + * 修改堤防巡视检查检查记录轨迹 + */ + @ApiOperation("堤防巡视检查检查记录轨迹修改") + @Log(title = "堤防巡视检查检查记录轨迹修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DfTrace dfTrace) + { + return toAjax(dfTraceService.updateById(dfTrace)); + } + + /** + * 删除堤防巡视检查检查记录轨迹 + */ + @ApiOperation("堤防巡视检查检查记录轨迹删除") + @Log(title = "堤防巡视检查检查记录轨迹删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dfTraceService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java new file mode 100644 index 00000000..077e4295 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java @@ -0,0 +1,45 @@ +package com.kms.yxgh.df.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + +/** + * @ClassName: CheckingVo + * @Description: TODO + * @Date: 2023/11/10 上午11:56 * + * @author: hxh + * @version: 1.0 + */ +@Data +@ApiModel("堤防巡视检查详情") +public class DfCheckingDetailDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("巡查名称") + private String name; + + @ApiModelProperty("巡查类型") + private Long type; + + @ApiModelProperty("检查项") + private List items; + + + @Data + public static class DfCheckingItem { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("检查部位") + private List parts; + + @ApiModelProperty("检查内容") + private String content; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java new file mode 100644 index 00000000..32de4e0a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java @@ -0,0 +1,62 @@ +package com.kms.yxgh.df.domain.dto; + +import com.alibaba.fastjson.JSONObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; +import lombok.Data; + + +/** + * 堤防巡视检查计划详情 + * + * @author sy + * @date 2023-11-09 + */ +@Data +@ApiModel("堤防巡视检查计划详情") +public class DfPlanDetailDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("巡查ID") + private Long xcId; + + @ApiModelProperty("巡查类型") + private Long type; + + @ApiModelProperty("检查次数") + private Long frequency; + + @ApiModelProperty("周期") + private Long cycleType; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("提醒时间") + private Date reminderTime; + + @ApiModelProperty("附加配置") + private JSONObject otherConfig; + + @ApiModelProperty("执行人") + private List operators; + + + @Data + public static class Operator { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("用户id") + private String uid; + @ApiModelProperty("用户名称") + private String name; + + + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/SimpleDfCheckingDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/SimpleDfCheckingDto.java new file mode 100644 index 00000000..e1d238bb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/SimpleDfCheckingDto.java @@ -0,0 +1,23 @@ +package com.kms.yxgh.df.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 堤防巡视检查简短信息 + * + * @author sy + * @date 2023-11-09 + */ +@Data +@ApiModel("堤防巡视检查") +public class SimpleDfCheckingDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("巡查名称") + private String name; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java new file mode 100644 index 00000000..67ad44ec --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java @@ -0,0 +1,60 @@ +package com.kms.yxgh.df.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤防巡视检查对象 bs_sgc_df_xs + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xs") +@Data +@ApiModel("堤防巡视检查") +public class DfChecking extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查名称 */ + @Excel(name = "巡查名称") + @ApiModelProperty("巡查名称") + private String name; + + /** 巡查类型 */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private Long type; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java new file mode 100644 index 00000000..e102b514 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java @@ -0,0 +1,65 @@ +package com.kms.yxgh.df.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤防巡视检查项对象 bs_sgc_df_xsx + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xsx") +@Data +@ApiModel("堤防巡视检查项") +public class DfCheckingItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查ID */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private Long xcId; + + /** 检查部位 */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; + + /** 检查内容 */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java new file mode 100644 index 00000000..6320b37c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java @@ -0,0 +1,81 @@ +package com.kms.yxgh.df.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤防巡视检查计划对象 bs_sgc_df_xsjh + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xsjh") +@Data +@ApiModel("堤防巡视检查计划") +public class DfPlan extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查ID */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private Long xcId; + + /** 巡查类型 */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private Long type; + + /** 检查次数 */ + @Excel(name = "检查次数") + @ApiModelProperty("检查次数") + private Long frequency; + + /** 周期 */ + @Excel(name = "周期") + @ApiModelProperty("周期") + private Long cycleType; + + /** 提醒时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("提醒时间") + private Date reminderTime; + + /** 附加配置 */ + @Excel(name = "附加配置") + @ApiModelProperty("附加配置") + private String otherConfig; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java new file mode 100644 index 00000000..ab0052e0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java @@ -0,0 +1,60 @@ +package com.kms.yxgh.df.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤防巡视检查计划执行人对象 bs_sgc_df_xsjhzx + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xsjhzx") +@Data +@ApiModel("堤防巡视检查计划执行人") +public class DfPlanOperator extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查计划ID */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private Long planId; + + /** 执行人 */ + @Excel(name = "执行人") + @ApiModelProperty("执行人") + private String operatorUid; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java new file mode 100644 index 00000000..f40db412 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java @@ -0,0 +1,70 @@ +package com.kms.yxgh.df.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤防巡视检查计划点位对象 bs_sgc_df_xsjhdw + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xsjhdw") +@Data +@ApiModel("堤防巡视检查计划点位") +public class DfPoint extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查计划ID */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private Long planId; + + /** 经度 */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Long longitude; + + /** 纬度 */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Long latitude; + + /** 海拔 */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Long altitude; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java new file mode 100644 index 00000000..95624b5a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java @@ -0,0 +1,65 @@ +package com.kms.yxgh.df.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤防巡视检查记录对象 bs_sgc_df_xsjhjl + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xsjhjl") +@Data +@ApiModel("堤防巡视检查记录") +public class DfRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查计划ID */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private Long planId; + + /** 巡查记录名称 */ + @Excel(name = "巡查记录名称") + @ApiModelProperty("巡查记录名称") + private String name; + + /** 状态 */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Long status; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java new file mode 100644 index 00000000..2a86ba69 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java @@ -0,0 +1,75 @@ +package com.kms.yxgh.df.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤防巡视检查检查记录子项对象 bs_sgc_df_xsjhjlz + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xsjhjlz") +@Data +@ApiModel("堤防巡视检查检查记录子项") +public class DfRecordItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查记录ID */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private Long recordId; + + /** 检查部位 */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; + + /** 检查内容 */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; + + /** 状态 */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Integer status; + + /** 存在问题 */ + @Excel(name = "存在问题") + @ApiModelProperty("存在问题") + private String problem; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java new file mode 100644 index 00000000..a7531399 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java @@ -0,0 +1,59 @@ +package com.kms.yxgh.df.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤防巡视检查检查记录轨迹对象 bs_sgc_df_xsjhjgj + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xsjhjgj") +@Data +@ApiModel("堤防巡视检查检查记录轨迹") +public class DfTrace extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查记录ID */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private Long recordId; + + /** 经度 */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Long longitude; + + /** 纬度 */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Long latitude; + + /** 海拔 */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Long altitude; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java new file mode 100644 index 00000000..0b798ea2 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.entity.DfCheckingItem; + +/** + * 堤防巡视检查项Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfCheckingItemMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java new file mode 100644 index 00000000..31535d31 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.entity.DfChecking; + +/** + * 堤防巡视检查Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfCheckingMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java new file mode 100644 index 00000000..2e5411a5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.entity.DfPlan; + +/** + * 堤防巡视检查计划Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfPlanMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java new file mode 100644 index 00000000..f344b91c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.entity.DfPlanOperator; + +/** + * 堤防巡视检查计划执行人Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfPlanOperatorMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java new file mode 100644 index 00000000..68e3257f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.entity.DfPoint; + +/** + * 堤防巡视检查计划点位Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfPointMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java new file mode 100644 index 00000000..eec9fc39 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.entity.DfRecordItem; + +/** + * 堤防巡视检查检查记录子项Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfRecordItemMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java new file mode 100644 index 00000000..3325b2ee --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.entity.DfRecord; + +/** + * 堤防巡视检查记录Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfRecordMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java new file mode 100644 index 00000000..26ad2a64 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.entity.DfTrace; + +/** + * 堤防巡视检查检查记录轨迹Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfTraceMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java new file mode 100644 index 00000000..e7ac1410 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yxgh.df.mapper.DfCheckingItemMapper; +import com.kms.yxgh.df.domain.entity.DfCheckingItem; +import org.springframework.stereotype.Service; + +/** + * 堤防巡视检查项Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class DfCheckingItemService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java new file mode 100644 index 00000000..e71b3588 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yxgh.df.mapper.DfCheckingMapper; +import com.kms.yxgh.df.domain.entity.DfChecking; +import org.springframework.stereotype.Service; + +/** + * 堤防巡视检查Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class DfCheckingService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java new file mode 100644 index 00000000..7a6e036b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; +import com.kms.yxgh.df.domain.entity.DfPlanOperator; +import org.springframework.stereotype.Service; + +/** + * 堤防巡视检查计划执行人Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class DfPlanOperatorService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java new file mode 100644 index 00000000..0f9256a1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yxgh.df.mapper.DfPlanMapper; +import com.kms.yxgh.df.domain.entity.DfPlan; +import org.springframework.stereotype.Service; + +/** + * 堤防巡视检查计划Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class DfPlanService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java new file mode 100644 index 00000000..9164b9d4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yxgh.df.mapper.DfPointMapper; +import com.kms.yxgh.df.domain.entity.DfPoint; +import org.springframework.stereotype.Service; + +/** + * 堤防巡视检查计划点位Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class DfPointService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java new file mode 100644 index 00000000..ffca2632 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yxgh.df.mapper.DfRecordItemMapper; +import com.kms.yxgh.df.domain.entity.DfRecordItem; +import org.springframework.stereotype.Service; + +/** + * 堤防巡视检查检查记录子项Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class DfRecordItemService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java new file mode 100644 index 00000000..ef5c07a9 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yxgh.df.mapper.DfRecordMapper; +import com.kms.yxgh.df.domain.entity.DfRecord; +import org.springframework.stereotype.Service; + +/** + * 堤防巡视检查记录Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class DfRecordService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java new file mode 100644 index 00000000..2e034256 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yxgh.df.mapper.DfTraceMapper; +import com.kms.yxgh.df.domain.entity.DfTrace; +import org.springframework.stereotype.Service; + +/** + * 堤防巡视检查检查记录轨迹Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class DfTraceService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java new file mode 100644 index 00000000..ee358f81 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 水闸巡视检查Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/checking") +@Api(tags = "水闸巡视检查") +public class SzCheckingController extends BaseController +{ + @Autowired + private SzCheckingService szCheckingService; + + /** + * 查询水闸巡视检查列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查列表") + public IPage list(@RequestBody SearchParam sp) + { + return szCheckingService.selectPage(sp); + } + + /** + * 导出水闸巡视检查列表 + */ + @Log(title = "水闸巡视检查导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸巡视检查导出") + public AjaxResult export(@RequestBody SzChecking szChecking) + { + List list = szCheckingService.listByIds(szChecking.getIds()); + ExcelUtil util = new ExcelUtil<>(SzChecking.class); + return util.exportExcel(list, "checking"); + } + + /** + * 获取水闸巡视检查详细信息 + */ + @ApiOperation(" 水闸巡视检查详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(szCheckingService.getById(id)); + } + + /** + * 新增水闸巡视检查 + */ + @Log(title = "水闸巡视检查新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查新增") + public AjaxResult add(@RequestBody SzChecking szChecking) + { + BaseEntityUtils.preInsert(szChecking); + return toAjax(szCheckingService.save(szChecking)); + } + + /** + * 修改水闸巡视检查 + */ + @ApiOperation("水闸巡视检查修改") + @Log(title = "水闸巡视检查修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzChecking szChecking) + { + return toAjax(szCheckingService.updateById(szChecking)); + } + + /** + * 删除水闸巡视检查 + */ + @ApiOperation("水闸巡视检查删除") + @Log(title = "水闸巡视检查删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szCheckingService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingItemController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingItemController.java new file mode 100644 index 00000000..327edd62 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingItemController.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 水闸巡视检查项Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/checking/item") +@Api(tags = "水闸巡视检查项") +public class SzCheckingItemController extends BaseController +{ + @Autowired + private SzCheckingItemService szCheckingItemService; + + /** + * 查询水闸巡视检查项列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查项列表") + public IPage list(@RequestBody SearchParam sp) + { + return szCheckingItemService.selectPage(sp); + } + + /** + * 导出水闸巡视检查项列表 + */ + @Log(title = "水闸巡视检查项导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸巡视检查项导出") + public AjaxResult export(@RequestBody SzCheckingItem szCheckingItem) + { + List list = szCheckingItemService.listByIds(szCheckingItem.getIds()); + ExcelUtil util = new ExcelUtil<>(SzCheckingItem.class); + return util.exportExcel(list, "item"); + } + + /** + * 获取水闸巡视检查项详细信息 + */ + @ApiOperation(" 水闸巡视检查项详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(szCheckingItemService.getById(id)); + } + + /** + * 新增水闸巡视检查项 + */ + @Log(title = "水闸巡视检查项新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查项新增") + public AjaxResult add(@RequestBody SzCheckingItem szCheckingItem) + { + BaseEntityUtils.preInsert(szCheckingItem); + return toAjax(szCheckingItemService.save(szCheckingItem)); + } + + /** + * 修改水闸巡视检查项 + */ + @ApiOperation("水闸巡视检查项修改") + @Log(title = "水闸巡视检查项修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzCheckingItem szCheckingItem) + { + return toAjax(szCheckingItemService.updateById(szCheckingItem)); + } + + /** + * 删除水闸巡视检查项 + */ + @ApiOperation("水闸巡视检查项删除") + @Log(title = "水闸巡视检查项删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szCheckingItemService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java new file mode 100644 index 00000000..18e777df --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 水闸巡视检查计划Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/plan") +@Api(tags = "水闸巡视检查计划") +public class SzPlanController extends BaseController +{ + @Autowired + private SzPlanService szPlanService; + + /** + * 查询水闸巡视检查计划列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查计划列表") + public IPage list(@RequestBody SearchParam sp) + { + return szPlanService.selectPage(sp); + } + + /** + * 导出水闸巡视检查计划列表 + */ + @Log(title = "水闸巡视检查计划导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸巡视检查计划导出") + public AjaxResult export(@RequestBody SzPlan szPlan) + { + List list = szPlanService.listByIds(szPlan.getIds()); + ExcelUtil util = new ExcelUtil<>(SzPlan.class); + return util.exportExcel(list, "plan"); + } + + /** + * 获取水闸巡视检查计划详细信息 + */ + @ApiOperation(" 水闸巡视检查计划详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(szPlanService.getById(id)); + } + + /** + * 新增水闸巡视检查计划 + */ + @Log(title = "水闸巡视检查计划新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查计划新增") + public AjaxResult add(@RequestBody SzPlan szPlan) + { + BaseEntityUtils.preInsert(szPlan); + return toAjax(szPlanService.save(szPlan)); + } + + /** + * 修改水闸巡视检查计划 + */ + @ApiOperation("水闸巡视检查计划修改") + @Log(title = "水闸巡视检查计划修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzPlan szPlan) + { + return toAjax(szPlanService.updateById(szPlan)); + } + + /** + * 删除水闸巡视检查计划 + */ + @ApiOperation("水闸巡视检查计划删除") + @Log(title = "水闸巡视检查计划删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szPlanService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanOperatorController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanOperatorController.java new file mode 100644 index 00000000..40b5652a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanOperatorController.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 水闸巡视检查计划执行人Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/plan/operator") +@Api(tags = "水闸巡视检查计划执行人") +public class SzPlanOperatorController extends BaseController +{ + @Autowired + private SzPlanOperatorService szPlanOperatorService; + + /** + * 查询水闸巡视检查计划执行人列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查计划执行人列表") + public IPage list(@RequestBody SearchParam sp) + { + return szPlanOperatorService.selectPage(sp); + } + + /** + * 导出水闸巡视检查计划执行人列表 + */ + @Log(title = "水闸巡视检查计划执行人导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸巡视检查计划执行人导出") + public AjaxResult export(@RequestBody SzPlanOperator szPlanOperator) + { + List list = szPlanOperatorService.listByIds(szPlanOperator.getIds()); + ExcelUtil util = new ExcelUtil<>(SzPlanOperator.class); + return util.exportExcel(list, "operator"); + } + + /** + * 获取水闸巡视检查计划执行人详细信息 + */ + @ApiOperation(" 水闸巡视检查计划执行人详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(szPlanOperatorService.getById(id)); + } + + /** + * 新增水闸巡视检查计划执行人 + */ + @Log(title = "水闸巡视检查计划执行人新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查计划执行人新增") + public AjaxResult add(@RequestBody SzPlanOperator szPlanOperator) + { + BaseEntityUtils.preInsert(szPlanOperator); + return toAjax(szPlanOperatorService.save(szPlanOperator)); + } + + /** + * 修改水闸巡视检查计划执行人 + */ + @ApiOperation("水闸巡视检查计划执行人修改") + @Log(title = "水闸巡视检查计划执行人修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzPlanOperator szPlanOperator) + { + return toAjax(szPlanOperatorService.updateById(szPlanOperator)); + } + + /** + * 删除水闸巡视检查计划执行人 + */ + @ApiOperation("水闸巡视检查计划执行人删除") + @Log(title = "水闸巡视检查计划执行人删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szPlanOperatorService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPointController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPointController.java new file mode 100644 index 00000000..acf45ec3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPointController.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 水闸巡视检查计划点位Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/point") +@Api(tags = "水闸巡视检查计划点位") +public class SzPointController extends BaseController +{ + @Autowired + private SzPointService szPointService; + + /** + * 查询水闸巡视检查计划点位列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查计划点位列表") + public IPage list(@RequestBody SearchParam sp) + { + return szPointService.selectPage(sp); + } + + /** + * 导出水闸巡视检查计划点位列表 + */ + @Log(title = "水闸巡视检查计划点位导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸巡视检查计划点位导出") + public AjaxResult export(@RequestBody SzPoint szPoint) + { + List list = szPointService.listByIds(szPoint.getIds()); + ExcelUtil util = new ExcelUtil<>(SzPoint.class); + return util.exportExcel(list, "point"); + } + + /** + * 获取水闸巡视检查计划点位详细信息 + */ + @ApiOperation(" 水闸巡视检查计划点位详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(szPointService.getById(id)); + } + + /** + * 新增水闸巡视检查计划点位 + */ + @Log(title = "水闸巡视检查计划点位新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查计划点位新增") + public AjaxResult add(@RequestBody SzPoint szPoint) + { + BaseEntityUtils.preInsert(szPoint); + return toAjax(szPointService.save(szPoint)); + } + + /** + * 修改水闸巡视检查计划点位 + */ + @ApiOperation("水闸巡视检查计划点位修改") + @Log(title = "水闸巡视检查计划点位修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzPoint szPoint) + { + return toAjax(szPointService.updateById(szPoint)); + } + + /** + * 删除水闸巡视检查计划点位 + */ + @ApiOperation("水闸巡视检查计划点位删除") + @Log(title = "水闸巡视检查计划点位删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szPointService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java new file mode 100644 index 00000000..30a37ab0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 水闸巡视检查记录Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/record") +@Api(tags = "水闸巡视检查记录") +public class SzRecordController extends BaseController +{ + @Autowired + private SzRecordService szRecordService; + + /** + * 查询水闸巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查记录列表") + public IPage list(@RequestBody SearchParam sp) + { + return szRecordService.selectPage(sp); + } + + /** + * 导出水闸巡视检查记录列表 + */ + @Log(title = "水闸巡视检查记录导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸巡视检查记录导出") + public AjaxResult export(@RequestBody SzRecord szRecord) + { + List list = szRecordService.listByIds(szRecord.getIds()); + ExcelUtil util = new ExcelUtil<>(SzRecord.class); + return util.exportExcel(list, "record"); + } + + /** + * 获取水闸巡视检查记录详细信息 + */ + @ApiOperation(" 水闸巡视检查记录详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(szRecordService.getById(id)); + } + + /** + * 新增水闸巡视检查记录 + */ + @Log(title = "水闸巡视检查记录新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查记录新增") + public AjaxResult add(@RequestBody SzRecord szRecord) + { + BaseEntityUtils.preInsert(szRecord); + return toAjax(szRecordService.save(szRecord)); + } + + /** + * 修改水闸巡视检查记录 + */ + @ApiOperation("水闸巡视检查记录修改") + @Log(title = "水闸巡视检查记录修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzRecord szRecord) + { + return toAjax(szRecordService.updateById(szRecord)); + } + + /** + * 删除水闸巡视检查记录 + */ + @ApiOperation("水闸巡视检查记录删除") + @Log(title = "水闸巡视检查记录删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szRecordService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordItemController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordItemController.java new file mode 100644 index 00000000..8abc41ad --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordItemController.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 水闸巡视检查检查记录子项Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/record/item") +@Api(tags = "水闸巡视检查检查记录子项") +public class SzRecordItemController extends BaseController +{ + @Autowired + private SzRecordItemService szRecordItemService; + + /** + * 查询水闸巡视检查检查记录子项列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查检查记录子项列表") + public IPage list(@RequestBody SearchParam sp) + { + return szRecordItemService.selectPage(sp); + } + + /** + * 导出水闸巡视检查检查记录子项列表 + */ + @Log(title = "水闸巡视检查检查记录子项导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸巡视检查检查记录子项导出") + public AjaxResult export(@RequestBody SzRecordItem szRecordItem) + { + List list = szRecordItemService.listByIds(szRecordItem.getIds()); + ExcelUtil util = new ExcelUtil<>(SzRecordItem.class); + return util.exportExcel(list, "item"); + } + + /** + * 获取水闸巡视检查检查记录子项详细信息 + */ + @ApiOperation(" 水闸巡视检查检查记录子项详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(szRecordItemService.getById(id)); + } + + /** + * 新增水闸巡视检查检查记录子项 + */ + @Log(title = "水闸巡视检查检查记录子项新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查检查记录子项新增") + public AjaxResult add(@RequestBody SzRecordItem szRecordItem) + { + BaseEntityUtils.preInsert(szRecordItem); + return toAjax(szRecordItemService.save(szRecordItem)); + } + + /** + * 修改水闸巡视检查检查记录子项 + */ + @ApiOperation("水闸巡视检查检查记录子项修改") + @Log(title = "水闸巡视检查检查记录子项修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzRecordItem szRecordItem) + { + return toAjax(szRecordItemService.updateById(szRecordItem)); + } + + /** + * 删除水闸巡视检查检查记录子项 + */ + @ApiOperation("水闸巡视检查检查记录子项删除") + @Log(title = "水闸巡视检查检查记录子项删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szRecordItemService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java new file mode 100644 index 00000000..e46e29c1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 水闸巡视检查检查记录轨迹Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/trace") +@Api(tags = "水闸巡视检查检查记录轨迹") +public class SzTraceController extends BaseController +{ + @Autowired + private SzTraceService szTraceService; + + /** + * 查询水闸巡视检查检查记录轨迹列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查检查记录轨迹列表") + public IPage list(@RequestBody SearchParam sp) + { + return szTraceService.selectPage(sp); + } + + /** + * 导出水闸巡视检查检查记录轨迹列表 + */ + @Log(title = "水闸巡视检查检查记录轨迹导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸巡视检查检查记录轨迹导出") + public AjaxResult export(@RequestBody SzTrace szTrace) + { + List list = szTraceService.listByIds(szTrace.getIds()); + ExcelUtil util = new ExcelUtil<>(SzTrace.class); + return util.exportExcel(list, "trace"); + } + + /** + * 获取水闸巡视检查检查记录轨迹详细信息 + */ + @ApiOperation(" 水闸巡视检查检查记录轨迹详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(szTraceService.getById(id)); + } + + /** + * 新增水闸巡视检查检查记录轨迹 + */ + @Log(title = "水闸巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查检查记录轨迹新增") + public AjaxResult add(@RequestBody SzTrace szTrace) + { + BaseEntityUtils.preInsert(szTrace); + return toAjax(szTraceService.save(szTrace)); + } + + /** + * 修改水闸巡视检查检查记录轨迹 + */ + @ApiOperation("水闸巡视检查检查记录轨迹修改") + @Log(title = "水闸巡视检查检查记录轨迹修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzTrace szTrace) + { + return toAjax(szTraceService.updateById(szTrace)); + } + + /** + * 删除水闸巡视检查检查记录轨迹 + */ + @ApiOperation("水闸巡视检查检查记录轨迹删除") + @Log(title = "水闸巡视检查检查记录轨迹删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szTraceService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/df/CheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/df/CheckingController.java new file mode 100644 index 00000000..88858767 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/df/CheckingController.java @@ -0,0 +1,54 @@ +package com.kms.yxgh.sz.controller.df; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.df.domain.entity.DfChecking; +import com.kms.yxgh.df.service.DfCheckingService; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName: CheckingController + * @Description: TODO + * @Date: 2023/11/10 上午11:16 * + * @author: hxh + * @version: 1.0 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/checking") +@Api(tags = "堤防巡视检查") +public class CheckingController { + + + private final DfCheckingService dfCheckingService; + + /** + * 查询堤防巡视检查列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查列表") + public IPage list(@RequestBody SearchParam sp) { + return dfCheckingService.selectPage(sp); + } + + + /** + * 获取堤防巡视检查详细信息 + */ + @ApiOperation(" 堤防巡视检查详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(dfCheckingService.getById(id)); + } + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java new file mode 100644 index 00000000..b310499f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java @@ -0,0 +1,60 @@ +package com.kms.yxgh.sz.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸巡视检查对象 bs_sgc_sz_xs + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_sz_xs") +@Data +@ApiModel("水闸巡视检查") +public class SzChecking extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查名称 */ + @Excel(name = "巡查名称") + @ApiModelProperty("巡查名称") + private String name; + + /** 巡查类型 */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private Long type; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java new file mode 100644 index 00000000..3a7f753f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java @@ -0,0 +1,65 @@ +package com.kms.yxgh.sz.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸巡视检查项对象 bs_sgc_sz_xsx + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_sz_xsx") +@Data +@ApiModel("水闸巡视检查项") +public class SzCheckingItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查ID */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private Long xcId; + + /** 检查部位 */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; + + /** 检查内容 */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java new file mode 100644 index 00000000..97ed7d14 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java @@ -0,0 +1,81 @@ +package com.kms.yxgh.sz.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸巡视检查计划对象 bs_sgc_sz_xsjh + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_sz_xsjh") +@Data +@ApiModel("水闸巡视检查计划") +public class SzPlan extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查ID */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private Long xcId; + + /** 巡查类型 */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private Long type; + + /** 检查次数 */ + @Excel(name = "检查次数") + @ApiModelProperty("检查次数") + private Long frequency; + + /** 周期 */ + @Excel(name = "周期") + @ApiModelProperty("周期") + private Long cycleType; + + /** 提醒时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("提醒时间") + private Date reminderTime; + + /** 附加配置 */ + @Excel(name = "附加配置") + @ApiModelProperty("附加配置") + private String otherConfig; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java new file mode 100644 index 00000000..16c4572e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java @@ -0,0 +1,60 @@ +package com.kms.yxgh.sz.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸巡视检查计划执行人对象 bs_sgc_sz_xsjhzx + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_sz_xsjhzx") +@Data +@ApiModel("水闸巡视检查计划执行人") +public class SzPlanOperator extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查计划ID */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private Long planId; + + /** 执行人 */ + @Excel(name = "执行人") + @ApiModelProperty("执行人") + private String operatorUid; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java new file mode 100644 index 00000000..18343e26 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java @@ -0,0 +1,70 @@ +package com.kms.yxgh.sz.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸巡视检查计划点位对象 bs_sgc_sz_xsjhdw + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_sz_xsjhdw") +@Data +@ApiModel("水闸巡视检查计划点位") +public class SzPoint extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查计划ID */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private Long planId; + + /** 经度 */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Double longitude; + + /** 纬度 */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Double latitude; + + /** 海拔 */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Double altitude; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java new file mode 100644 index 00000000..d29f904c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java @@ -0,0 +1,65 @@ +package com.kms.yxgh.sz.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸巡视检查记录对象 bs_sgc_sz_xsjhjl + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_sz_xsjhjl") +@Data +@ApiModel("水闸巡视检查记录") +public class SzRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查计划ID */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private Long planId; + + /** 巡查记录名称 */ + @Excel(name = "巡查记录名称") + @ApiModelProperty("巡查记录名称") + private String name; + + /** 状态 */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Long status; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java new file mode 100644 index 00000000..14674839 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java @@ -0,0 +1,75 @@ +package com.kms.yxgh.sz.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸巡视检查检查记录子项对象 bs_sgc_sz_xsjhjlz + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_sz_xsjhjlz") +@Data +@ApiModel("水闸巡视检查检查记录子项") +public class SzRecordItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查记录ID */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private Long recordId; + + /** 检查部位 */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; + + /** 检查内容 */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; + + /** 状态 */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Long status; + + /** 存在问题 */ + @Excel(name = "存在问题") + @ApiModelProperty("存在问题") + private String problem; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** 最近修改人 */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** 最近修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java new file mode 100644 index 00000000..0f9cade3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java @@ -0,0 +1,59 @@ +package com.kms.yxgh.sz.domain.entity; + +import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸巡视检查检查记录轨迹对象 bs_sgc_sz_xsjhjgj + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_sz_xsjhjgj") +@Data +@ApiModel("水闸巡视检查检查记录轨迹") +public class SzTrace extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 巡查记录ID */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private Long recordId; + + /** 经度 */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Double longitude; + + /** 纬度 */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Double latitude; + + /** 海拔 */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Double altitude; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java new file mode 100644 index 00000000..13a38762 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 水闸巡视检查项Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface SzCheckingItemMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java new file mode 100644 index 00000000..4fd340dd --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 水闸巡视检查Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface SzCheckingMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java new file mode 100644 index 00000000..0ad2e74c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 水闸巡视检查计划Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface SzPlanMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java new file mode 100644 index 00000000..736bcc05 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 水闸巡视检查计划执行人Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface SzPlanOperatorMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java new file mode 100644 index 00000000..0ee740aa --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 水闸巡视检查计划点位Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface SzPointMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java new file mode 100644 index 00000000..9f35e899 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 水闸巡视检查检查记录子项Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface SzRecordItemMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java new file mode 100644 index 00000000..43ad8207 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 水闸巡视检查记录Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface SzRecordMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java new file mode 100644 index 00000000..750ca335 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 水闸巡视检查检查记录轨迹Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface SzTraceMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java new file mode 100644 index 00000000..96a07176 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.service; + +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸巡视检查项Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class SzCheckingItemService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java new file mode 100644 index 00000000..aef2c838 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.service; + +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸巡视检查Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class SzCheckingService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java new file mode 100644 index 00000000..b3d3a8d6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.service; + +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸巡视检查计划执行人Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class SzPlanOperatorService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java new file mode 100644 index 00000000..5d330f36 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.service; + +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸巡视检查计划Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class SzPlanService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java new file mode 100644 index 00000000..92e93db9 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.service; + +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸巡视检查计划点位Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class SzPointService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java new file mode 100644 index 00000000..ee74bf74 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.service; + +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸巡视检查检查记录子项Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class SzRecordItemService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java new file mode 100644 index 00000000..00d06752 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.service; + +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸巡视检查记录Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class SzRecordService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java new file mode 100644 index 00000000..439f6742 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.service; + +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸巡视检查检查记录轨迹Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +public class SzTraceService extends BaseService{ + +} From eefdb7017cfe810cd719c420c24471d7a33444d5 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 13 Nov 2023 09:26:25 +0800 Subject: [PATCH 05/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysDictDataController.java | 9 +- .../system/SysDictTypeController.java | 220 ++++---- .../shuili/common/annotation/DataScope.class | Bin 544 -> 0 bytes .../shuili/common/annotation/DataSource.class | Bin 629 -> 0 bytes .../common/annotation/Excel$ColumnType.class | Bin 1326 -> 0 bytes .../shuili/common/annotation/Excel$Type.class | Bin 1330 -> 0 bytes .../com/shuili/common/annotation/Excel.class | Bin 1422 -> 0 bytes .../com/shuili/common/annotation/Excels.class | Bin 443 -> 0 bytes .../com/shuili/common/annotation/Log.class | Bin 847 -> 0 bytes .../common/annotation/RepeatSubmit.class | Bin 485 -> 0 bytes .../shuili/common/constant/Constants.class | Bin 1503 -> 0 bytes .../shuili/common/constant/GenConstants.class | Bin 2486 -> 0 bytes .../shuili/common/constant/HttpStatus.class | Bin 871 -> 0 bytes .../constant/RolePermissionConstant.class | Bin 710 -> 0 bytes .../constant/ScheduleConstants$Status.class | Bin 1456 -> 0 bytes .../common/constant/ScheduleConstants.class | Bin 722 -> 0 bytes .../common/constant/UserConstants.class | Bin 947 -> 0 bytes .../com/shuili/common/constant/YesOrNo.class | Bin 394 -> 0 bytes .../shuili/common/core/domain/AddParam.class | Bin 2975 -> 0 bytes .../common/core/domain/AjaxResult.class | Bin 2280 -> 0 bytes .../common/core/domain/ConditionView.class | Bin 3976 -> 0 bytes .../common/core/domain/MongoOperType.class | Bin 836 -> 0 bytes .../common/core/domain/SearchParam.class | Bin 7424 -> 0 bytes .../shuili/common/core/domain/TimeView.class | Bin 2538 -> 0 bytes .../shuili/common/core/text/CharsetKit.class | Bin 1826 -> 0 bytes .../com/shuili/common/core/text/Convert.class | Bin 13661 -> 0 bytes .../common/core/text/StrFormatter.class | Bin 1860 -> 0 bytes .../shuili/common/enums/BusinessStatus.class | Bin 1051 -> 0 bytes .../shuili/common/enums/BusinessType.class | Bin 1523 -> 0 bytes .../shuili/common/enums/DataSourceType.class | Bin 1051 -> 0 bytes .../shuili/common/enums/OperatorType.class | Bin 1090 -> 0 bytes .../com/shuili/common/enums/UserStatus.class | Bin 1502 -> 0 bytes .../common/exception/CustomException.class | Bin 1060 -> 0 bytes .../common/exception/DemoModeException.class | Bin 410 -> 0 bytes .../common/exception/UtilException.class | Bin 818 -> 0 bytes ...ption$InvalidFlashExtensionException.class | Bin 775 -> 0 bytes ...ption$InvalidImageExtensionException.class | Bin 775 -> 0 bytes ...ption$InvalidMediaExtensionException.class | Bin 775 -> 0 bytes .../file/InvalidExtensionException.class | Bin 1783 -> 0 bytes .../exception/job/TaskException$Code.class | Bin 1449 -> 0 bytes .../common/exception/job/TaskException.class | Bin 1107 -> 0 bytes .../com/shuili/common/utils/Arith.class | Bin 1943 -> 0 bytes .../com/shuili/common/utils/CsvUtils.class | Bin 1955 -> 0 bytes .../com/shuili/common/utils/DateUtils.class | Bin 5108 -> 0 bytes .../shuili/common/utils/ExceptionUtil.class | Bin 1378 -> 0 bytes .../com/shuili/common/utils/IpUtil.class | Bin 291 -> 0 bytes .../com/shuili/common/utils/LogUtils.class | Bin 670 -> 0 bytes .../com/shuili/common/utils/RSAUtils.class | Bin 7786 -> 0 bytes .../com/shuili/common/utils/StringUtils.class | Bin 7201 -> 0 bytes .../com/shuili/common/utils/Threads.class | Bin 2567 -> 0 bytes .../utils/file/DataConversionUtils.class | Bin 3895 -> 0 bytes .../common/utils/file/FileAnalysis.class | Bin 11589 -> 0 bytes .../common/utils/file/FileDownloadUtils.class | Bin 2084 -> 0 bytes .../common/utils/file/FileTypeConstans.class | Bin 496 -> 0 bytes .../shuili/common/utils/file/FileUtils.class | Bin 4079 -> 0 bytes .../common/utils/file/MimeTypeUtils.class | Bin 1806 -> 0 bytes .../utils/file/TestFileAnalysis$1.class | Bin 750 -> 0 bytes .../common/utils/file/TestFileAnalysis.class | Bin 2068 -> 0 bytes .../shuili/common/utils/html/EscapeUtil.class | Bin 2854 -> 0 bytes .../shuili/common/utils/html/HTMLFilter.class | Bin 13389 -> 0 bytes .../shuili/common/utils/http/HttpHelper.class | Bin 2520 -> 0 bytes .../common/utils/http/HttpUtils$1.class | Bin 233 -> 0 bytes .../HttpUtils$TrustAnyHostnameVerifier.class | Bin 936 -> 0 bytes .../http/HttpUtils$TrustAnyTrustManager.class | Bin 1217 -> 0 bytes .../shuili/common/utils/http/HttpUtils.class | Bin 8444 -> 0 bytes .../com/shuili/common/utils/ip/IpUtils.class | Bin 6092 -> 0 bytes .../shuili/common/utils/password/Base64.class | Bin 4513 -> 0 bytes .../common/utils/password/Digests.class | Bin 2808 -> 0 bytes .../common/utils/password/Encodes.class | Bin 2901 -> 0 bytes .../common/utils/password/MD5Util.class | Bin 2124 -> 0 bytes .../common/utils/password/PasswordUtil.class | Bin 1756 -> 0 bytes .../common/utils/reflect/ReflectUtils.class | Bin 10970 -> 0 bytes .../com/shuili/common/utils/sign/Base64.class | Bin 4505 -> 0 bytes .../shuili/common/utils/sign/Md5Utils.class | Bin 1979 -> 0 bytes .../shuili/common/utils/uuid/IdUtils.class | Bin 717 -> 0 bytes .../common/utils/uuid/UUID$Holder.class | Bin 572 -> 0 bytes .../com/shuili/common/utils/uuid/UUID.class | Bin 6437 -> 0 bytes shuili-common/target/classes/fdfs.yml | 19 - .../framework/aspectj/DataSourceAspect.class | Bin 2773 -> 0 bytes .../framework/config/ApplicationConfig.class | Bin 1865 -> 0 bytes .../kms/framework/config/CaptchaConfig.class | Bin 2429 -> 0 bytes .../kms/framework/config/DruidConfig$1.class | Bin 2097 -> 0 bytes .../kms/framework/config/DruidConfig.class | Bin 4751 -> 0 bytes .../kms/framework/config/FilterConfig.class | Bin 2340 -> 0 bytes .../framework/config/KaptchaTextCreator.class | Bin 1852 -> 0 bytes .../framework/config/ResourcesConfig.class | Bin 3519 -> 0 bytes .../kms/framework/config/ServerConfig.class | Bin 1420 -> 0 bytes .../framework/config/ThreadPoolConfig$1.class | Bin 1122 -> 0 bytes .../framework/config/ThreadPoolConfig.class | Bin 2252 -> 0 bytes .../config/properties/DruidProperties.class | Bin 2403 -> 0 bytes .../datasource/DynamicDataSource.class | Bin 1145 -> 0 bytes .../DynamicDataSourceContextHolder.class | Bin 1286 -> 0 bytes .../interceptor/RepeatSubmitInterceptor.class | Bin 2072 -> 0 bytes .../impl/SameUrlDataInterceptor.class | Bin 4324 -> 0 bytes .../kms/framework/manager/AsyncManager.class | Bin 1427 -> 0 bytes .../framework/manager/ShutdownManager.class | Bin 1328 -> 0 bytes .../sa/config/SaTokenConfigure.class | Bin 5131 -> 0 bytes .../com/kms/framework/web/domain/Server.class | Bin 8156 -> 0 bytes .../kms/framework/web/domain/server/Cpu.class | Bin 1602 -> 0 bytes .../kms/framework/web/domain/server/Jvm.class | Bin 2327 -> 0 bytes .../kms/framework/web/domain/server/Mem.class | Bin 1088 -> 0 bytes .../kms/framework/web/domain/server/Sys.class | Bin 1347 -> 0 bytes .../framework/web/domain/server/SysFile.class | Bin 1725 -> 0 bytes .../kms/system/mapper/SysDictDataMapper.class | Bin 1538 -> 0 bytes .../shuili/common/annotation/ExcelField.class | Bin 797 -> 0 bytes .../shuili/common/config/FastDFSConfig.class | Bin 1632 -> 0 bytes .../shuili/common/config/ShuiliConfig.class | Bin 3055 -> 0 bytes .../shuili/common/constant/ScriptPool.class | Bin 434 -> 0 bytes .../core/controller/BaseController$1.class | Bin 975 -> 0 bytes .../core/controller/BaseController.class | Bin 2780 -> 0 bytes .../common/core/domain/BaseEntity.class | Bin 11188 -> 0 bytes .../common/core/domain/MongoUpdateParam.class | Bin 2744 -> 0 bytes .../common/core/domain/TableSupport.class | Bin 1199 -> 0 bytes .../common/core/domain/TreeEntity.class | Bin 1840 -> 0 bytes .../common/core/domain/TreeSelect.class | Bin 3427 -> 0 bytes .../shuili/common/core/domain/TreeView.class | Bin 3993 -> 0 bytes .../common/core/domain/entity/SysDept.class | Bin 18723 -> 0 bytes .../core/domain/entity/SysDictData.class | Bin 4813 -> 0 bytes .../core/domain/entity/SysDictType.class | Bin 2601 -> 0 bytes .../common/core/domain/entity/SysMenu.class | Bin 5285 -> 0 bytes .../common/core/domain/entity/SysRole.class | Bin 4624 -> 0 bytes .../common/core/domain/entity/SysUser.class | Bin 18733 -> 0 bytes .../common/core/domain/model/LoginBody.class | Bin 2294 -> 0 bytes .../common/core/domain/model/LoginUser.class | Bin 3668 -> 0 bytes .../redis/FastJson2JsonRedisSerializer.class | Bin 3292 -> 0 bytes .../shuili/common/core/redis/RedisCache.class | Bin 9185 -> 0 bytes .../common/core/redis/RedisConfig.class | Bin 3240 -> 0 bytes .../common/core/service/BaseService.class | Bin 6485 -> 0 bytes .../common/exception/BaseException.class | Bin 1982 -> 0 bytes .../common/exception/CaptchaException.class | Bin 493 -> 0 bytes .../exception/CaptchaExpireException.class | Bin 512 -> 0 bytes .../common/exception/FileException.class | Bin 621 -> 0 bytes ...FileNameLengthLimitExceededException.class | Bin 702 -> 0 bytes .../FileSizeLimitExceededException.class | Bin 659 -> 0 bytes ...ption$InvalidFlashExtensionException.class | Bin 760 -> 0 bytes ...ption$InvalidImageExtensionException.class | Bin 760 -> 0 bytes ...ption$InvalidMediaExtensionException.class | Bin 760 -> 0 bytes .../exception/InvalidExtensionException.class | Bin 1758 -> 0 bytes .../common/exception/UserException.class | Bin 621 -> 0 bytes .../UserPasswordNotMatchException.class | Bin 536 -> 0 bytes .../common/filter/RepeatableFilter.class | Bin 1778 -> 0 bytes .../filter/RepeatedlyRequestWrapper$1.class | Bin 1271 -> 0 bytes .../filter/RepeatedlyRequestWrapper.class | Bin 1773 -> 0 bytes .../com/shuili/common/filter/XssFilter.class | Bin 3586 -> 0 bytes .../XssHttpServletRequestWrapper$1.class | Bin 1294 -> 0 bytes .../filter/XssHttpServletRequestWrapper.class | Bin 2306 -> 0 bytes .../common/mybaitsplus/BeanToWrapper.class | Bin 14275 -> 0 bytes .../mybaitsplus/CamelUnderlineUtil.class | Bin 3388 -> 0 bytes .../shuili/common/mybaitsplus/NoQuery.class | Bin 459 -> 0 bytes .../common/mybaitsplus/WrapperUtils.class | Bin 3211 -> 0 bytes .../com/shuili/common/page/PageDomain.class | Bin 1828 -> 0 bytes .../shuili/common/page/TableDataInfo.class | Bin 1630 -> 0 bytes .../com/shuili/common/page/TableSupport.class | Bin 1185 -> 0 bytes .../com/shuili/common/utils/BeanUtils.class | Bin 5280 -> 0 bytes .../com/shuili/common/utils/CustomUtils.class | Bin 687 -> 0 bytes .../com/shuili/common/utils/DictUtils.class | Bin 6227 -> 0 bytes .../com/shuili/common/utils/FastDfsUtil.class | Bin 5820 -> 0 bytes .../shuili/common/utils/FileBasicUtils.class | Bin 2167 -> 0 bytes .../shuili/common/utils/FileUploadUtils.class | Bin 5412 -> 0 bytes .../shuili/common/utils/MessageUtils.class | Bin 951 -> 0 bytes .../shuili/common/utils/ServletUtils.class | Bin 3511 -> 0 bytes .../com/shuili/common/utils/SpringUtils.class | Bin 3272 -> 0 bytes .../com/shuili/common/utils/SqlUtil.class | Bin 1246 -> 0 bytes .../com/shuili/common/utils/UrlFileUtil.class | Bin 2485 -> 0 bytes .../shuili/common/utils/poi/ExcelUtil.class | Bin 31680 -> 0 bytes .../target/classes/com/slsoft/App.class | Bin 535 -> 0 bytes .../com/kms/generator/config/GenConfig.class | Bin 1583 -> 0 bytes .../generator/config/MybatisPlusConfig.class | Bin 2107 -> 0 bytes .../generator/controller/GenController.class | Bin 8063 -> 0 bytes .../com/kms/generator/domain/GenTable.class | Bin 6815 -> 0 bytes .../kms/generator/domain/GenTableColumn.class | Bin 7153 -> 0 bytes .../mapper/GenTableColumnMapper.class | Bin 808 -> 0 bytes .../kms/generator/mapper/GenTableMapper.class | Bin 1566 -> 0 bytes .../service/GenTableColumnService.class | Bin 1709 -> 0 bytes .../generator/service/GenTableService.class | Bin 12529 -> 0 bytes .../com/kms/generator/util/GenUtils.class | Bin 5505 -> 0 bytes .../generator/util/VelocityInitializer.class | Bin 1089 -> 0 bytes .../kms/generator/util/VelocityUtils.class | Bin 8515 -> 0 bytes .../target/classes/com/slsoft/App.class | Bin 535 -> 0 bytes shuili-generator/target/classes/generator.yml | 10 - .../mapper/generator/GenTableColumnMapper.xml | 122 ----- .../mapper/generator/GenTableMapper.xml | 217 -------- .../target/classes/vm/java/controller.java.vm | 126 ----- .../classes/vm/java/controller.java.vm.back | 116 ---- .../target/classes/vm/java/domain.java.vm | 63 --- .../classes/vm/java/domain.java.vm.back | 87 --- .../target/classes/vm/java/mapper.java.vm | 16 - .../classes/vm/java/mapper.java.vm.back | 64 --- .../target/classes/vm/java/service.java.vm | 16 - .../classes/vm/java/service.java.vm.back | 64 --- .../classes/vm/java/serviceImpl.java.vm | 109 ---- .../target/classes/vm/js/api.js.vm | 53 -- shuili-generator/target/classes/vm/sql/sql.vm | 20 - .../target/classes/vm/vue/index-tree.vue.vm | 438 --------------- .../target/classes/vm/vue/index.vue.vm | 508 ------------------ .../target/classes/vm/xml/mapper.xml.vm | 127 ----- .../{df => }/CheckingController.java | 2 +- .../sz/controller/SzCheckingController.java | 111 ---- .../controller/SzCheckingItemController.java | 111 ---- .../yxgh/sz/controller/SzPlanController.java | 111 ---- .../controller/SzPlanOperatorController.java | 111 ---- .../yxgh/sz/controller/SzPointController.java | 111 ---- .../sz/controller/SzRecordController.java | 111 ---- .../sz/controller/SzRecordItemController.java | 111 ---- .../yxgh/sz/controller/SzTraceController.java | 111 ---- .../yxgh/sz/mapper/SzCheckingItemMapper.java | 1 + .../kms/yxgh/sz/mapper/SzCheckingMapper.java | 1 + .../com/kms/yxgh/sz/mapper/SzPlanMapper.java | 1 + .../yxgh/sz/mapper/SzPlanOperatorMapper.java | 1 + .../com/kms/yxgh/sz/mapper/SzPointMapper.java | 1 + .../yxgh/sz/mapper/SzRecordItemMapper.java | 1 + .../kms/yxgh/sz/mapper/SzRecordMapper.java | 1 + .../com/kms/yxgh/sz/mapper/SzTraceMapper.java | 1 + .../sz/service/SzCheckingItemService.java | 2 + .../yxgh/sz/service/SzCheckingService.java | 2 + .../sz/service/SzPlanOperatorService.java | 2 + .../kms/yxgh/sz/service/SzPlanService.java | 2 + .../kms/yxgh/sz/service/SzPointService.java | 2 + .../yxgh/sz/service/SzRecordItemService.java | 2 + .../kms/yxgh/sz/service/SzRecordService.java | 2 + .../kms/yxgh/sz/service/SzTraceService.java | 4 +- .../com/kms/cms/domain/CmsContent.class | Bin 1860 -> 0 bytes .../com/kms/cms/mapper/CmsContentMapper.class | Bin 396 -> 0 bytes .../kms/cms/service/CmsContentService.class | Bin 562 -> 0 bytes .../kms/common/GlobalExceptionHandler.class | Bin 5474 -> 0 bytes .../com/kms/common/api/CommonApi.class | Bin 6925 -> 0 bytes .../com/kms/common/api/ShowFileUrl.class | Bin 1614 -> 0 bytes .../kms/common/config/AlgorithmConfig.class | Bin 1604 -> 0 bytes .../kms/common/constant/DictConstant.class | Bin 1043 -> 0 bytes .../kms/common/constant/DimensionStatus.class | Bin 477 -> 0 bytes .../classes/com/kms/common/entity/Chunk.class | Bin 2650 -> 0 bytes .../com/kms/common/entity/SearchView.class | Bin 12523 -> 0 bytes .../http/config/HttpClientProperties.class | Bin 4272 -> 0 bytes .../http/config/RestTemplateConfig.class | Bin 4039 -> 0 bytes .../kms/common/http/entity/CodeResult.class | Bin 2797 -> 0 bytes .../common/http/utils/HttpClientUtils.class | Bin 7977 -> 0 bytes .../classes/com/kms/common/ir/Node.class | Bin 2132 -> 0 bytes .../classes/com/kms/common/ir/OrderItem.class | Bin 288 -> 0 bytes .../com/kms/common/ir/PermissionParam.class | Bin 5480 -> 0 bytes .../com/kms/common/ir/SearchDate.class | Bin 2559 -> 0 bytes .../kms/common/utils/BaseEntityUtils.class | Bin 1312 -> 0 bytes .../com/kms/common/utils/DataTypeUtil.class | Bin 2936 -> 0 bytes .../kms/common/utils/Itext5HtmlToPDF2.class | Bin 7877 -> 0 bytes .../com/kms/common/utils/UserUtils.class | Bin 2064 -> 0 bytes .../framework/aspectj/DataScopeAspect.class | Bin 2979 -> 0 bytes .../manager/factory/AsyncFactory$1.class | Bin 2868 -> 0 bytes .../manager/factory/AsyncFactory$2.class | Bin 1012 -> 0 bytes .../manager/factory/AsyncFactory$3.class | Bin 1444 -> 0 bytes .../manager/factory/AsyncFactory.class | Bin 2323 -> 0 bytes .../web/service/StpInterfaceImpl.class | Bin 1687 -> 0 bytes .../web/service/SysPermissionService.class | Bin 1871 -> 0 bytes .../com/kms/log/entity/LogEntity.class | Bin 1646 -> 0 bytes .../kms/sys/progress/ChunkController.class | Bin 2684 -> 0 bytes .../com/kms/sys/progress/ChunkService.class | Bin 4384 -> 0 bytes .../kms/sys/progress/MultipartFileParam.class | Bin 1757 -> 0 bytes .../sys/progress/NotSameFileExpection.class | Bin 448 -> 0 bytes .../classes/com/kms/sys/progress/StdOut.class | Bin 2143 -> 0 bytes .../com/kms/system/base/EditView.class | Bin 3039 -> 0 bytes .../kms/system/base/analysis/FileUtils.class | Bin 37284 -> 0 bytes .../system/base/analysis/ImportsNews.class | Bin 2982 -> 0 bytes .../kms/system/constants/AuditStatus.class | Bin 2765 -> 0 bytes .../com/kms/system/constants/LangNumber.class | Bin 5281 -> 0 bytes .../system/constants/OperationStatus.class | Bin 2856 -> 0 bytes .../system/constants/RedisCacheIndex.class | Bin 515 -> 0 bytes .../system/constants/ResourcesConstants.class | Bin 662 -> 0 bytes .../kms/system/constants/RootConstants.class | Bin 505 -> 0 bytes .../LabEntityController$LabData.class | Bin 1590 -> 0 bytes .../controller/LabEntityController$Link.class | Bin 1432 -> 0 bytes .../controller/LabEntityController.class | Bin 15429 -> 0 bytes .../controller/LabFieldController.class | Bin 4284 -> 0 bytes .../controller/LabLaboratoryController.class | Bin 4379 -> 0 bytes .../controller/LabRelationController.class | Bin 4326 -> 0 bytes .../controller/LabTeacherController.class | Bin 4310 -> 0 bytes .../com/kms/system/domain/CmsDataSource.class | Bin 6860 -> 0 bytes .../com/kms/system/domain/CmsEntityView.class | Bin 5742 -> 0 bytes .../kms/system/domain/CmsMaterialEntity.class | Bin 2383 -> 0 bytes .../domain/CmsMaterialEntityRelation.class | Bin 4336 -> 0 bytes .../com/kms/system/domain/CmsTag.class | Bin 4797 -> 0 bytes .../kms/system/domain/CmsUserCollect.class | Bin 2357 -> 0 bytes .../kms/system/domain/CmsUserFavorites.class | Bin 4379 -> 0 bytes .../com/kms/system/domain/LabDatas.class | Bin 2685 -> 0 bytes .../com/kms/system/domain/LabField.class | Bin 2265 -> 0 bytes .../com/kms/system/domain/LabLaboratory.class | Bin 5238 -> 0 bytes .../com/kms/system/domain/LabNode.class | Bin 2927 -> 0 bytes .../com/kms/system/domain/LabRelation.class | Bin 4018 -> 0 bytes .../com/kms/system/domain/LabTeacher.class | Bin 3200 -> 0 bytes .../kms/system/domain/OtherAttribute.class | Bin 2306 -> 0 bytes .../kms/system/domain/SysBatchUpload.class | Bin 5911 -> 0 bytes .../com/kms/system/domain/SysConfig.class | Bin 3082 -> 0 bytes .../kms/system/domain/SysCorrectText.class | Bin 2155 -> 0 bytes .../kms/system/domain/SysExceptionLog.class | Bin 3187 -> 0 bytes .../com/kms/system/domain/SysInfo.class | Bin 2702 -> 0 bytes .../domain/SysLabelsAttributeView.class | Bin 4404 -> 0 bytes .../com/kms/system/domain/SysLogininfor.class | Bin 2640 -> 0 bytes .../com/kms/system/domain/SysModule.class | Bin 3130 -> 0 bytes .../com/kms/system/domain/SysNotice.class | Bin 4331 -> 0 bytes .../com/kms/system/domain/SysOperLog.class | Bin 10313 -> 0 bytes .../com/kms/system/domain/SysPost.class | Bin 3842 -> 0 bytes .../com/kms/system/domain/SysRoleDept.class | Bin 1419 -> 0 bytes .../com/kms/system/domain/SysRoleMenu.class | Bin 1419 -> 0 bytes .../com/kms/system/domain/SysUserOnline.class | Bin 2260 -> 0 bytes .../com/kms/system/domain/SysUserPost.class | Bin 1300 -> 0 bytes .../com/kms/system/domain/SysUserRole.class | Bin 1300 -> 0 bytes .../com/kms/system/domain/UploadFile.class | Bin 6312 -> 0 bytes .../com/kms/system/domain/vo/MetaVo.class | Bin 877 -> 0 bytes .../com/kms/system/domain/vo/RouterVo.class | Bin 2723 -> 0 bytes .../com/kms/system/es/DataSearchEntity.class | Bin 9873 -> 0 bytes .../classes/com/kms/system/es/EsEntity.class | Bin 6737 -> 0 bytes .../com/kms/system/es/MessageData.class | Bin 1458 -> 0 bytes .../system/mapper/CmsDataSourceMapper.class | Bin 411 -> 0 bytes .../mapper/CmsMaterialEntityMapper.class | Bin 423 -> 0 bytes .../CmsMaterialEntityRelationMapper.class | Bin 447 -> 0 bytes .../com/kms/system/mapper/CmsTagMapper.class | Bin 390 -> 0 bytes .../system/mapper/CmsUserCollectMapper.class | Bin 414 -> 0 bytes .../mapper/CmsUserFavoritesMapper.class | Bin 420 -> 0 bytes .../kms/system/mapper/LabFieldMapper.class | Bin 396 -> 0 bytes .../system/mapper/LabLaboratoryMapper.class | Bin 411 -> 0 bytes .../com/kms/system/mapper/LabNodeMapper.class | Bin 393 -> 0 bytes .../kms/system/mapper/LabRelationMapper.class | Bin 405 -> 0 bytes .../kms/system/mapper/LabTeacherMapper.class | Bin 402 -> 0 bytes .../kms/system/mapper/SysConfigMapper.class | Bin 947 -> 0 bytes .../com/kms/system/mapper/SysDeptMapper.class | Bin 1710 -> 0 bytes .../kms/system/mapper/SysDictTypeMapper.class | Bin 1158 -> 0 bytes .../system/mapper/SysExceptionLogMapper.class | Bin 417 -> 0 bytes .../com/kms/system/mapper/SysInfoMapper.class | Bin 393 -> 0 bytes .../system/mapper/SysLogininforMapper.class | Bin 764 -> 0 bytes .../com/kms/system/mapper/SysMenuMapper.class | Bin 1691 -> 0 bytes .../kms/system/mapper/SysModuleMapper.class | Bin 399 -> 0 bytes .../kms/system/mapper/SysNoticeMapper.class | Bin 849 -> 0 bytes .../com/kms/system/mapper/SysPostMapper.class | Bin 1240 -> 0 bytes .../kms/system/mapper/SysRoleDeptMapper.class | Bin 663 -> 0 bytes .../com/kms/system/mapper/SysRoleMapper.class | Bin 1496 -> 0 bytes .../kms/system/mapper/SysRoleMenuMapper.class | Bin 604 -> 0 bytes .../com/kms/system/mapper/SysUserMapper.class | Bin 1747 -> 0 bytes .../kms/system/mapper/SysUserPostMapper.class | Bin 653 -> 0 bytes .../kms/system/mapper/SysUserRoleMapper.class | Bin 929 -> 0 bytes .../system/service/CmsDataSourceService.class | Bin 589 -> 0 bytes .../CmsMaterialEntityRelationService.class | Bin 649 -> 0 bytes .../service/CmsMaterialEntityService.class | Bin 609 -> 0 bytes .../kms/system/service/CmsTagService.class | Bin 2229 -> 0 bytes .../service/CmsUserCollectService.class | Bin 594 -> 0 bytes .../com/kms/system/service/EntityData.class | Bin 2998 -> 0 bytes .../kms/system/service/EntityRelation.class | Bin 2451 -> 0 bytes .../com/kms/system/service/EntityResult.class | Bin 2223 -> 0 bytes .../kms/system/service/LabFieldService.class | Bin 564 -> 0 bytes .../system/service/LabLaboratoryService.class | Bin 589 -> 0 bytes .../kms/system/service/LabNodeService.class | Bin 396 -> 0 bytes .../system/service/LabRelationService.class | Bin 579 -> 0 bytes .../system/service/LabTeacherService.class | Bin 574 -> 0 bytes .../com/kms/system/service/ResultView.class | Bin 1850 -> 0 bytes .../kms/system/service/SysConfigService.class | Bin 4900 -> 0 bytes .../service/SysCorrectTextService.class | Bin 417 -> 0 bytes .../kms/system/service/SysDeptService.class | Bin 9601 -> 0 bytes .../system/service/SysDictDataService.class | Bin 3289 -> 0 bytes .../system/service/SysDictTypeService.class | Bin 4891 -> 0 bytes .../service/SysExceptionLogService.class | Bin 599 -> 0 bytes .../kms/system/service/SysInfoService.class | Bin 559 -> 0 bytes .../system/service/SysLogininforService.class | Bin 1728 -> 0 bytes .../kms/system/service/SysMenuService.class | Bin 11790 -> 0 bytes .../kms/system/service/SysModuleService.class | Bin 569 -> 0 bytes .../kms/system/service/SysNoticeService.class | Bin 569 -> 0 bytes .../kms/system/service/SysPostService.class | Bin 3750 -> 0 bytes .../system/service/SysRoleMenuService.class | Bin 579 -> 0 bytes .../kms/system/service/SysRoleService.class | Bin 8070 -> 0 bytes .../system/service/SysUserOnlineService.class | Bin 2809 -> 0 bytes .../system/service/SysUserPostService.class | Bin 579 -> 0 bytes .../system/service/SysUserRoleService.class | Bin 579 -> 0 bytes .../kms/system/service/SysUserService.class | Bin 14862 -> 0 bytes .../kms/system/service/upload/FileUtils.class | Bin 37162 -> 0 bytes .../classes/com/shuili/aspect/LogAspect.class | Bin 7779 -> 0 bytes .../classes/com/shuili/aspect/LogMapper.class | Bin 384 -> 0 bytes .../com/shuili/aspect/LogMongoService.class | Bin 547 -> 0 bytes .../target/classes/com/slsoft/App.class | Bin 535 -> 0 bytes .../classes/mapper/system/SysConfigMapper.xml | 112 ---- .../classes/mapper/system/SysDeptMapper.xml | 211 -------- .../mapper/system/SysDictDataMapper.xml | 128 ----- .../mapper/system/SysDictTypeMapper.xml | 107 ---- .../mapper/system/SysLogininforMapper.xml | 57 -- .../classes/mapper/system/SysMenuMapper.xml | 187 ------- .../classes/mapper/system/SysPostMapper.xml | 122 ----- .../mapper/system/SysRoleDeptMapper.xml | 34 -- .../classes/mapper/system/SysRoleMapper.xml | 201 ------- .../mapper/system/SysRoleMenuMapper.xml | 27 - .../classes/mapper/system/SysUserMapper.xml | 366 ------------- .../mapper/system/SysUserPostMapper.xml | 34 -- .../mapper/system/SysUserRoleMapper.xml | 44 -- 386 files changed, 141 insertions(+), 4809 deletions(-) delete mode 100644 shuili-common/target/classes/com/shuili/common/annotation/DataScope.class delete mode 100644 shuili-common/target/classes/com/shuili/common/annotation/DataSource.class delete mode 100644 shuili-common/target/classes/com/shuili/common/annotation/Excel$ColumnType.class delete mode 100644 shuili-common/target/classes/com/shuili/common/annotation/Excel$Type.class delete mode 100644 shuili-common/target/classes/com/shuili/common/annotation/Excel.class delete mode 100644 shuili-common/target/classes/com/shuili/common/annotation/Excels.class delete mode 100644 shuili-common/target/classes/com/shuili/common/annotation/Log.class delete mode 100644 shuili-common/target/classes/com/shuili/common/annotation/RepeatSubmit.class delete mode 100644 shuili-common/target/classes/com/shuili/common/constant/Constants.class delete mode 100644 shuili-common/target/classes/com/shuili/common/constant/GenConstants.class delete mode 100644 shuili-common/target/classes/com/shuili/common/constant/HttpStatus.class delete mode 100644 shuili-common/target/classes/com/shuili/common/constant/RolePermissionConstant.class delete mode 100644 shuili-common/target/classes/com/shuili/common/constant/ScheduleConstants$Status.class delete mode 100644 shuili-common/target/classes/com/shuili/common/constant/ScheduleConstants.class delete mode 100644 shuili-common/target/classes/com/shuili/common/constant/UserConstants.class delete mode 100644 shuili-common/target/classes/com/shuili/common/constant/YesOrNo.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/domain/AddParam.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/domain/AjaxResult.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/domain/ConditionView.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/domain/MongoOperType.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/domain/SearchParam.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/domain/TimeView.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/text/CharsetKit.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/text/Convert.class delete mode 100644 shuili-common/target/classes/com/shuili/common/core/text/StrFormatter.class delete mode 100644 shuili-common/target/classes/com/shuili/common/enums/BusinessStatus.class delete mode 100644 shuili-common/target/classes/com/shuili/common/enums/BusinessType.class delete mode 100644 shuili-common/target/classes/com/shuili/common/enums/DataSourceType.class delete mode 100644 shuili-common/target/classes/com/shuili/common/enums/OperatorType.class delete mode 100644 shuili-common/target/classes/com/shuili/common/enums/UserStatus.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/CustomException.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/DemoModeException.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/UtilException.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/job/TaskException$Code.class delete mode 100644 shuili-common/target/classes/com/shuili/common/exception/job/TaskException.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/Arith.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/CsvUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/DateUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/ExceptionUtil.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/IpUtil.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/LogUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/RSAUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/StringUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/Threads.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/file/DataConversionUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/file/FileAnalysis.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/file/FileDownloadUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/file/FileTypeConstans.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/file/FileUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/file/MimeTypeUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/file/TestFileAnalysis$1.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/file/TestFileAnalysis.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/html/EscapeUtil.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/html/HTMLFilter.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/http/HttpHelper.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils$1.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils$TrustAnyTrustManager.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/ip/IpUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/password/Base64.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/password/Digests.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/password/Encodes.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/password/MD5Util.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/password/PasswordUtil.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/reflect/ReflectUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/sign/Base64.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/sign/Md5Utils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/uuid/IdUtils.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/uuid/UUID$Holder.class delete mode 100644 shuili-common/target/classes/com/shuili/common/utils/uuid/UUID.class delete mode 100644 shuili-common/target/classes/fdfs.yml delete mode 100644 shuili-framework/target/classes/com/kms/framework/aspectj/DataSourceAspect.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/ApplicationConfig.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/CaptchaConfig.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/DruidConfig$1.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/DruidConfig.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/FilterConfig.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/KaptchaTextCreator.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/ResourcesConfig.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/ServerConfig.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/ThreadPoolConfig$1.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/ThreadPoolConfig.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/config/properties/DruidProperties.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/datasource/DynamicDataSource.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/datasource/DynamicDataSourceContextHolder.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/interceptor/RepeatSubmitInterceptor.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/interceptor/impl/SameUrlDataInterceptor.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/manager/AsyncManager.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/manager/ShutdownManager.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/sa/config/SaTokenConfigure.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/web/domain/Server.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/web/domain/server/Cpu.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/web/domain/server/Jvm.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/web/domain/server/Mem.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/web/domain/server/Sys.class delete mode 100644 shuili-framework/target/classes/com/kms/framework/web/domain/server/SysFile.class delete mode 100644 shuili-framework/target/classes/com/kms/system/mapper/SysDictDataMapper.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/annotation/ExcelField.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/config/FastDFSConfig.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/config/ShuiliConfig.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/constant/ScriptPool.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/controller/BaseController$1.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/controller/BaseController.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/BaseEntity.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/MongoUpdateParam.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/TableSupport.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/TreeEntity.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/TreeSelect.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/TreeView.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysDept.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysDictData.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysDictType.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysMenu.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysRole.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysUser.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/model/LoginBody.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/domain/model/LoginUser.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/redis/FastJson2JsonRedisSerializer.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/redis/RedisCache.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/redis/RedisConfig.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/core/service/BaseService.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/BaseException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/CaptchaException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/CaptchaExpireException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/FileException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/FileNameLengthLimitExceededException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/FileSizeLimitExceededException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidFlashExtensionException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidImageExtensionException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidMediaExtensionException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/UserException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/exception/UserPasswordNotMatchException.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/filter/RepeatableFilter.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/filter/RepeatedlyRequestWrapper$1.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/filter/RepeatedlyRequestWrapper.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/filter/XssFilter.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/filter/XssHttpServletRequestWrapper$1.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/filter/XssHttpServletRequestWrapper.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/mybaitsplus/BeanToWrapper.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/mybaitsplus/CamelUnderlineUtil.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/mybaitsplus/NoQuery.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/mybaitsplus/WrapperUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/page/PageDomain.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/page/TableDataInfo.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/page/TableSupport.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/BeanUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/CustomUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/DictUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/FastDfsUtil.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/FileBasicUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/FileUploadUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/MessageUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/ServletUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/SpringUtils.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/SqlUtil.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/UrlFileUtil.class delete mode 100644 shuili-framework/target/classes/com/shuili/common/utils/poi/ExcelUtil.class delete mode 100644 shuili-framework/target/classes/com/slsoft/App.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/config/GenConfig.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/config/MybatisPlusConfig.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/controller/GenController.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/domain/GenTable.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/domain/GenTableColumn.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/mapper/GenTableColumnMapper.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/mapper/GenTableMapper.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/service/GenTableColumnService.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/service/GenTableService.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/util/GenUtils.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/util/VelocityInitializer.class delete mode 100644 shuili-generator/target/classes/com/kms/generator/util/VelocityUtils.class delete mode 100644 shuili-generator/target/classes/com/slsoft/App.class delete mode 100644 shuili-generator/target/classes/generator.yml delete mode 100644 shuili-generator/target/classes/mapper/generator/GenTableColumnMapper.xml delete mode 100644 shuili-generator/target/classes/mapper/generator/GenTableMapper.xml delete mode 100644 shuili-generator/target/classes/vm/java/controller.java.vm delete mode 100644 shuili-generator/target/classes/vm/java/controller.java.vm.back delete mode 100644 shuili-generator/target/classes/vm/java/domain.java.vm delete mode 100644 shuili-generator/target/classes/vm/java/domain.java.vm.back delete mode 100644 shuili-generator/target/classes/vm/java/mapper.java.vm delete mode 100644 shuili-generator/target/classes/vm/java/mapper.java.vm.back delete mode 100644 shuili-generator/target/classes/vm/java/service.java.vm delete mode 100644 shuili-generator/target/classes/vm/java/service.java.vm.back delete mode 100644 shuili-generator/target/classes/vm/java/serviceImpl.java.vm delete mode 100644 shuili-generator/target/classes/vm/js/api.js.vm delete mode 100644 shuili-generator/target/classes/vm/sql/sql.vm delete mode 100644 shuili-generator/target/classes/vm/vue/index-tree.vue.vm delete mode 100644 shuili-generator/target/classes/vm/vue/index.vue.vm delete mode 100644 shuili-generator/target/classes/vm/xml/mapper.xml.vm rename shuili-system/src/main/java/com/kms/yxgh/sz/controller/{df => }/CheckingController.java (97%) delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingItemController.java delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanOperatorController.java delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPointController.java delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordItemController.java delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java delete mode 100644 shuili-system/target/classes/com/kms/cms/domain/CmsContent.class delete mode 100644 shuili-system/target/classes/com/kms/cms/mapper/CmsContentMapper.class delete mode 100644 shuili-system/target/classes/com/kms/cms/service/CmsContentService.class delete mode 100644 shuili-system/target/classes/com/kms/common/GlobalExceptionHandler.class delete mode 100644 shuili-system/target/classes/com/kms/common/api/CommonApi.class delete mode 100644 shuili-system/target/classes/com/kms/common/api/ShowFileUrl.class delete mode 100644 shuili-system/target/classes/com/kms/common/config/AlgorithmConfig.class delete mode 100644 shuili-system/target/classes/com/kms/common/constant/DictConstant.class delete mode 100644 shuili-system/target/classes/com/kms/common/constant/DimensionStatus.class delete mode 100644 shuili-system/target/classes/com/kms/common/entity/Chunk.class delete mode 100644 shuili-system/target/classes/com/kms/common/entity/SearchView.class delete mode 100644 shuili-system/target/classes/com/kms/common/http/config/HttpClientProperties.class delete mode 100644 shuili-system/target/classes/com/kms/common/http/config/RestTemplateConfig.class delete mode 100644 shuili-system/target/classes/com/kms/common/http/entity/CodeResult.class delete mode 100644 shuili-system/target/classes/com/kms/common/http/utils/HttpClientUtils.class delete mode 100644 shuili-system/target/classes/com/kms/common/ir/Node.class delete mode 100644 shuili-system/target/classes/com/kms/common/ir/OrderItem.class delete mode 100644 shuili-system/target/classes/com/kms/common/ir/PermissionParam.class delete mode 100644 shuili-system/target/classes/com/kms/common/ir/SearchDate.class delete mode 100644 shuili-system/target/classes/com/kms/common/utils/BaseEntityUtils.class delete mode 100644 shuili-system/target/classes/com/kms/common/utils/DataTypeUtil.class delete mode 100644 shuili-system/target/classes/com/kms/common/utils/Itext5HtmlToPDF2.class delete mode 100644 shuili-system/target/classes/com/kms/common/utils/UserUtils.class delete mode 100644 shuili-system/target/classes/com/kms/framework/aspectj/DataScopeAspect.class delete mode 100644 shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory$1.class delete mode 100644 shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory$2.class delete mode 100644 shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory$3.class delete mode 100644 shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory.class delete mode 100644 shuili-system/target/classes/com/kms/framework/web/service/StpInterfaceImpl.class delete mode 100644 shuili-system/target/classes/com/kms/framework/web/service/SysPermissionService.class delete mode 100644 shuili-system/target/classes/com/kms/log/entity/LogEntity.class delete mode 100644 shuili-system/target/classes/com/kms/sys/progress/ChunkController.class delete mode 100644 shuili-system/target/classes/com/kms/sys/progress/ChunkService.class delete mode 100644 shuili-system/target/classes/com/kms/sys/progress/MultipartFileParam.class delete mode 100644 shuili-system/target/classes/com/kms/sys/progress/NotSameFileExpection.class delete mode 100644 shuili-system/target/classes/com/kms/sys/progress/StdOut.class delete mode 100644 shuili-system/target/classes/com/kms/system/base/EditView.class delete mode 100644 shuili-system/target/classes/com/kms/system/base/analysis/FileUtils.class delete mode 100644 shuili-system/target/classes/com/kms/system/base/analysis/ImportsNews.class delete mode 100644 shuili-system/target/classes/com/kms/system/constants/AuditStatus.class delete mode 100644 shuili-system/target/classes/com/kms/system/constants/LangNumber.class delete mode 100644 shuili-system/target/classes/com/kms/system/constants/OperationStatus.class delete mode 100644 shuili-system/target/classes/com/kms/system/constants/RedisCacheIndex.class delete mode 100644 shuili-system/target/classes/com/kms/system/constants/ResourcesConstants.class delete mode 100644 shuili-system/target/classes/com/kms/system/constants/RootConstants.class delete mode 100644 shuili-system/target/classes/com/kms/system/controller/LabEntityController$LabData.class delete mode 100644 shuili-system/target/classes/com/kms/system/controller/LabEntityController$Link.class delete mode 100644 shuili-system/target/classes/com/kms/system/controller/LabEntityController.class delete mode 100644 shuili-system/target/classes/com/kms/system/controller/LabFieldController.class delete mode 100644 shuili-system/target/classes/com/kms/system/controller/LabLaboratoryController.class delete mode 100644 shuili-system/target/classes/com/kms/system/controller/LabRelationController.class delete mode 100644 shuili-system/target/classes/com/kms/system/controller/LabTeacherController.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/CmsDataSource.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/CmsEntityView.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/CmsMaterialEntity.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/CmsMaterialEntityRelation.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/CmsTag.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/CmsUserCollect.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/CmsUserFavorites.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/LabDatas.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/LabField.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/LabLaboratory.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/LabNode.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/LabRelation.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/LabTeacher.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/OtherAttribute.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysBatchUpload.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysConfig.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysCorrectText.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysExceptionLog.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysInfo.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysLabelsAttributeView.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysLogininfor.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysModule.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysNotice.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysOperLog.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysPost.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysRoleDept.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysRoleMenu.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysUserOnline.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysUserPost.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/SysUserRole.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/UploadFile.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/vo/MetaVo.class delete mode 100644 shuili-system/target/classes/com/kms/system/domain/vo/RouterVo.class delete mode 100644 shuili-system/target/classes/com/kms/system/es/DataSearchEntity.class delete mode 100644 shuili-system/target/classes/com/kms/system/es/EsEntity.class delete mode 100644 shuili-system/target/classes/com/kms/system/es/MessageData.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/CmsDataSourceMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/CmsMaterialEntityMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/CmsMaterialEntityRelationMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/CmsTagMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/CmsUserCollectMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/CmsUserFavoritesMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/LabFieldMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/LabLaboratoryMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/LabNodeMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/LabRelationMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/LabTeacherMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysConfigMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysDeptMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysDictTypeMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysExceptionLogMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysInfoMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysLogininforMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysMenuMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysModuleMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysNoticeMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysPostMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysRoleDeptMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysRoleMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysRoleMenuMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysUserMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysUserPostMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/mapper/SysUserRoleMapper.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/CmsDataSourceService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/CmsMaterialEntityRelationService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/CmsMaterialEntityService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/CmsTagService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/CmsUserCollectService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/EntityData.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/EntityRelation.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/EntityResult.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/LabFieldService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/LabLaboratoryService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/LabNodeService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/LabRelationService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/LabTeacherService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/ResultView.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysConfigService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysCorrectTextService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysDeptService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysDictDataService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysDictTypeService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysExceptionLogService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysInfoService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysLogininforService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysMenuService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysModuleService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysNoticeService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysPostService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysRoleMenuService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysRoleService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysUserOnlineService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysUserPostService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysUserRoleService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/SysUserService.class delete mode 100644 shuili-system/target/classes/com/kms/system/service/upload/FileUtils.class delete mode 100644 shuili-system/target/classes/com/shuili/aspect/LogAspect.class delete mode 100644 shuili-system/target/classes/com/shuili/aspect/LogMapper.class delete mode 100644 shuili-system/target/classes/com/shuili/aspect/LogMongoService.class delete mode 100644 shuili-system/target/classes/com/slsoft/App.class delete mode 100644 shuili-system/target/classes/mapper/system/SysConfigMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysDeptMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysDictDataMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysDictTypeMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysLogininforMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysMenuMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysPostMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysRoleDeptMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysRoleMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysRoleMenuMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysUserMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysUserPostMapper.xml delete mode 100644 shuili-system/target/classes/mapper/system/SysUserRoleMapper.xml diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java index 4aefc76b..eed87ea9 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java @@ -1,5 +1,8 @@ package com.kms.web.controller.system; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiOperation; import java.util.List; import cn.dev33.satoken.annotation.SaCheckLogin; @@ -34,6 +37,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; */ @RestController @RequestMapping("/system/dict/data") +@Api(tags = "字典数据") public class SysDictDataController extends BaseController { @Autowired @@ -41,7 +45,7 @@ public class SysDictDataController extends BaseController @Autowired private SysDictTypeService dictTypeService; - + @ApiOperation("字典数据列表") @SaCheckLogin @SaCheckPermission(value = "system:dict:list") @PostMapping("/list") @@ -66,6 +70,8 @@ public class SysDictDataController extends BaseController /** * 查询字典数据详细 */ + + @ApiOperation("字典数据详情") @SaCheckLogin @GetMapping(value = "/{dictCode}") @SaCheckPermission(value = "system:dict:query") @@ -77,6 +83,7 @@ public class SysDictDataController extends BaseController /** * 根据字典类型查询字典数据信息 */ + @ApiOperation("根据字典类型查询字典数据信息") @GetMapping(value = "/type/{dictType}") public AjaxResult dictType(@PathVariable String dictType) { diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictTypeController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictTypeController.java index f6cd899d..e3ec3893 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictTypeController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictTypeController.java @@ -1,13 +1,22 @@ package com.kms.web.controller.system; -import java.util.Arrays; -import java.util.List; - import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.core.domain.SearchParam; import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDictTypeService; +import com.shuili.common.annotation.Log; +import com.shuili.common.constant.UserConstants; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysDictType; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.Arrays; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -19,16 +28,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.shuili.common.annotation.Log; -import com.shuili.common.constant.UserConstants; -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.core.domain.entity.SysDictType; -import com.shuili.common.enums.BusinessType; -import com.shuili.common.utils.poi.ExcelUtil; - -import cn.dev33.satoken.annotation.SaCheckPermission; - /** * 数据字典信息 * @@ -36,116 +35,111 @@ import cn.dev33.satoken.annotation.SaCheckPermission; */ @RestController @RequestMapping("/system/dict/type") -public class SysDictTypeController extends BaseController -{ - @Autowired - private SysDictTypeService dictTypeService; +@Api(tags = "字典类型") +public class SysDictTypeController extends BaseController { + + @Autowired + private SysDictTypeService dictTypeService; - @SaCheckLogin - @PostMapping("/list") - @SaCheckPermission(value = "system:dict:list") - public IPage list(@RequestBody SearchParam dictType) - { + + @ApiOperation("字典类型列表") + @SaCheckLogin + @PostMapping("/list") + @SaCheckPermission(value = "system:dict:list") + public IPage list(@RequestBody SearchParam dictType) { // startPage(); // List list = dictTypeService.selectDictTypeList(dictType); - dictType.addParam(SearchParam.SORT_BY,"desc"); - dictType.addParam(SearchParam.ORDER_BY,"update_time"); - return dictTypeService.selectPage(dictType); - } + dictType.addParam(SearchParam.SORT_BY, "desc"); + dictType.addParam(SearchParam.ORDER_BY, "update_time"); + return dictTypeService.selectPage(dictType); + } - @GetMapping("allList") - public AjaxResult allList(){ - return AjaxResult.success(dictTypeService.list()); - } + @ApiOperation("获取所有的字典类型") + @GetMapping("allList") + public AjaxResult allList() { + return AjaxResult.success(dictTypeService.list()); + } - @SaCheckLogin - @Log(title = "字典类型", businessType = BusinessType.EXPORT) - @SaCheckPermission(value = "system:dict:export") - @GetMapping("/export") - public AjaxResult export(SysDictType dictType) - { - List list = dictTypeService.selectDictTypeList(dictType); - ExcelUtil util = new ExcelUtil(SysDictType.class); - return util.exportExcel(list, "字典类型"); - } + @SaCheckLogin + @Log(title = "字典类型", businessType = BusinessType.EXPORT) + @SaCheckPermission(value = "system:dict:export") + @GetMapping("/export") + public AjaxResult export(SysDictType dictType) { + List list = dictTypeService.selectDictTypeList(dictType); + ExcelUtil util = new ExcelUtil(SysDictType.class); + return util.exportExcel(list, "字典类型"); + } - /** - * 查询字典类型详细 - */ - @SaCheckLogin - @GetMapping(value = "/{dictId}") - @SaCheckPermission(value = "system:dict:query") - public AjaxResult getInfo(@PathVariable String dictId) - { - return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); - } + /** + * 查询字典类型详细 + */ + @ApiOperation("字典类型详情") + @SaCheckLogin + @GetMapping(value = "/{dictId}") + @SaCheckPermission(value = "system:dict:query") + public AjaxResult getInfo(@PathVariable String dictId) { + return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); + } - /** - * 新增字典类型 - */ - @SaCheckLogin - @Log(title = "字典类型", businessType = BusinessType.INSERT) - @SaCheckPermission(value = "system:dict:add") - @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { - return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); - } - BaseEntityUtils.preInsert(dict); - return toAjax(dictTypeService.save(dict)); + /** + * 新增字典类型 + */ + @SaCheckLogin + @Log(title = "字典类型", businessType = BusinessType.INSERT) + @SaCheckPermission(value = "system:dict:add") + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDictType dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { + return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); } + BaseEntityUtils.preInsert(dict); + return toAjax(dictTypeService.save(dict)); + } - /** - * 修改字典类型 - */ - @SaCheckLogin - @Log(title = "字典类型", businessType = BusinessType.UPDATE) - @SaCheckPermission(value = "system:dict:edit") - @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { - return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); - } - BaseEntityUtils.preUpdate(dict); - return toAjax(dictTypeService.updateById(dict)); + /** + * 修改字典类型 + */ + @SaCheckLogin + @Log(title = "字典类型", businessType = BusinessType.UPDATE) + @SaCheckPermission(value = "system:dict:edit") + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDictType dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { + return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); } + BaseEntityUtils.preUpdate(dict); + return toAjax(dictTypeService.updateById(dict)); + } - /** - * 删除字典类型 - */ - @SaCheckLogin - @Log(title = "字典类型", businessType = BusinessType.DELETE) - @SaCheckPermission(value = "system:dict:remove") - @DeleteMapping("/{dictIds}") - public AjaxResult remove(@PathVariable String[] dictIds) - { - return toAjax(dictTypeService.removeByIds(Arrays.asList(dictIds))); - } + /** + * 删除字典类型 + */ + @SaCheckLogin + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @SaCheckPermission(value = "system:dict:remove") + @DeleteMapping("/{dictIds}") + public AjaxResult remove(@PathVariable String[] dictIds) { + return toAjax(dictTypeService.removeByIds(Arrays.asList(dictIds))); + } - /** - * 清空缓存 - */ - @SaCheckLogin - @Log(title = "字典类型", businessType = BusinessType.CLEAN) - @SaCheckPermission(value = "system:dict:remove") - @DeleteMapping("/clearCache") - public AjaxResult clearCache() - { - dictTypeService.clearCache(); - return AjaxResult.success(); - } + /** + * 清空缓存 + */ + @SaCheckLogin + @Log(title = "字典类型", businessType = BusinessType.CLEAN) + @SaCheckPermission(value = "system:dict:remove") + @DeleteMapping("/clearCache") + public AjaxResult clearCache() { + dictTypeService.clearCache(); + return AjaxResult.success(); + } - /** - * 获取字典选择框列表 - */ - @GetMapping("/optionselect") - public AjaxResult optionselect() - { - List dictTypes = dictTypeService.selectDictTypeAll(); - return AjaxResult.success(dictTypes); - } + /** + * 获取字典选择框列表 + */ + @GetMapping("/optionselect") + public AjaxResult optionselect() { + List dictTypes = dictTypeService.selectDictTypeAll(); + return AjaxResult.success(dictTypes); + } } diff --git a/shuili-common/target/classes/com/shuili/common/annotation/DataScope.class b/shuili-common/target/classes/com/shuili/common/annotation/DataScope.class deleted file mode 100644 index 7642a4f821594384e096cfe22b7bba6778735932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmaix%}xR_6opUu8^J$N)VMIH3!)omU*T3s~0;lWg0a=Fm9n7}> zL7t3O!Gb|&@ciiC_qqaS>m{BE((Dp6&TIn{y2*R0v~u|vn#f&w)-oA^dY*KDG^Kz; zZRM>MO&(WUaO?$MMgGP@NuY!>R~4>`2^?;0{An;-%}CU+$$N`+Tg-32LJ)Sai+WZO J8rZ`=@B?!sm$(1` diff --git a/shuili-common/target/classes/com/shuili/common/annotation/DataSource.class b/shuili-common/target/classes/com/shuili/common/annotation/DataSource.class deleted file mode 100644 index 07d220020b3c11dd20cdb586d48d6934dbda89c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 629 zcma)4%TB^j5Iq-xDn0<;E{u-_q6@om=Zd5?l7Ns>O^mB+9pRGp*3g!OUvuFH_)*4b zFqTA&F79LIo-=c1=DvTtz5%$vu7NEB+Xi+73S;RfByd(gZFyl}MuSB8%H(ShYLj#l zM5ZNU*$b1ANABc>E(NL$t;1NxD%2J|%fycb>i?$~+l`)UI|8L?)GOt)f^wGTd??3K zV9!Z(tOB}Ik$UtgOBxC6w^EGhOWil+w;I!xqdvtf@p%5b?NdNH{;H$cw%zNFC6IUT zySBjLe3C;kbGTTJTl)jj4SnTJ7-%@RH*T}dQIFLOIJjtxd_0-t-&xa|M{ diff --git a/shuili-common/target/classes/com/shuili/common/annotation/Excel$ColumnType.class b/shuili-common/target/classes/com/shuili/common/annotation/Excel$ColumnType.class deleted file mode 100644 index 7f614cf836188920d65ab0a1a345f9682e10097b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1326 zcmb7DTTc@~7(LV7vhA`ISg^>=3!=6~SU~XB#z2~?O)4Z5NQh6%y26s}tZBPMABhj@ zga5<_1r?*w@a&H=elu*KL=)3}*qQHk&iTHX`SttTPXKc$B%xwL#|=zsNNcckbYWWj zW<+E*fs{_`O<~L>V2X8K!z~7FY3*@orCemti-8~3`0C5&E`w3#+^rXVyU}nP3|7Sn zYF1-A^nA~vZ7txI&3VwYn;vaTFC5n&KdsL*bW~SY%1aL!;=8sV5+W-T+4%ZmWvx_Y zn10eeq68u_vzcuB)oL+#N-DZ59(R|*+NN7ywKsk8XcBh$8ACBs*|B$R%eVQKRc+Qi zzLn3mEz_(7j_t48bx+_&Br3OS#AW_XK$9wX+-u%v82AT&xtv{RP@CHxHJ+?`TikAj zb%IheGNNR%G}lDI@gop&P{CpgQHh7OLYr;erxVnxL0EU(2cDRcE{}Lh%*VhvamCUG zZsU%Iy9|?UT@C}oxM$!J@&@|QFLsv=q|j@?L@z_?^bmw}x!I`2c@S3>apc8K)u+mg15XWRc zVkbIMaD}`vj1yBIu15MST17|k+$U)7Wx{DI?U>U4qXR0_B85v&;HA0v)kv2tm@IUfF zi;AP8!?S;soF)N+&^(`gVXD>A6#tBa*)g)&3t zMJJ?!f;yQ>r8_w%FL|%1a(Bsgt;db(x>Z{-*B#nX1>y2*hWS)!%iJ*y$85{Wu+h1T9_($bpF}+H+;BVSAY_x1|xTfEz z5tW=087Y+}6(hNd6Ohmb9muv7D!7em?$p{Y(3NRruTiU54{WZCCT??@Yog;Ee@jUn zS>#mAGfbTF9q1Urf{shLrz3#@?v3l{L9dQJzVxG)A$F`g@0mfVIG#%_^rg~m^DM7# zSrwn!9Q%K9hPif8#RG2F=IDM;mL~E<`?&x{isxtO2kE9?OvxvC{{UGUL0FoCGI2g3 z&@;%@;z&d>i1T0=qG*gP|FkC97laNWeV~Y8nAWh!Z4-V37Xth&LSk2o%bBlG4k2@V z=mdV0cJvks7pVfzlfbm{iVq=C&xFWK4jmwz8U76QqrmW*G0FmOsrD|qu!m8K5_FO? zUKaCkk544w3hjn4L6s6n1^pRh`9wowo7;J}v3eE|X+C*$u)c|Cb;9 z0sbiQgi@R7Favg`lg-Jw_nv$1O@9CR`HP62)2B4OPt%7qeN0oH(a?r+L(i|Dv<0I~ z+4n`T;c~5oPE&zVvhyIRRbUt;vbi#&k%I3l!;MsaQ5^8lHHjamr>7wM+(VY}Y_4+1 zkGSn}ziHP@ApPb#BSNtTH)2x-9!IjlhIC9P{cs?7V?+5zA}}H-9k&@>)1u7-ZdAaC zEip=Ihr1$yIw+J0ROmO5c1txx0&Q7H=LpyBq+5dkM|rkxh0>Kaj-K*u{!g`CItF>J z*E!VL{~ck~>ecf0XGT^_$Y!f!PtnRRK@WbA{9QIo%gV2I0ZWGm2l5#D8y(+vxEsPS zs~sq>jRYx3-B*kzvbnvBEF6>?=5$A~8+Fd$s^LLXn1V6zDkF6*nvFKn(GdYclICo> zi&wKH@(_kx$-;APqEM+oM@@x+BQ~Xro`%jmUWxXA(PTCBjr7Eh)NyAt zji@S&K#cMsC3V#CY5o%GSLI6Q1Oe&lx9xg)tHfyf;*k28V_?o+{Ji7}59QC>OKp}* zl_JQOFBPNV-s*qZKNJqeI@5z<9rj#cw0wEy*t#-WxB@>CKaZD(2JnwIVJwN)iiU7^ z9e0T`WdPiun_WQDEday)z(_wZ+7FDyfpO%Rh*!A{;7%O43t*D&otI4snxgxFrs+Xf zNs(p%Jc$30?#*6AHtAdG^L1e(fEQX1F6{N!J0(NyUG diff --git a/shuili-common/target/classes/com/shuili/common/annotation/Excels.class b/shuili-common/target/classes/com/shuili/common/annotation/Excels.class deleted file mode 100644 index 3e8fdde5e720acc965903ee077777f17d4b561ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmaiwO-sW-5Qg8WiP6@N>PCKa13WfMVj9z-$hM{iRY^2!~``0}91N>3q zv<+w;}`k>Q-JOJ^S}kl*V^@jc;eHJq>$R)!U{vj%xCjLv2P2FdGV+JA@$7wi3t zk#_ClX*lN05l-vW(!y%{9Ri^tXG8W+9>Iezs)5bL9bik|V~Mwg@dhA96D{n_BgQWF F{s56*fJy)W diff --git a/shuili-common/target/classes/com/shuili/common/annotation/Log.class b/shuili-common/target/classes/com/shuili/common/annotation/Log.class deleted file mode 100644 index 5c4b0bdc3208d24472c5f73f9c711abe83c3aca2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 847 zcma))O>fgc5Qg7P>bNZh`o%|q(zH}ndZ~rPjgwIVMQWPLF&x^{#ti9J_HOH42lcOU z=nv?RLW~i_7DT|o-ksO)%&ec;+izcQ0KCGkk8K}2K3)iTPPvo>);s%07jhzlRO)ds zbh*;w*8(e{*2YPvjPBBBS)@(?0!yR9DoxhL*O#2!;pD_*fjuu&ssi3-MhB#e%m#02 zPA<6jzeaBmANC?{WiBa~&gB1YHK;lN+UhrBs~;YR?|K3)WryeHi-35^zs`Z2P()V+ zS=W_L3N$!p;Db|nZlFPwx?*zd(9q!zD-gRVe(c4kD56M2X~uvBxd9b#%Z zF{w(f+2}_fj^p=z=CVDzYS$!1c_8}4?)IM-pjMsv2rO5P2crv0_%3Z#Qq3Js+3fKw z(BP+}?#&6z!Q-gKQPaX_VIB)V1&^?ZJ1i~XZYABreU_H%X)7$OV(nL*Q>=4~2VAm& fhj_&6F1LHkpEu6XAUwg-^7Raxr9^m+Ewq8}TWjZ~ diff --git a/shuili-common/target/classes/com/shuili/common/annotation/RepeatSubmit.class b/shuili-common/target/classes/com/shuili/common/annotation/RepeatSubmit.class deleted file mode 100644 index 24a54615ad0d2336fe9a4a2cff98e049f26905d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 485 zcmZ{hJx{|h5Qbj^ZJ>O$Ffky$q)IGg>BfZAASzLc(!j#xhEwaxv8%+X)W62S58y{3 zE*+W-VX*Jc_t;WW1FWjJt|ECosbqJ-8i2l%H7T7QVN`f zxp69?ca^D$rUzrJlTKNa30yuGjIX7c`f`)-2WCd8a`bsGa9)o@GM$p+d}Aqf&ZV#G zxj<7w#zm_IG29#m(bK5^Z{d&}!`vIQ-TDVN$g9;VUNPu}Z!ghc7zkX|U+LR8FPd1- za~s>l&t|#O%4avRraF05KY@0s&S)~H*a=*eM-{HTfDaUr@-FMdT*e~_J$*m W?Jno{J|GA!?Bk$_2!}YrG4KbVmXIO< diff --git a/shuili-common/target/classes/com/shuili/common/constant/Constants.class b/shuili-common/target/classes/com/shuili/common/constant/Constants.class deleted file mode 100644 index 446aaace6800a8f93f7b96c4127bcd2db015f669..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1503 zcma)*TUXOq6vy{LN<*n2s3_s*<;QaQ zpvwn8z|> z2aG1_@B9zG+V!Kh>SRe6wI4D%smD>8`BAp%cXO`L8lw}d%j*hN;J4DdO;=yjJl$F` zymez+p(dlT!pgPQjYgq-#%SC&nug{g^zw%37HS*a97Zs(rQKtcyZL}g3TFYItY|}LjjOzt*Iol38Zq&@xBG*gA7P=Kv?|1eJuD0P= zEn7Fd!!loEm`h<4W{+??Gqb2@P>*-H7+4tbM!vtp6W8DALNig11HZfJC!yfJaxm+J zDWj|PAl_HgP9Anc72RyNZYS4)v4@EkUjp2J{a-0x9(P$a%VV0$u4V4Sc2(!k^Kx MzX^H*-2iDn0N_X&9RL6T diff --git a/shuili-common/target/classes/com/shuili/common/constant/GenConstants.class b/shuili-common/target/classes/com/shuili/common/constant/GenConstants.class deleted file mode 100644 index 42e7e29032af73d3d8f2e2c2b3849b23d9fa1d19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2486 zcma)-`I8e>5XZl>n@xJNVOatms30K9rL3Uh0fIS(Wn_{p$z&y>#@S@Z4kVLxk|22D zeP4Lr_bncXN|jam2l%6Z5M}q9q!>Y~{N=s=^!57n>q-7R{o5Y^uEnW1HshWcd_srN zCG-e~2=@{W6OIt>8^tEvPk4avAmJgxQBgchc!cmM;W5JFgeM435}qPFO?ZazthhW! zc%JYA;YGqrqIj8bjPQzxuM%F9{dK|{gf|Iq5#AQXJA`)$?-AZ7d_ee6bRWg=aSWem zAZyyJW{TykhNOAGK4eceZLcv|>iVwN*s5VcrtNjQw%47pn>~l{X+Oj&>N?>w4WlAe zGleYU=NcvyPN#}`-s)?=7&zrqId=L|!+77G)AQx3ktKY^fniFRuqdR-mvd=dVgsEdujUI@RnHpMxmwdGv3AK>zI)1gv7%ut zohs>7zMEkQsml&1zRSv)RUl9o1UW>btB7DmMN>$QLJ;Of7H3TumRMsdE zz8l13cIlbj>B3&Z_XAZnW$D4q#s7H#G$fS5$Xoi9UL^b|?UsI-1#vhbWeR2s z<+RED|4G9_rAQl7Sv_OqQYPW#AV|(3{LGc98&^$ZH}fwVVnuyV*(fsnsv)|~_1x}u z4Z~~K&1i^Z+I5H1ny%;Md#zc=x9r&_Ym#QWW;bVS-xcmFBi%W-qhXy{Yquslb3M1| zPO{i)d%Ok1HaX>ZgTd?Y6ws<%nR5x174$YXv~fw$~6bfeiSgp}O65x^9b$iS#$o za65(g%W2Igpo?cr61yJfrB2Ik@_kqw4RR}aSglb{HIV%oorc3DM`zuJvW@I-wr!4z z*4sVR-&ozLxtuJ4opQvGTj!KD-{A_Xvq$*l`*Khj)tzQ_f75OxFeUDzy?LoM@a)Ut znZPbFM}4Pd`v(&+geXXr=B)8RwA8IB2vqt&6nz4>N>F^>_8qUAx1~Q6fKg|$?bjWj zM}>>9y&Cta?ej=bZO(1hIU<4G629htPRKvryD)pesmbfr{2m__>H3ZwE?Y3B<04M0 z!UBb|1vMsu8gq`PDc@$I_XR=03!2WQ)d*%thc z@?#o<$BdXfKy1nOpD>^L+DJOJ#c1&LgIFo*lLGkf@!CB(Ng?+fuA%y)+PF6L^8 z?`F0`Jj+}Qah=%-@qT^-O@3;4b@{fFylcFVtUm?q1Penrz-v?~2?tqD1P*AT#YFH1 z!CD6q)&j^A)6*9#sb?Su_eW}SZqrq*?E%ee3k41mFz-ZDJkn{aw)IzQY_)&+3`A*J?4u@rlaACcfF?Dth)JMshDnV|z9p z#1lUnj1XDvWy5IHk0y!qNwAV1CR0Y6yz_bT0`dk~{ttR>p} E3&^mJFaQ7m diff --git a/shuili-common/target/classes/com/shuili/common/constant/RolePermissionConstant.class b/shuili-common/target/classes/com/shuili/common/constant/RolePermissionConstant.class deleted file mode 100644 index 1aeab581daa3a3d5cfa97ea0788cdaff5781538f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmb7>TTc@~6vzKldRa=j6)z|tg384QHb&ntB!-SjlZ7t3wZM~^b|>wS-5uSF!pGu? z#0NfrAIfmH)i@-+_;U9A{xf_2bI$qs>&GpCci66D3Trhyt6`mC!R6jj+xOd@m-prN(L{d5uw<0*xX-)pDOqkYRNt#uWd{sXJG(uG@}UkS zIXWtq$9dG3NmukkQksq)h_ELTRq$`IoQ+h<@YWgV$WBMO3YAT1q+|L_8n!(hN>?V4 zN>iodKXag&)P0>N1Nl)ESgN&i_HJ8a1^(%sa z+7DzXGkQQ-28vFr^74yLibO?|#7bl;GxvLd4U}m2Kn+h&Mg?? zvp>psPS@xVzPNtqJ?Gx%p659)_vf##KL9MEl!Sz71vAiO49b{O(2IHgE%3==0(}WA zDP%6Q|2TpE1XkF5BIBt*e0yj2)kcL3-7`GDC7_mF*J^G$Myq9!yHqh7b***e+m5Y~ zS#P+sxGm3cJxw={tV7?iHp7ipwjE_vAohA=Pv4^T#Bh8|AYC~&P7KX4+?u9)P1~&z zNX}L_DtlYH!1CKJdE!BQ61tMhcN;_6Y#frr-iqy7+kXAPYQ8ZJ9NLkC;5+XG%DJoh z^Ib|#R~n|_RE?(1EFqQT8g*if7j4(})&z3b5SFjeP!*88Bby44)a{x}J#12#fopE( z37V)`UbWqj{#^cQI6@RnCzKG)@s$@Hs4ds87rV-Ojk>Mq4Zmqx&uuPk=F05M@PMee z&0{>MViiRh&jc2_m_HR`SW|Hi>naA25fHQNO{nO@E%N46^s|xrJCmFmO{?iNTvB(r zI6DW&mg!LjQ~#rd-cDy1f)};gQOxiabasJ75KX4@UI;7atED-5w!QT1rP2^50?CcQW5hbmJC`^u?BVL&P1o=aNVa^nt0(s&tpa+xS zSQ)y>5$^~2u*Dfgk)_=T9uU(*JPP$`w6eZf;UnaKrD;L9wzOCnE`c1;wTrP!#o=%M z8>IboBAQN~LpeiF;HpykM&PDm-|0AdiXMGmIz>u9gWv?(MQbN8PR+i-Cly5@ z3D+Z=e~umB<~$DUGnb+7Ux}~6N`=0(c$q7G`Ho@D$#hW)U5-UsNfSmBc|Hoy-BIMZ z+{7v=&pbZ#Ms7TChxQjgGVz3AyHR?lK}fc1q==^sJB_gpvx7lQDIM1xm^h$j8tWj8 zgE0E!1*ayS(KzpwR^%EfZ3 zX!K)0$!1nDtyHQk`kZB&uD@eiJekUiDwWOL1udb=vno&IP|Y)M{pWE!-&+rNvBmK6 zCaD=V{;fQmT*;(lIJrrNgXVSFD+czO&Ko)>*hh!{17I1uFkpgVg{Xrr@oI~E#A_|S zMZDhP4dUA^?i1f>@g`+v^T|nWQw6JLVCltouy1wAow^N1(xhOZM=s=md$><`2M=ob QkXi+`M^8$+rH{LR0AMzrA^-pY diff --git a/shuili-common/target/classes/com/shuili/common/constant/UserConstants.class b/shuili-common/target/classes/com/shuili/common/constant/UserConstants.class deleted file mode 100644 index eb583682a04d1e44292c3ee7ca6054baabdfd0a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 947 zcma))*>2N76o&uF(zsb@2}>#aP8*=o^5H^5va>fez)he z_e_I0uuWr$wJuZrlWGQYI?Jtfd!1#lI5Hd!IuD@Z?+@C2w$m*8%ymZxvhzU03nt~% zH!M%XOMzOBd!Fmcv0iavvpupsSHo-ip4I!{v0K%$UH=psj^Q}Gh2OWk2Cufu#CK5~ zE#3oonM{J|FqlV@|8ABRM^P%!GAGGQPmi)_ z8tHUrNzBiQpt_fa^HX(GN?mo5Y(5G1qrB@s(H;3Rb=<>!fvx{-DX_kLPwwjpYgs^KjV;o6n{>5c!56-(8MN6D1$Ym0xD!p z;Z<@~;TpMqjvMFrg2J+XO<`HTuCR<>R9Mb)Nnshktgx)VqVQGnhQim#n+jhi-B9=@ z`If@6|80e3|2qobr7}W373~8mq~{EjTi+qR<&r(5UEww;+#}k0?w9cxPe^=X+5)!! E0Pu34Z2$lO diff --git a/shuili-common/target/classes/com/shuili/common/constant/YesOrNo.class b/shuili-common/target/classes/com/shuili/common/constant/YesOrNo.class deleted file mode 100644 index 46050626a918946f9cde67ab2a5a417a97865928..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmah_Jx{|h6uj53gf^ume2*Xo=zu|D1F=*vMd?r!siPaL)>UdtiNpV5LSo-_`34UW2KV%Ni-hkZhG_An)c(MrBZkx8=8%#%v3SSW6LSJQ(NY#deoI)u+cB8xBmSj27D9;cDhF_y6!MKH)UzF$R1?)EsD!-axN)OP{gBGT3mN RF{tY{1{g9U>@YSEeghGAQVIY7 diff --git a/shuili-common/target/classes/com/shuili/common/core/domain/AddParam.class b/shuili-common/target/classes/com/shuili/common/core/domain/AddParam.class deleted file mode 100644 index 9d2aeb51044116977619da8f9cd188948d14ac41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2975 zcma)8>rzu!6#jOuBnF{W5TT+dfe^%KwOUD_MZk(iq)os|+aHG{gU2Q(Omfm0`Uri4 zzC}Az$6jXo0DY)VzjgM>g_DzMm|^dA)?WKt-@5Dt|NQ&s-vI98yBHF9D$A}c&t!Qn zOJ0^2ag1Uwj+fYv;>$Q<*t>wQP>7-!#X%H@3ggX6!!)Xgl}6L7TL-(_3hJ4{=vLio z+JhVIu$5_`%3j4eKORup6dzl2r&1-W z?5x{+-30MT+2EX*b74uDI6I7B19Aze;P&dZyq! zaq~xMZhDIs>a9kp^2C(ZA8q&VZF$lOT*71mQ?gu^Wg1r!_(-IyBCTOPidPAIjo0i1 zX9zf9ZZ;amnLO_(juQ9=-zqE)_iQ*Jy0b*b!uRW_Jj@kt_Ct#IraOZUMCRi#n>)2r z`%K|VZ<}n@t5sHqLoT~~q;RoIUU;(-EGj39Up%A5nBXsS z=EzK&vomwf&g9W<#*t@f$2>YRQ`yna5l!J5u5+E|=_Yr@J)Hgx>K6(@+~68b&uNzU#hHa=t^&7Dw*l^v^vXM^Unyz4xTBpzn63qLN?W;@;!lEN6?vxp zMR=ys)4pT_Ub6E;l3np98}O1{Alc*qvXXg!vbTK62EAmLh9tY{Pd4Z!nQn!m zN4%tSB)vX>w4M|GIlqdzPR<`uT0_>Yaf^G9bs0;)M^v7DFn#MCdK^z6#N*Gne$M|0 zH#yWEI|Q!lYn>S|CVv75O(>cEgzZupbEknmo8y@dJ?Bta=PF&i!(Hx&g^D-wZ4%fS zDys?`q^lpsPb4WFoaB6r{Em^IaWVZDVz1vL&LBm(@&_&i@Jd7}V#t}FI_9T{W0x^K sXM^T@lAi3uoMcYq?R6uSGu`NN_Lyf|L=8esx*>0Og5SXt9tH5le;Y9Bl>h($ diff --git a/shuili-common/target/classes/com/shuili/common/core/domain/AjaxResult.class b/shuili-common/target/classes/com/shuili/common/core/domain/AjaxResult.class deleted file mode 100644 index 20a4a982a057234e558e073ccd596d46c7040775..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2280 zcmbtUTW=dh6#mAyU0*^PLran-bzTZir^XXJ80D(&}ZPx>?YkNTS35jN~wlYeJq;QOaQ!Z>gxLsO6Br+hUnhFfaD&Di*}PD3&D!%M2$x!!>nl z!*D&*vDcU98Q41veRGcOaoy${y5$>baw&d{L7i*NU;nsOTVyEKcl4Wj)za-wwaH!6 z?o2T#E6v5=vpQdE)q-QX)o9h~DhN0;ZQ3TEVMvxM8w{yAXUkydubZ~9>UTE{x211d zbW^N5ZK9ax6H!ZVD$F5`3<{H&4r>mQGwYH;we#7v5ixZ(! z<>jM1rR%nI%_s@UuGe8G$7x1v8=E^un@>sGEuHI6W+41ZscUk*{ppInD@jv@6uhgT zPO0(ycH8hMfU$DrI3diGV_5uWfUs1@Vz3rv5CZ&9PHDq+9hYG?F6+l4mu;FITj#z@ zZ8I6L^0{eMmvnEN$}k-v`c&#O)G4{9_R|Lv{oXBYO3~BCg-J(f9JgrY$1?{_!AZL2n=0?Y$5-B&uBhdIn z4pSwP&QODLm)!L^!$h=A!hwjW?+?(?D~5AN;}>Cg;mfiv&J0=8TXp!VZ&5raW1Lk! z#LM)w4bWSa#t@2l77Wjkl)y=x#`73Fkdq{zj>s93h9a^`@|lSI0`g=_O+f2eLcB~n z6MnQku)EU5FsO-LBQYtr8!N+czuzjEmBHfal-(o_76_n>@-yjE1l z_uVHc2vAlsv|c6SH^}`2xu2vgOp&W=l7<$*9?&Qq&?tp8$SKj+h`=ZzQBD3L1*v;6)V(O91e9V{>me_c6A|ULND&mt zA#immG`|pNQaF53QOb`8sMIMGmSxgqb bjezB4gHYaRq(q-G%FR`h64YQ5a-aMg8U51V diff --git a/shuili-common/target/classes/com/shuili/common/core/domain/ConditionView.class b/shuili-common/target/classes/com/shuili/common/core/domain/ConditionView.class deleted file mode 100644 index caaae009f6ca96a190e2972f80d1c627c55f4682..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3976 zcmb7G`EwlA5$?A;*Y1vlEK9Z*46K7lq?N>SAL}C##w1Q8@PvgyZY?-tKC(;{sJlZ~DFd zx~IFp?l=4K=kLBpM7Pq34B1rSWri0&OIOijELC}#wJFHrd4!jvtgEp!$4kgd#LGM@ z9=EBUr9OJhp$0!=hZgv`=+H5To^a^6LqFq#pWE~cK}P7!`GWcZ zi|@Wz2pWauvoEn!i?yURwb(B#|NRuJs!&NutEy0~{O;_f^G_FoP)irzIk|l156iE; zUI=l9oyLYuX#2>k*B{~I*Z+Fy&F5GC@{j-h`)`F>a1`;GL1QAE5wvCHHzzOt=e0|3 zoL~O)3x%8D?ze>-3oFn5UQnvCC}@1L63vwwvkO5jC_$WyLOkkzX(pQUg0QqZ3TFbY z?R4NDLn-WrAMcaYObmB(GqO%^#%@p|=!(f8^!F{y9ro*oJTS^ML=~?#?bQR`>q8@+ z4M4Gj5T+G#9WiLS)*Az7bVzb)?Fhmk-X-X+gw$3gt6#M0M7QS1w4n4buXeRrrh(y+ zZXl8XKqt|OXf++XP;oJKucFh0xEr*U;B|e(an-bw!G!cUXcG{2e&g`Ee6y+LKfd7A zKu(A6CL<3D5)u4I@vL9RI5CeyYQVGdthtd2J(W47Y0jursoB#udLtFO+qI3}*;2(_ z?kHa@_8g48%F!urUN#l(FL~WK6))VwDF8d`HD*;`g3G-Kd;fvGQ+tpCWUKBs7HTmL zb;#C`4$vG@@mNFp?dc);<~UN#At-w=TBuk2djr|v9fNfP-*SSsebwcK0o*VbRijYN z`tnP^#^vGCR=V1y0)4}!A(n2T+g$o4OT#oGXmlNo;?hCd?b7XZhf8;}bSK^AQkl2g zdD%fbT{=WR60~{k#e6rekQt_TV@GPk%rlIBNl&7-V+C0*xqk{{GFITK?UWi>H;Cp~ zp|Xgl7;)*Rbcdk6_N!D!fd_AX-sk&mJgJwv22RI@@^#>w{drkDZNum5Dtrh{N^zA* z&^6fQ@VplPg$4jAu6(!RIw-(Kx8iyzKu)*fTTp;7`0s`;3=Rp`OWQDsq)?ir?*S@t^#TIf`>#qD775CMWW4* zB@Ox#jWJgV#;LW&gNeqN#{}c_TH}18G3GeI*j#ITb)qrmKf%~qYdoH4ybGSn9OrlqGw(06De$&dAQ{qT@6#;}x)@sB8%H$J2dr^p@88%vaJB64LDkX+fyn~bqO zr2bRXlQ;9$Dv(>Y0dmVu-e!=aL3Z9*1?nkh0O~1c^BD$ZH7JwMt^)Oza{%?0-F%Kg zt_DGBf{fEhEiJE%)dhZ9rQ9m;Cv=az$Oh>H+Jh4D{q-i@i?cLF>kNGtl7aPQ`W_^c zrs#Rv3(2Ay9i{I>!cTni=?9P;dIgq~kTUct2%CbGr6pWc`yl1$0&dm&Ai1<3u}x6F z?fjp5ZTjJ7w8^Fe_;bW(v_*-TuNDy)K3uvhc(S;=Os0`@SJ&n0+*Na#t=vsy%$K;} zkDGEMF2c@%^$UI5cNjY*^;`S4&w_ZTZ}b$|<4bhKqkNt#8?4A1TH|m#D3x0_r3#%O zjhwvMRP~fCsj^xs^oO$QE!$Fs*3eeARBcTr@_-6cCzGaUX`1dw5+*%EKZcY->3>BJ zAi*?UN3--GB!hN=l!qXh(A-Q9L$WBQ&GZvUwxs1#%6@?Z1GESMDoBVg;G(@x@xdUO zO+XW4bRKD#wF=fou07RYyA#~TCn&Uu(`C}OO4h*;Wx{U^#W*dZRQw^BJWqWOyiFVW z`{hO8C!}1m-_cA6Ad5NxEdo`-dO?^uyHDxJ!M0V+; OtzQ=&;=r$q!(Rek*C*}( diff --git a/shuili-common/target/classes/com/shuili/common/core/domain/MongoOperType.class b/shuili-common/target/classes/com/shuili/common/core/domain/MongoOperType.class deleted file mode 100644 index 019c23ee31dea40d9321e737423bf6cac60c352a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 836 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 diff --git a/shuili-common/target/classes/com/shuili/common/core/domain/TimeView.class b/shuili-common/target/classes/com/shuili/common/core/domain/TimeView.class deleted file mode 100644 index 56bcb26a0c0d8a418bf6f953d1c97ac2a7a8fa7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2538 zcma)7-%lJ>6#nk+%+BmG{3r$5Ra8(c3k$5RsO9iTV}SvM~t1HKik>-e0O8}?~Qu` zn&m9{uN!|p{9^ac-I5|IA3bkd*(Lh;mpk8X?0$D&ATn$_ws%$_oak8)P|oowfyPPO zv8D^Fi&k#lBvP4=n=!KsX3m!9;8O8cY(h^=X57_Oex+b%?G(jT*Ws44QcLctX*(&2 zX~DMEiQHJWysVPLhw)#B4T}9FtY@{ z&-wD=O)KLK^;{DW?*0M>DiZH{D^^aRK_=c+QSQc~qVmQlnv^S2?;DiQeuRp;1Q9B3 z>gPN&^U;*KR%DwET5K{sV>;s!zkt4C=2!fJv3e7PH#0jiHBS7LBRMNy$a-X=5|!Rn zMiA?&cuV(Oze{O9=N57q(k;tgFKLst8<6cR(D{E|Dr@X_*zVo0|N8zb1J9wuKr7k| zJS~@J&?a!=a1CQ%7%2lM&~0EqN(m|T$YliV*<;n;*ce-INfzj633sAgq!9z};|BBV z>j*d)A=bW*G7CJ49s}d(7HHaw>=&Penrmxx6zH$jatFFFfHH(mj*u1(o-jg^1`sw+ zb=;5hKc2@^RFIm3igqeU*FnXzMRyWQRVRa`xC`!T?*oV*DTMGm*GTa)iWevwz5%-M zB2TOUy1DLmzK75cRn84Homqw&&f#k3rkc(yUkzua+PS%=b1#yCbDBwpWRktf`v}!e zy3Mx;l9q({1rX?~9VdL)IDWm@3$^1YhmGTxSIF-6^Ae|tIm*0lCwsqvs%#~HgZd@Z z@K*9ys8fBt+lUm86tw9+E@`Fzchtp|M>w(xqd%@}LoZoG(<)7(=}26aHjzhY-b8&| zjYlesVrh*=v9uo7q>&yNX>q+|q-+sT_&`rx_kot_y^WV}l4-Q!6P#k7g{ZOdGVj9Z zMTS4UC!yd1&f^tI{L#f5c$HEFS$5)Ulr-e{DV(OH;|$+S!qD`8(4Zmx7;PGc_@|4< zIPQzlN|B*CErRYi!(DcVD(REx4}KATbEswXDltp+Le3UHj2NI_gx*)0hK7}qBIWH( zLn|a)Z%S@L>)%G*hw?s}R-_`X1R7nI!B@r7YEi`s6rJ?AT2!^yCiSfUU;rzOS-eh~ zINLFUQA#1ia0z3C8s-;r3g;*(1bhr{Qc{bwtt0Y;7Yb<;f>c3>Cp6zXhvY>o)RIBT zM%jNAm_;hg_AIM!X-t@$o<4WDL8x*l4L*c%^#SUe8@ACXDdg7N5@;rTu?{S_^{0Ftq)VKfu diff --git a/shuili-common/target/classes/com/shuili/common/core/text/CharsetKit.class b/shuili-common/target/classes/com/shuili/common/core/text/CharsetKit.class deleted file mode 100644 index ca51d4b73eae020b8024e48093fc74833608e5cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1826 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 Hc-;R05j>!{ diff --git a/shuili-common/target/classes/com/shuili/common/core/text/StrFormatter.class b/shuili-common/target/classes/com/shuili/common/core/text/StrFormatter.class deleted file mode 100644 index 0ebd75d0745ebdbbff87d2955b73a409005cbf29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1860 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 diff --git a/shuili-common/target/classes/com/shuili/common/enums/OperatorType.class b/shuili-common/target/classes/com/shuili/common/enums/OperatorType.class deleted file mode 100644 index 8e1d889f6a61b3a0dbf2dbbc42ee6adba65381b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1090 zcma)4ZEw<06n-ugTDmfz;uM^36UWQuDvF5_vJ4m0C3Pf%B*aezE9+9)rN9#Zm9oSc zjb@+yQO0xch-1+Yw8=g9-1FS$Jm=i=>-V>x04k`&AR(`!fTE1FjFO6FZ181MK|-bA zCPzF_km7brfzGWV;~_(&*?!e{!?14l{h={Bm^iLu(01s1hV4y;Bcpj_2iDjR+8>YX zDns;jeZT&)!8gt4dnRqjaDoIImY1lySuA<+7wTPYFY_ M0YTnOub07`A|5C8xG diff --git a/shuili-common/target/classes/com/shuili/common/enums/UserStatus.class b/shuili-common/target/classes/com/shuili/common/enums/UserStatus.class deleted file mode 100644 index 29f7f3e10221ed4da782c34db73b7ff64548d79b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1502 zcma)5OHUI~7(KV0wnG^n9bSSch(+2W6c7*rkyp`5mBj!F(alhYGNhd*eXw`u4{&4R z!bBHtOcX?jM#I|wfyO^!{Jv?GLYvrG+{d}!|k; z9!~03BCO>yrj?+0$+Wi86zpH0i>*a8f!;^eHFEFj$-I#j=nDj^Opz9B9t|AvKnc>&bOJV{*}AWy#W0)WAJ$T4ruWV6sB}XnD(W zB)Cpq<+e={T%(x@i|o!&;l2v>DkpmqMy{a0IS?!lArmMdYF~yt9ZwedIs@Ezyd*wC zcRpQ>BQtcnUM-!^#Em7BU2ZsiD1-bG6kO(K+NIzgq5?hte_smxxUV39Wd#?}so)Yi z1;h{;{Nvs0lcOU(3o2;C1%ihOK6(1`=kvD;+HGWnk!P=dy?CRbgOU2v7sQZ;PD&@77<`u)D!S&f;`o~)7=XKAvGiiWk zqH51XkWN$u91*KF)!IWS`>3;ldP!|i8*RX61FB1H xQk!j{#r>6XoO`I#Hl#iHv<=rDTC{x#wyAJIUb2*~4mTjvsvv!Yc6=eDe*ml#J2C(O diff --git a/shuili-common/target/classes/com/shuili/common/exception/CustomException.class b/shuili-common/target/classes/com/shuili/common/exception/CustomException.class deleted file mode 100644 index 71e59f080e6805419b74802a81a31839a7c08afa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1060 zcmb7?%Wl&^6o&tCZX~!($OS^6w1onRQ}Bje5t~4zqQIgpkyyH6lnjb(Cf z!2|G6h<_X>F(pF6l4s`l{O3ED@y}o1e*k!bZUsf`mQlc6z1-90UJ3V0cpy*f=pXBNu>IrvJ_)Jn5&R8zW0I zZ=}q()ac0Sl4SRX~Ia-w9_=lRO>XR)!)BB zer@qv9LgPB#dd~oF8Rr=kVXb8=&)>oTezL_ZSLAvu)e|g!h^vXfI$6mF9Di!K?)Su UVzT*Mv%$H`!M(M?+ewO@-&aM)*8l(j diff --git a/shuili-common/target/classes/com/shuili/common/exception/DemoModeException.class b/shuili-common/target/classes/com/shuili/common/exception/DemoModeException.class deleted file mode 100644 index e240419ac5d55e555fcb3c33f1577acb94c587aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmb7AyG{c!5S&f!5^-Dzgh!E%4v@eFbRe1pBv7E>alLa`#OTgO_dxs>6%qv>z(*nG zA`k@?E@pQ|v$M88KHuH}9AG^{8-p%ZyI2z}m!_~fOH5H(?{3e=0y!7-M&6Z`c2%OY z+JqczjtDwO*4gS<(B9fk1i{GP89{$yow=;@sVQ#sG@~+@_>{4l;pE?9P|a*9P?OZ> zs+`p}vx;r*oifj diff --git a/shuili-common/target/classes/com/shuili/common/exception/UtilException.class b/shuili-common/target/classes/com/shuili/common/exception/UtilException.class deleted file mode 100644 index 1e00e0c88effec3c3d09439ed6c018ce2f686417..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 818 zcma))%Wl&^7=_O`sokdOg(jtGxwHi&ngrnu3#6hhC?FLD7PQTN8b-+=dyMQc@LFs@ zV!;Ej;3aqu#2LrAfU-cAX6C=l_n%|?$M0|70X)LJ8gAfb4NJJ?mfHdL0~`o!W-8S( z>Z>%S<=IYnu<)8Nj{3qIIdm_*}>b;X6WEe>^3@=7$ z@=;zz>bTt(sGcTomB2<%8}&MmuT*;BY64rmWWZUH6B(DusvYS}pxYZHahQ#A9qEwA zI5DC6G*Is?b%mE!N6#nGF*TC5y-)!2^UBU`s?D&F6~rpb!nu#P*pTgNJP+|m?i|F>Czy_wiIxv@G{(>Ec|m=&iV zfs%&GzM8mg9<}FulzwrDD*pq3eE0~sFEjG6f(p;8sB>Lo<|$*3d#%&`0@3{n?{m?& z?s7$Cop(0)0N2Nz*u*tPuD*o^IgZyXc_-{~JikL$tVLtH1?*tlHiZQxj91a3M32B-f;{Z~0p}pFH2?qr diff --git a/shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class b/shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class deleted file mode 100644 index 2fca5ea192ac05ae94bd5b282497599788e0aa26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmcIiyG{Z@6g|U3U`0{!tuZmN@V$){7#qX{Lu^zMLp8t%V}@C?yC}b9Wn$q6_)*5Q zDp+8QF>#Bz=bkzDx%2Y+^bFtts}AB=N?|#L6@jTh`C6Kq@&oPJ%gV8UI2D*Ec{T{8 z4QtZ$RFZ+wCj`b0wbkK~Kw-09y^(j)HPW`-^U&9}UHlERRTD^*yp|HkRkc-Ty>3JK z7qVf<%v8N5yOHdP{wJ9TJ30_ptJphfbnC>(pi}OL%0?}h`%QHl5(s1~)+)cm>p)Ro zuQt7|8+3ZwXqT|-Syv6z?zJ|`{meL;Y~$xzMJ`SnME!F?1wsd$MBk>EuQNKT!kjV(PrGK>0Ko&*nmfFC8k zaft^-L~ssWuWDXZy{hh~=Z8lCo0xHs##9cK9Hs@zp$fD#4Hbmix2Lr|0dXiWQ1xvX zNgFk!iB*<~$tMK*cC^*euE5qpvwkVBrE8?^y2nwVZFl=Ok;R5Urs{W;K&h^+I*PrP z3QlCpFfv^C+f*Z|iT-;q6J6*~V76wjrO}<5C%bC@Hc~c`ynowPR}q0gv1Y9bsz!#P zBEMO0`<@$K#M)?=(DSXUKG^QLHp+dk__f&l&%L&}IBAT3qdL7@fst=EB2Z8tQj_t% ztV|%ENU_r6_|CB(2W@r0z~{WZ4!u#=k}5?M;0T=k+mO8Dzt_ebQhaB8GpHbgENvgX z6mmpd3LKvOjGXXqhBm*nys~-^areq9@^r`s)|s(^0ivZh9tJT)j~N)o2&*J$6l1UK WJjRLA#1o9CFo`m4(koF@Lg58of7jsv diff --git a/shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class b/shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class deleted file mode 100644 index 6f2a8a8aa563ef72fb759a12c404d3ba298ad1d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmcIi%T5A85UfGuv7-2X$Hc^g@4a{u;{`CmpcjzDcp6~DF~h9cUDV(5Wa7aO@S}{i z2zbC4W8xmBt9z@vt9$0{{pA(F0ahK1U@3{^Bvu3_1LbRJYRV6^XD>8MdAMxPK!9BHe=V}ZlXtMaY9m#&eva*QzZIs)qI9zPw=UzE3P8#DqsOBJ7VCI{R2&7eCYBb)^ z$^=r86f4^t->G;VzoAYT_?manVKC}`R3(En9D&P!8FfsiMBs^n7|Z0W?&jKtP-JF%yro* V%oB|eFEAd%A|`30UXhwC(jQyB*Z=?k diff --git a/shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException.class b/shuili-common/target/classes/com/shuili/common/exception/file/InvalidExtensionException.class deleted file mode 100644 index e66f1b04a6ba220c2e552616846d05ab268548ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1783 zcmb_c>rN9<5dKaJY+Dwng#r?}h$yABtSF)aA{Rkxs{TNl5WT5l$zxs~3kseoSXA(wVJK(rb3-q^5hb0k9k{}Dbjw^jD2kd(3WJ(6 zO<}JZ+;N1XVCgJmootn0h=S!apInufMbL*K?g(4wMnTxJ-e&Fv1AEQTv1*x)%T2ey zjk;*1F6AF1e{LAoM^W-~F?4U|_xL{73~rXS4cFGq@;pOSoHoIbXyy?4pc}&ERl(4< zpqsk8$S{{`k}DV-v`iEjT2`$RCF{!Trg&Sg?h5-o-!;gR$Xi8fkyE2|Zx~zLitaEh zlk`yrXU1VZ~8Y>A~#ciw*fYUc0nH$+wu?nI)zLOd8 zxsrBT@*y@o)$g5Q>*@u^{Ed!p#h2h&lWWV5;j8k;qBLEU(pAc(q&6ezl|w8=Wq#Scq2D-^rV?1h;4L;M>$ z5-}PLpZ!tBb1zdy^b54fJ$>#y_nhZB_uT&c_4NmUWo(8ZVo|{o?n#)Gu%aM>`)pX1 zF`&@mD)V?CBg*VU86(U-k}=9`QpOmwDH-F;K9;a1pev_YI|cnk+R9l1#LdbpM}V64 zeW$wV*|nNe6R?~qRmzFlLBsXj1bvn(e!_WIa^BWm`Z}x>6FIx~M*lN2&4MHaTr7>#n#spjmWM|G2UQ1i8bXR*wo zePky*+uu)E^{VUdC*xOR8qQQowzp?jU6!PkN%ZY9B@F+YML;m+`fi=hcJMzW((yey z=K6t4(nFTJ@7wi8l_CXVY(Y+yyw>LJw$QrYD5tK%evR5du_}#f$=P;Ug~As)Wr5X5 z#RTi-Nfl49E#P* zNes872k0GP^`o64Lb#3_pmQg5lPr6bCWO!EI7Q$iA%W(BAYYpx|0ztj{Fl+eXO*xx z^97x!5Sf3+1^-(#qn>%;Htz6ssyKPEjEe}+OA2OY$4(IZ#FyLCoo|;g!>D7H`^-Vc zJmy+NK9CUhy#EF|qkdG1KKoL3U;y~@>pqqnhK@NI2=#@C=;~*?^(BB*UPVoXw zYWlp`M3|@;cDR z0tr-!0}sGMA!ave0-~27d|1zpKmT^V8T-f2Z{GnN;GvHa?)oTWW1gc;5BEIW_pn7M zHL?>y2%1WXyphIQ3r(nMk;^#kh+NA|y>7lB&=KKEBU8GFRndvlp(r!kT*Q>bQVv>4 zHi&e8C{r16ILK5a&JyvyU`lkFb)$By-yL3Lw#?aeLglGcvUo;lZnsY34{?;nsuvv> zxm3OSzaV!ygr$~L;?;1_6?r@ErtERKl_l&cW@o$~Crd?Nvf*g9W4LH{pnHb-SHXn0 z|H;O0>`Bk+#@n0{x)3LaXN20NB7)Zw#b~rows&STcQF?KI2-1Pcqwi3{+Qe&<2pbU zt7dr+U=d4%{h6juSef>2;*aonCWt<@;Q?yGQ4s&sM$6tIuzMl^$zXINBKLa1Axy@f)~~8%!~g zAv>14I_AD%b%~z^;qLx9oN(_e+$np}vTCR>V}U7#ACB}BelX$N3D{}^tg$cSU>&!{ rCq;ZWRg}Xoa6fV2z?5IH$#shkMuIWg!ELL$!-X50{Eza{-t)CzZ>kJx diff --git a/shuili-common/target/classes/com/shuili/common/utils/Arith.class b/shuili-common/target/classes/com/shuili/common/utils/Arith.class deleted file mode 100644 index fe70076636416bc618ba603e1519937cab22e84b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1943 zcmbVNZBrXn6n<{9$tKJ4A}vTNr4cPAP>3z4<;5x`&_)7O0w|0lvk5z4+s$rfv&*Qz z!%vR?p<_Ql$Ij?SXZ%m?_}ohduo7q5nQ->pbI*OwbI*Bp`TN!He*l=lo`Ea)M8~HF zKEquDG0aLcC(XPx3(|b9Yy3X2B1Fq>xlzT8|&qljhct)%ck$3ubc;_}LV zv9z;aSz0VF3y2b9OTO0%Eic@$+{lizx*?EUa6BixClJr&cLcO0|G*aLEjymQ9yO|V zuw_+UM*7Qs&2o3Fz>({APzw*8mcWg2&2JQ1hmqqt1-cF2D@38=whD`Z6CTbJ+&VZA zNaTved{H2FbeoKnbBC)cSA*rp){#|cSm9yezEdySHK$>@JQ=GpCEkjvw2jE6J#dal zn@}Z*m1vO``E^%9tM+8gYAR}MC$|DW@=nXDRKasX;`km97!^MXYW9jFPaBHpl;mJy z2pNH^m+{e2GVv8wWlq_|4Xl}1$A*bV()$`~0@wey6(;f+7Z_FGuI1GWCD*mJIMM$_9r{=O>E+( zi3+xKY@67@HzvNtE-%dH_MMm8s6Mu9;lDyfKT;D;g?=Rr9Iq}gkSpd-2ckHhhB=IZ z+<&7|HB;^Q>*H&KydDI6jy*^G1lpV?7rFK#kj7T6WpztmW+&v*{wyw^!JycLB$s0N!l>v5{xn?xXbcqBv;!cWo&|C)|gdLl1T9EsFFmIQ3WH$f+ diff --git a/shuili-common/target/classes/com/shuili/common/utils/CsvUtils.class b/shuili-common/target/classes/com/shuili/common/utils/CsvUtils.class deleted file mode 100644 index e1983520e7600c6e80cb8e3bd6c1faa9697e2bcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1955 zcmah~&r@4f6#i}!@jd7zx!SyL2z8;ynF9C=R4m$KW=_~{nO6?hG2zp z7B@9aHsU?p3d4unO1!T`Qi(fZ+{KiJdto%_f!;+TbUB3a&CQj2j0%2{b^gGkY?)Vkc1iGnPyCDM*< z7T3mAXl>Oj%EBE>AY>adH)X1@!A)7H7>v>S__&vVF!`G%?VNO^qU|E9*oj$LV$|kr z#kP&2vtVQ`J4fRgVk&sU7KppNv*k_iK(SqLRdm$y?uwBkb)YG;>`*DxHR|}>{XA=w z9MdXN7g{Cp2hz!_oE^KUK9>R3abWOSHV*YH$F0UJ8r!UY`{Rp8dc zT>g`89Yv+O{D1AoA|86rXV#6ZBXH`Fi%J_aba+5wM|`|C6=-u!il&vw=A~UW95%2l z=A@lVdVBUu!_wl^lTm^5UR~;qt46Fw{|Q5o{BH*}A7Ry{wLa#wJ|e?4!$}@(a4Oj1 zjZ`dGCnws~ed6qRDRF1zwr$HTQV+_qmx_+AdKWKalnUfLDE~Emf!;t-p6w=fT!np9pYCRaq9yjLgWysw_L}Wxg{r>G`=@MRmtg+gh6Wss}au4B}BxC6xXJO}A{ow@;p{z62n1&GzH^d+4_#GkN0qOZP Rj4DDx!Bp|Li{Y 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 diff --git a/shuili-common/target/classes/com/shuili/common/utils/ExceptionUtil.class b/shuili-common/target/classes/com/shuili/common/utils/ExceptionUtil.class deleted file mode 100644 index 63db2ed9cd915798ee5719faa44f2133a6159bb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1378 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 HA3pGJs9Ft3 diff --git a/shuili-common/target/classes/com/shuili/common/utils/Threads.class b/shuili-common/target/classes/com/shuili/common/utils/Threads.class deleted file mode 100644 index 5c17c8a0cf7f70d3a03b641e68c8ee6d81a17e20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2567 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 L^n+Muq3`|&aqDTz diff --git a/shuili-common/target/classes/com/shuili/common/utils/file/FileDownloadUtils.class b/shuili-common/target/classes/com/shuili/common/utils/file/FileDownloadUtils.class deleted file mode 100644 index 070554466d6a1df1791a23463b048f7522b32069..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2084 zcmb7F-%}G;6#gzG*<@W&f?|We(%MQ8A=GMH6Kjir6&k=Az+$a+NiJb^vm19eh&Y|T zbjF#!^rcVEv~Lct?MraVOxx%FPnCW*2?U4Cw9RDCJ@?#uetqZMd;fa%+wTA_;;D`| zF{{!L8DlYZ3> zRLuK~3dDTrtx9j+vjw8Qxhij(!HU3vb*qx!orz_Eu7>X z94feuBXFXzUCD0*L4|8$l*>Y3xej;50yi-2ytU435ATU9=Q34+gZaQLJe)Qwb!6EX ztaQD;_cfRT`ovm6R+K5it>@jUSC9?ldiS9_tdchH7S0gnIsnZSlx)dB0Yw86MS-3c zJiGP1dus8X7H0hgG~V?XFw4ZKf{{kEGaL6*I8dg4yZ(ueoR;fFA!Al5(qUbP+9~eox!20d=8FdIj?W{hwnwVVrR7#X6QG@a z&2qQaXs_FsK~peim8Dx{!lBfpiapMyTk=s=`oT?)M!n#PK!2Nf_l28P>Rlxn+>j=_ z@wz2#rh2xGYTFEA71Q%&1M9ZHPO<*0rd^e@Jo`PVsl8U3hcsrhR10cP9eZk={nu8g zUwAy<1-J5qcfy?8IJT#oaW~;>UUoZo&Awr*)ne=VW(i{cH@VQNhU+c^7 zkVfi44QI(4jSc8WinAC7aE?Z(EPg-;QOY*9(6KnUiOx(Y5vn2d9D`~MKgXFZL>9N8 zEp8$jkJX?L@{1oJslnL9!9TXpwMf^8GT}tHhQoiNI}=Gn;ypDS;cztGTf;FjZ`6=@ ziN2ROp3xFo4JTqh{*2y4SUEmV$1ia*erjd|r}p|gO*iLSu7-YLsGU&hW%%9!JzGrp*XkM{g8?=Dj7D!&lDtMYwJz5}2919;F8UH||9 diff --git a/shuili-common/target/classes/com/shuili/common/utils/file/FileTypeConstans.class b/shuili-common/target/classes/com/shuili/common/utils/file/FileTypeConstans.class deleted file mode 100644 index 5c632a62e2f80b556eb50c7a6c71bb24e2a06f46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmb7=%}xR_6opTLfe}FvfAKG2rzYBsJB^zOu0~xjnXoNmg_2Ik%ybAomMaq%K7bEp zyhBJN?p*Zrey8ot?fLrt_yll;lRC=St6{%}E<-sO1`Hj4DrSOfVa9x5Q)R~23{5XF znH9!{Lg&)O0o@+n`z{U{oc_@3Q+Y(5HwaxEGgNPsQTCRc)3cDF;w4X#q2((hAM$u4 z(?EhYfH|ZrS#wBf22fkpyIe!OxTeRFHt&&}6hqSS%9c*En Kh%z88VfP16k7yqN diff --git a/shuili-common/target/classes/com/shuili/common/utils/file/FileUtils.class b/shuili-common/target/classes/com/shuili/common/utils/file/FileUtils.class deleted file mode 100644 index 3aa1b21b19aca5fa16bd846d0ffccbccf7c74f11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4079 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 JGxYl~`xjf2YVrU8 diff --git a/shuili-common/target/classes/com/shuili/common/utils/file/TestFileAnalysis$1.class b/shuili-common/target/classes/com/shuili/common/utils/file/TestFileAnalysis$1.class deleted file mode 100644 index e9ce1a2ce9cc1e675f45c88048f5060856fa0746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 750 zcmb7CU27CE6g}D9cG_{;ty{Z(TR*C76^#YoDxwqxVHIIZUwle;V>gmXWRem3v-Cm1 z2Y-M+N<5h@SX(GK!^}-?&N(;tB)@+D_zB<%?&X-n#YJ4gg zuuiL=9!G+?Fu|R6MM1)o=K^U6X*}#pYA_dvvSO^!w_}J!}N8e8#BD| z@*RDQbW^L6X0JAcf71flrv$PNkI~^>Nl%L(4T8V|N0L!6&fWhG@ugW_Yyc^l^970- z0Ozp8nZPo-{3r5riY2*)uV_8^hW1~6-sG29X1USm&u~W?WMBp7snSM|{1#Smfw6-% N^jR-erbUcI{sDT`u=)T1 diff --git a/shuili-common/target/classes/com/shuili/common/utils/file/TestFileAnalysis.class b/shuili-common/target/classes/com/shuili/common/utils/file/TestFileAnalysis.class deleted file mode 100644 index c7e947187e17cd6c17dcd87b268feedd5bd8682c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2068 zcmb7FNpl-T7=0tjR$G?0_L4nOf-zFO2tyn~Yyyt#I0kvaQXG;vz-ZL6+MY$8#aJvk zrATpx8x-8Raex%KisB3xP82sdLFG?Sd?R@x*`|_0s+xY^>+Wyw?w|kp;YR=$a4&}E zF&D-47()IyA43Fl46if1(T*$@7#10p7?v5{WLROyG2|I;Fsw4%WO$3=7Q=0ZI}B?K zcNyMhc!%L#29=?}pfMB~1Vf2oouSMi88#R;8FU7N!DO%)Dp71P*fBV8qwu2GRuG>z zO<`wr)p3NQpmj=`(!HV}oJ_4Mh-9pyP|%f?rdafhg0S;yK_`Z1Elt%|Ra^S<9vN}V zl60iAnq{P&vL|(!CTLh@+HAY~jx~ek`#JzL9O^f)@=Kprimc82KEP8 ztptHi>|Z){*z3d06;c?R-O)tFm6qv5@gB)J%d<7%`=p@%U}DC6f8uxnFH%nbS4s!R z74$Tsxvo0pT8J%q>H4NxTz`yWCypxKCqJfLN_N3>{T7I+O+x#Oa5P)id{)q2Y?eav zGYUeos34m23`4c6gq#5JW!ut3(X&Njc1JZTy05#Z5|9lpvZxy5Q^c$dZOgjqmMq(# z)oqmq?#QZ+n^>@lk}5_f*)sN(wq1uaFOz zB_g7$!gi<{gti0Jw=8T!IzH_rR>YPkZQovRr9n5?XvP+*>(58E0Cny&Oks31n zMwEobSxPJTQdm(pK)&*gXgK$auyw>*cd-S`*jyi4&R2 zYd0KIxN#ZL$D3{M2`EI${(XZTk=I130KQFg2K;IY` zy6NA86W|y^FUHY_DfDBG=2vh8cX1SD9HSTSIPTG^PjC{S;S|2YX?%?{_!bHLL`C@p z=kOZ_@duK%Tqo-J#3X40S@|8W;0oox8^7XJyheGSCf=_|ow-U(hL{L3GlXXehj5Mj M@x7#Ll19?=FCO3_YybcN diff --git a/shuili-common/target/classes/com/shuili/common/utils/html/EscapeUtil.class b/shuili-common/target/classes/com/shuili/common/utils/html/EscapeUtil.class deleted file mode 100644 index 09d26e37bcef2cb9373a39dc8ef4985756d09c7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2854 zcmaJ?Yj+c65PmjEb7M9!3dn~-d{;{`!Q z6a-W*A3PlVfFBXh2|c17Kl#Bw;D7KRh#c^lO=>BvoSeKnGw(a|&OGzX?jO&8`W3($ z-1VXfJzgwEuPl8o?D4`O76~d*`6`-re>IXwNycOa z1@?HnU4b*2G?HeFYB02yd+nJaT|re>($IGl(t~=gPa90p;_u2NwA5ZLmlVBhbeN;b zyn;|yB9o5fM+?bRGD0z(F(L&snaW2-&2%c#kxyt@eGd)H$EjPIf~MfqbVE~3Ov%(w znF`zmW8Br1$QY(>&{&a3>6#%?jf9oBJ*87sI{8oV&jOVsw+9Qu!+K7^yeSuKX3|4? zPLS#~wZyS*Eo&9W#=3Bhu0wh$vMn)6kj!*efh(ou&0QH*ZqLfTBDJ&#f2LxZsIEy z>m~26ReXb6Do2xrza@p+Ec!Mzu2{XkRmE-GAsw0;SFd3!<+-l(Y*|r$uHy6cSWO_U zz&BC#&cUO4f?Qi3jK&W|4~93!Lgy$R$Wx5GY_T>YrHxoTpbOw;}l2ZMT^j&!9RuH4c$+CG#EW zta(~N&2)3QUrrc9`l+46!t<##@02P$`NCk{dhy7i&dzCXnl*uJC#QHs#?qbDa(SJq zTtB_rvS}`z8h-+jmm1i6I&bP}LY*nd1*PPZnaD1_B2D6=YiS}d+sbRQnN?@yP>Rz% zEiUZY3^UU%UCZS(qUQ*P;_X<-mvG$I*9f%;pBy$+ zgdaos!8*EvtJ5-iv68Y{I)GJJP0b^7K+9z3G1wly;=E*%a|?43XU@+w&h}TGS50zW zS9az&mYrKzproxnfn(q?voFH=YK#pp#ZXa-;g#1{ImS~|@CWP;{|=P_Tm#X&aQZzD zpTIj%Ute+N$YadtwzoKH9QF4R3fDM_P-6jK+kN z#h*)y@JS+etl%2vXBOy0CAPzdZUnHC-Puk2dkAJ9+OQ8>Y3oAVN;XE|z4UEGlu0hb zd~86B`T}-tBW(^z7bPrx*i=3jU`yJl*|3@Wjc`^zgH3skDi_+JykL|H7q%$W6k=BK zH>>u@8@z;rGQzNe!}sAa%(_D?EdT@%*575{V2?G3avzt%et$y|vtxmVdqgeZI6^>t zg?m^W4pbZo_?*iqUhOaGRPQP48 zx68B;+-flesGn}01aA+jnfEYU7-dDrP=gd{Z*T~*r2TP{JkNd?2>c0xeG&(7mb>R@ zInVV1zaSTJ1(*1)zl?ABwfGKK|7$}xs@R$su`w{SED@tJk80@i4k7193fHlXt&xGd z##Tq!E@{IoI6b8nD9S(BJioSzDZWb{ltyQm4mKWJ$tD&7rgN!D($Ux z!sc3%xz6!(#elu;#-84bAdml|$+yHmzla6BA};bT92cAXi^j#Mzj0iQ`QH>#l6{%_ zGx@sllls-9zMs^b%Vg&9vs#BOsAp;o*w3Buw~Uv2LUULMdSH77ukw^m3U<+G!|s0p Dli6L5 diff --git a/shuili-common/target/classes/com/shuili/common/utils/html/HTMLFilter.class b/shuili-common/target/classes/com/shuili/common/utils/html/HTMLFilter.class deleted file mode 100644 index 10f1822fe4a07be7c9d4c4f1fad3c9426ff745f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13389 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 diff --git a/shuili-common/target/classes/com/shuili/common/utils/http/HttpHelper.class b/shuili-common/target/classes/com/shuili/common/utils/http/HttpHelper.class deleted file mode 100644 index 1e9b3fa79241d8b6e14f1421046845430fc2e277..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2520 zcma)8OKcQn9RGc7x3fE)@@Pxx0?I>>ma>e6%43TtEtG=W7Wx3H2u^pWyIZz9%gij4 z#ArBq^S}X(i5$E%F@c~aZFxjYBt3XCAs#r85E5cI7!ofe9<0A_X4`HTFdlZk|M!3X z=Kq@g^`Bcm0cgcV6|1pN!MiHTu&)a5VZVZQ1sy>gP;n5QDk^bEMF3qv9G2%1srkN& z7`heos91_#$>!x~2w@yk(TDyj3}7&b7WR4ql zTHXuH3OAK@1e#)TYfN`i`E(|&lN__MdfrWE96jZ_IlYUIE;Ez!;#DV2x7|uy?04;S zHYu>ZF*a(PH^z0xw9jWuSMT@FKJ#4OblkQkPpoH*Y*P1a2)ZIecoLH|Es<5Fv$?!W zRnr&~SmCRrE&cEUn;rzsi)6hA$Kz(sOOBo6W-%VV&YYkqV?I`az~DeZ$l?1lypQkI#CrwrTSM0EHk8*{|6 zdyFwweVacui(0=hDKD|4*TR_TC4=BM<;zUuGN>&?p;4h(B{wKrTJ8sdy22|h!oi(l z$F&Z6p%?`CQI69mk}fhGIYSozy1Lw8))iA=0YT1VM{0gk*$36oQ#F7adhz7zHQn+jayM0y*S%D~-ccYcmUR$JH8&#;Sc-o584p-jYI)gI|w0r_5 zdwxJ|WEyohv7!tU=#uxE`kPo;25Rl`wYHaNZHNXb4Ew^GXoxo9(43QS@NV-Y8g4K( zN6>>~{Os0YKN5v=j42t%C-{u_1Xq>3U%}V-1~p9AWnANV2S4MN!u>ww*DwuvKEOjf zBL6;q_wMChIX-2*zzPOgOO zeT{{?j?IkI%;-Afw-P}M?os|5>HFkAAparhN8~>y{~31TFE0XcilvV*@@6#hAI5TA zB7!aKrmM_CGq#etPHaAPZ=UxU)gCWI{Lg8>jc1U4b-cwUQt>AvZD-T%ApZ)M&r+pQ zL92qd73@^7O98(odw{=D+e^BtlaDU`W{E&4Q3UxAQmcHHF3ab|z!3#e+D8Zdlja&i sMRG1Q#N%90YG5iY~;3cz{}mcFJ@{I#Unl!UK3HG2OT}A^8d9 zKl1)OUjWt^h6qCp2=UoAbtZR8OTu{X{r%#VcFQt-q=d=VWZF7q@}u;Hy@iMgi_BKS z6^+tL@K{+Rn${xjf3Q|F{3BrR3w)a2rHEoJ5j^Z#JU6od}H-bR-b Tyanj72IzB-xMIE`RwU6EBw{@j diff --git a/shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class b/shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class deleted file mode 100644 index 1cf9c612a267b2e7e0febfbc2d806ed34e8c77a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 936 zcmbtS&rcIU6#m}swp-VVr79vQ0wJW3=t$zl)To5SV6xG}Vh`T7b)ZAGvu0f_q{iB_50T)fY(@$;A1&LfaMU+Lac;%PN=_CTG@95 zzq8dN1bg{+Nw^;?EkBo|zAO&Xe#Vt{oDb5hmln$9lVV_p$`BS0iqhC!eYT$)tJ9I} z$wD0}SrD3^w3fwQmKq}&xf>7ikubwjWlC^3%C#u1%8VFV`$O!r`RdY*+d6hx@rmnx zMi8C&I6X;4mg*ys*h1-}ZdExIT3TUDCXyshq%kVj-K}qg#&9Cg?Q?@m2w9{96P9jo z6k?U|qBH9zJ6(5I@AMU6dv*>XO7gN8$dAfhfA0D+FP-cr>Ig%u5#ImjJqfMp9lrFB z<-ihFTxoj5o3GlLaq13Xb2cbe`Ev#!)cCLZ@Z5r&H8>OOiG6MRC%g*|JltVhuZn*V zaoijOa2Io&@%KfGts{S6@3Z%Ub7!Ya3M!@>>*`~si{{a;x_Nkjhwxf%(!!+M8}=UK mofP`Fl!YBIZC{t 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 OQ;XGwJ9b9w5EB)-IB>1fGe zF^M9UObF>f@MR79+^w-;4PDbK)-x+#v7AzVF7RxpG@_w>!gc(>a)Je`QWqMcGuO{) zhDXo4v4bl-mK|8&MHB84G4@Q`j<{2=E(&kn zTCC90HSHFy%7W$Da@{cMLD}{-3{Dr_YThr`?TVe}wCXzfdSF-le9iLx=dQPuziyX= zANag5T3wRiWgm?XJQ~+v*iNk;Xo$##N$Zp{C+$FZR$wzV4cZg~^UD@15T{4ur0!c4 z9!w}pcq+D}uF=p(<;If!eMk3RZ7-$ z@LC2K|Eg;gCI?bd;QP>t0dZu%&8J4c<>m-KKCD@3ENwS1c)<0x37B z{S(8iUJ6f8Nudfy?i^3Sm2k(^lh~B^yQoQ_CcO)9>zlE>QoSmiAXBaTL1s~8tW3@I z?ZAE}GPVB;A?2#a}psW5L3oZywABj zKnEPf2mB^*49987aDE25+Di;}MKygL`YMgh0DVmW34Dlb17M&5FiL=kv`K)z766A8 zz=6=I0U%=-M2-*%47G~IXc^0~maz=s#O_#(T&rXT-Vw`5rWM8_iE`(B($k;3@%u3%E%5sABsxIR?&=^$WCJL?=clrcv%) zVSTSsB%|CNQzsk9MVczg|as@0;9h-ot*}XBx9j^!78w9DVomiff8q z8J2-a{F-F?7^96Srib~Jd6*RNIy!gi|AE2`ACSrP$LTu3U-@jVEBUqnGFkvV{!bt& zlgTh5)p`rpJ0`e0g*_OD^@d86Bie24T9*WDCI*Ve|Xjo&G!eXBDZ z+gPssp-?X3(xy;OqK(jkl~`uLq8PTqFlsL^pUKX5zMz!X+k5IiPQY uM-rO)ihTT%=`;N2nkgH diff --git a/shuili-common/target/classes/com/shuili/common/utils/password/Encodes.class b/shuili-common/target/classes/com/shuili/common/utils/password/Encodes.class deleted file mode 100644 index 713047855ac4f463959d8e0bfa50af40e3a2cf93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2901 zcmb7Fds7ov6#v~o*d%N~qhhtxN3|M4brld%(Uyep&<&-tB`KmPf36+j<8 z4WSb$30Fgyz+?zMT;t1ie!L+e9fE`mmt;ej!cD%rCE<1ecldT%!UqA|yM(L}GGyd}5R#lA2Q& zRHdXEvr5{rbYu1cLpWg?wxb%(lv=823@!1Ybh5vP!8e_t)1YqX&LxJXXx9`&bHXf; zPJ2o>w28`mPO~y>X*%LN9McrnIrSj&yVizlVNmpn)ZyHL)(Mz^c zR&D!{X%&>DktfGC!3k<&JEko%bVR4)U5zmNb)#HyIK((v6f|z^S!`AB;!2D#cBf2h zR#D4pzNmRPZ2FS9GAvwJ$;G@@c68I=c}Y8J{=rqXEFMEOV~|~Jan;uP`xuTz8wA@b zB1KoIn@ZNOE9J6jIa)zHnM$w`ld4WJ+}Etdh-^N(HLJxzgzcZdg-EucT(L@S#mISCwWtz7 z61hoa2n^;+9&18rvts475uI~Hc5UpFoP{#p#u0`c^^BBIlF@~Ees9PyQI>H64;i{% zyLd7z9Fbwekx-G*iv{lN5kvHKc}Tg;W=2j7a3?1jjtY>kC?5kg=~*|{qKrd0EMZB; zWAw@Rh%X=WWf*-Dp2&ELXA+*v_yo@wE}c5v)7y8Z|LnlIp?HFNcXVw0@|D!piOFl% zZ=^HXshhWM-%)e za8R7WbSCD|zMW*$A+#Q)lR{r282qsnu%CqLJG8b4VF!-UUUn6598o$2sfS`D;l}-F z5_j@%@ZFA8(X@i*Ws>`_;p5;YA2Pb}uJCaJCp{nc>FXm|B=!RSDq5CP-7gTJLvUI6 zmJpzyv?k#(f@ab@PLim=5hi~eVF!5#(w%}+!X`rU10+99|MZeE2|aY*yDjd}3R>%N z_cX-aOFzNx+ck>EaqkgtkAz>KtqS2N71`lJ-+`T!Z5MhQeSz~Nxqt`;*I`FUuHcM- zy{8uTb%_!jq|RSURS#+LT8Zpbv9liXl}(TXp06MVwt-9;CLfXT3L?w@0Xa>OGXy#N zKOmo5&-B;ui-#+*)!+T8ri-1i)gRE=-T5}f|-V=NZ;{Arkd+LqN8sj0)INs2>quzL-#yH^_(|o4~)wXOE zd+Uv#)EFl{|uPv0#HNLv7_BlzupmzI`hQL?CGjFwk zXf>C!Z5S0XyjB}^IXkvZy#23;_YKASmi&K5@xFiUcma&B&of?i{uhkAN%Q0v?BX+x PZJI~>=yaK6K3w@1^M@@6 diff --git a/shuili-common/target/classes/com/shuili/common/utils/password/MD5Util.class b/shuili-common/target/classes/com/shuili/common/utils/password/MD5Util.class deleted file mode 100644 index de13bf76eddd3c78e57df64be43002b37f774d1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2124 zcma)6TXz#x6#h<RN?mmpr+A@F(~i`~@sgzcY!&lDK4LoqhJ%+2?%U+50>5>z_Y90dNvu zMG(VP1#d+Vz|{y|!Q0YHNi(nDS_BHNh8bRv-gRjhekTGAX%#mjSj4+3-jnP1rTIWc zK9uJea=E0yRFP3(saRIAqGDBrtzu2ZO%+)c>nd_8##Q816ja<&;V5twcmm;7YvY2w zVtcMYeV}4PqPV>*F=zV4IUTEjov4gdy-Z*| zBhXn&b}h5$*xqJ5X}PYkVzEz_>&cen9kz_{dgZACb>^z!xR#eQ*4Y-VTnxXR6qSM^ z<-#IOn%Qz=BdL7RF|A9sY@=3g#BnJF4Fect>0gvZsfZdTF{R-)?r7M+ra)_Do}JBD zj)p$;%fycaqA%u1jJs49amh`?$M{5ms{R!BG<=57HGF|DHH_kfTy9aO&ri6xVOj;x z&a)I^n1js_?1ebNagt+6`-)|O*vqPO5B)1kYnI6;)b8`C z-YoXYC={$5!3L{{qEZ68@>IS2Kgw^4RpwCzLoa!t-vZ`0SIg&%u3NFZnVjnxIg|Am zsh0JBdbDm8jV#~!9*9zXCi-qrY=lVgZ80Sj>yvM^Hsgz#j(pZK(ozk0F@YX_=3@Me z3baWX(W{|PUD6J573WOBpr-#3#CLQ8I8Iwz3i59$CO-kg7~v`+wZw?r{56970mpU_ zNIybwHaOMM|KwXV4fJ=Mc#P0CYOZeu#Dl+nAJ|6iLuLm3(_2UaQ27fZ$`ji;_Yg;- zbu%Y|R(|)#$c1NP9H;#3E}X_0BEQO&hQKpK6ikSxXkk8|Qkm0z?hi3zq;0bO8-#z} zf}qHv(d-mWVR{D&nX2C-+%dY12!xy*6GSBo@GadOE=x=`|6k*{9fF0wA$z z<^>pgjbsILx^dR0-NGxKqZjnavY3BB<3|n&oG;V-txWT*NbW#Ov-o*`|m>^8r+7yjmF1lNkQmAgfMv z@z;$*=;b`bQV-)Wo7lsBN4T?>_c*$Hv;EY`1zhB5;B7A9bV}_o@1Zz_B z3|$J|Q1Iryr_d4#W@TfOyZXB8*9tJB(VuwFpx&BFhx7xfbd7#6m9Ev>QfWnRPo-78 zBbAQU>YcQT-bJhGhiJokH*G}kp{>&o(`tGzZM}YkcAtKfwn0CZ`T=37UhyyW#<-ee IEPyM21Ca^F?EnA( diff --git a/shuili-common/target/classes/com/shuili/common/utils/password/PasswordUtil.class b/shuili-common/target/classes/com/shuili/common/utils/password/PasswordUtil.class deleted file mode 100644 index 0b785364b8108cd6c30b5fe5a508e7a421584fcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1756 zcmb7FZF3q`6n-u&ERan~ux*UmH)~s7LN?JA0J~=lCLlb$ltUdpb4}h{Keh?@Q||`FJ1`9?IC)(kkdEGR&07T}nGP|;PD>I=;rhLoU4L9MPa;pq{h>sW|`}Ljtx{fUa+t|_Z$Uq4<8S?*2 zH650LZ}6>-vVjV!26pk7Vd1|sQKVgHik^Wd*fUT=-M~H$419<04Lrr6fg}7tLo&wg z9zPcik|$Ct74oYL>9_K#Y~7WMq;Vo^TWux7`n$n9O44Tla8GToH4c-+c|AYv< zo$Hp}5}q%SE#ZnD?Q~5ILnLiw1V#R19$O zV1!HJ7lz9eKX+QAyxSFSllJ-?ai$TYy`uvX^E;<(E~cjwDI@Onk3Dq@$o`gfeo|A& zb2cJ5ExlS?RQ%NE4lVZ5B*|bZHZq5}fe77fKp2Zi;XS%VE|M3*CGsz0;mm)Z{KX0X z19juj5ul7KgfQvN=pD(v0{c^yxJu8c3eMmf*+!6n>(mr*>Rtg!e1vXZeWIpEl_PqIUCf)ZPhb^9PTKMW~h4_8DhCWs$|Iu6QdlKMhp6l z{0QMUB%?|$oJbBio+ikZ(wcFNhyM3%u>HoWrnLEj-xLtla z_uO;8^PThk&;NUz18;u(!Z9M6%};qqrT5+ROAq}Q{Ys%vszMUZMZ-kc7`L=HYHGk#Ao486jUsLOGWzT;}0Xe3qMiSQd|# zpD_xLmCkVrpDoYv3j5_bLE(w=oTTt%51+$RMAuXgm-93a><+kU_tpXdA`i{upqoP; zuHZ@!6?2tHPFHw_yv%g-EP2kB&T|!>BQJAhN%K4uG}kX{xPZyKYI}G`xGENo zw^y~KlhJs44TP2?;;D2vo?ai0^=Noso;#>?$?{bVi?=LURoBw8rKNsNU2|RQ>SiWa zEYaSsB}Ho@*qJuTNRCKO+8&(wPb5} zYYaUY90|wPhm%oxH#;5aj%bRha#bYJRh8=KiN>N;Xm%yyRXyowELD}%w#Bqax~kcD zu9Hqosz&2G5}n#|EuEHy%`3OryL#((jHt2omb(um;!`pQojas@R(bg31!b%-+ z{ZW|Mx;+=k%pkQpndsJ%>0QPE7bG#IY(qL6>1+&l>*m3EKwyP#XDVumw#UQio+Q*S zT2Nm-cqI$Z%!JnZto1FX_4ChY=-?@3yN0I*na@!sZeVimFlgcwIIu}0F0`r0kg6$ThF>9P@aXm>b?J%TH=0)K3k*FK3cEodE1wh!FK45M9!KBm#O z2`zvOlYvm_AiWC$3u_eKfLPAd{x|G(Ud8rK3o4yeUc>#3buBi%aOLOT5KE`csRU!ra-CetkkGXNl z8~_G)?OK(HgEqVZ!qK$WWvCx+SZG(}#r%fLL@}ApbA%@QGR)=Lz{wLwEs9t^ZW=SJ9SnvmDuDhqK+Kcr;`lD2+u$i%2~I;0Bq42E!@s0V=}wvS*B#z zKEbvQ!xrOHt}$9T8R-zeL#@EH?*FzBvG7yZ;>%;UMf|!mnzP|k^($R^JVAUIV@GKa zCW-_RvRsQNqY(jhfNKoiHH$RP zNGyEWWs+T6KP$U_f|3QTtu+hbWaroyX~^bamzgmdZ_{=%DeYR^Sn63e!dTYJ7s)Mp zhz7jAeDLZ*3SXemk5StIg>|WnhvY2B3L&7ePf@Q*FVQiT($s@;>BNCY{THgdl_R1W zn3ZkzzuW)B2QS`w@|lND9@uko&#@CX_xfQ+(PsaNC+<1<_P3btn4!FTYYn@fKEjJ9nz|M~=bc zK1sIP4{7=~y{0echUF98osmeQf7if^3wjrL@aOzO` zGQJ$4Ci_7$oXS`5l{t!y9H{bDe09!NE{i3?*z0TfT1!bL3o3k_%GdL5m7b$Mg>O*# zM!reqn|Tko$G0$@waqFZ{gH5dYTCb5^KZqOs#D=Fs(dTort+6~uS(yix0ue(t}tKX zQ~Aprf%_W>N>MsMr^;X9+eOzuGmRgpYe3>r`3}BQ<-26B@8)|H{;JCRc)!Z`3i%H3 zeJbD252*Yg`si)?k;)J8L8eJrwN`jqV^xmP%d|ELLn=Qk&M;|e%CG0?h!m~_WKPhshUys) z^ct+x*k^=}!Jh;;WJ5WDhr7cF%;rHkrJwR=na6xRej*s9x?@osNOO*cgTuB}(Ajg6 z*@u)B?(Wv&h+`FbV!yqZFh-cM7&*lg33o@+;TTxJH06v2W0X6cFcdM3EFY|1B&_lP z;VDPLN`W~G&6D>AE_C?7>kI(brfuz!b637)qeRIuC(jgS7eK&b8*v~Fw*v&HmP{r< z+^KoA+Onvn5A)>F!oAFKv(7pu+qsW1(d3U@9d z_Z)~U<(m*X2It~PBB@oSwVmlITtP{>0Z8=i{%k-qbaaD@sSVLIa^x&Kj7vJg$rh|h zi$}B?n{7G$)3B~#sh+JV{Vr^=whap!aBXBxWYb{ww7EC%+v(h1{i zmUGs#aI;M-QieZRXT8rNUFQ6!q!W6+8&JgNnM4=EEE5KAmgL8je&RHPNfAPCO3QOl z&DER9t59pt_`6a#hk{~}o@5fCwG|a%V>A|%dp}$m;-FgGrXP6C>mBqh#brhL3ONx> z_{4Ar>1dmNc6K8=3R3Z3#Cs)RaM3j;7Y&!Xk?5#!=oNo+i=6SOPAd^(D)VZOVR9#4bZn zuGs9oj`B^i>q<1WEE*4^d>si*I1EYwV25sWPWZQ$Byr2aIoj17(+rEsprcN&FGQfu z%MX&Rn9$CYQq-u`yu(YHq1bzO^HnxKwV$^}9~l zyaD9|Du^6wvjgyDU;uOFjNrSqD@vU+t6fLQvGE8w zy-FXseXf2g!n2P&)k?^x6uv~o_+Ra(A&tA8eE9Smp zQa#!$X}Z3!+2lmuFuEFcDv&6rYtWK0jdU$tho`iz*HI|IsNLu*pc~LTnhH+SaB?Yh zqe3_7zc({r_%l`09(*sLTVUuH=~lx~u7y?w{Z|K?3`468D}9b*2PszS#M9AskY?nV z>VWlGYh4vSm(ALy!>W4;5erOFMwe#==lbKMmWUV{^Ogk3)y1l8VuukL6WkV{53C z&ZF_P2(4OLL3J>DDMbO+PV`(w=j(7aW3OsVxLo);jBeB68UhM^iS`0a7?=U>Y7;o= z`?3yP0d`&>EX0gG^cA`tYqjS}l8r~Rson|~kB^D}Ppc3e#5q&h$TZ(oN|9i{u1MWOeqY8+7xhVvRvw-EuY6pgT zNBbOoH0F64TSyhXplvnaSVBG%v;Y=Pv<7>*7OfU=rdPr@A+(nSQ5Rh#~@0JX| z>H*U|^i^oUIy2y`r+qrBT+p_k?$x(pEFI9nu^_1?>A4d&3ggC8;VGJ@(0!*dwZr1w zeP|FXbpLQ0?H;gbN53@zYSsa2s(78Ie;$CIt_XzsXj}%Jv$N4%IEdqx`1aZ8@Hei}Fz%-k{5H*{uanULrqCy*2S0nNP0V4{wQ#QM0o)CU zuQ$>tx*2TR1IgPUxtCVMU9Nz`2zckimMb8AP@-Lf=@f&=V%Ho&=(}3o{TcxEG@lCpiur zkM&czQ0p^&FBe9jGtC|a-wz?&y+-fI1754gvpx#!r#JPcH+YDq|Y%FwhKFVGd+Vy^Bi{i2t7;B<5Ke| zuJB%>f1#J@=kyBwnqH-k=-ce1*LfIyhsV)(IY^K34BS=Cqqn)5e!$!4hnZBcgnna& z{aWO`r@=A@z8k!BLVC8&OT;~nTf9WeWlE_!He;zuxBqa{anQG4Oi-X^XOPKL1D#2cjMR1=;zoRMidr1C)rqQ1$g#Ov|VJ5^*gtTOrLVPX6 zZoG`&GCG@%W49$D%(3p!|#%ICy zL#TD)S!0>I%x-Q|g_!HF2*SYS5^($Je4hgj0Gq-4`liFDe`?wsgar+Do3Wh^#y>@3%7p?9;;#c3PGb9 z&V6i-t8k7|s+778Ql-yXs?4l*`%tE=1VvWuqf%*4J2v(~D)zYrJ$LVJ1*PuyP57P$ zd{$jIQ;K^&2e3^AY|{W+0I-EKjLC4G#(rwrN5j!t-A8NivY&?GW$k{XT}K}^ zOMz?D{$4Decp;s|i|A}@$s}H)8)_7rlXXK$U!;QyMiuKbzGcoBH)pJbYE;jdaWq=3 z#*F)Dh|#@npFa0`bM6fT=U#!iS5i4QQU$NJ&0VScWM=LOGWXkv!iFE>XrDpt;#W-ishTrjNFGFGj;s5k|Y>7<#R$8hR?mARQLx zopEdKjF3D|#n}^^LEkVcv;!tAel5B)H`^Z+jng?4wa=*Efb4Uqd7KT2S$N&|){8%QwQXJ-PvsV9HSuTcLSA{U;6sL?aO3Wt%zU zVTP0ynv1Al=qV}}$1zSwKZhmw+c}fTdx48Y`r6boqZHLLS4PayR@Lg@T)Qj^?W;(@?A8Z@1ZHYkLK{bx)BmPF_&JM yqJfrFrmTCJlL||V%7Dhn%+DOl_-e$2#NK)~OxG+E%7kt=d{XOn>*i&9W#= z{i9)c=bU@)J?GqW@A=)c&wu>X2>^8%^&o&=9Z@$F#9Zi;G_E7zffKjOPrrvF1M-uU zpDiA2MM`pmI?@83mgcUuj<(J<-D?FzyMVuSC_R#mrn4KOsnLW=FS`YN9qZOz*R$T9 zC&!uuin}+qb#`xBy{_lRmiF#7H?HehFEynCuD13yYr8opWfy&Pwcpg;*4CLDF*w6o zwW+&J&d>z3uJ$#Z>eSQ}eW~l4S22`UscH}i#G)gKNL_Pkcpw@}WCfJXEdn!BLql78 zhFd-Ev$oOMTXWPLQw3CWRF(QK4VBHd?&S5mdPrMhEFbX&A0 z6;1cobY(NibU!_4+oGu}nGbGSvP*4J%aJ5A8%w66nH{#RKq`^$&kjhTC7I7{isYb21i6Oc&`rxJ3C-yXPOG@8lEN3lNcP@mMAIxZh`Tn6L)qc zcXF<)zAu%#MPiG*!9$~&zQpRJ<W98yJj2xB)x}AqWEkMU)g2Q=U;E z&!lV?$R(67DUeGkmlen%%H;)e1?9>Dc^2hMF+1;X4rL~jzC$vZq%P`s68u(Csv%{j z;Rrtg@faBe)%-fGK^Ma0ef9(_z(PtMnOcs>#oe4O7tabAv-iUc8UFnUh78YsxI>2f z0CepzH1$!=Pz$U!6Q|kN{Q-m{A8f6aCJLVNf;4lMqJq1$Gbn4r8 zpEsmCwwuQJLmp%0uDYHvzc@U#tio^|KrdtGR{m$e{sLG2^Ssb)UN#!0Ln3z=dn*j% z0LE<>{A#_m5%*`#k^ka33S2arzy;G#7~s=zZYpy;0ev!G2hUpfy$2dL^4{Fc3fs&Q zzLmhxi&8{c&@o=UK2}-+%g~QiNMa4P;98{6g*0x#5H-W(GT27EyBnkUHo2p?6E9*1 zUc*kjhr5J^&kGYNQO?F>4(<{2@g=bsW1=1RijDZP=*NBH4tz!2g|CWTxL=InYvO)9 zAok!vF@dj(gBTabu}8duZ-_VXP4N-FrMR$HDaJmlG@i#y`n{VmMhJFC8TD190eOIS_LXPrnpW;)NnC(dGq5KVMC4*{LC`KM#8B=QefxmKJ(k&xeFHi93a;n2nKWX`Sgd@Se&>MJ%M=-9np$S4 zQa%P>nPCPBw_r?KCMIxe&P31jzD?bE&XVK8mOhaWY5P;jFedHX{-1JLrk%r(ldKou zyR3wVdA%OtUH$>@@efgg9}z>2paMVU%lbI4@RNM(pW<8fH0$Ljtcnx7`#;56JcD(3 zmI(ASd=bxKFMh$QegOyZD_Z+C9%JP`$x40!zr`DP2_JCoDZDH~ctup;4`Lo(6$|l4 zu?(+?M*K;1;&pKw-VnFrO)-GKiVXfHzJRyHgE%S1@pod$Kg1(=M@-^9z9#Pz1wIhJ z#D}cTe~EYTZ}C1(ix1h0oE1WG2t~O>s7j5{lqQy*>_Q%Asb$#OTt}2JxcVxaBXYE& zgE#|tm8;Q7L|`AM)N*eUIVzO-SWiyHd?L&ZT&p3hlv&u|z#^r@!UiXnC^IZ<&{0eL zxzR$7h~g*O&SoiJqj=cs%qDWwD>{0}d9jk{w1J!tEsC%)4sGIN3s(XJi_;da1T9>t zN6>i|MG`~Kz)M^S!_cwO!jv4o*w7+?)5M$8=)F{2SynaswEXqxkv*;rC1C5of51Ws zCF-MUefUI!+E`g}2<73*x?}K9z!xqb6M|CDn967OFXiX@uPeA0h+_VXoC&8W zh7)3DD^Mg~ps*mSy+mhvxj4R)r`z zMNoF}k;?U$ikGGoPC3b@>$vMERHNy*<0#`_VYgvHmR(5c9s|RD*SL8_$Y?%@8FG+Z zoDhPk!&7e?JE@2sM2W44#*I*KPIuC{hPowr-IBObm)CK+vA}5TmbAuL*-fuT*+bI4 zgXTlMdwML#ZyTW%YJJG4eMowsDq3!KC~~A{+@8~Iv>ur`1Z(hxrIkvM4$5bz>_G+aZU7Z zkKK~z?#pWrFdAEXh}v7ZRuC?x$DYZL$pc@8fP4f`q4*3G64NH7c_MY@Szb2rACyj0 L8oZ5*6@2c$Xv<8_ diff --git a/shuili-common/target/classes/com/shuili/common/utils/sign/Md5Utils.class b/shuili-common/target/classes/com/shuili/common/utils/sign/Md5Utils.class deleted file mode 100644 index 834b56a52d8bf5552d68743380876a045460f86f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1979 zcma)7Yf~Fl7=BLfgoUQz63Ru>+R|Jg=>@bF3d+rbNvm?Hh_@wKlBHoc?rs#u(NFqA z>=(bH&H%PEe09c;{vWN+*#t--&N!Jpd(OM(ec$JK-uImR`OouX0Au(njDAdp@F0vS zOv~Y&5Z(==3o~*tD~Gut=G)MRg%I9r$3rXzu@puJ-VY%s-}x{e;jx^35X6UJ?)*p& z%QDJJ2&+M?h4BO*2eB^Tt(YZ&XwI}sS-Y||ww=wHrIKb%2m~f|LwBaQCy`te@XeY< zP2f^aH?&8!olVVJQ8z2J(7B*i)>KQE>xR+ilyzI+X0BlFWbJZIujpA$cT6K&bM%Ux zwe^yb%@@a4<%-$7JH>H<-b8L&{aVddRHKw#b}Zc}O(ZvF1Uhy!+g3~3oLkFO)8k#Ir z8bt{&n>DMTE$FfY9VbF&qFgsxy4PvuY% zh@AIPa9!fKh1=4PHS9M`CvMlORnu~`V!TjREn9P#_}lLUZv3xK3c^reqWVg@$D7+) zflV{uB52(r0_`QuSu|`%H40>S`@d__IsnV#w>08qnHXti&(YXcfm*ewI*jL+{la4u zC^kCSmv9?9a{lCTt0wgpNVR~_)DQ9m zijy-9UI`(`tXEdH`qJV>SMu#nv^2*^wF&3RF(&!gd9n*?!7;5p9%V{azj;{cX6UmO z)wU;+7cVGW<)zloTa$ewdzCXk=WKnBuXB~z!Esi^+|fdd4&3gt)k^S>e-Z6Em^iWg$v4JDDZ(J@Zf zYY1`dVZvU9j-i`)ukbhEq8-9bCXygh@X_kQFfAVL?m+@cMjJ#szols-42)ou?+hOj z*a(tczdSh&xX&3w!d*)J0l(OPfsXamvA=wX&YbtbVCwi8GO5A4m+|uZNaPv9>FA{c zM4qG@wjU#rBV3l2A3Wmcmw%C8bf3}cJch{#l*UJd0b+|1Q$NuR6T>JGOmjVtyDpb_ z9R==?3%K(h?PJ8)jW;pQ$Kx_k;0yeXjv(F=eKAJA!+mwxcbP@!~AjAEC!p zJ?cM1?|x1y9!tB5r|OFLP~8*7qx1&u(=tiDr&xh$7gaA~#`u3I)f6t5SJYgSYKHLk hY3E#ZcL8nDz9U@u4Pn_m!YyjOdpfzgPn!o5{{s9gv}*tW diff --git a/shuili-common/target/classes/com/shuili/common/utils/uuid/IdUtils.class b/shuili-common/target/classes/com/shuili/common/utils/uuid/IdUtils.class deleted file mode 100644 index 2a79b36266e4fe094fc78328a03689f66a864c1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 717 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 M$ZIvfAl4xAKj+M@Q2+n{ diff --git a/shuili-common/target/classes/fdfs.yml b/shuili-common/target/classes/fdfs.yml deleted file mode 100644 index 30c70a19..00000000 --- a/shuili-common/target/classes/fdfs.yml +++ /dev/null @@ -1,19 +0,0 @@ -fdfs: - so-timeout: 1500 # socket连接超时时间 - connect-timeout: 6000 # 连接tracker超时时间 - thumb-image: #缩略图生成参数 ，可选 - width: 150 - height: 150 - tracker-list: #TrackerList参数,支持多个 - - 192.168.1.20:22122 - pool: - #从池中借出的对象的最大数目（配置为-1表示不限制） - max-total: -1 - #获取连接时的最大等待毫秒数,默认值5000 - max-wait-millis: 5000 # - #每个key最大连接数 - max-total-per-key: 50 - #每个key对应的连接池最大空闲连接数 - max-idle-per-key: 10 - #每个key对应的连接池最小空闲连接数 - max_idle_per_key: 5 \ No newline at end of file diff --git a/shuili-framework/target/classes/com/kms/framework/aspectj/DataSourceAspect.class b/shuili-framework/target/classes/com/kms/framework/aspectj/DataSourceAspect.class deleted file mode 100644 index 34d924bfdf58c0248490e190b2932e09a9c34dfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2773 zcmbVOTUXmg5dIbn3PuD7xzVO6fn02JQE5`z#%TgI&|H9AAhb=dLKa3KORg>I=be4~qEIvi48@-s#Vh;0Je1@CdxP{wtc1O+@G%R+b2TL06W^oVqvv`1IDOr)r zhZsL071tlwT_nPB5(RG3LTz*v`Q}WBUK<|R%*-LSC z%??(~HJ1_|woG@`3>>+x3p3G%6AFwiSbo*ms)ojTU{>vIKiD$Nux4A)rZHDXjdnXG7E54w-m|KEkk>fggKifvdSz zkoN-LvhA|tRc@1~!dc8OY?_ZvLy@?Wnizn45_hbM;m^5c~`f{D?*k@{mnbFj!&dWlY*R(c@cO6 z_1)SXRldVoz~rXIZux=T9QwOK*$#^Byy9XP?*1cTWCyk%J+0YB$*V;H7}H60ep8f+cwsA$;G;b2q8mNej^Dv*=6 zeb43jk0|Nz;0s(jWHvO^bo_uoL#QK?fMPt7lE>sKZ5*x<2=wj05ds6LXk{btx0Bv; zgauY|&5$i&AlH16l#m5^YJX#!H?7DIo(gpFXwvHhF65f-U~)8{q;qde9BBuG6Wr=JbySg9wt~lRPUG^Sz|V`bcorwp_k~ zy-E_Jxn=}OMgI@SIL8l;6S7$$BijvU8P3^?_uBQ)=qvmRQ7F7b+YZ`)LFQ-5 z+VD1?S&pD?250yK^h6);;4D`H@6uMAvNfvKl%nz9gPA{gXb?j* z0{$ zOXEA}e~ymv7nC1M7F zepT`%N%6rSkjihe?AhItOV~oR{4&$s+x_%(_tX2&>%&(7zQ*?sO89(&nP_Q``&&GcR?m$?W=F;h zH(H(!++Gm7+Yt}MuR7|vo>tqk>#l~OFFkIgR?XDXV3^tEUN6?_$M&x9%rhQ_B5EeF z(SiIe^5*NwwSs_qeLTWjO;#OMq@iG-Vjxlc3D+x@6(iS#>1;3A^zm!2oe z$Utn#SW+dcN@{H&iuI`%Pim(=Z9<)1r{#^ylFETu?7J}~>6WV6& ziO7h^-KD;qR7%4R>2g87yi|tukCKML+0aSkiAT~-fAZKI>$`l9Gb|NmE9h7=oqiIf zt)|wkoHlS>S;DQxA#vsDDvkc9NbesI!l>8}bu3bKkjTv#YAI-N(55VLPM-d;WnA0v z(%}v7aX+Ej&JlU*MBaL>Ru57#R#3(nhVeCGTWlg8J`-j~cjB=Uz8c4Qx^7f(6Jur6 zD{!$`#;po&;|@LG^ov0FwuP?GRoBf(>(H`(<6sy|3?p8?5q9@d$HYkA-6ZC|(29&s zSD1%ln%>eD$wnoBpMd${%&*dHVez@f908ZTg!p1e_>`Q7 zFiGbCK7)n5LX};l`w{_NenILK30Gf&#h6BeJ~*V`!+m^5E;FRtx@IY84qssI4eS>s Aod5s; diff --git a/shuili-framework/target/classes/com/kms/framework/config/CaptchaConfig.class b/shuili-framework/target/classes/com/kms/framework/config/CaptchaConfig.class deleted file mode 100644 index 66faab71b3aabac8f315bf364e120de2cde3b97f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2429 zcmb7_-BQ~|6vzJpgExi{DhLfpN+2QB1|vcE2wzD9rX&r%s* zYf;>fp;f#e#L$K{hA$W%3Ui$y&9K3cVc2BYVtB;xm|>e?hv7?xU4|zNPZ{dtZ9r_`%RCfo1Dk^?nM|E-O%Q^VH?TN%hkDA6J~f zD)C**w+PX)(EYM!IfWC90{&y58+BJ*K%w9fhd7c9rX)d$MtWdraLTI991+)J(D_LX33(KMOhJ@bD6eCAJFr2{e z#5gnsW2ZSbkyb%(Gbu>$>VD9&u9p)KT3>Jq;G(SHT5U{#Bwa&HTHbX6&2(*-oZGUt zVIB~qnx|DV3S2w1asplJw8R-qUuXc1!rwXydj_|{J(Qp?m_!|FcwebQVz z;4c((ROiY=HQ00|Ivt*7bEhEEQKruC6xzuY>1zodS85BpS>L3-yk#1J z>uCZqolep~lVTB*9M@{zVp!WQ8aemyKG~G-jnm|6*y%#q=bi9CiPX7CWopP{lM^$^ z$=mbEdEytz+Le&f4DIIz9&(fR*OECwS0*ktk4CqORzEQmK-??P0VNwdp6g{&IS~;%e^IFnvheazOFSVAD9F?gIpUE)eX2ePgMg+eP--8Oe!<}v$ zPC?(y?sJniTZhks>IFnf%*Exs6uN8&;@((%zbDbqCD)_X} zNkdh8q|vKhlt!QWu{18J{lYlL<-Oz)u4Kl>-{R`nZxmD}x_~aSFM^>D-MEB)`i@@5 zRjPJ?5*@@HYOP@yn;5}U#9<(TeT>r0GZq#%DhsFJmljqOm*l+O>X0<9t2d-EtlpGH zuR0=)I;l_9xa>)&qtf^gy9|1$qDf+Ri|U;wcC$olj>s%fYl-T-OYH6uyA@)$N<`L( z#sm0xh@X+hFUa5}jlRMbUgJ>%&o_0Rzt(xatnz$y2G3>Uy%K7h3TcaNxC;CWdmny2 diff --git a/shuili-framework/target/classes/com/kms/framework/config/DruidConfig$1.class b/shuili-framework/target/classes/com/kms/framework/config/DruidConfig$1.class deleted file mode 100644 index 2b54579e3b3f289858ecd141b2062cfd5770f990..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2097 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/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 GJHQ`C#A*Wo diff --git a/shuili-framework/target/classes/com/kms/framework/config/ThreadPoolConfig$1.class b/shuili-framework/target/classes/com/kms/framework/config/ThreadPoolConfig$1.class deleted file mode 100644 index 2956616a1499cbe327977ba425322ce969bd6bc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1122 zcmb7DTW=CU6#fP%2(A=ssa2~*MO|)E5`9pNFN7u}*qB24zFh_wyUaARyDk1KA54u8 z{s4cJ@ytRCAwJ+HJC}3&&iT%n-+zAo0`La4G&WGkAc?1Dd6vO*6jOMS!b^r^FcyCC zfT7ZL)uetl@#{nFO!%eJXLVP}p%~TsW6hnxXQjMWBxsV`2O&l9k)db*hhL}r#kp|m zVIVvc+YPnmGML9dblgDcug%g4L!zYyoME#oBtHr#r(E})Q;#HDUFAC7iKB(N&xHw7 z1B2C(lIxb|_&%p=ZT-ZG4Js)%B^Fr692yM8by6ivXBcqZo^m$~D7~sZbMqWIsvn0^ znk<`3GNMvlMnY32(+t~7+8Ym21q}Hm)xwb>(^H{#`Jph3g;y4Alq{rh%R(Au3wi9MP_aD3-#8v*B-rnlchfng(ql6Cle*3dG+U0N`sX> z*FpyEsmsp;p(G0Qypr_NST1L{rBjUlG%{egO{YHMNYHMTE8oG&d$lXXzC~6Rtx2*1 z-r^3e<(VC_$kB~FqIgDc;V!nKxEAhVJBmo%n976{o$_l}U> tQ$EcIsW7u&Lb{LLC=&}0@Q{$=ctjCn*u!Jm6L^AsY|_b8wLv?5e*tUgBwqjk diff --git a/shuili-framework/target/classes/com/kms/framework/config/ThreadPoolConfig.class b/shuili-framework/target/classes/com/kms/framework/config/ThreadPoolConfig.class deleted file mode 100644 index 661bd209bdc7ab82cbe145602f79c37169f27c2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2252 zcmb_eZBr9h6n<_9Y={elSSU)XSh0p6ZULoMEES?uYE&eY7W{PCTw!IiOZSChzx5xr zGbPNFnSSo{m-JV3`rJ);6FP&|%;cQhbN4>yIWPBY{`%+lKLFgqi!Ayu){YM`uEi}a zZfh}N;PWinFs8*FExyp=t`?I9zRbdG?0se6zJZx6av00tfz}VTnAPIzEV}T>z?^|^ z1k5?lQ$fjhbZ9h=+zVB9?pOk=@6F66s+lQ8pA7T}&lH8QG6TKG5Z78)l?K)ek zqHN!*5~J;&<2likKuck0Ng!SFtAy$*JDz$P*H%@qC|6xt@@3za?ve}~y>1%Q(Yiy7 z;j-=5tc_Y|y$obc{pbf97U5qyYu4g=pk!4uDkX+Vf!^rAwkX4mhug}IBR>#$P#7xv z!I~9r29CFO2o>7vsv5hrX;eE70_8lOk702iI24SSc^;O7r6g_ zi)G?5$|jy@@l=avC>xj;xN~X-4g=fI+F(h#t_oP7aNc(vTetX|CKJ!Gz#ctwiw=$& zs0d8y==9B5S1d!V#(G<>^w!3Y7G*|;j@{rjD{Xf1>%p1WajS~$Y#jW`?U#FGlNVv+ zTGhlNzBRFg?@WA;Wu4;{fuS=~WSB{YG#~5P>MLbO0-d3Xo*cdX>B5}8(p|Kdjtz<& zEzgfnhVwK%J~14wpRo=C{XD;*G?D!VJ|t+E-0^XwZi8F^+0hKqL>@o zL8{n|KX=el>~8sc2kBzBxUqxQUlW8+D0|ULnWv{7==W+jQTsS-uF`5YurP>gTnT)N z>%`Z7ex~0P_3b^hE$_l84;Oz!OC1@lQ+2d!ovtIRb!#2xhWB9d!HzmQhkxP06twe8 zFetAgLl-$Z>7$DQIw@cX<0vL1dK-?KBr+IDb_I8VPLdkt_r?o|kZ04}z1gI=z?XiK ziam5K7d5Rto}}&~KjqF)mY|Oud3+`4 zo}dLmi-PV8$_iQ%^gz(EpofAU30e`fDrim6*Mf3_)&+ed=vzS>g1+m(;|_eU&}}^% zT3uSTKN$tJpwPck^+H=VIa{&$l9~2AKh&Z1y^6wk)(^Ja%3ff-t<6A}&4C~6x_P6$ zio2-`p&vYT^|6AR)1|7(D75VhP#7HeIo2I5>QGnwYEUqv#h_}7qbJ<>MWLf?y@g_l zD%TsU9LZ3;v#bxN3!&Yo!ax&+x>R(7K3vx}Y<@#5L-8x}A~PmDFvh#PZ+VyR@trD5 zwp6lwn90VsHr1r*ON=8jsrlLx^ct_K+ns1^x3OAeR3E;U(S~X?+RHRrW{$Bxs+!=b z!ny2@-q&tPdt2^mC{@914>$JtB?GkC6Pil6zHQ^sS%Di0>Ba_5NmJdCgJo~V4+8%{ z;YM@Ky5I}N6%$qi?-dkdK`OT2ky4#fXiX306jHN(kyY25wVruUE$2+oRQ zp*ajsj*Z#qDXKwKX&DE%aNEHpT<*XV2S4CP2iI}gffjUCP+ri0paO~x1_c>GX+fKU zh6Qa2`Vb#E*oJlB;$sIp*mZDIP)X3ZpfYw9#$F>w3VkmcVmZHK3LG$lV(7oqq;R%k z!iAILIF(+I8gqEQRG(eUk!eM!L!`;Px)R%HI3gmx;VfWvQ=ilQ z^fb7TPL2cdr%(Jj-R7zEhA_QHOuaErp2Qu8Yy8XV=ig*ETBHV`@J_VjOeTJ}g7-+U z3X;S%5-gM?@jeMwOOp721dAt0+#tbPN)kgPSXxP9gaj)sNsN+U;U$SrNU#o*#25*d zWs;a6!M4I}ekb`TE?331ZTJtU-w9gqDZlN}VGlkdc47f!aECjE&oRZXC_hIl<$)(7 z!_UxCL#wQ*8ro!Suc1TMGr!i*DWHp>TYy8*Bj7ASuYkT9-jMZN4R6YNzJ?33UaaA* zk>7Yj?A1;B0*v7dW9!2NvpmUMXZV^^JpF?H&G9#nEbd_qi+GItQ3MxbFOMRizm)xw RF|=ShvON>khr~P!`~$~wd_n*K diff --git a/shuili-framework/target/classes/com/kms/framework/datasource/DynamicDataSource.class b/shuili-framework/target/classes/com/kms/framework/datasource/DynamicDataSource.class deleted file mode 100644 index 7fc9d441b9ca6effb1edb3d64199e97628668aaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1145 zcmb7DU2hUW6g>l5u((S3D6RFYwSE9?SReF>rip*3(kF}$ z{s4cJ@ys*F=|E1^{jV%T(6um7>%GO7_u$b7bnrED`bav zJwo!Wz~hu+@4EwGt2rHu$Z?%v zz3n_L{bW0wSr(6jo*q1L$O@B+#^F~Cf;jTt5Uke zZA~j};s*9jJjN3fPw~t|8T)BeOjL2eP`jR549!3~RydZf?_3Bx=ymNymA$xg>s2>Y zlH2NIKy&3gi^?X;`pP>Y>HRA}Fsaz4Z zg<_~*@6L_DSK>^)3A~<=GpUNlekH?gf+5R7}%i19Bv~|ZviHuyR&rMB2+&Girb(P`YT6K3G$%G ubEHVfCLswr)xZ|EX-79wBd=qOA6WYq@9WB`7~763&CW39m1suesGYyQIyPtk diff --git a/shuili-framework/target/classes/com/kms/framework/datasource/DynamicDataSourceContextHolder.class b/shuili-framework/target/classes/com/kms/framework/datasource/DynamicDataSourceContextHolder.class deleted file mode 100644 index 54faf5615405d33677e1fbe29f78822bd9545ff0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1286 zcmbtT%TC)s6g`tboH!;x!lUm8DUblgeb8qDR0<##5lAIM?W!6aV+@X6*@hNXU6&0~ zH~oQrKt(}|2V@MPh z7fQ1)O0VV@i!-y&8TyOse2dElH#NDmW~;nhv=nX-HMXQ{CU-Y&m0|RJR=xpVa&6tz za#K_p$?K->PLYvJcA25AV3kRuv#6Wu!e(VfwM%@(AcP#!R?FPhy?G66bJui-VX~-L z6?voL$g4K5sBbKLLoRcdJJzPHsPfFV$t$`tL&%bk6fDzK-@5abQT7ko?Wk^jwY2@3 z_Up~G`t=M(%1%H?wyraDYpqH>ne2JglwzpdZr(PUSBzRi#K7#F?j1kxVxoR;CpOZ&JTLXcdmr$6}Y|5{3 zl@g-%oXMoNOySyU#oD5F_c!~PdF26voXw)G+5COyXlz10vd zdg0LDB`*LlqDeHNN2UW8Ss_S)>*KqjZunM3Fu%kbN9TCB<)uA0YGt(#s=s9H70q PxPuB)BzKF1LKyrDg<~r87$!6n{2eiviWZs-?{uxR71v*#F&G#oL{t*UoIHBngSH~FUS3g@ONq+XM< zq0iH&Ed8>zD>WX-NJWD2&krn?Qtu-1Bs-x6iL-uBS_%sT!Q zAnMy0PPJ3;p*dpJBy74LmAqoyvTVtvVOtDShXCyT?_-v>s*X<)!{k7cd@dP=9O3iD zFt`96X6d937oIS@s`b%KRFx#JY%KCdTPUPU6<0}>l-#vVPZX4!t74AfnBfN1K@}Mc z!bje&Wyx-m$gUfne#V1=0y4{Z_!#2FrX`KKSTS6K6rAspOae|FT1l4_ENuB{L+EpM zoirsZnbU9#BMj;PQhE(<;~GQK>ym!0J)xAumWJziN5d4-RLn;^t=-Q*+xvd!k1t!h zcU!-GbNkVQyMO-p)!x1B-@j|^-u`;`i`L$~Z&l1|xPb)~?`kMuQN@ymWxS{18Ju9a z_`kZ8A^)UYyN&Ai#lGGH+~=#jK`b(y?1`jb@C?U$zq;a}n_*4J{YD#4Bm*Mr-|zJ$ zx%SG*Fyl+em*kwuT{jopAK<*Vi^3!hmgn%RfFU9r$EK`igC~`wcM;H0|27VtdD`>k zrcvf)uCH=euDf&tEtHm*{2PlwleV|?gEL$Rp16Oj1<2`uU^sseMN=B4t9LHb54{D2 zcZ5|H&VKl%!QFT8a_uJGD`dx{oS_$Jm|iF#3~F|a(Dx}?=`=DLBdKk$A7~Q7)AWtD zjbj+4x#m0IIL2tjJPDJRxA|`<7@~1u`e%ghV0QW;LRlrQ+($SYiAP3h5_t$E8;wVQ z!9;56KB9MUVpQG1P*zRHX*{xn*hk?lWh*t6p5DgMEs7RyBgo(=&Ert<904Dvv!BNc zn81tloyJ*uYR_R7=Wzv-xJupWAuSS`8N&N4PSU<%dU@kGMHt7Bp(x{s(B88YXM*x0 z)SZmH*=hR2+O{*~5o*uQQS>mK2f`D2?7h+#R7|Q!{6(%wGAlHu6nYwvrd5bwdEX3i J>J#`9@DB#4V^;tG diff --git a/shuili-framework/target/classes/com/kms/framework/interceptor/impl/SameUrlDataInterceptor.class b/shuili-framework/target/classes/com/kms/framework/interceptor/impl/SameUrlDataInterceptor.class deleted file mode 100644 index 151c0b79be4ddb38bd231578f14a2e521c0c2d28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4324 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 diff --git a/shuili-framework/target/classes/com/kms/framework/manager/AsyncManager.class b/shuili-framework/target/classes/com/kms/framework/manager/AsyncManager.class deleted file mode 100644 index 8d3466454ac3fedc7f668f03172b4cabad83a775..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1427 zcmb7D`%lwQ6#njB-9{0ZJmn>VunnO;5Ff+Ggpoi77&c}|Oi1ajTVZWY*Mk06iV{#0 z37a|&Ub(R`Ti5Y46<>wVIqbol2N4MNMlmM9pO(2Gc7?0 zQ=<6AW4McZEePX&91k!Pr}GI34;d0`uXF3!Vs2|8m(Ol)6_-|W3~Y&^b>1@Tj%qq3 zwdV4m0AYyo4_tE{%VtpWJL;aQxQ<>^G|SXn+vcXD6tpTYyER_UH8Ts`-qSUnVF(zU zA(_`KL)kUz$~#*%_`YTDDu!yR6>clp`bSe+X*iT0nbS?(dCm|_rb-NkR2+>golh20Mc6P5Rgsbwkvu?`FI<9C~Bu zx-fwzRIj>D+1fYhbxx}_8N>^gYioQ_7yWklc}|Nd%IHO(jCOQT>G~xTlrSsf5gs#4 z{nzAWbfQZ}H+mSxuQq%MPh>nrM#dbTNq8>f1zs|=dv$B7Sy9%ucev&-j0!-atk-l> zfnivtr--^zcyH@wWrNf~TaYT;dBs(l$#`?H9!S9vIhj;rls;Tq{@{fi#VR&P6b$mp zQa-;_$jz^d$ac!aV;mc-H ztlC^H(>(f5M3Obj*?m=airhAIQ+0HUW|Z=a&qwC`jY^d;Lif0hu4WJkp&rm>ATNOH z^rx+hODh&n&oD(uWR!7(ycO~oJ$uqeVCnYwAp+?{@ED=4;b zg6bo%Aq-GNZhVeG4?O0@8_)yZ2@pDf^ocTwE!l_{9V0u8n`A{3%U)AdBmEVT$xg%$ z(DDs(7;nz%$Egosny4vW-EPlMH0z4~MsSPpNQtN9W<4K>3fyC~o=2O7MEB^7MYM?) f#n>svs85w3lKBw+kx1dZDi3t;>&mXTFh diff --git a/shuili-framework/target/classes/com/kms/framework/manager/ShutdownManager.class b/shuili-framework/target/classes/com/kms/framework/manager/ShutdownManager.class deleted file mode 100644 index 80e7ea8b77a368c8f5cd5820c5bc3947d7f66853..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1328 zcma)5OH&g;5dJ0!Y_cq`@Ddbx2uOmkD){7~h;j;Q8H)R|3}GSJN$qZgoIH8aD)r`7 zPkOORqzZXd>D}L9r2G?>J)7__pyeKVr+eo6`s<#aZ@+fF02slPiW>B&s77yuOkWu1 ztI&^_iZ}+Oxu9TBMHoXetcP(?#U)%;FsxvNp)xH}Def>t6T(U9ZhCQKSx@+}QQ94| zY|EQq2=>S37(!EGfiu)5ESulYW#+jvYs{x9LSWNK&l!#-{ZcUGEmp3kBv3mI0)(w9e%e6C6-3FL_F!{ZL`GAz({J757pC#ozm~EnLH~g2~wT(40C11 z$olH3XAI#nGhM1*O^Tdj@@Y#}+gK)hNQz;I7dx1BEIV~rs_Suw3ooDL`jp6Ih0Sem zR6{+Y8cs`7i#mqbIDLhu8$VxvD7<=6c=_@B?r!1P+oIju`MUT1`H%HC@{ocn8m{7+ zg6kS?;HHLAL>U^ShO(+OjA2~E1a46+Zr&Ztx!h53Tf-#oP|p9p7lyh+`UmsN-1I0^ zJ})#Mmc1yb#r;Qmob+TrM&(YSH zRT0Ud^pX~a3hp?9hCY6R(j(_*mmIMwC)$_aQeN=1VS2)$QH@Z_;+vr&PoRt)e_QCH z$67-#n4wLM0Ifo_rm-N~K%P#2M*oWVXRviz1kgyf(ht_4iPl>20GiQ49>XaD2Ym1_ zdHdkNAy}nt5Hv)P;{>fG`ZoFp2{iJn-3KK@kZ6m=z2UK)YjlHzfP4OP8zRy?COw5hci8E;TvE8L&&Js#NAgQ3E nn#ej2#B}+`fJn4z3)%*PvO2nFvc=Za5n~s50m`&r(K+BZC}cl^ diff --git a/shuili-framework/target/classes/com/kms/framework/sa/config/SaTokenConfigure.class b/shuili-framework/target/classes/com/kms/framework/sa/config/SaTokenConfigure.class deleted file mode 100644 index 979789ac7bad0263dbf66ec1f3e85f24afe5313b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5131 zcmb7I33wFc8Ga`T%w{u6SU`%P1PmbwE(3)> zK*3(xYVD=g9*V8CtsK>mMAY7gwf4U6)*$w>_xU`1`u;PMWRqReu+OtI|M`9I_x<1X z&r|;$egeQ6{3nXF*jI`d54(aknX2 znHVJWiq`95C?!A%joA%dGraS(?hI2^?raYUdv z8pSPmQv`30LdIKUyfuoq;npZ_!`q{H2W}UwJ0f_ej5|xQ0`H3A-FQz7#kebqyK#?r zyg!B#d{9h$D2fl`z6kD@aZJVo5@e&(vK>7op}eVE>(kV%XP9b};d=EFN)w#bysV>3 zsGKytF6f(@)u|>t$FMr<*K^B)wyfnD8GWbW8XczIU|F`Od4_Gd64o@?PN(Yjip6P1 z%jo-Ur$_D3HOp1gTGF$fepMUWpzhSntWJ_M`b0xQS>=r(*sE`nFms(@8Qyvc#nm-C zC6sKoQ(QBv$*}b1Y^FnZ+BNc*5NooNnz>VR4ABn8M8qPnIjX{jl_udYsYHBW3()BYrB zOjt}3@q$VqOHV)G<%++Fdg1zork3eQX_fh$E7wSvSDkYVEgju@(yJHhkccamKQ$$} zItewo@=QMSmBJ?^tex(mjT(z@ z^7RTfV55SU;H4Bt&ANn|vYYHq!;DmaBtDR=~rmZO;i z17hH`f}_>JSyXig2(X$LxZcuDNmp7$aqr0r|}s&-|qNU;Yab7-q7QtiH03p zTG|?~ZERNXS$vKNcE@)o67g2Y_Gqh&3)IZ&`icy__nHpVPWDK+WOtlu^mNOMxA*tv zP?Ig&wTyIH#^)7$0bi7`IzINRIQQf|BS#-dXmQ_bN6s7`85|rrcI3I+Z>bnt6pzdJ zl7cVeD+->%S7kh{;A?nB!t7?-^ABdrfu!!ESMYUwL&7o6L4VH%7JnT&0T@Zfry z<*C~|ua_q0WnCHHRPZf4Bjei&zJu?|_@09A;|HSi!zp1NeQ@OD!E+BEJ9qq0E=_+SgYXufATxxB)$01pjB;ECe5_+6Cs!S6}Y$IQWYLiIy6BObr+4->zUB82CUN!a`U@lD))VE|uX6d2)F~|4I ziNiEcQK@+*ZF_=)j*84OBfPMM1s{3;|w06^@l1bWft$p}VfuNo%Ms6u2Fo2{@w}mfFy*9iS~_O=@L^E(~8B zY-5fHqhk6s;^Yiah!DkHESPGh(V=x{ENNY@+hxMoo@i+vjev@0i|(ijs&Y?%H1_0! z5YaDxltxh?Ih_ZZ97cEvRa4YPR0Y!Vjb>C^RkdDZK^o;O4~Te3?} z_JqakpB4NC|4`6|?Fx2)#a^RmT`#JUc2Q?69ghQs)yEr>+T>qrSjK4K)sNvkGv1T& zFW&K*Y`Z7hD?w?rEZy;giq2T`bgnK!dO<<7O|w#_?p6jH>kB9-4@j_4RGPWVCs3Vo zGGICN-rUd_Qr@hYX2S6FdKv$w@tz0PM0q4!KJ_{*p-HXfHwcN}9C+>E^JVN6;cC?L zUB>Zs{9of@JwGNe;$b774V+T>miV4gdm7S7f6pd9XZnM4v6*cpSb&#f3wsi_;#yJ` zoA2Of4zW2=`v{6+#X~45!mh_KW6x>KEO{LAp5j;}F@RDrE&fA@O1wtMLntfa)j=7+ zMZ>rl7{IJyl#BQ5VenJR0Op(^*&+ximl6!HkT4b#_YyK+jTVa4#{M|GL*>*%nZBei#u@mk(lYY~BzqDMD<1>_tOZP>k56v4ufnQS36mv1?ot0sCtx=>|gG zg!yDtK^;_)#W?%rcma_W#a*l_!j&qGiG6KNxeuv2MH<@AJp*#RqWj F{{T4H+=2iA diff --git a/shuili-framework/target/classes/com/kms/framework/web/domain/Server.class b/shuili-framework/target/classes/com/kms/framework/web/domain/Server.class deleted file mode 100644 index 09a09952274504db7c85e1a24772a84720ec1034..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8156 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 diff --git a/shuili-framework/target/classes/com/kms/framework/web/domain/server/Mem.class b/shuili-framework/target/classes/com/kms/framework/web/domain/server/Mem.class deleted file mode 100644 index 418707ab66438d0b3f72da117d117f30a7a9040b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1088 zcma)(*>2N76o&sv;ss-x(1fy<(iX@<+o1@Ri?UTjm8b%}=pu3HB-3PCJC?kp@4(9- zBoGxBJOEcb5#o$vB~=tl_+rjEzh{1bp8xmXpT7V+$1@8y9$vv!JkodmkVKD#$EYf) zrk1+?_R~af7dTO!-s<=sKl4I<5;&eX_k%NjF50~7dyX9NPy|B} z@DIYA8OryXg#3AEBiow7R$ogNWd2YwuM z#I97hCVg$=)EPQ9u4CTDHOv`Ux3K|kqlh^hCAB=oCPVc<=^0AOk-N^I$M@T(q7yMJ zs>5MFmagQ~dj5dNk#s}86UeAf*V>gsy5(B4`Ck2P-is*)jmCNt%M_SRY2}eqfYjv_ zTT%&+stKm}X)V*lsWPfs;|JK+WLt$+JrOP3pxz#Bzyfa4#Bd9@X;p`}pe66@#y8|D z$ZHqSzL1{7#AET2hduVVgS)B68$!*~8KbfE`8#qG1dD8d6+&4}EEba4NG<39{og$@ zq5GN%q-OwCX9C^N0Me&{)(B`l1E`n+EzJZnGJrN`0zJq8GNysH2mk9s|8f eBP&y6x{A%9%qlQ1U`;2teTl0)PHrX1cl967DU^}` diff --git a/shuili-framework/target/classes/com/kms/framework/web/domain/server/Sys.class b/shuili-framework/target/classes/com/kms/framework/web/domain/server/Sys.class deleted file mode 100644 index 1e2b680a157310b36f826f43c9c030e1385026a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1347 zcma))+iuf95QhJC&aOj3Y0LRgpfm@>-joXj3PM4MN}-hq^xkoo)NO26Yo`@&1ri8} z3m$-nLd@9d$!sKUW_D(0_WyQvfB*UU3%~{*+oZvC^-7El`f)tcez{w6{l@7k=m` zJ%K{2y(3WUN4s=pW8jBsYZ{D{{@{)#sY>LzlO0$49M6))WY3QU+5=LP2SF@9X+k=V z^npB9Be@#|t{+MgKT=u_KgR^t7^|dzfq$vhHr=2R=L?rx|JE^c{oIj!-TJvsj&0ii zcrpQ-Hcx{Z?QG8`QlpL2b(+rxl;yLvJ&dN>Q*V5pNR=-1gh%h7fu@5RYzGT$95!_} zmtYI5|L1fBnrAP$J=#}Zf>nC>Dt(R;EEb@Z#Tuz6nbea~>Pd|J0%*u+lD$lkBrnL9 zIzJ%3re%v{%W1NTE3|g90xV&fB7qfLC3~^?8>}z6<~3vUHC&%H_lVSDsZRGhtTSml z&35QU-SmW&tZF9DXnaqmzF`C@le`0Z7EUZvX%Q diff --git a/shuili-framework/target/classes/com/kms/framework/web/domain/server/SysFile.class b/shuili-framework/target/classes/com/kms/framework/web/domain/server/SysFile.class deleted file mode 100644 index bb487943a676d4f66b464d746a801af7f091447a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1725 zcmb7@S#Q%o5XWa7Cr%xcl+u>_C|7gPnj-}&PLl}`mo zt&n)&1Mr~`GiyWWvVN#6{bzS}X6Lu#-Jid{{{Vn0teaqhJp(gvpX33_Ly|`%RgyK5 z#|Atx;3)&6^TRHJ#a=nyBYfKsP~LPE|>({lYJhAWW&G1bm)c7fPvoi zIVS7lfOi!|UKmq2Z4B)_B>2eO2r?V`rMg7UrLNqkcyD7S5pfet! zZ%4F_e9?%qccMOG>#&owN9@pxb;2{7-q>$*IyD0;KL0BHKMUqz!GauE7Mvl;lN3m1 zNzRhY!8rz%Q?!=B?DTTHY3=cL2upa4OuTdkXjBeI8dVe)iwcW%g~igsVs&8=0Br#n z(V{Nm%tp)5rpw=eeHCHnQ8U7sg$p>gq5!xEmvF}5GF(ADnS2D=7b)3RCSQeXadHjG zH7ZrE9D_D3Z3=G{(y%6WSd60L@`Og`ChF@-kdzFvt^~QE21&^vH3WH)078u?kR>IE zE`w|+L2jx+bQ$C&g1kxqp+8R`x0E1h8RWGR=}SF?N!Ss7#>K|Upb(Ca6V6;W~ZH(UhU%>V!Z diff --git a/shuili-framework/target/classes/com/kms/system/mapper/SysDictDataMapper.class b/shuili-framework/target/classes/com/kms/system/mapper/SysDictDataMapper.class deleted file mode 100644 index f355cc66fec56f4260b4157beec0fd9b48e86023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1538 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 kMDbsQAMZ=SIU02R^o-2eap diff --git a/shuili-framework/target/classes/com/shuili/common/constant/ScriptPool.class b/shuili-framework/target/classes/com/shuili/common/constant/ScriptPool.class deleted file mode 100644 index ac35b6b462e33d2da93dfe866c3a6ee8adbb6795..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcma)&Jx{|h5Qg7t(>8>Zmhf4a7!V%=0mKGksmc^Jh*m*jb3@d+N^O)l{4XXX27UlP z3UMh&?Z|NFdtTeG@BH=s@d@Ax`wptuYGAv89fI}Ldk6_$Fcq)DPlX!$1CvQLz9uxg zTIEJ46N$7)Z0r)MVZUdi!^QA1w6RC1-$*6REi1<-5&L!Zb3$kZQYHOjHcGOg7^SRu zfsREQiAzSWV3Ykiu%b8ZZ{J!lE;!M7nd#zJ$$r%X|1u-A7bAzGX%ZU(opW4pT;c!~{wHvBV4(({l&OLSv%SPC%+3<8@<}Qi m;k?E-{5b=)(|6F@+@i&~&NA4n&DovTHLSy9B5ZK3VDkqsUs!hBgDPiqNOyV*bN47)ZvsmyD z3qF94LR?QmY1LIm8v9=R+;bntzyJLF1z;PE02gp8L;<%$+`-+D+WR7%7n~}7n&gdkOhVKb0TPJRlqMxZ$xgCb5wfV#AU50#1_a(zp zTcz?~GK!@+6mdc)<+kpLq$`Z_{_HUCi)Dyjrl~ZoL|7}y-JUyjb&F~btaQ8fP=0a@ zE4B8K_$YWH(gE){qtZb$E6-)u<@2`;VMk9)PrgvT+~u>QdFd8_wda-HQ)yos23~7xGvIdYC-dHjkv!Js13#8Aj|sxx$@sZ&VhYbDm#g{tt)9<2 zaVoK#(DJRfNQbd7R{8^m>S-Nb$49c~n)T`MeOwks(k+s7U6D*E;*4_tBD$#18!yo7 zXQh&#HCYSv2MED%k*po^{Ylu^_zKqej)gB7CZe@K7?4btXuUQ?;WA3(5k6yMgt&t8 zjB9ts6*M+}AomUV|5RZXzD5PCpP~y+=mIR`D$(SyLgWjS?mF#x+`vsNW$73-l6`*x Dx~KY3 diff --git a/shuili-framework/target/classes/com/shuili/common/core/controller/BaseController.class b/shuili-framework/target/classes/com/shuili/common/core/controller/BaseController.class deleted file mode 100644 index 54567657c518fb44262f5c01e25352fe034a8f1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2780 zcmb7GYjYD-7=BKgWRvX@YFdf~QK5ioOIeECgJ^F+r5EfCQ`EXiPSb5SyW#9ESdp6` zqd$RPz*lvK(vi_0;J@*^Vfg1l(jrgw>< zCDSv{5FK`kB;7r3+I-S4=ed|Q@)k+RV!^QH4PnZCRT%Y_O>*nxc)=;_?y_%MrcTSU zW78x!4Yns7%i=;GGF(okt6OqJm3D_ryC~z)Ghsj#>E)6z%KVNaR`okPujffczrph( zhG&H8S?Oq8%H`2xJ2}bFHSOD;S?2SmYf>PCw(WR^XHrraPW?BOQPb7OYQ9q>anBiC zF}`8w&n)z8mx`iOHcVTWiqqWnEl(a4!HR(`P+?{~qp&(*RD#?pSY=2EUNi+Scnn7~ zjm7L~6j2#{VKFEr?#<1aMTUhY2g7r|XIeUCm1i4q8YNAQMZL8OaYHQ#PB;>aq3um{ zila!in+;SW(x-@j@Eyn;J4f}Jo~B`RP{Dl-574dQAs#Wr`UeKi z^lSJYk2O5O4-A=RW~dJ|ke_^gvw>YU3Z5g@7?Q-@u%|H`sb_D{2D3e3)n9LYr!(8# zyX{+$>>|B^7yqm4FmwoBG9|r+eb;l!qeYV(4tm#C-a{WlYUjCOyZUwERJicgLiM0` zDXw2AaF;sHvCNJdMvMy~O?EftS<=s~w)r`^ruMSrh_XQhI$xi~>YLzZ-SrE3M48=+ zqxQb2qgyB=Tz<zY(AbG6_F@3$}1#t1f5)mx&@~Oj}H-S zCV=V;)vHi+5XYety?P6esZ^t)+n}nx%o%{%1&Tp!GT88_<3xNedx{XMmMD z>{JaqMPE~=>HHbeQxH*y6r82)Ih?P84^_QSrFTVtM=ICSH?x7=53qh`< z$l_uZ?=NyaPN$2n(3X3Nw=Tre?S1R$c!pG0EWKwPoj0DNm6m(uGTq)^d-nF$vo5*p ziv5ax$2PE^HtBb0=!&+qCDw5ue7KHxw^DEvNwRs5#{0y82RML7RQ1P{*e4X}Qw-uq z`ojAuh~iS{UoAyNd=x}MKI0NT4pLpjCnS?BDAL((iYbYk7{V}ROQy0F(Z6v(!HCkX ZklHATB1Epu3SOc8d-PW+DG8eC_b;;j&gcLD diff --git a/shuili-framework/target/classes/com/shuili/common/core/domain/BaseEntity.class b/shuili-framework/target/classes/com/shuili/common/core/domain/BaseEntity.class deleted file mode 100644 index 6e65b234da3057f7bbbcdcda2e3a3b8f6b89e6f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11188 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 diff --git a/shuili-framework/target/classes/com/shuili/common/core/domain/MongoUpdateParam.class b/shuili-framework/target/classes/com/shuili/common/core/domain/MongoUpdateParam.class deleted file mode 100644 index dc046cdd06aa87807d312df6667559a818c78102..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2744 zcmb7FZBr9h6n<{9n+-{LO9c#~1w|VYAhgA*1Zb;bL0+VwSnV52vO}UFNkig{f2BX5 zeBnbo)8e$wblNXE)8Eja(T}zEIlCL!q_G1NX7}84&z|#~=REiF$3MUP3SbhMHW*ki za61Ga7Q#l)&A+%#Lhz)t)m&a#8JP6{Un4cT? zLP0N^6>~?SbLo-!#7xzy`9f;hET%S!>=#N ztLl=~9UpP(c;<4Y*>~(|NMfld1KB;S5p@T0SVA!LHgfi~T<7g-Q}i*5+kLU7TRvcY zQ!@+1(c@KvOV!9j1yv%OrE1QqD1>BG!>&%lwzIx+wx|N>$=$M7JQudSgBi0pC$-pe z&fLv88X?aM%)h#}usp|Fv;!4uw^pdqsHYALyJ>^fk|R@vQ+4Va#~xZQ)hZe5R$kQB z(=5$#(Lw~h=u_xEI%M-iLoq}U$B2P1BlrqmN6;@(<0sR81T&b7Ac15A?~64i)+|0$ z=sVJ()5CQhsH~9M*9(B@!<9F0UUhg%9=M;V=QQP@XKu_3Cs zTqBWnq1aTpll7dL`mF!!;tb4k*(zog#=Poq?+W)ocqZWX#4Dg7zD0!w4$>InRoTNk z*2f>m1BKJ}D#kSj;aP`ipTPj1XBn{zKYzer;zy{L=tw+=@4++pe}WQEa`b0te%w!d z&lo?>@fn52XFuzmp?#LVb9h@aIC=OU;!4)%ae-CD8pcK9xJ26z6{Yi?mH_ky06GEa zZv=3j04@-~MV7yGasX5+VF&{$z6GV8c!t0aG<cf+Id}h5n`rJm;((oORx zztj2kR9AXho3ZH{=t}2ERTN%#mK zv!+gpuG8`%gbCar9zPFfA88V5fjG$_T^q10;z9j$%h=z(4jsK;oHE{3rl zuWz^0HP%$jAAgQ^-di2f&I5Ew!w2Y&MjbmW_FJ?MaH{!uc@KEp?Mrc(!u&`@l9G+ijUv=nJ>Cz>q6>ZV=jTxNSQT zXXuIjt@6iJhQ8|N%Iaoqd8byYR<_pG8M@0>ZOJN;vM5{;zGCPq6t@}DC9g^3zKU@9 zdep9S|ASq3$f8%ghV5+IzL5CTm=1SEz%Wy3cx^M-jf5jiQrn(O!slkwYumy#V{a?k z-}n4bR@&m>hTY;T@xKfch2kXv_Q}J%a3h{7O=qOB|DxpUR8vz%+2o%h9)uLd@*=;% z-wN4Pf3mb$IaLkUaf4yBv!lNXVlX;={?#=@R?=yrSv=P81Wz?Q!*klIG+W{e*YHB( zoaZ;Wzx=u6IZ@lyuz*DkFG2gsh+rvbXn2iR8gAnbL;m6ls`WkIpytLqONv6_1g6FP z1BZuO5>VUm27J5CLt3y`c8NMw=)9_8!bDEI#eKPl;ADT)4Z~oPcIG25srS@NHpieP zGcrsjS*ItQOm=?Nd5Tg^j)Y<0GA<=l$h9nIgi(5F^7Q7VF@%2TV7N*sg$&_q39Jwv zNMM!lU;^jRMO?ZEdJa(plO!XVF^<5##UY33*&Q1-+$3E)ali;}5$chPB8wzDRDdMU z{y=Ky2wm?DJ#&oiLu3tIiIpBhSC7$q2+h!Qv2w-uN{kd_mSM^ROo6@~)KrnMfiX;D nhJI(66-?qTwJ$T@JI_24=cRERqff?TalDhN=Ln6FErszv3>FwV diff --git a/shuili-framework/target/classes/com/shuili/common/core/domain/TreeEntity.class b/shuili-framework/target/classes/com/shuili/common/core/domain/TreeEntity.class deleted file mode 100644 index b7159717f2c6f350fef2cd3e794a3141a7c104ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1840 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 diff --git a/shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysDictType.class b/shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysDictType.class deleted file mode 100644 index bcda8f90d09bb82757e57f1a037f89342162c503..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2601 zcmb7FZEqA+6n^fu-EOx7l*+q;C@5`tnNn0hC`#K!7nbs}+X{-7>F(GL?9Qw+v!wNt z#1InshlHqhC&NSgHvPm=`m%u=hi-Tf(kia%E&Lz+;^Z5jJ%KTvhAIW?n zfsbYWB!MBBFD78fJe)vY=7Iz<8}Vr)Mig2+)3uD^py_&+V-KYJ6x4Br6}^t_`G)Ne z8pVp)z%=Ej6cPn1@An%eQ=v6;$+%+ZMZ+G^v%YKDBZm|=o~_uvRWb)H&l)b8M{V2j z4WFSsh3%QVQ_{WBidD39!jfa_#+-wm8q1qShN!oL@LKiO_tk5Y)o*T0|9m?-I5%GA z!O@fHJNK(UeytE^qJD+(odTn;%2>A9UnvcnZq6VDA?oB=B7=pZ9WB=TqZZHX zs=+DmxTaokN`__YCad9(>)COykA;)`$*_6E^u-M8xTdYWRwZ`?i(~o~qi7X^60&A& zip#LRr}sO44@-ZU;TlV(=NTi+bi=}$J)FET^W|R;C#R-=ol@BLaiL)UXZPHMGmH6Wdui#~sm)vXLJ(BgK2ch1sVM^A;3LSI0x%G6Ha z;RYU|9eQ};5qHg!;a=9@OW5P$)VchcK3UQVZBO3PV|ZpNxCsh-p1CAhe>^Dl$$?BR zJ(NlJr-rh*^O+Pg%sgKZDm%4MVyA{LnR)-v^F|R#Hc%*O-if$TE}J&NxrKqF_uv9G zM@O|k`&p3^n6t*SdV>}ZSUhRPoGJa|dujH?QSq&!-p4*idj^80&+Q4#aF6KxY|wGM z!jHjbUhsNs!WO&?g{`z=T#t#2X}?Chne*%X@9@yZ2bA{m2OWGsxknFLf*mp0u?xFB z>_LJnyd50(GNR5|ac=0i2X!YnvWsIpSX_;L#9HXUZ{wS^l;|FHOE%v{?Dmq)J8Ene z4qKSt0fsr~;cXmZq{C@+<479s$kMwwN}pE|TZ1_-!Ww=GJ?Lc|VR3{pW1Qn1JO4y% zo<=fQ-NkS0?jW0Wp;tsjXoj^_a*u0}s#{8G-_uE@mM42`IjK}FQpZT=z1pPemXbO^ zQU@PHD%6FN_fk}#`8MB0{ZdlhHApF>YbR2_G?5-A()*Z1LLDl3lSPS4P~oDti}%rR zzT*$X@1e0Z(J_Ih2_##a2{ZvK2v!PMMbIK(H9@O@7YNn}SWB=@z{pVW&>A^Zgu8VGyTr0cS8o-+9?zoRj?tMu{QwKkrzD A+yDRo diff --git a/shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysMenu.class b/shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysMenu.class deleted file mode 100644 index 06aba516d7ddb141916105440609880a07ab1e9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5285 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 diff --git a/shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysRole.class b/shuili-framework/target/classes/com/shuili/common/core/domain/entity/SysRole.class deleted file mode 100644 index 21d3eb861d1ff5a33d57398442c1b256267cfde6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4624 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 diff --git a/shuili-framework/target/classes/com/shuili/common/core/domain/model/LoginBody.class b/shuili-framework/target/classes/com/shuili/common/core/domain/model/LoginBody.class deleted file mode 100644 index 775115c7586b4718f23ad08c81505df6c9005a0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2294 zcmb7^TW=Fb6vxjbzS{%{P)eb&Pzs4@S#E8^Es$_4l7Vo`3rN+*UO5ByuC==c@yJUB z0t6E9PzfO}F9?YQBoMa*-uWCjfhWE}#sBOYJFLe-JnY$-`Olp5n=@zT-T$xN5YZ;u zm!b@9P0+R^rD;2xel|PU>|`^*W{}M;HoN1rCr*0>C91CJSVq|t)SWwJoH6v0VHNeG zo+GW|RzZu7R4q@I&0*=vk&-!JS+-|*(zaYdy*X*??pdQ)G#%Y&D*8Z09($4Hmp_c3pT2Wm(>7>Y?akQxw|75HT!fp-sBM|M5Kz$U&|Ij} z9m?l85H?#eT=%T)6a;1J@y7p!M?sOizdYFpf}v_vVq&adR=oY(*d{IM^$Y6k=^ch# z515mdd9Yd@F`Z)u62xh=^G0dda3uHZgAs33B4c_kZ|#T~Boq(wBDXs9kmP=3dFU?P{cE zE!V1`<=-knq_Dew)MK~bPhPK$zx?pzZibf9GC{aAOQB3 zCFu9>Iygadns@2Y$SE`L(Q;h73@&SeIye@gSkX)4KL_7jm%1S!YO63G0uWn;A0Pk` zZaSE}b;2SD*iEaj7y`ELuf+cFpNmOI3ap0SX6VQdrL)gTWV<__QRfqMJFp9)6#ksM z2=&kkzvWM*UuY$If_|k{bvHWxtVOd=De@SNz(LF()MqS?HWsgj(}1BLvpG;KyXF~1 z!r?bk6z?8~=PY1W-2=CRWZ{8Qf<(h0eM*q58YCJ9*$$BYHXy+{3tFQDiG@K1l_0;V zL1JN$eE|8p4MV^}>y;phFvvejkPT{(L^vaPfE3z*1Xo_rMkPox3{q5rY*K?H!yu;tQfdRj uF9~Pl4<$${3}P!m{#1jc!XPd{yfz^GAPHRRzx)TIuklW9#wgy&EuR4~pL`hr diff --git a/shuili-framework/target/classes/com/shuili/common/core/domain/model/LoginUser.class b/shuili-framework/target/classes/com/shuili/common/core/domain/model/LoginUser.class deleted file mode 100644 index 6a9417f0fcd11e06a228edaacc4b9226d0d4ab34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3668 zcmbuA%U2s!9LIl?5JEzDG_>^Li(08bfuRqdAeK_7&;+OqO~-2Q-NEra`9T4UZ<;ET;uK=T)fG}TU@- RWNm@@*F-awjdR@~IMx|gn zuCT4Og^L<#iyC#!+Lr4XmRB$;H8X)N`KM`=@a#>~(kPqTFy1xvieZ)Yyypn3JgHHt zVwZ)rDyk-gLlbhg{G2v#Z3)NpzqgAmqf~ORm0Xmwi-rdRjgsq*eG^m~#cWrj&Mnia z3YY27>+w}QMuIlcMny3gJ&8lso za!kEsR}Eq5rsWB5ThDL1YnYF99c9y7^{qcRG`w3I%CmL}7(F>*nM<|my6LPM>lKV- z*}O`@fUD6D2HU(F0w(Eua8#jL(R1wCI*8ixJ z6oeLnqmsgcdb_v20msEZIXKI{-p)`Ovo6%nQySkJodmut!+Qw~a@~c#Z@y35h4FB| z8{b#LNAW=2q|jj;RL3I2t5G+^o5Zq#?F}t9{iHG&DaI3%VB?5tGy#AIJl09D_=`_J zU?%g{>AYQYisroFW8U33rQ>`%X6O+0XK0MZGxRu}$k3zoSdz>PouR=DUFYI39m&u! zp7jtH4|DMd7f0y`GW-6fC^rM{+?_jld40nydKw*+L&C;w$@jdt?O#Zv_g8Md4t9>r z5{?WV#}m>`xaKGg^j!V z2M$B~7{;EUL6j%a(@|@v6C>Y|_O+b)B+7OWkD{%NLQgXmw)}ZT=j$)_uaC$*@0&U+5Ji@LV zz(|ZvgBgj37JK7NU_l358ULOVsy7QE13H4;&SD+=`W$MFo@#_e(P~$_%ZTuS@>n3h5-W04fk?nA}iQ{}mRsNCLD<@tT6ytk*yBu&8^YPu&?r@kK& zN(8Ra=mn&CM7k%{9Q^?4{-IRZo$h>cIUp}K0vtYf9V*C2ks#-z&s~QKat9zEw*cWQ zgF$8@K~gHnCy^i*qCrwB$fp4LtOW?)Sqw5836fSpK92;s7!8tELB0gYS1myJ(qxdi zNRUnyE=ZicHpw3i4AV$V<`5no&W10m!c{K=^rKkOf){ zZj*4bwy7Y$MSu**OXo5~a`bW_vVywtScI-+|FQT3K!3IX^53xuX!@6MyS#+!FWVA! qS;lp~`+&z))W0H7HM{~>g2hemSzPtm-$4AQ1tLGK?6bTyeDyzAvUyVg diff --git a/shuili-framework/target/classes/com/shuili/common/core/redis/FastJson2JsonRedisSerializer.class b/shuili-framework/target/classes/com/shuili/common/core/redis/FastJson2JsonRedisSerializer.class deleted file mode 100644 index b5ddb4f283a9d6ce87517467f7f70030b59c94f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3292 zcmbVOYje{^6g}$)vK>JnO#-0}F{N!BJ0M;ykGLU;iGkD!6q`Vjwp5m7M?sd1Bm+qw zANd#k50nhm{m*Z20G!7U2^>aVz_kQI z$j32=>wLH&U@ne*_#%M<=K0J*0zJ4X;1+*=$)|6}P)wkNI|(e}E+6j2u#~_uRucFM zU-RJ`0rv%bD?nxt&GMS6IP-F&p;`t@gIgo7H(JrB_8zvi-Ju=3^elXK|7u`U_5RQr%#xaI7d>x&T zvRszkZnDOkNC0KArClqpx@TU5f{FlDL=`m=@8bgztI!w@cEszcheKNv@c=r*$fz0U zN2AGl({_@E=_Jc)(rD_sfVv0+rhtZshp7ESBPWs7mpo=<={E-CB3qTq{05u?i(>W=rdl6Ip*i-cGI{mYlM1?ca*xi@V3$5 z7gUR>3qjz1#=uc*HIj}V{mqdKyYbX?G+mmuN%W*Rfke4Lf@ByCX7M8gviNymi z+pc1Vnw`WuUS3ul(^{u%ucB7vrtaJ@Y)3W}&UWgZ4QhKBVtc8p);A$`gX z@kU0^5O0fQ8*$&0^bJQ%7$4I737UE6t^fwoufWo;5n6hM@C!uJnHPxuOb%guL}MQ! zG@hVw0KGKRkB{jGN*kha0H0u#p8U;AmZJBLZLDoewt=MSErW52&td$Cs2gcG^B08h z@3Ci@$RF6Z6n+k&xQWB$1~Fh1)zR z+$NFjG}*#nF`RKjGo1CybdHSY@u`pQDJ9|wlbJse%e?ssQTFULdX_ST>lMWL@$|2V zZeo82pjWT+h~qQ*I=)EcTy{Ywy*O=o6< z>!7?$eiO*j$ZNPvt2rBDrtiQedO3rU4uf9Ft`PlGglIZYGO>-uy+$co2Lre9l11=2 zCMi14bI;Ec+r+`lOB~|6_Ef^91Cx@%#6TPYZF4-G=-$;LK7-su}mhf$0&`{nMYdfY6Zw>04c_+TSGgj?nA z!;Sa|Zfn3taeE^d-yw@XCYO&l;uE-2rraf8KPi{HeMl}3NAV>K^K;HvGC%B0W>az3v2fC0 zCO00-XLHH)`0iYM(z!5`+Y=j$yYZNs8B1hxPHcy{sLMk0jzZc^PC7f2`Q&KIS)Wd4 z+_;;}r1KWm1WFur;^};BcRb-{a{FR&e?e@0!OdKlq%MlJcl2%SAKJBjN8hIYvn(7u zctLz`JeG>5$74gTAmp4?a}&Qao+>z8R=ZbjEF5&~CHaX$GL`H|)7Z_1Q0XD%E}rk$;Y$x$aa9H)_jCzFV$cE)o_`K|{e?nIJSw+<#UlQB;; zIh&l!q&@0978QZL@x+8+S&(;Jb-!)&0w>{GSl%+zQe(uM)+N|#_Bi{>iO~-&99E8Q zU$%&_W_XxN8-|kO>9||S(U6Yr;k7g6_XMEeQc*h+@Mxw0W28UrI^#~R%Nr`V$rRa0 zCknZolXhdn44pGcxsn}~K*|(I!yy3zEY!<$nQh^yS;Sd5e=e2BdeR|^JfQhY~(-|;6Fq_eo zA1Nr$E})9CEpc3cyjFuCKkOSaStqA*4?zUxhRS57Qo^?4syz3`;PYA6ZJ^QFiMyqT z;#P+CTC3Wcs{?E`g!iW6`FvNP@m7KvZN^l|1*OcXmUnAty`iB6OYi{OV@}F(onrb5 zj0yU-S=*(ye{Uw0VzOh6=#qG8O!(h@xRvu*5Q>>{Fq!B6UsjbUwNxf4;q~HjZ;9Si zrROXKi43ckg~gtU{-YvC^M~AcV$YU%R%Q4ozHDLL9BHeNDF)lc2={Ou8(@ldvA>w1 zbZThDm5YnkG!-cva%gjqT7w48Q3OVXK(%0D#ZwE1mX8$mghv{*UKrXKKuP)Bu72Zt zU_GIjh|~)vu73W};$5K`G-T6s&#o{En~I)Qge?uQ!t{+$Y@sJKs*1Hmx_!4YPG@y1 z=Xj-7+^QCsZk4ANjx)^XNcHS?Mri2aBuY*7DOBKQqtFAqJv0uJ!ULMND6gv!XQ?V- z;Uxj?^z1U*Qe(tu)*=(^FXx^-Ou@SUT2u_N60kL)fN9f}NWWw@X0rKBncV5|{6w{W zy0T`<+_I8+UZ|2;zAPZ74C2ab=v>o@Nt#!r7L&6rg_N6AeMO15wN;5ziPx-CMgXhY z!rCD&WxL;IJSwd)4b*H)KadO^so|xXF)i4Nc_G3Bg5V1<(p*x)OnlL7+;yE?nrSKY zGSgJ;IWe_vBA!=4-#C;h+V~s(ZsU#kM->0G@h|+_#((f% z8_(c>qTyK^&#^ziwKD5^JjwH5$g?Dmk|oX3^IJF}h}X*9tlUw02hil@1D)|!x3mU2 zr&7qwHo7jJ%{u8ZHo(=x$k?aaXN;P9H{-dH-37ImY|@d%*A!vQszAikGV^)G=~{0~ zLx&!bGIUT$vp&EQTQcoxX83x5O~q-ZaaG05diJ5Zh7?^^lFi=bNCiOUp@8;=J9Vh9 zciYyDLlqUjXo6vtK0pS6ofVoPW2LNUUQ5mrmrFV!tdSKYnDQ&S(lX&@rx(CDvrbv#Saq$*y`IEe zI4S+qX|liP9L~xkDmrmAUx6RN_v!P%_ois$bp^lG@v~ixvWDxiCVs~FcYGcv;Bels z72tIhr^&Fz&)T;Au>gjWzs6*07d3W$`Oe!(X7K?QYDQLd|`M zjO?eVyHPiV=)v{8tl-}i8rrAPSObw?1CifI3BYpxwkRD-JULniC8A5Am%HQ9&Dp1L zzK29cdN^__N9JLjLbRTDg6Mi8ujOZKc0?l$l_$;z7W09{ zG%(?C1A3JKF>FL1|8G$OE3-;qHz}~EX|UI6upObm&aZ-XHJi0H2G$NAYln}u!^he| ztfwoi9W$`XtP<9KVjaL{UWM2=d5G|HX_yQA!^2B`a7%q~ zO9^R^D=apSTeZ3oLX-$uCe&2dIE6)1n14rw!a=3*Fi(K5aG6#pR&CR2vb0LVMFntm zHA|W!Q#fb}2UnVQmeSOwm}&7fnZfIsCSkl?MTUhlu!G2i(@SZjY@b%`|1Is+Axz_t zdHf$&`TiM2JrV}Htv-ZSZEQWW#1Mw5uo#lw$eA4R_RmgIaRy$hAzed2;^rcxtt;mU zX*VH_8?4NPMBz9KBUD%fSEImr{*q^B`_IlK91rF>gn2H`n`?L+8sN07f>%8}&c(~L znso#sQD}>Un8_9g1lz@iG~4Ij#x9&sDHb=*C}oJdZ_(U#dhR}~I2It~2FDncw_rXTwd;#P07^<=H=m6Y7?bfcI6jJr z-iT&9N#GY?j|RSrc}i$lF)Q$fL-B%Xys%D1s+j|>HdtEWLtUYvdM-{;=_Jxx>1|Xh zk=X4ieNlC`BKPBnk(&0QX&gBVX*V!c-)NB5?IY>-N$W-iSz?FR52bzMLJA__|ef5?;pk z+A$gFAtBx-zJlPc#2YlYD>*LUiq1MvIib6bt(j5c9%q$!!a&#NyQMT0V8+o&j?kb{t3*M^HUBq#teLWC$(^zI=^BS8cjSvd1{#UaIm?6}Ht8ooS zJg(kGG}q$o8qF#E6owlluvu)5lWK47m#2)_Xz*!hz&li@?1{XNBCnr&nOq)FCZ9Ic VE%VhCyQq11r-Jt`|IqPn;Q#W`IgkJV diff --git a/shuili-framework/target/classes/com/shuili/common/core/redis/RedisConfig.class b/shuili-framework/target/classes/com/shuili/common/core/redis/RedisConfig.class deleted file mode 100644 index 407d5cec91000b8af4110dcd088910da914c9869..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3240 zcmc&%ds7-$6#rd85xPc0e3UkA)7G}An2phxL=1{3i3TwhtF^D>x?XShZ zXK3>W&eWNHfPSb>&s|Uv!8J3TDKnhA_i*m-JnnfcfB*C6UjSxs6vF$M4d7u2U6_^R zQ2>tvm`LryhRsu+eFi=1JR6;zHWL1(iNuCFg z31FR}XI?jSC&A#0j%_peQ|7*4=+Eee$W}^w!rJ0{MdE}rrpAlg+|uQ~!Sp)^y3H`2 z(ae%+A5`?BuF_-4G-$DeYKeW_RyQS0nMPhO#2NZr=9Vaxi`*gL*U^k=6;!)y=|&-M z@sfCLT1Vc!N$Qt+XsbaF^<~eW!h+)Ya$;%jq zUgylaX>YtXmW6CVaW3k=2#X#~do+}PEN@vaOU!|ZkO>ZdA} zYX||)v_HtT1JP{8iXl5jirAD+aRm{4z%b=m^Q~o}Ad3x#$5*zRtBQe~KhKnUUPxnJ zFic3yYgR@8Un|%|E`ViY0B*vmPuXBsU|f|*tSXi&6mt%7^XXPxhsy+L_K7f^HeGOYqH{)%fg{P zIqH@s4LqkxCDy!ARw-PT>x`gs^(C{r4D;T0b;PGq>!WLE*6~}^8?QA)^*M4m&6`5g z*@UqU`sA2yH$B`ky{xOP_~^38^Gea#s+Orkkh3lOV0I(>GQFBj(*1UF;u^pd##_Se zMJ@P;oq~BC(02_?Kiy>Wq-D7GPU_wI2+MTf#fmr|^$ZEmnrv!0Eo0q99VXOg+&;L3 zJU~A@7u9BEvM)&47Iv8D>Gh(KdAhK3f_jL2C2Z4PJLVle#R$Ct%TE`WoEJntq@7AD zqqTed80-)C=i5YkT;>oyqGzQpfRFJB?HKM5m`@&NU9|QP@6`#qc8}p(k4@CzKSB3y zxaSyw>iZS>J>o&$QL4N{bq+Q0NED+yDRo diff --git a/shuili-framework/target/classes/com/shuili/common/core/service/BaseService.class b/shuili-framework/target/classes/com/shuili/common/core/service/BaseService.class deleted file mode 100644 index 0130140d98c1267fd3c04270a97e1d6e04402a86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6485 zcmbVQd3+RS8Ga_&?1as5g#v{l(594RldzPtCLx7j(LfT81R|uiPBznI(!JQ31%gUF ziuX~q9(Yu(T0Br&Z37fVytPH^Rjv1J)$0HL{Hgf7^UWSfcC*Ak^5r|<_j&Jk_KE*K zei6V1{3C?*$mlo{!ciQXg>@JUaX7ByWg)yAuaMzH2tnKv!YlEr8oU~>k=ea6oD5-= zTv>$^a`4&^YVkT9udl`%ZPgHL zvlF)4uA#EN;edv~_T&&L%EEs1@lj9jjN($#T&|Qe&wsxeYU*)7IDB+Sk|GPI@87idj*2k2y@71NEhd3?<{H zorv^WW;!~u$4r~?R;8#xGa0vsl9@<+Y|wOVCl$*$N?&oyHHS>sjC2ZdvZ`=W8X9N7 zLBraszuo2wG^^JhPMB^cO?j*t$fMrROsFi+1LgRL4R1@hwmaslt%!g5D&96~9@}R* znV3tJX|9HF866bR)}S9vo2itQ*09BUR@yw#WMas6?PS7<9L`wjvB+K-`_*%@*5hVM zc|}`kO4c#gN;o7Eq1}gV(n^{9M@Qh6Z+6|uM5C5NS1%{Y1ko#LPYoTVd3!-QtrS`F zIHie{6`-wa)I4HFGOitqbek!E88Z{ZkzO}#Cx%aV3!zsiy=bvq>>) z&vwisR=@3zcu7V>^Gw|85c7|`r_*pcyVo_NcN4ImY=Ryb9?Z?87?eI2dx%yEraf=d zU<_Ms0r!r2C7GRM*fVp*?BkNX%8E3>9|MD9okI+Lo5P~w^fc5&CG{%hF`a9;t`uv} zCl;iwc=CwVLCOVimy~)VLaP@Ax0lur6i3s*>y@5f7MHl;RgDo13w(y2YjoL;+bVD8 zDYE%Z4U_NrJ~Uac?X5aK%LIAV*M(gTZRUB)E^AD~HT4aOeW8D9IMdeM(o#AGyg*{K zGi`XqhF-&|3Z6dou5`L8uy%WC7WpvCRy8}GiiuxIiR+GwG|B*f{rg5xD{WL#YF>O#w7z^k!3f&N*^czcS;&y6id-G@HKqhz&G$s4OMQ^HDd<8 zg>UQlj)5oeq=EgotYNX2n+lBG!LDVa~wEpsMP3?v!S=aVk-1;cQp6a3W`4(r*V8 z+1z5ZTwR(;n>cL+mohp-eQCH)!7CczO2-pB(=rw*0GREL${KMZ0}XaLjpd`vudk)i z7vL${xK$<7OaU4mDyN3&33*z%s=QxL8`JaAFh_lYFh(44Q+^WpQBs=wgicXhexF6l zN;gxRErEp;jhWg$3~0*QdvCLq{6J%VXc=X?)@XGH}< zT2fBDE;1a_=}>yyy!0 zi0SmOb@7~&kOK*CF|ix;jXlZHvMx~I6%!o|*Yh`&_54Xl^L`fE$T7q@doYf-aJ84e zw#eE1@L6c#+KO|iyo8F!5O{=}m3Y4Qpn~I41h5P(oEho?TG7VUmI*uUTxsm1wvw!n zPeSJmSP>pa)dd6(HjYC-$)Wn>S_9&m6%sSMW5Q$Gl2hLa^r?=C=fv z1Zo#FkK>wgEbQle5$B7~;aauKLtakuKpk1!h#LOl6~;}7U^QXaV<#FsQ8p+5IZ?Xt zLcE9|t2lP@Rs~+GSvMbI$+6FOfiLFMJ{+{-<=mwWkA3BQl0z3B6W ze}Mayq|g*@Jc}h;mYqUf_)!EdVCliLxQ=RAHjd{}0n7Ps94k0m892lH0nhfe9`~F1 zL*F_&&U&KR=*hEE(ag!yaH8djhC>hyXhQmI)yc1 zDttB9J<~m-8{QpQ=5`c$N?qr`e1f@DjS07=IvV zr~%x8JE`o|{GfU%PnDs>oa+AW+pVWAN3vYVgLXD diff --git a/shuili-framework/target/classes/com/shuili/common/exception/BaseException.class b/shuili-framework/target/classes/com/shuili/common/exception/BaseException.class deleted file mode 100644 index 990df92e9f390217f451bc69882fe42f023e8956..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1982 zcmbVMZEw?77(F*};@Si#FD`bsv z`yKlgOj-rn2fiZln-JnW*KX4_w-O>!t{>ayIp^Hxd9L4m`0ovX%lOWPi&+N_=45He za$c4TE|-fgF5$9^Z}6>+D>kkwjK@Jg^gF9TKMs4*%Kb$J^*~|&LNAIFKT1~p&LAj| zTYgHR*zK(kI)TFB<}?2fztQodc4Il|hf({6g4OD+^PT1Q+p)rtUv^-ASbG+<5@HUl z2fz7)PVy*-W4}#waXyT~kG)&$VW&*KNd42Vo~{FzoiCM)159Y$PmCEYP^G>DS0J8URV!|-J~e+v1El&?IhFi65qoQ?j9#4KPK zFLgJP7kjkfiNefYJlSc;h^`sBXsE8Ci};G?+~rvf^S0?#tJn&N8%>0Bk^NtHzzYUD`c?v&hcvXS@jCVp}4El zXEBC3E#{@bZ82wC%#mTzXh$ZBVzS{=nZ!d%h&&~fsv9IOQsR=9IGqBG65>6liN72n zR<*jx`xO#j-Gf*hOQBN7De>uy_zoRQ=^RffRWmrAC-F^9Jeh5Ks{@XlCekR*%hws* zpTr1VSv9?Xk$(;QZyc0}f9o~InzgqWV_ay~UJ{mPd$(GDmx&7;wk3|v_iXZg(mvcF zT+T|Bo)O>3y~lAIXU6E@?6!}F_QeUNR!)?1TB*p#z>k_$##%-^-3~vc#^n6& i`wmGm|WAFtA7NkHEt&W diff --git a/shuili-framework/target/classes/com/shuili/common/exception/CaptchaException.class b/shuili-framework/target/classes/com/shuili/common/exception/CaptchaException.class deleted file mode 100644 index 3c78c1a2637db46173287e5e29a2dc6061fe1842..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmb7AyG{Z@6g`*Mk`)9&)Y#d9F}sbi!PuZCnvE97Hdezrfg#HbnVmKMmX(QxAK*tB zFZhVDFmZ}A_ne&je0_U<0dR<&D%w6u*!0lxutjKQ(khY0(q_u&(Zwl&E(!I4(U}w4 z#UjmRnRAzq2$f@{l{+C6ySm%Rb^R-?I_A-Duf9Oog6=LuZwq^lyJi*W;N?T)!7%4@Eva z9}&AKqr$((tbi&Bb5PidUP7p-=h*oxB!6k&)U~CW*%|#338mnd9z>;H^-0d0umX(QxKfoVl z9PlF+#>6e&&b+*NGqd~p_WS~%i~SO|J><|RVyB2*LM>6T7E!3;L|ZeuJSWffIj2YD50TwEQ{{R30 diff --git a/shuili-framework/target/classes/com/shuili/common/exception/FileException.class b/shuili-framework/target/classes/com/shuili/common/exception/FileException.class deleted file mode 100644 index c38cccc11fdc24423074dd6f472d83e154588c21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcma)3yG{c!5S-1MBO&3!Gf+U62jUvKAPNFVpc52kNZ`WWnH}%W+V3B)ZvYOkUBJ453^wxE%%euAgfdXVb7T-IU*DXc5a@zX>i9a0 zgpM5H#WKrxlSPEwq0%ZkBGl{lP&^9D6S{A8qd@6?`*w=D>J6nEwHpp0)A8>lp=>KH zFXK^92G^qJF=N`k%e@6VU_2o+(LjZSmhJi@D;&hiQx=CKUt99Yl@Ag7w9b?#Prp%{ zTe#yE=9GbnC(enW&jqV<+!2hf9|x{X>am|+W%rZ$`1(EPiZHN6X#CsLAKGIP{`e=@ za~^YclsN;;iW&}fk>)Sv??Me(Nr$<2&5kB!_L0hH&1V7eE;zK4!}0POk>5ts*4X;b1{W=2Ok}55au&ZwTgP2 zW;!uHJKqU(M3~)AOlFm_Jr(6VDH_E`gsB~EwB03?8=YoP!hRAmq3UbH$9df6^oQz4 zlBxMgAi7G_1^-Q!?MP>YZ+?)(UN*{gq&>ODiShU<;0r4ryh9!Fv5MJeGqfXL$J!pq zBZnLoaZG9xmO~z>JhHFpV!uOhyGfn~Ts#q)uNm(Pw$9b1B5dRrQKG`uKq`%RXce|N zYzY!CGOmK=Mam4llm0me*1@L=K4Y_j3bqJ)|J#_@{g=ek5C{v;b~?uLkW+$lS*+}2 zK&Z=#{5K34U8C_L-L29m33>(U}$6_C%b^39eBrB24Zmt?VwL(&#jMZ1zkf3AI3Jd6Xx8nf?&{ zm>DlHA=edLo$+6?Vuvat>;$1n{A`%3So!QGM*H$2lxLQE@V}{8cGaZ}RHEzw(=w7# zVaMS%VK$PdB9HB%xG3@nZr9{#C<`Is>)ZO)NSq78LVgw-5w(hAWz m?r&7C#`!hgUDkoKKcI#>dy8Z2G4>d-7IWhh2=k0eSa<+LZ>!G$ diff --git a/shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidFlashExtensionException.class b/shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidFlashExtensionException.class deleted file mode 100644 index b989fa108338efb079a99cb88f3d9f3305e2c3f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 760 zcmcIi$xZ@66s(6RFyg*1F){I=xXeW_V!WUx7~)0b;;Dre+B7|8WhN4 zxZpu!jEQ~dSFgI>ntpnIcm%MGMGt+L%V0i(1;J>fL!)d>hmi@~S@}R9$AY0!;G$T$ zxTb7J_cJg#A{f{+&cyqI-PQBTmFg<{Bs0MZ!QN$2Y;Z28OjL~BR#xcPx37W*zt2&EmqCVmo Q@+r(>ls2iAbTfk73n?4Yng9R* diff --git a/shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidImageExtensionException.class b/shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidImageExtensionException.class deleted file mode 100644 index a315f8185f22bbaa1f33084610eed5b91eb106e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 760 zcmcIi$w~u35PcO#lZ{G7f)@{#+IHQnI-18JP98B06$8s ziAg*}L%l`VF&QC0OO4E(v3vGV&tvZ)8{z zH=3DAFQ{=hf_q}WLt62jiU`ZDX$r0Ct}hz$v=vK}wtU*E$%mK$q2L-L!?G4pBw1he zYJu-WcZt%CETQ<#G6;Fu?J}LLZ(D@itM2#RPjCfk_lOONyp2-B#x?!)So< REb|%6VVrGREA3_s`48?P(q#Yu diff --git a/shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidMediaExtensionException.class b/shuili-framework/target/classes/com/shuili/common/exception/InvalidExtensionException$InvalidMediaExtensionException.class deleted file mode 100644 index 924637c1f24514892166f7647d3acb0388af99b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 760 zcmcIiyG{Z@6g`)RzzTxk6OD<9h2moyZN%6BCK$8z&K0O22$Et-WmJ=u@utLcB(o;e^(({#TF6vbRof0w?*Z6@j zfg^NZ#yK!NM3_2KMg_-&!_CXatr!Sf3v+EZ15cUj@^6?ehY+i{T}j9`l#%ECUR!!C z(bml58*YcY5!@5|pJXh!Q9fazOXTC5|&AB#T;iijc3c8a|S5{!5i zu=t*4rp2!@w#m}=&h8`V;a!#H+hR3P<%k+Gj7lFm%wU#1jzAs-&JvrN9v6#k|_w=E0Qa+L^FL}|-qMY$*-QYvT->JOlaA^aHHu`Jo{HoIHINAWE* z5ipwg06vuQ%u*I%OH80i=bSlvF5kJ$?>|3&0hmT!fffV9!w9A%eH6jt2&QA0!E6L` zQuHK-4m^#b9rN;7kjJ8eX9|`SJZBipn+M#`OK(I;=c|XVFdf}8R}YJ#>Jr1C=1o)B zIfFZna1<<`o2-#+FKD75d#;nO@UjT%FvJ~U>)a>^TgKbUzhGdm8QOA|>A2i<3*4xQ z7Rplo80mAvus({C?~9>xdwriDaLwRmS=(@J-7GIKM8#PW42ebxkq^2dOkNQT;YHol z-6e+kR0Cf@ zRWxU>rW?9OY{fD)aaMJ$-V{GszaNxfXIZ$}Kry;g=>{oK`$*e&!_bvV2a{lEC9O5T zEU^u%W*3DNoOjZ9;$xYV)o19v+=La%sU&O_cdE4&^RXkDG3ob}iaQukF^C}*NenT}T&tW6Q>tk2(6j%BdD2)BeZ?>LX6Pa1NoeFV~V(00<}P}mI>BbJMqxdW z%;O}?kjF`&O$0E7bRDKfRBE+kzM=ICF(JrMVNW>VxmHgV>aH1u8Y79!@n2*0vhi?3 nZZI_Kl8yJT$;o+M^f@nV_5~m*BLKK}uyNGrZ?LqV}>l?+} diff --git a/shuili-framework/target/classes/com/shuili/common/exception/UserException.class b/shuili-framework/target/classes/com/shuili/common/exception/UserException.class deleted file mode 100644 index 72801f34e3905ca26584a82cfd83f3b59f01d1c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcma)3%T5A85Ul3y3WAGI^q@B$#=UsMcn~$wZ1jNa#nZ4(V8}9S_F?=jPbMDx06)su zi)b*A=p1Ics%yHdXWli9a0 zgpM5H#WKrxlSPEwvC=9!A=K;kNIVM56MA5Eqd@6F`)-E1>5rrvwHpp0)A8>mp=>KH zuj6rF2DhT`F=N`k%e@6VU_2!=(NKkimhJjuD;&nkQx=C~Ut99Yl@Ag7w0dm&{2R5o zg*$0s&KQ__;+zNuT(G*p9l_}Oap1}eHSzPS>|rt=Uyr$05e9Y$jemRkLwhPh`Qx8p zFL=!PQ5Fm^FKRg0N1DHwzY8^Fk>fMZD1`z?JTaDeFEV3uHqEEeG^uq!FGxL4bftu2 hJ+Oi$lz9jCzLbnAjFS8+Osl|}veggCoju-#{ diff --git a/shuili-framework/target/classes/com/shuili/common/filter/RepeatableFilter.class b/shuili-framework/target/classes/com/shuili/common/filter/RepeatableFilter.class deleted file mode 100644 index d5ed7453bff1ca78bb5d49cdbbb07650812a1c76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1778 zcma)6ZByGu5Pr@U$T8+6grp@96Cg?L7*L^3n__67F0^#)WF{tbXg(eCVGD$$p5!$A zl>CAAb3dhNrI-Fvv0L3DwbU2Ba$#o{+B*OcH_AzyuflDU&jhV zrs+l=8J;Gg8WH4U@k2-WK_%h1d+U4TOeC-4INRKE!Z39ixnank=O}`qn52k&Qu^oV z#-I#+rh;IYNND!rGYrM(-%0LyLNW|C0&X7Gxfj+*$EpshuHK|XrF%>~HQbIgRXM1t zSCjQwP&LV67$Xd~PuHg%1fKB?EnR-Xv5E|X$@b0944{JP`tpwNdr@$Cuu&~I}j%I^4Mvn-uGSpv^eIi z+o#mh|Eds2%5Wt_vRq^9QIFA3O9V6%fpCI|xv@eqY>|liMxc16Ih#G3Qzx)&--tAx zs6Am&mALJ%JI7ls$CaYWeJVydnwYc2tUT?3>aB96_&vi`a?sA{ndC@yJ1TB|HT~nK zx#{V8hP5P4*TMf9=;98hk)z)wjSu}hHTqJ+(|Vas27MWQ`|iF3`-L_sjMCa43deAT z_PIy_W4KBuYJ7Y^TFUqyy(uM28eR_#uSJ)!p)&mt>8hFvx!W!>#8gX2dxzn1r4h6p+3E^UI3%_M z-+3oI#Y3mcJKR;g>GiApLzheSCUiR;9%}ce!WZfp!$JB#{4Y)}bI1@a1x?P7tO%dK z>bC1VJaFqCX_hKM!}Si`Q0VjW&DJAsk? zipVEY8Caw_Muxx+k~FW7j!col60KU&kc@t!oX#}hqro1CXFtREg6K!mO(GQrNIE>( zjF7I993{;Pjcd40vqs9%s;!L3G)8d(!x&*O-1rC2-E%!};?^i;LC2%PrU`g4a2yiA f&Iq6`V2xZOSRXiU5bwH_+qi?vBx!Oq-}Lxps3?b01gTbV0C5=p3he{pgrp=X1K&z#6jWyX z0DdUPeNCXHfCFZx@7VqA`F6Lz|NQ&~U;^(IL@-#1p=u0cq#7DV6g!VU-``xa&=oz%ICM*0x+eHLyVj=Isn; z2&W8-FX#5RxwEcsn?#AE?6huf=#C-o0Wsw58RXS?DsAs;?q1F?4ULZbwx#VDrpFy^ zm1nu`@r-#KIPuZZvsvy;G02YZ7DIoDV>kKFQ0Z{rS%!`hq0(p=l!c=-&w2(0C*vhU z)h_o|xt`$;LrZKRFRvN4mdNewaEE7n9(h(vz@(MUd261-^?in(09{CNV66y6a-nTq zq@%r{`Pk!gj-wx6#wlxd&Pnq{LnOBCrWB2cM^zEU97Fks^~K>y83`5hcqL;&#-fVX zSdx)c@dj^IG@y|oDrBz4#L#@sDDuRQS4A)Sgqf6B-Z8YELlf6{FEGpW;&*=Vo>3vX z!Z3PgQHCMmQX%;_)JITS4E5&`Bv&pEWr4qt^u?CQnnqpx!Aer+k3*1y;~bBAey0t%TUuWB)NJ z{@qOj8+b^gG(y9dhLq?6I+f8miu;hzM7IOFm(kuGA3Oycj7UFFCSgeIAqnxp?%#b#Lsy{>J<{7Fs<0nu~QGE*aGm(A66?sTs-jM3U14G41sb>SF%VbC*>F611 zHsfC*pQ1K(hVZ6{wyvO8$)kp$(qEDYBI-*8x>YFXM~v(htVkHhdlg4L?F#Y2wA1$& D@NC;_ diff --git a/shuili-framework/target/classes/com/shuili/common/filter/XssFilter.class b/shuili-framework/target/classes/com/shuili/common/filter/XssFilter.class deleted file mode 100644 index 003b798154e990b033e20c239af17cc29ca40cde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3586 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 diff --git a/shuili-framework/target/classes/com/shuili/common/filter/XssHttpServletRequestWrapper.class b/shuili-framework/target/classes/com/shuili/common/filter/XssHttpServletRequestWrapper.class deleted file mode 100644 index 95f837c5473e88c7d84b09290e323dab22cbcc4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2306 zcmbVN+ji4N6x|cskt3AQIwU2O5C{+w$3cabTMPjbLNRrKk`ONGZQ@L9fh@U_Ov!tH z0v`LqL;FBq5>{E|u@C)&{y~4CU98eQvbcpnyReo=(#)B2_TJ~5(eMBK@)*D;xM^Z5 zPUvC6z)2IQaN0x)lO{gEl%775#k7gD_|(KXlnk8L%b%IpgtCDd6J5Aq;9?e+wDIQ# zE@v^TP3E$=Vqo6DRROEyc`BH4Wf-bZp#8YxInjhbez<&7-j;XlPzASL71^~YYS`yE z%(f;jt8besjEW=k0_iD#NeOH&JD$4GtS_oyPASob}9*>NKk*w@1F^+;C(*=VSsC}0Gw*aG|hCrBcxs_2poWL+`9ymX13 z+gl`US9(=@HVPcCS{zx3eZDd$ARPWn)W=m`HL3}8s<0v(p?c=3d&6yMj{&s|TFZ4V z+ixc*I%gwUxiupju|9EPP8t{y=pyEl*JwtBres}U&+y1P!bvh-vZ6leo1yOsq!zWz zJ6f?F-=18F)af9QE3aCc(|0PW5jnmW8n{MgPI#XCll;=n@W>4kuPM2t0s(W@Zw3{0 z*3tRh^|nmy*Q70M!-p1jV~@al>s2st-NFqlSoi{8S~!Yh77pN`K&BZjj~zAem4&bI zjRCq@L`7hG?BNYuEG$9kc*`uVcdD&D2lVzTh4zE09X519EbE&2&JS+A=zw#v6x7z5 z^1VoT(b(KdgOO`k5Ey*p))}?rNNq_aSjw(bky>?IXUl@4`R!OgU#!$*5US|JmASKH zM+FYO6EA^+7VbZrIcYJ0?q@oeEtJ{s(dN(pzn50I-3zPcryf*xf2jSZrTf6Qc zj8?I-KTuOLRM^Gu$X0%7fHZ_|Q;ysDHi0%?Kzn|44dQ1$wV|J*8P9G< zhHpFg-rKUm0Cw_?_VhSNA3}F~;_DCkZs*##_SH61_zh!)#}oa(A~l{)9nSP*`hURI zzI0Ef(33g%5b0H9X1~vf`%nMuOFxMBJmBtB9DfKMd>*8~-NdpNoftwl_7QU)qr4wL zfnUx2F}4X>^^(zE+GJ?CkJk|WbQ9w+Mu>`-o+BTRJ@Am@{sLFqFvj(Mq@L1AyMg@% zYy%$&{RjTWw!dg1^ijpTmh4A5Oz}RMUq$;pWbRgUHh3As9FU3q>M1PDm3JV3KgBcv_x`sqSn=PRR6< zz{iwBaNQ)GLkXDslTVxwamHH8KZb=C*+x%b!j#ma3NT}975Sh-&P za2H1UKGLb5XwphYE*5c__^On(Ml98r%3>hFW3a@=V?0{YO-MaKA3>x}2}Ub&s*SYz McsGfoi+BG11#F>5F8}}l diff --git a/shuili-framework/target/classes/com/shuili/common/mybaitsplus/BeanToWrapper.class b/shuili-framework/target/classes/com/shuili/common/mybaitsplus/BeanToWrapper.class deleted file mode 100644 index 1c3b9f0062ca078d04f2d69917f93121f6e0f9c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14275 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 HdOqv##4>dK diff --git a/shuili-framework/target/classes/com/shuili/common/mybaitsplus/CamelUnderlineUtil.class b/shuili-framework/target/classes/com/shuili/common/mybaitsplus/CamelUnderlineUtil.class deleted file mode 100644 index 29a0864d0c06f2bab88f553a248dee7e368ba96a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3388 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 Y80kA`<#n{<4UA&~lXx@K-VU^X0h4l>3jhEB diff --git a/shuili-framework/target/classes/com/shuili/common/page/PageDomain.class b/shuili-framework/target/classes/com/shuili/common/page/PageDomain.class deleted file mode 100644 index 4ff1b1f10bce8f5b1e38507a14faeba3fb9db0c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1828 zcma)*Yg5xe6o%jJEhSB*7HGW-qF9O$#0w%9~!dl;b%`paIJ0m)$*^v+sHKJ)7Tue*6M(AFDFb7>(m@2hL-RhkG(@KZxU@ zgmD=XMmc`OtBE)s^E}CEQ!=J8!^0B}pGugOFef0@wTiyntO;}#x3v$NTGh;ox@bCj zMQ=;UA6;BnOs2kFo$oJ z@TEMD68;%4O101qO-oUNPkXr46O{IiWaT)WUi93I(jux z3q5%9Q2M~p$~%EfZZY^K58n>@=r>H$PaQ#sjiyzI?R97BnmbbqX_l#P)K?lWQ#3(& z)Ji1sdl30_=sUt+-Q+87YRDZU)cC8kQoK}L!*z-Tda0}@WB4*7`EQ8qBl-!kbnMGd zNN@HK_x3t=A*T~GP#C6Z7s?k>34<%0qZtGxQv)1h+$Rb4ynI*{70pcmyqfE7@91c)sk5eixWv)GC>LleDQQkX)lAi`s z4IXt+^(mv=Ep{&CHpX*qJirw7nFR6}qC=o diff --git a/shuili-framework/target/classes/com/shuili/common/page/TableDataInfo.class b/shuili-framework/target/classes/com/shuili/common/page/TableDataInfo.class deleted file mode 100644 index 6b5d29f8e8e2ce79c4d616dde683498d3da661f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1630 zcma)*ZBG+H6ot?9Wec?emQoZ@KoQ%5EGnP^RuhOxNkwCk?@L|FlI3OGczqOYe|GKGdpwdxzC)r{QmRv7l0*{(@0^Z9|j)E;gK93%V9NzwG`G< zcp@+q*e%C$ckNc-_}-h!rhwQIxV+(eL1=m5uI0AvB=zKv5J-l8Xt@H3mj5AOdiB71 zZ<+1Tam}g|glhu*HK*ZOVY_7u3`dUFOJznR>i%0Eii$wI88ig4I?T1ahFJ?+j@Mw6 zvF>(4 zG8jQ#VCH`wiv6bAP1Sw5cVO4~I61ZD_-0LYvhzu{0jAmKDbRK#F@}DmxxT~}jv>Q8 z7FTPMaQ}*0XSq)vwI&j0nL}WX*ZB2-v*4U8{ebwc!p2lkjN>E{n8G+$86AWPT<4b* zxItkl;3CdnU`Ps-=8h37O?*B^Tx!J$31q1P6gifNJV&GEmFASr>u6Ge^(44l4G=lT z+TF_XEXy-}scEim;uc3qU@}r);Rx}s+=!{NhT2^0i9dteo#b){-zZIXpmlbdD!?** zUQr5p^=+KM8p>_y-7N0#OoMd2JVNYS1Z1@bh`vpMB1L+mMP6~1r48lfsf!xuDS@6{ z0HmLNin;o=3_5-4*&M6P<8J5LCg-kai7ye<%^s)%3p83AUOqt_KSn|#p7pFk#H|Yu uWhctQi@4X(It!AFdbZsYIJVL3IomJV1x<@ep$NlW|VX-_Clh+O1}Wn z#2?^~GM-azO_0PdJ?A++&$+k1|NQs`U|MD&UWo^UZAT~-V{hzylo=))ofR; zMxCbgKUz(PEQOlavYbuJw;7)p)8URC2#nWSUdIS_BHOVIQahe&>{)GT#BOG^x99mG zm)Mr!8rhe;j%B;VE0r%}p1ToG=omb=(jby`+`%f&_|}_#|TrWVvdZVHQs{Ji~JhFYuD~$Y#_2DmA=fob&u`=`Vh% zcuv%DHOyj8!)wq+GIp>Kv^2cIyoTGjBalDed%d|UTh!Iq#ag1!b^^nc{=Or_4F=S2 zJbK^i$dFd*Rb8S^mM-2=Ibk9v*_J*pAUIwebt5pCq@DWk?ev~_adQG%GNZsml67*l z$z*4DoTn)D7z)3b|H!Mi`~fBv0R38bjzu0RmSErH~3>y fwa=OFon;=0^U^qu(8uva9PhYlZmCGN6vqAnHO3OQ diff --git a/shuili-framework/target/classes/com/shuili/common/utils/BeanUtils.class b/shuili-framework/target/classes/com/shuili/common/utils/BeanUtils.class deleted file mode 100644 index d63f0d943e7ec9d683fcca511cc746c6f19037c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5280 zcmdT|`F~W^75~1>@+QM$NhEDhRlMK+``YG^v@4j=+ zJ@=gN`QCHy@cLWNod>W5|L~&*@AqRFZdLICKU}y?#RvWH2;qnDVL#U4_F}5<@Z(P0 z<;O>Gw;%W5Uh#R~B77A03+=~LeB6&u-~sXYq;U73(0ytVK8=UO<1;Eg>&FUAh{rMU zxXXu!#S)MB@i{!|$747y7JJ-}6L>-d@Okn11>xq4!emm#lj7q`;_;LZUly^P^x}>1r-nFy4za!k%ezO9lL&4(KMBK9VxV>ACr3@DncPUu3y}h@; zyScZweOFjPpmS6|tcOx|G!`+L?&xvE8~E72j#0+a8Hp3f6W;5@R82Bo&QCLmZAJ;&N## z)MDuIJ_ccNT`iJGjtfDznMf+w5OiXU>G9#v&Vf-QVmB_7h?o>EUzVe4KN>NTb~GW9 zaSs}nEuxe8=K5krmKh;hJ+>Y>*rg|B%w&avWy6NuV+cID40|Lo$P}(B5KWciRD#$U zwQMe@j1|JROSdB)>)z0&|^}=478dW@_;}k&gDp2QngP((b(1bEJ*8wW|M*v!9C&GFzu*eb&eB% zFRQ?^DDVwMV@6mXW3HZ|s1X~?)>!f>Q@(9NC2DLXQf7q4URyVr1qYFsZdnYVBnRGB zA*1<{L4#`37?ksw)cW~GTWfM8>7CHTnQ3vBe}zDHf)cfRQpFi|B^A#q@MpIO*IUXM zrCH0kjEVa-x1vs*1-QO6KX9g3QHX?DSWLr8#fXM`P`7o)V5NvQQ@7@FE|`i8U~6?# zqsV!A4is613igYh1wj|aZGI*fLyd)AK#Z30-gH@gTO+Y_bM*Jfnr|afSkY`(+bFt@ zhRxWb;Vc;bWpiyPTLKMV!Iq3lBG7D_`nc#Q+;JMdiYX1}Fs)$|u2wOl;W<37;%gdS zzsDj@=;7L?VQ=ok%(bg zQF$wJ2lt5^ii?S{u@{Oqr=MlL`0PZ6Lu)UzhaH1Had#q1qETrotEZq& zi73K#=j+|BdQX|B%zXma)RlQQHF%#zalktT{}dKAr~w*k6DSvw#pm6}q16PuGgwlD zJ$HDN$=O$HPSdknhQCIxaxI^YMEM4+XGojTf_6p{=65f4$W*p4!Of_od>aE^k07>F z;}sF2Lnh^;{X6k4Cbf(5r9`kw~Cuo?BYL#h1&8a7wO@Y zA}(8uzAPC3OoP#P2{7t2U@Tn#MwtV~vH4iMwg8JhM!SbO>}8hwnezdL@g8Qgm!S>h zU{R69VnY^-zAP49#Kpm)eE}9icPT73=VP%4HxoQTj23cAa;citEvXTYDU_a+sLioE zDFZEcEE)Pf>ILiebHqb~Ni|YOf66||QD8(6tgCh!mxb$Quv|fdJK&x{nSu#~#i(52 z?Q2DYC*W~UVP(KW`#^&?;F&@NDd&9!>q;vH^Gc7QQhH)-`q#*`)U6mXFPyG{*S{j9+KJZ zAQ9_n`EJtBOUn%`(>}_A+;9DOFa0qq=#rdbG{6ym*C4{bgUsGfdxJ%CNtz0*9Nkb> zH%y(_q4jXTg;EtGlCIHNR?jENOa7*1Dn_N`AQbN9H=+ESUSgc<=9;1l@Wx4rK>T{j z#KsvVf~z_OrE8{fS%qnX TFo-_2lI^sTlJ{|3gj@at;3W)V diff --git a/shuili-framework/target/classes/com/shuili/common/utils/CustomUtils.class b/shuili-framework/target/classes/com/shuili/common/utils/CustomUtils.class deleted file mode 100644 index d9c676badd776f3a6f919586813647364fb765c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 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 V4{|QBe28a0jE~@cXY^6r|8Ltl9)AD; diff --git a/shuili-framework/target/classes/com/shuili/common/utils/FastDfsUtil.class b/shuili-framework/target/classes/com/shuili/common/utils/FastDfsUtil.class deleted file mode 100644 index ec72718efe1687963f2da051786a155b9b1816a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5820 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 Q$%3$mjn|jj;M;*00Ltb1IsgCw diff --git a/shuili-framework/target/classes/com/shuili/common/utils/FileBasicUtils.class b/shuili-framework/target/classes/com/shuili/common/utils/FileBasicUtils.class deleted file mode 100644 index ec368fcd7801818b470b29a7912e70e9c9f5c186..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2167 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 diff --git a/shuili-framework/target/classes/com/shuili/common/utils/MessageUtils.class b/shuili-framework/target/classes/com/shuili/common/utils/MessageUtils.class deleted file mode 100644 index 691f39412bfb9306644cdefa93d099a05e09c4be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 951 zcma)4%Wl(95Iy6#F>zelrY+@7-y|u*Lh1q(#DYi&2^SVAWx?vky>)N#1KAGn3;YeN zC@c_bJ_<3{Ho{0Lsu!L+XWnP#=dW+y0qml0!@?B{S8ZIwbsINuvke2cEUa2sBQzhX zSmlohjc)INU=EW*Ntp9gET2!Ju}t^HIAo;bCB6s`M5?r2fo6WJGQzg!Cy|>SPgJN} zenv^`PI47y?w-st5y+QX84#?f)Cmu|-idf8+)%`UJIYfP2ZPr&=*9R%`uU(&gDNlX z(Jy-JOtpzL;EoojwLcd&s?3tJAhaoa%`J;LUBxFpQ~rLW|QuyI!8sF<)= z0`DM@`C}=w5nhb3`OlkiZcgccVn4TPm`wMl&z zmAj^tT`D38&+6@*eG=u?>v^Ue3D(f$yVsuq(wpJG&6>-SSkCmnfIb)IHvgLi*oMPz zr*yz9F0%F!bC_pD2fu=e2FvA+af-$d7<+g6JEt(eV#dTLHW<*!Y?ipb`a(-v?_dmb>4&XGti{L1R zBRGPQGK^v@f^kfUVNwj&#lo`@C>RmLa{}^w1UK-446O`PNQ99TPd$uj@l1(fCISPq zGUg(vMmmgsVKyJZewblcVPwSnO&N9=*)W_4a##rCRv3$6+?Mg8jF%+rIB%GS^Mr(w z#->pT!7eMQOQ`HKOno3XKc(Bl+Ekh|(LO7orAIZ}5byqE(3vr^5*qpv*1VdX$r))w z<*hNXw4 zsn|2FXS0T7N~qt;(#6oCdQD}g!z51S9GyjRnYNalQnMM6*J+XTTb4bi-qNR7BMjT3 zquQQxD`nz4u*M?vXa$@d+h#0ArP#We)NQZOBn)^7+bW)ZR0@)_Rh3GN^==PqSZeQJ z_hLfNI1D7+2;2HfI<~zn4`uQt zj;2WovLAUC_%^L5MoS2PBvh``S<6)LKJG{e<(%o(a|%Ad9R(laBN-nn_(ZJia{JHvjd0Z9)fQ*|s>JmhrWMZ}2Tc zf8&M-F6X`F60S-(x}C1OZkxfWSv|oF9uqr1v{ED-*}Ox-vUSxxyj_;Lpxa~%ITnw_ zhED8l)v?W^LyFDq)~6`mG1s-*&6{oAZqIMGi2Q`nRpD}vm1h5taN$3+HlJZ#PiuHs z_*Ys*X_n2{(VQInX|SG~I7RLq0jw6l8D6#t-nHFk!b-9YODJWx z9elHrQns2d5t( zt(UE9?Zy}x;(PUqj=~RtqSfbrRk&Tz{ixtafnj=0xi@99HoG)&{92u06!jQ+N=4uI`3|{~0C^em62gLr zspIHH`4qvt0E&W3H-g&<=0)Ly>wM-?x|>Hta^qjf-AOoa7#}VKiRchsb~W|~lr^6s zZg9I1#Ff?P1QEg$cv2YPB07DNABZgBTx+Zff8|jgKrC93N2Pe~%%h6WJfaesm$2(6 zg!@~Tuv@z4?t6q~S50H#dp*J&he#bq6^2oZ5tisU5u>cFG1l6IE95Zo$0_R)x?G8^ zxQuREQUIlj@_mZGWdx>W^aM%Qi>E!M(jMv$anXrI_vBF%KwtBpsBDf_EMafpM}&fR zW6@f7p}&O-Ezx~z3wb=kPp8(U?d`$ZppU2%i27AT z$zAU2IeG@={5?fw3Dh7-M^kiu1}FHh<|NWg{5%F=;u>yZ5;ii(a?H8TpZ4_QD*DJ# ziaGSVF4r?~1N;@Bbq5CdtAw`u$e}V+A|U$^ypLKL&)mmecRb*ZbsQO;AtC~Z{|hLp Bec=EA diff --git a/shuili-framework/target/classes/com/shuili/common/utils/SpringUtils.class b/shuili-framework/target/classes/com/shuili/common/utils/SpringUtils.class deleted file mode 100644 index 5af423c39114465a2a60c0dbabe655a06f703e3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3272 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 diff --git a/shuili-framework/target/classes/com/slsoft/App.class b/shuili-framework/target/classes/com/slsoft/App.class deleted file mode 100644 index 59b60145b2ccaad221f9e920e0db411c87e47d09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 535 zcmZuuO-sW-5PjRPd>CzQZT;5PQ}tjjf`^JAf_MljRO-RgHeKtMO|~Sd;Lp;7f(L(q zKT4dWLMe0)Gdpi)-n`lU`ThC^aDoFHC9GMfqhVs*#s)SGY#G>QD4oerCg%+K_F<2q zaH$7^q3p>}+)RSLi0*k`5mNQE&sC2{GL8SiLh>wQhKlFwz>QU`pAz?CJnj%rz-7qL zXg_)*{=!|w!=c+vA{h=l*&H4Xsk62q&0u%+B=W_TOb44pc${)LFkl+kaj=U$2IpER zrJD~rQiGO(eFsgn7*^(`kht0W+x|%S$sE*ujS~^j_Ig5z`c$mc?j0#jNUz`lZBxrQ z=3xe7oE9lsv)*2`C0Z!byQe1yDu+qdqR1uB$QO@3!QQg8O}3PQ2A1gVObf^_Q)FQU mWkS;C(~OL;cjT)14-{quHl;xACbi8-EL5;cIQ=2n9BO~wK5kh6 diff --git a/shuili-generator/target/classes/com/kms/generator/config/GenConfig.class b/shuili-generator/target/classes/com/kms/generator/config/GenConfig.class deleted file mode 100644 index e2d32ebb64da30e56fb6965a3dac055dd1138ee0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1583 zcmah|T~8B16ur|=x0F(m54CNlF^XItz%vnJKPbBh7l|Ggd6ph(VAh2ze6FN#TGFlAb#q&|Tj2@RjJi;p9qwbLxhVEV&*e z0~=H}T~{iuZ0Ul@N?H1KGw`$+H6IdulK!z-72FNX8n-~KW%A1ev%(uq0cOb)eE`Ga zSzFxCjB;SR+pA>`-2QbG&w9j0O1|A-ui#J>lIPoP_5Mhd4s@1w4*hp8{lH0ioeLJnonW*U344LqGm;KStKAWRCane!0*|Z1 z7niqdvE?+fl%tU>T_Yn)8NCcqHcP`~Fq;1Vb%gTW$MddwBrHV_@XFG7gb6Y%b;STXF$g>#B^%Va|53|P;Gr6$@zol*!7d%?3o>JT7q<0}NH zYtY>&7V&--3rM&Z$s*p*VhJpkuVA5-9AI%D&M62#phesEP=RhT;p&O#P>`Nsh3P+-2@ARHoDK z)XsF!DKq^5ekk?XB$6AWLTodW`|a-SKF{-e+26f-{m;JuX7Iqq2r?F=jRZ0_hViW# zT{WX?7OvZ{kQv})#>RJ;HPgAiH?5zI?{UK{{a_($W5@u_Tli6+zf@S?t+@ijxh=J$ zWJP&p`7{c&SI!EIJ*j(O#d`@H{_Kk@me%U?%4WWf|7Y){Q__-QWCRTNYg9 zg>pj`BR|-c>fnIPt4iG^WZ#Y%2n=2PJ>0D8iq13@{6Q`A+SAcZfu2-4FVMT_m$>nG zPJ8Z8^=iQl))hqoL2_EwbU20` zgCW77j-xLAFPK+87tGyT2rQU_{ZD1);2T_aa1*y2q%kS*unWk;65!w@PFc9^U;%d=EaI+(B?rs6 z=iok81Ri%yc39vACXarJ*-6@sYpt;579)WXRVsB>$#Sau%6uOsYdTXy-Um|_Yj}5C zjdh^xM(@VAQ=MJ*6Md!wjU_n{w&CO_9O^u4lpkxyD(8D;0jtrD*ESfl)Pr~Aa%<7CO-=5hcMpBW_8a>r z-!>74Neo;@lGkDgQ#eCvgFf0sXrU*m{{k+O#ppIFF3}2esrWRUzoMscVqzZ_Ig{l4 z8v`$4?_qH2B%GHxwuj>##B(IR!O&#s-h7OB;(+)xNm3*c=H9l*u93<_C%KOylAUO~ X(+tp3EI`Q?Qi9GIr>75GxB|QdbD?GR diff --git a/shuili-generator/target/classes/com/kms/generator/controller/GenController.class b/shuili-generator/target/classes/com/kms/generator/controller/GenController.class deleted file mode 100644 index 2c2fe0a4c8dcd9c79a6dced9428ee74b373c0d51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8063 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 diff --git a/shuili-generator/target/classes/com/kms/generator/domain/GenTable.class b/shuili-generator/target/classes/com/kms/generator/domain/GenTable.class deleted file mode 100644 index e72de36bbbb3cdd8a2dbd94fd4adc94f4b217659..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6815 zcmb7|U364e7036PWHOn_ny4Cl_Y!P4B&f zM6K4gSfo(sx3shrwS`tJA5uv{X#H3&muu;RFZ$q%t^~4{KKP;!KB)hF?|hzn#!}YG zzW40A&pyAi&)Mhf;kW;}c!h{o(Jx|jGd&xn#q=DD=UKeK;zbtUV{wGVODtYyag@a? zEM8@CjKym#jSsPK16csKwE3L(6Q_ZO5?8tsCwUB<>T`IB1!UtC{XLEtAv3m<#_Cf}*ZA zp3ygHSzS=u@J?;FmdI#kIx*_nhMDdabi^Duz)m->?1l{6w*pt|; zWsH=kOeA?6TQf}8No=y*0XW+QFOjV7I9eKm%$qxYa`y1SYbVakOdp(k?DEX?#cOX~ z6tu8%oUy6N%CX`e=%AI&>Za?vxq9f(+yb?8*wNkl4&=&ZnS5F?FedR@r zQ)wC>&pC#PxmWm|nSN<@|M8&lgE=$Fp{+2U-G2;W3K%yPjQex$gk@v(W-cF{dt`6r z_>r`3awxF^cpK5&2|@Lfy9TXHE^7+v9!^@>#ICH9z*pVYT+2?RtSpuZS zgv&kKam~saDJz%APK{&5oyknjNod7Qk?{JgGxSUfUBdbv!*Of8twxcgHz>AEi@(ou zu8~O$!vL1iQ6p_?Zq5d2uk?BKbwl>SQ)h5bV$U0l6R{@q8@JxIb<8Y<(VF;mM6k1k%XLG?>F`JqT9g7+s zaIln0?76Jj#2(7ir->a@C}1&Co>FX4p=gA~#sPMmt$CJ@k(>6Jezr?WnICCpGyTFev5aV-@lOcyrU{LJWfgD_v3M7U7g|Z(BAQ| z9aokr9ieX=b&)6=waI++&~4Dp;k;=yoYCB*Zu`rCLz1s&?`*}@t8k{scDRp?S~)wZ zuQM_rX)GM;x3Mol32)b3*P+hy#7Pv!WuJqmXj(USxO|?)X@ou(r!MM_Q-a0qELO5u z#o|sDpJMT87OPqGvG@#&wbUP{AzBxw`?&d87Q-wyve?98GmG!gKFpfa%bCa-83UC@ zHfx!F!GXetFRVh5gPf>!5%~yRh|@H^8>ju;yEcii#_35q7^jPLDNaA5OA)#prz`Xx z3Y`ba;x{;<*`xYHIo(X^y>WV`llXv>TvbioazJ-AcDX(MY15 zN~#cV;h^pEpzU&4VW$UeR|IWWzzPZB@gOIHeeMYMxdT>6ouKVqLEF1vg$xVY-W{~P z8&*ifplxr^wii~&*P!j1pzRu1A+5bRBD1|Gk{huu#C-togWKsI7$V`RhVJ!@)_Vrc z&~8AxXvB+C?=23iLwr1VPn-~HpExztA8?YWKj3sxf53^O`fw|hIO`y{040H^z%$%) zfy7ylZ4|Q3Q+Ci8-s8RjZKZ8!3Hm&J0kX35c?zA8I;WJK@2Bng&V2|+h==M~`VNIk zL&rR=L1EhId6@58<%ef9P6VcYKnYSKgP2N?FRDRmWDo}+ZWR#DG6wmQ5~NlJ*`oyc zvKpjT26-4D->d?{Da;@{lptXlGRU75ApX6a1IljtYTn5R zp2a(-iGgZ}uRH(F`3r#lS_O#jdO>?&>tBa;xc%2dK5dU5Uk!uTHyl*H$T4a!aC_x@pgS5yX{{+ats(|>#jlgZCDim5}kbf&dzNH3f zl|lYXVbm{NrvwWHznBvAh!Uht0ui-JkZ-F&+9VJW1xTz4h+n)3dQ=J0E`u~FK^{|s zw96pv0P!ogU_|_4QPAT`kPaE7Qwg$H4bmZlECk3+RU+aSrvkr-pTL&olV*jtc~LI+ zoTu{y(bQ%Umg`o-BIhpDBEf zMLAYWr)hzVb*JacU;k*abdJ&i?~I7@e;?!lvxp44S_HItN2p`zIr`{1S~yKNy-y#T zrbVZqKx9y~K&fp}$rr4Am}+Pd5&~Te0kS|1SaGsDBtv#*H#4(9 z)Ye+6E!tY^M-|apt1Y%x3kpk00Y9p>t=5nFfgi0}rLUp;gXM5A3f=G-5}ze;H;K=YxQE2&N!%Ml@dX*a z7=!!Zerh>HEngz-0n#2M?aQP+MA}zKe3hyXlXjT2Bcy$e#Men2C2@>8N)jBGVN!-i zWH=$iqcWV7;gk%gW%z~+-=rnKMdQ9L!(%dhhw9&z;PDuAz(J~fPlhLA@FYA%;`=0i zAj8wt{X-HzlHtcP{DjnJNc@z<&m{P{1ixU=U}>hVX18jlrRR+;$<++lItF#UdBd_* z!``Z9i&_}TqCdt!ven_Nmdr4S_wQ17tBI^?j3iRFsT(898N|~0Y%ymHs5uRdxRu^~ zE~goGxpVVG0Xt=y?W$2y*XUXnt+osn4O`D?TXjpvg;p6x-d1gdW-(acthhI^Tg~bj zr!kQxn5L>5wv`yj+dYV83}Hw)&9c-HTxRwFM3n4w!qBW-G)2f8(=jTd!OL#Q%!A${msM7R1fx~uf-7Alf%Z7OQ! z1cT@}m7de1b}s9w89i;gYRJlykw%Wtq+x3#nu)GNuF?(NUcsQYwQVbdP;WkiZq4l1 z4Q-&98`jLtv>~(|`84jMio1z*uQ6ng>PTE$e>$H_jODDvh-PS}YUj;FCZ9vv5^FWX z8QbgZ8||Q_*-i`XaZ@XY$=hT?5gXwK&1!9%J_>gq4Y^jmXuvsq9V5@Hmjk4sJfz&@ zTXDInD-Ut&Gtdfcu~)-hzovM7UT7&^r&pD*H|gxLgdMJi9B-@QHMZBKY&AW$UM+a+ z);sgK@Thl8at(w&$%PD|=j((%S&pI^o;^3FqE4S1R#B(N)17uV%G`EWr;STa1s!cr zxk5ZR!RV4iJaAQ7^_p^65~9l5>T;aYNWVt>rJTT>%}2>p(&;F0(h#S!PL|YCZpYW&NQ=cZvoF8CMMIyXspaZ8-{mjX`4=rW@Mb+ zFeZv39t{bPuWF9rL8!5Y88lCe)}G?dop{)soOlLPs|3Hq7*FMkW?EaL)9GrgJSU4N zV=+iL=W1BZ=k!dzn8-~GV^*>X*`k$D%ZV%DL<^k(#D)=W?6Aqf9ckypDKG@v6j%j4 z3iOg#O`?y)8WL+starsY=H|r`{7Qje!*3KApw{ckP$ayoPnV7yXJF2*Zg$c=0;8}Q1fe#Xt+E-5A>d5^H z{1$#!fz3@r?v^R=dm7Fzli-X3&%+-S_#>QE-~~9x02Fu;ULx@)9C9`OIu-acysW@q z;I9h&4bu2X`9BjQgH{@8jTZH+j!&IjE^lCAYEyZ%N42y*d~(@HQiD&V3l`&N`?R3L zXqZ3UX3^HOmiIi}LOR9scu^%~DSyuREn3bQuV|-i*62=OWlSVT3`E?ENEs}vYKuoY z%~*p~9JZW?eUE1E(KLg>I^L4&FOR2ci}0Zl(=B|A_vH%2V;GMTJyaJ6R%qj4dTZd* z8sYhIdr50D$*)r34TfIX7fSgRBg+OOYN3GXgh8hW14p|%!%HNA;a+Cqp#+9UvYIhs zk2(+eBm*U*Wi?wPysOavxgv1orDQwrT7%2+lDHhNX>phXSHac5UnxC7uFumfuh-U%v7n!EyCsiD#B9mk-?pB-~rH$oV*Bw3j4j`A#!b)t(F9)`4M z%Lj54Y7XP18t{Q^5dz7Gfz$?pY(pU1s{o<>A|RR&NNo_v4k3`8Vj!U)kPHIRssN#Y zAs{0{AfX@-T?k}U3?v)`Vjz%w6(AI`1Vk4C2?v2#LLj@uKq5gPdlAS)6(DqE2*{Wa zNF)g4dLfXk7>E=EauWjCR|N>2Spt$10+E71ZV>`8#6aXAklPT*?NxwKLLeY{ArLtT z`&%huWp!46@@i;WZV;z$) z;{ZsZLlCMZQ?=X)KFGP$SWX0uPL5+>;^;8cT(pwBvxMF$LGSM2z=g};Y%$GBkmmbv zz56*#kus(TUHlLR!&1nUQi8f5Qx9@re5Ua7h-QfD3t;MD4i(Roi>iXDqS)E`ptDEO z*<+kp-dTF6kh8mmtk(xwe}r??XMKa1srnMk3^H|^GvG6Ym+K2>>M_nGo+;O*3a0jm znQ90!^#n5YBxjaqiXOYf)LtP|4MC=!<{b5z+9+nKp#&ENnRrw?%?-n!F7-Z`2$kabLvpiFDbt9(UBV?*E$kabMM}4LS#Y{DpU{)}u{>>Ti znHqdGOr7Uk;+b+?s$lARF;h(erdSBVEXE)Fs^ zk8{*#>V3k=&B4i62q)hp_M$oH#RBxAwTc(?@0^|)IK7Y11+crlA$kff8LExXOAUqMm!^io@zX*vGBdO&{0LI>T>HQx~ZK;swF^1KfNcF@Cf1 z5chb9o7*EUU_=xmKw*R_z_XdN*IdT)p{Y1v9e7ENBF25lU?|=iZ<~bn{zsu>=s0w) z$NTKU1F*9rzNiF=frY2LLbYAtrf^f}Ug%xe6kgIDX^A*P5-pM1Pzm19Ewx0jT-+^p z#+Q^}X^T{XW$`zXhS%$*@h%kC-W+C!&Y$e;EWwqbObOmpf;S(g)oJtH8}lOkHUMl0 z6t)d!vF$LIT?buk2drQ!tYyQnfu&&=wiVb;xPk3*TwH-K)oWos+=ed?5`L?k3m-=E zWqjLT26vzqAt${MP+$*y1lt(Q!dHnq;iGtorz~_Sgw8`7L?rl_1Rs~+6B68o|B{0L cz{-C?xDH2s5=Yg*r^??i4xo)YEco>Q0M6a@M*si- diff --git a/shuili-generator/target/classes/com/kms/generator/mapper/GenTableColumnMapper.class b/shuili-generator/target/classes/com/kms/generator/mapper/GenTableColumnMapper.class deleted file mode 100644 index 0d86dc3fc8a9517f69bd22ffeb3b0c820a7badea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmb7C$xZ_?40XCv*0M@)L*meiB^Pc*NE8IBR6wGL3#UxSj6x^LD9M24*EsM2d=$c6 zB-+wLIYfya``LcaU*8{}0B{OBW!NmkRvES#>^Y3F>#u@G5yW_D;#6tZ%5eJ^`R^EGUjdRe1k!yBO@(*YANM@j+C=@*C^gojz_4`3U4eAjS^Dx z8`NWsG|mZqf7s#VPrq_A8-%t(23t})w0<&%!BK7QO7#|@q)8||PNVFGMA5XnnYBX4 zV5jyxgCfGxWA6Lll_+iudI^M4GBhbySs=W0Nt`;~H5R!NNrIL)g~Qvy^M5ogc1&u! zcr9a6VRv$dA>K(}OZt0AwU-K?q?081h1SMXCq~mahizjc?vlRJFP3)T-Pj&?9xWQ5 zCCDEzF;0?T87Xu8SH{s0v&u85{w~vy5(YH7;{V{J#DGDLPM$WoSYS|qB3UJ}a!@9F hVal$+A^`c9M)xwTP;7pbu?lO0%qpzYT_U6nfFDuZ`7!_i diff --git a/shuili-generator/target/classes/com/kms/generator/mapper/GenTableMapper.class b/shuili-generator/target/classes/com/kms/generator/mapper/GenTableMapper.class deleted file mode 100644 index 46ed3ecb81450ee5c7e68303e372b0ac9e11697c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1566 zcmb_c&2AGx4ED55LJEYoDW&C~A|MqKa{+M(LLx$-q5xG>Ap|EUG23Z(XI3+_g**lC z!+{6j4R{%ZcQuK;i#ZdTxW1#VPeUBHr~kb3?(=^gBb z)K<<5c+hC~OeFUsCj-)C(HkrKCPJm<$g;W7-opcwiC3Xa-I@Zb9TjNwi6sH={s!Yw zfw+%3&|;qT)9$gPmnY8NMxlVuc^+Lfk?Na7MuRST<>D}Ll0JFTP8ls(4U~2=MizX} zM_U+Bvp_x@nax!Ep0Ok&^4Ld@ax+5|@cmyhDpsNYo_4XY0@k+^?Nvl?lv7NnEwsq* zC;LQe$ ziS5xdmG-$l$~eckm+lz>Yva@!W7OS@Q7%r~{voB@M`QP;W8#tVgP7zt#l|UKV*}>Z zoyl%QdE(=N1uSGMF5^^Q00A;}{(}mX1qhhoZlvpdXHUkybPo2=KFwZyn z{b@MEcC{J)5pb5jnuBxfvjB^S7)z|zVHtqs`Jr5a3z@z;lxuL2A!diDm*8?1{R&)V KS!Seb06zh=#qp~E diff --git a/shuili-generator/target/classes/com/kms/generator/service/GenTableColumnService.class b/shuili-generator/target/classes/com/kms/generator/service/GenTableColumnService.class deleted file mode 100644 index 037dab3a1b2bdbe1d23a778e5c4a285e51e8f6a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1709 zcma)6-A)rh6#k|KYD+DOfPyF>C~f%}QBji;l#*zgR86em#;c(n%1C#&nVkju0zQow znwThF_y9hX@yt?)Z5M1dnKN_doNvx|e)jjDpT7V+!jlw|SWMy)vct$BZ|lfbUA-`g~7R3B1L{nFHSnjCZ88 ztP$+chH{nJWQb>TI}8KcUQIHLl$9%A2hOh4Veky2Wv?n4J3=c`-+}liy-4m zeWOErdtZ25yY6ucqaIXE5y7VBIYPNzWD1+~_?U8uY8MZN`Wy!OpP+!tuD4oHLBQnR30dfxU#pO!pHsnKs6MnK6N~ogqHlYs72w+ zb}6H>bx|Yt&C4b?Rq+B{l`m9-YB$wMu>Jn3?GT1+WN9 z__pUBQX5jrj7O8QrL|}=EJl_2ebkUlWFyqM66WY9m!zK_L(JxkWSUMxBrlU3BuVL{ z^$MLhNoKYA?_ghP6T?+ntuZi4AILd0z%`7~iTV%|WM!S7k&KZX&VNH}=@{`CzR>Ys zh?x+=I*?f#!tSo)20=}R)>E{ja?%F3|irpto?FK$vZdbHE0B!Pfr+HcR*~A1ly;+h$qTk2w$6M~Z_uO;O`Jewe z_fB5=>WQa`XdHj)rgQ0VK5e8g3+O94;--yEcw&}ImRz#slH;a+oa^R1Hsr}AZTa%# zF5m(-3%DD1mrD5SC!Nc4%ln%RiIPN^cO@sL)c^c`aAw0_9A~zM$VbQzT%_Usw=F#jE z$={KulMNnY@K`sEp~D7`bMbgLPvBGBJdsaDBabZLGA=iGlAFq;$7ybw#FItZ>25xQ zr=Xdqii*<=p6=oqE}rS)SuURK<_ex8{l05(rJE{5l`1z^^IU`Hxp=<83uOKpH_hcy zBD7ZIEtJb5d0i}*GsRR(3V10mGkCd+&vMhr{5>~+pU-yDr*ikpJS$vW=c2#4xZXv7 zcd;clS}99xkjpCR5)e16me)1%8g$V=T=bc|H_9a>m#|!#LIp|qtmo-Fy0t) zH1i!>v(y0)ls7353dAPE03$~&V#=8ouD6(aR0cv;b-Zzf6;Uf!mZ|dx7x^Orv4q{2 z6I&I)I*K#Q8nq(p0(DlxAT|0OGkT&{(5j0$mYUjJQO|VB$ja6Jb$(yaA8PQ`#Ka=y znao@tZuAF238@g56~J&$=g~|q$3{#;GicaZR0qu}1JM}M_>o;0J4(+Vj|GB083w)b zYXS`+e=Ht>IhTGL8I!s&?_^BWOWSk$3gr~7^fo==3V*mUP#=!_8k<)DbkU|@JnFMH z#H>&h2=w8#Apop3`EgUA^v&}(Smj-qSoZA5&pvI2Db}O%5XcO80LkzpDm+^Z#Ppu1)g)?t!jN%hbOUn5H&YgP9QJ z!$&Ub9Az1R?^Zst2ldV{hG|Y$M0Hi=?(rrd&2spJX+)Qz4P@87&Sq=PiJ6JL15N0z z2sl8UOW5!ZROc@v`fXZ1>K%-FW9SGZ*ZE++JQSQ@9XMp%|DI z;hS-mMfP;lbT{QWdoqkpH8`f4q$f(v(VbhwQNvO+5)5P*D1N!X;LS`G$2Me!@tG$! z>%;3q!LYwx`=~IJ=w(xx%y2x`6px|Mu>6foCu(VM(A4IbH6;@9H_uJ!fE8tL48YQM zKjmLE_?8BmI`r#?Akr0~)}U`D4S*%2!`P}s_+a9SxykTBA#d;&)YnY?G6wpxsRrGN zVjguo)3^*%q}V@`o`Pm`oj({5;+#<*06g-W{HQ>qb62cp8m!U}KCkev@S_rq##Tqc zQgdqNR^vNrH~8*C#6#4I&0C}6lW9U%ST{v4RVIld{%|+JxW*n6y;aq`IJ8r*Bm9qpRY9V8Dl|8sQmLayb?ERDaa6tL;o?YRtG% z>4MS{*zTHeJW^-P3`h~y2a8rlwPzbGG{iJAW4eoi@vLwRm734l3Yc^;U1HKE0uNkd z(p9w8q)+G`ldhxdO}Y^mzL;(@=??m#$(Qh@2480K<$Q(7SJK-i-OX2-yp^v8xtqL= zuQB+1ldt9LOun9fz;x0v-JlU-(uH)9!8e$EBV)3M`DT;1^UX|zKscrhlW*Z$4Zh9f z+xZTIq3902)#N*&Am1el-p%)zyp!)WxrJ{65R65pZd>`L$@{dHN2XKMG-v*~7(*?G9 zYpnX&{^%;uyGb9>#|A%W@??FA#abjRVHFd~rNC2G|ghUjL z`9m=uQjK~*e#u=}JF|46!H=2zIPU@HncT{Ikr+&F<9$pgIMOrHvh)3Dbd2Tl6DGYy z2MlgE`ANL+Q~b2a&(KyR<>X?ft@1}|thI3~R0mk+Mb`#LuR~VI_csMbua2r`GZ3n` zHjG{ux72Gd^;#;VVYeCltjW*u^Ctb1{s-*pXs$zLL?(M+no@t={5tZ1$-m(@ zO#UtZ&g9?on@j@^?6~&elQ$mRv3dVPHywC*&j)Q=4_)}w2W?Lry#EPV3cg;}dh`x5 z9LqY`@@VJbCjS9(P9O1GCcn+^nEWokZt{ElN0a{~X#KOizArKOfn4^><$zoc;zIxA zTT#6FMDar?uHqoh(e;6d!GAINLs9=D+J=lDjnrXB(3t_yJ=4jC!5^FaSN?>l=qS#1 z2Br`+PA(Ksl*cMSk#d%V6q9V!C3LrBgDUxk$}v^Pim^j2$8>zAUQS(!YDV<@nk=7@ zLo=oi@Ia@1pZS#>DkyTMx;GAM)>ShtkKtAyvRRx4lEG!j=rZ}~$Q$|oJ(k??X zW=%I@DUss4wim?KO_I1y2vF6NrmCt`02C?OwSNlJzB_)ydW=>6XtgT0ah$dkWnM_V z^l|#9D$i8f8C)IAt2KhH)VX7y^qsE$$W+pWl0)|`ABB}>-aF!hH+`$Ahu9lV6XsF5 zUY9)S3$oAaY(%A>iz;M;HWuP&43^E8Dnn^ox4fer7YvIC*=}0)hhN|Ik>}93yjgL#iuU>joAAMl93>9`NmTiFakhSTdGXqu- zrQ+PKd!`Eom=v;o(iPXUA!i9fLYT4i=&GjFmUh7)1s(iaWksXvaLyGAJJF^%EQ2Q< zj;X*>1K^I0Qg$FY24c<^+c{q|)^QHD(^5(!q39jzoGw@khr*di&6(Vmg@xhJK33Zl zoQ4ff1J2Ra@kY$yK255FGD(6VeU3D2aYRaD^F2L-arKTS#kNP$(2)YwavQCPoQ2{j zB9jJ4wz@2^x8!;Tlmhm#fxsXeo7d!7Mk=eM=#zmY?Iy&!y%dN|+rf(P6H>H7fMSCY z^{Gn4cAQxk3`ec`@qiTz!mtIgaH2c|par`HxbZZ+=g2@1pn zIOdN|2|<3^{x-E#D^ERJO#2|zo1x^=Q?112#V2K%JzKB!avY--s13^pb?C2>4VEnp z88&PwcDCtHOec7e0h%Qz})EXikY@zp1FQkAQg#B|zG z0o&2;EbrH8XNza^65{mGnC^id`m1vuB4d&*y4ToLlct4cie1y% zC1g|gm(4gZz#dEjYFp`MGqhDI60u)qP@hs z)R47(nzlh^0U2}+U5k+{M=H3>ET`k1g?oWLOKuh=#cM_9 zDY1pRTS9Ds62|lcrOXWwiX)n%2+iv(bXk{$-ee11j&+GWOr>ebJ~FbEs@cjCT2+6F z16$rhW3NfSTr{UHwp;bTlT1>hb-^AB?vR$+rS^>w{ z-sg}T-}ZP4t1tmfS6ylwZVMii-TH|&Td99pt~aNojlABRHaf1A28e!Q+~c!oLSEmz zI}m5Kc~8iqGQ(?VSGc?`TVkm^*{;a<=8K$xUN{rNPEs@rME zl6D%pWG@Z#3~!|orLA-lZml$OFO7O;7Z#L_pu7RhlcV4~2VqNadN#m05Re=WP!`h; z8Ve(wL3hD5J81!2w-%1s0M}dq*IY#pz<3Wq&TdG01o60w9;e5YIhRvD`VPR`y?9yx z*FR2sKnTNWHML??E~L&?PR_%8YgL%!K*B)UOKs2shE2F)5ADO7XuO-APymr|5{GHI z?T{<|_tBH+C6Jj(d0&znkO5+j&^*dF=qZDq)(r+dqrrst2Z@egjX9~`iN2sL{KE0< zKs!jE>i~l1=>^O!Ah;Ad6=1$i?NkI)7mFWl>a2#vyOre>l?npj{L<1k8eNu)R$m)^ zr!3E#r=6_4t>Ud*{H~mQa+#~0#z5fMvV5=0Gro-`l)1fbZ>~4Ll};(~y5v4_ADx;l z!T6lwXYIx^Ff`Fqh{k8AH$6vQdY%SB-J$ej8bv?DpJ)A?=F=}}DgBD-=w%AhD~Q=w z5wEW)x2*)Gmtw?==%0@s{pct3Q?$)jqqnJ8-;{97CP)*echP!!iGBg2^oB%Xyll+8 z67%cj;&TOL++X{Izl) zT=%+iC>;0&O|c#I8|d-|{T5frG#em4N9Jj#GT5@bs+}e+DcMV>RTmYP?xo3a$myWM zGm`12P%+cn(CQuPMekzu?*YPpRF)~yvJz__q+l#-?@zy@-(v;6z*KM2A22K9(D!Yv zMV1Mf0+APOXiPy?#jM?`i%Nh60S5k$F3Uli0!FT|tPrt6hyuoyf)yJWfQ#`IOx`&5}IN%$hcubqg(bfaCHS8aRqCyelx!b8?iPycC=1A*A z=~dZ6L!~{*8Py;QsMJ5n87)WF3TO(8K? zAyKGA_i9Hk{p~gQP4HJqIY&@B84muy9jV|uLLngz_WS6TvF5 z-y8I2jSOfa_$NA}6F!S2Z#+FAH(Rnp-`u;XpEsv(-k36@$ZH64FUsSVBZpG)t8?){ zu?6=b7x%@VE*4S|_s1VP7Sbtv9F_9`Wnsy~Md&9ajNYJOT?xvQE+SksF@b2GjcBpN z2@;9N+m?9Wpbre%Z_xYjD1DB)HA{Z!NCCZxA+1T!e{()Or>lI}PIH%dT`3&E!anAW>d?N%>wg!l*QL1V7`F* zz_7!pfJeZvCsBVMMFY4Pe*og9!tx39M$tgiu0*-0hi$ipmMsLC*k*= zDRd1_rtA0&+RamG4^K};EOm(gOIcq=HNKrTROO}MJn2D!8e z12*yY0?0M-4n|hi#9M@1og`j?yY3})tG_vPyFlPRHc7Yea2l#5UoNKt2k{+0cLe=l z4f=zqMl~tF1JDa8FZV1(&FO2UW!q_iQ<;JZmsgj1&T6IawbA#tQ#WBG&)HJ3lzRN> ztt)hEU3zQ1u5O&-v(#j76Gw{X7HIbpO?aKXC+9!4~RvV zpTspa7i zr#$SX%R_5BnZ;5itZbpYmLqS$8VzlPd?V%ZO~BW7 z{0053YPnKZVS43ZJm5*PB+kQNh=1WJMfoy77smN_;s9YV`pLh1&&D=7=P|u$;*<^V WSP0i!*UypKvybk6UGVn?Sb< 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 AIRF3v diff --git a/shuili-generator/target/classes/com/kms/generator/util/VelocityInitializer.class b/shuili-generator/target/classes/com/kms/generator/util/VelocityInitializer.class deleted file mode 100644 index fc3e58da85e54a72d218d28d769c778e9197d77e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1089 zcma)5TT|0O6#ljp5=yw0i-3yULBpbsB@G1~ zMIFmIXeengHCQ?H;gNeE2zL0sLz;Zm zv$?a&0~w!FWmYw0$go_sy{2{446V9wMZlF8Sdo&BwJRLYmg;1aC?t2}7ZI#87%}6e ziGdONNcE5(bIajw-Fo%e7QT|6ORmgk7;V`Sz;}V?i$F;clCig@xPA17`$;y`0xFLo zSM#F478^3odhC*>Edw*AGLXj*!*D`-1DavtBSo8m2oosN@%VuVOxxihRa^0by2*WR zH-ved7H9^Mt7P+bOeK!-xoT{uVATZ6z!R)8Oc9jTg0e25=_4rZI#O9wdbW3 zhPk-UVIz``v`B1vE^Th8xT~y6Do}=gzMYu7(_4po-wWIGe0`F6NZOMdb4A37FKN--q#t^N;bh2n?w09QH!Ojx%2(4X- z(!eOmM#}+rFh-|tj9&$xqJ!XowF_kS&e8F@kk95jzoP3yA+P6iEukkBzQH&}Z}kFw zd&P6~|2!jD9SbO+mtbPjc>)K4>qIq3G!yjB;vV@-lh-7Qn4({QCP`|Ph>PSufx8J# diTv(U^dx-)$o!!Irr|-nOm&mTH0d*#`3rC%62AZd diff --git a/shuili-generator/target/classes/com/kms/generator/util/VelocityUtils.class b/shuili-generator/target/classes/com/kms/generator/util/VelocityUtils.class deleted file mode 100644 index 7d9ed7922c4621fcbbc1926de95519e72ccec9f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8515 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 diff --git a/shuili-generator/target/classes/generator.yml b/shuili-generator/target/classes/generator.yml deleted file mode 100644 index 64b78400..00000000 --- a/shuili-generator/target/classes/generator.yml +++ /dev/null @@ -1,10 +0,0 @@ -# 代码生成 -gen: - # 作者 - author: kms - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.kms.system - # 自动去除表前缀，默认是false - autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: sys_,cms_ diff --git a/shuili-generator/target/classes/mapper/generator/GenTableColumnMapper.xml b/shuili-generator/target/classes/mapper/generator/GenTableColumnMapper.xml deleted file mode 100644 index 2b22c1e0..00000000 --- a/shuili-generator/target/classes/mapper/generator/GenTableColumnMapper.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_uid, create_time, update_uid, update_time from gen_table_column - - - - - - - - insert into gen_table_column ( - id, - table_id, - column_name, - column_comment, - column_type, - java_type, - java_field, - is_pk, - is_increment, - is_required, - is_insert, - is_edit, - is_list, - is_query, - query_type, - html_type, - dict_type, - sort, - create_uid, - create_time - )values( - #{id}, - #{tableId}, - #{columnName}, - #{columnComment}, - #{columnType}, - #{javaType}, - #{javaField}, - #{isPk}, - #{isIncrement}, - #{isRequired}, - #{isInsert}, - #{isEdit}, - #{isList}, - #{isQuery}, - #{queryType}, - #{htmlType}, - #{dictType}, - #{sort}, - #{createUid}, - sysdate() - ) - - - - update gen_table_column - - column_comment = #{columnComment}, - java_type = #{javaType}, - java_field = #{javaField}, - is_insert = #{isInsert}, - is_edit = #{isEdit}, - is_list = #{isList}, - is_query = #{isQuery}, - is_required = #{isRequired}, - query_type = #{queryType}, - html_type = #{htmlType}, - dict_type = #{dictType}, - sort = #{sort}, - update_uid = #{updateUid}, - update_time = sysdate() - - where id = #{id} - - - - delete from gen_table_column where id in - - #{tableId} - - - - \ No newline at end of file diff --git a/shuili-generator/target/classes/mapper/generator/GenTableMapper.xml b/shuili-generator/target/classes/mapper/generator/GenTableMapper.xml deleted file mode 100644 index 3b07b878..00000000 --- a/shuili-generator/target/classes/mapper/generator/GenTableMapper.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_uid, create_time, update_uid, update_time, remark - from gen_table - - - - - - - - - - - - - - - - - insert into gen_table ( - id, - table_name, - table_comment, - class_name, - tpl_category, - package_name, - module_name, - business_name, - function_name, - function_author, - gen_type, - gen_path, - remark, - create_uid, - create_time - )values( - #{id}, - #{tableName}, - #{tableComment}, - #{className}, - #{tplCategory}, - #{packageName}, - #{moduleName}, - #{businessName}, - #{functionName}, - #{functionAuthor}, - #{genType}, - #{genPath}, - #{remark}, - #{createUid}, - sysdate() - ) - - - - update gen_table - - table_name = #{tableName}, - table_comment = #{tableComment}, - class_name = #{className}, - function_author = #{functionAuthor}, - gen_type = #{genType}, - gen_path = #{genPath}, - tpl_category = #{tplCategory}, - package_name = #{packageName}, - module_name = #{moduleName}, - business_name = #{businessName}, - function_name = #{functionName}, - options = #{options}, - update_uid = #{updateUid}, - remark = #{remark}, - update_time = sysdate() - - where id = #{id} - - - - delete from gen_table where id in - - #{id} - - - - diff --git a/shuili-generator/target/classes/vm/java/controller.java.vm b/shuili-generator/target/classes/vm/java/controller.java.vm deleted file mode 100644 index ce54f8e6..00000000 --- a/shuili-generator/target/classes/vm/java/controller.java.vm +++ /dev/null @@ -1,126 +0,0 @@ -package ${packageName}.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.${ClassName}Service; - -#if($table.crud) -#elseif($table.tree) -#end - -/** - * ${functionName}Controller - * - * @author ${author} - * @date ${datetime} - */ -@RestController -@RequestMapping("/${moduleName}/${businessName}") -@Api(tags = "${functionName}") -public class ${ClassName}Controller extends BaseController -{ - @Autowired - private ${ClassName}Service ${className}Service; - - /** - * 查询${functionName}列表 - */ - @PostMapping("/list") - @ApiOperation("${functionName}列表") -#if($table.crud) - public IPage list(@RequestBody SearchParam<${ClassName}> sp) - { - return ${className}Service.selectPage(sp); - } -#elseif($table.tree) - public AjaxResult list(${ClassName} ${className}) - { - - List<${ClassName}> list = ${className}Service.list(BeanToWrapper.getWrapper(${className})); - return AjaxResult.success(list); - } -#end - - /** - * 导出${functionName}列表 - */ - @Log(title = "${functionName}导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("${functionName}导出") - public AjaxResult export(@RequestBody ${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.listByIds(${className}.getIds()); - ExcelUtil<${ClassName}> util = new ExcelUtil<>(${ClassName}.class); - return util.exportExcel(list, "${businessName}"); - } - - /** - * 获取${functionName}详细信息 - */ - @ApiOperation(" ${functionName}详情") - @GetMapping(value = "/{${pkColumn.javaField}}") - public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) - { - return AjaxResult.success(${className}Service.getById(${pkColumn.javaField})); - } - - /** - * 新增${functionName} - */ - @Log(title = "${functionName}新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("${functionName}新增") - public AjaxResult add(@RequestBody ${ClassName} ${className}) - { - BaseEntityUtils.preInsert(${className}); - return toAjax(${className}Service.save(${className})); - } - - /** - * 修改${functionName} - */ - @ApiOperation("${functionName}修改") - @Log(title = "${functionName}修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.updateById(${className})); - } - - /** - * 删除${functionName} - */ - @ApiOperation("${functionName}删除") - @Log(title = "${functionName}删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{${pkColumn.javaField}s}") - public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) - { - return toAjax(${className}Service.removeByIds(Arrays.asList(${pkColumn.javaField}s))); - } -} diff --git a/shuili-generator/target/classes/vm/java/controller.java.vm.back b/shuili-generator/target/classes/vm/java/controller.java.vm.back deleted file mode 100644 index 4666423b..00000000 --- a/shuili-generator/target/classes/vm/java/controller.java.vm.back +++ /dev/null @@ -1,116 +0,0 @@ -package ${packageName}.controller; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import Log; -import BaseController; -import AjaxResult; -import BusinessType; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; -import ExcelUtil; -import cn.dev33.satoken.annotation.SaCheckLogin; -import cn.dev33.satoken.annotation.SaCheckPermission; -#if($table.crud) -import com.shuili.common.core.page.TableDataInfo; -#elseif($table.tree) -#end - -/** - * ${functionName}Controller - * - * @author ${author} - * @date ${datetime} - */ -@RestController -@RequestMapping("/${moduleName}/${businessName}") -public class ${ClassName}Controller extends BaseController -{ - @Autowired - private I${ClassName}Service ${className}Service; - - /** - * 查询${functionName}列表 - */ - - @GetMapping("/list") -#if($table.crud) - public TableDataInfo list(${ClassName} ${className}) - { - startPage(); - List<${ClassName}> list = ${className}Service.findList(${className}); - return getDataTable(list); - } -#elseif($table.tree) - public AjaxResult list(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.findList(${className}); - return AjaxResult.success(list); - } -#end - - /** - * 导出${functionName}列表 - */ - - @Log(title = "${functionName}", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.findList(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); - return util.exportExcel(list, "${businessName}"); - } - - /** - * 获取${functionName}详细信息 - */ - - @GetMapping(value = "/{${pkColumn.javaField}}") - public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) - { - return AjaxResult.success(${className}Service.get(${pkColumn.javaField})); - } - - /** - * 新增${functionName} - */ - - @Log(title = "${functionName}", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.insert(${className})); - } - - /** - * 修改${functionName} - */ - - @Log(title = "${functionName}", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.update(${className})); - } - - /** - * 删除${functionName} - */ - - @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @DeleteMapping("/{${pkColumn.javaField}s}") - public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) - { - return toAjax(${className}Service.deleteByIds(${pkColumn.javaField}s)); - } -} diff --git a/shuili-generator/target/classes/vm/java/domain.java.vm b/shuili-generator/target/classes/vm/java/domain.java.vm deleted file mode 100644 index 1ba1ee09..00000000 --- a/shuili-generator/target/classes/vm/java/domain.java.vm +++ /dev/null @@ -1,63 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $importList) -import ${import}; -#end -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -#if($table.crud) -#elseif($table.tree) - -#end - -/** - * ${functionName}对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -#if($table.crud) -#set($Entity="BaseEntity") -#elseif($table.tree) -#set($Entity="TreeEntity") -#end -@TableName("${tableName}") -@Data -@ApiModel("${functionName}") -public class ${ClassName} extends ${Entity} -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField) && $column.javaField !='createBy' - && $column.createTime !='createBy' && $column.javaField !='updateBy' - && $column.javaField !='updateTime' && $column.javaField !='id') - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1 ) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - @ApiModelProperty("${comment}") - private $column.javaType $column.javaField; - -#end -#end -} diff --git a/shuili-generator/target/classes/vm/java/domain.java.vm.back b/shuili-generator/target/classes/vm/java/domain.java.vm.back deleted file mode 100644 index 2cd76de3..00000000 --- a/shuili-generator/target/classes/vm/java/domain.java.vm.back +++ /dev/null @@ -1,87 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $importList) -import ${import}; -#end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import Excel; -#if($table.crud) -import BaseEntity; -#elseif($table.tree) -import TreeEntity; -#end - -/** - * ${functionName}对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -#if($table.crud) -#set($Entity="BaseEntity") -#elseif($table.tree) -#set($Entity="TreeEntity") -#end -public class ${ClassName} extends ${Entity} -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField) && $column.javaField !='createBy' - && $column.createTime !='createBy' && $column.javaField !='updateBy' - && $column.javaField !='updateTime' && $column.javaField !='id') - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1 ) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} diff --git a/shuili-generator/target/classes/vm/java/mapper.java.vm b/shuili-generator/target/classes/vm/java/mapper.java.vm deleted file mode 100644 index d157325d..00000000 --- a/shuili-generator/target/classes/vm/java/mapper.java.vm +++ /dev/null @@ -1,16 +0,0 @@ -package ${packageName}.mapper; - -import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ${packageName}.domain.${ClassName}; - -/** - * ${functionName}Mapper接口 - * - * @author ${author} - * @date ${datetime} - */ -@Repository -public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> { - -} diff --git a/shuili-generator/target/classes/vm/java/mapper.java.vm.back b/shuili-generator/target/classes/vm/java/mapper.java.vm.back deleted file mode 100644 index 4bfe27b6..00000000 --- a/shuili-generator/target/classes/vm/java/mapper.java.vm.back +++ /dev/null @@ -1,64 +0,0 @@ -package ${packageName}.mapper; - -import java.util.List; -import java.util.Map; -import ${packageName}.domain.${ClassName}; - -/** - * ${functionName}Mapper接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface ${ClassName}Mapper -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - public ${ClassName} get(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> findList(${ClassName} ${className}); - - public List<${ClassName}> findListByMap(Map param); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update(${ClassName} ${className}); - - /** - * 删除${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int deleteById(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据ID - * @return 结果 - */ - public int deleteByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); -} diff --git a/shuili-generator/target/classes/vm/java/service.java.vm b/shuili-generator/target/classes/vm/java/service.java.vm deleted file mode 100644 index ba56dccb..00000000 --- a/shuili-generator/target/classes/vm/java/service.java.vm +++ /dev/null @@ -1,16 +0,0 @@ -package ${packageName}.service; - -import com.shuili.common.core.service.BaseService; -import ${packageName}.mapper.${ClassName}Mapper; -import ${packageName}.domain.${ClassName}; - -/** - * ${functionName}Service接口 - * - * @author ${author} - * @date ${datetime} - */ -@Service -public class ${ClassName}Service extends BaseService<${ClassName}Mapper, ${ClassName}>{ - -} diff --git a/shuili-generator/target/classes/vm/java/service.java.vm.back b/shuili-generator/target/classes/vm/java/service.java.vm.back deleted file mode 100644 index e8c4822b..00000000 --- a/shuili-generator/target/classes/vm/java/service.java.vm.back +++ /dev/null @@ -1,64 +0,0 @@ -package ${packageName}.service; - -import java.util.List; -import java.util.Map; -import ${packageName}.domain.${ClassName}; - -/** - * ${functionName}Service接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface I${ClassName}Service -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - public ${ClassName} get(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> findList(${ClassName} ${className}); - - public List<${ClassName}> findListByMap(Map param); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update(${ClassName} ${className}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}ID - * @return 结果 - */ - public int deleteByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int deleteById(${pkColumn.javaType} ${pkColumn.javaField}); -} diff --git a/shuili-generator/target/classes/vm/java/serviceImpl.java.vm b/shuili-generator/target/classes/vm/java/serviceImpl.java.vm deleted file mode 100644 index ac7f20f9..00000000 --- a/shuili-generator/target/classes/vm/java/serviceImpl.java.vm +++ /dev/null @@ -1,109 +0,0 @@ -package ${packageName}.service.impl; - -import java.util.List; -import java.util.Map; -#foreach ($column in $columns) -#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') - #break -#end -#end -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.kms.common.utils.BaseEntityUtils; - -import ${packageName}.mapper.${ClassName}Mapper; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; - -/** - * ${functionName}Service业务层处理 - * - * @author ${author} - * @date ${datetime} - */ -@Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service -{ - @Autowired - private ${ClassName}Mapper ${className}Mapper; - - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - @Override - public ${ClassName} get(${pkColumn.javaType} ${pkColumn.javaField}) - { - return ${className}Mapper.get(${pkColumn.javaField}); - } - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName} - */ - @Override - public List<${ClassName}> findList(${ClassName} ${className}) - { - return ${className}Mapper.findList(${className}); - } - @Override - public List<${ClassName}> findListByMap(Map param){ - return ${className}Mapper.findListByMap(param); - } - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - @Override - public int insert(${ClassName} ${className}) - { - - BaseEntityUtils.preInsert(${className}); - return ${className}Mapper.insert(${className}); - } - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - @Override - public int update(${ClassName} ${className}) - { - - BaseEntityUtils.preUpdate(${className}); - return ${className}Mapper.update(${className}); - } - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}ID - * @return 结果 - */ - @Override - public int deleteByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s) - { - return ${className}Mapper.deleteByIds(${pkColumn.javaField}s); - } - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - @Override - public int deleteById(${pkColumn.javaType} ${pkColumn.javaField}) - { - return ${className}Mapper.deleteById(${pkColumn.javaField}); - } -} diff --git a/shuili-generator/target/classes/vm/js/api.js.vm b/shuili-generator/target/classes/vm/js/api.js.vm deleted file mode 100644 index 367696ba..00000000 --- a/shuili-generator/target/classes/vm/js/api.js.vm +++ /dev/null @@ -1,53 +0,0 @@ -import request from '@/utils/request' - -// 查询${functionName}列表 -export function list${BusinessName}(query) { - return request({ - url: '/${moduleName}/${businessName}/list', - method: 'post', - data: query - }) -} - -// 查询${functionName}详细 -export function get${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'get' - }) -} - -// 新增${functionName} -export function add${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'post', - data: data - }) -} - -// 修改${functionName} -export function update${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'put', - data: data - }) -} - -// 删除${functionName} -export function del${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'delete' - }) -} - -// 导出${functionName} -export function export${BusinessName}(query) { - return request({ - url: '/${moduleName}/${businessName}/export', - method: 'get', - params: query - }) -} diff --git a/shuili-generator/target/classes/vm/sql/sql.vm b/shuili-generator/target/classes/vm/sql/sql.vm deleted file mode 100644 index ffa92099..00000000 --- a/shuili-generator/target/classes/vm/sql/sql.vm +++ /dev/null @@ -1,20 +0,0 @@ --- 菜单 SQL -SELECT @parentId := replace(uuid(),"-",""); -insert into sys_menu (id,menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values(@parentId ,'${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '${functionName}菜单'); - --- 按钮 SQL -insert into sys_menu (id,menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values(replace(uuid(),"-","") ,'${functionName}查询', @parentId, '1', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); - -insert into sys_menu (id,menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values(replace(uuid(),"-","") ,'${functionName}新增', @parentId, '2', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); - -insert into sys_menu (id,menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values(replace(uuid(),"-","") ,'${functionName}修改', @parentId, '3', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); - -insert into sys_menu (id,menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values(replace(uuid(),"-","") ,'${functionName}删除', @parentId, '4', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); - -insert into sys_menu (id,menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values(replace(uuid(),"-","") ,'${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); \ No newline at end of file diff --git a/shuili-generator/target/classes/vm/vue/index-tree.vue.vm b/shuili-generator/target/classes/vm/vue/index-tree.vue.vm deleted file mode 100644 index 951186f9..00000000 --- a/shuili-generator/target/classes/vm/vue/index-tree.vue.vm +++ /dev/null @@ -1,438 +0,0 @@ - - - diff --git a/shuili-generator/target/classes/vm/vue/index.vue.vm b/shuili-generator/target/classes/vm/vue/index.vue.vm deleted file mode 100644 index 2db48d3a..00000000 --- a/shuili-generator/target/classes/vm/vue/index.vue.vm +++ /dev/null @@ -1,508 +0,0 @@ - - - diff --git a/shuili-generator/target/classes/vm/xml/mapper.xml.vm b/shuili-generator/target/classes/vm/xml/mapper.xml.vm deleted file mode 100644 index d58d129b..00000000 --- a/shuili-generator/target/classes/vm/xml/mapper.xml.vm +++ /dev/null @@ -1,127 +0,0 @@ - - - - - -#foreach ($column in $columns) - -#end - - - - select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName} - - - - - - - - - - insert into ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - $column.columnName, -#end -#end - - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - #{$column.javaField}, -#end -#end - - - - - update ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName) - $column.columnName = #{$column.javaField}, -#end -#end - - where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} in - - #{${pkColumn.javaField}} - - - - \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/df/CheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/CheckingController.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yxgh/sz/controller/df/CheckingController.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/controller/CheckingController.java index 88858767..675d53d7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/df/CheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/CheckingController.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.controller.df; +package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.df.domain.entity.DfChecking; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java deleted file mode 100644 index ee358f81..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kms.yxgh.sz.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; - - -/** - * 水闸巡视检查Controller - * - * @author sy - * @date 2023-11-09 - */ -@RestController -@RequestMapping("/run/sz/checking") -@Api(tags = "水闸巡视检查") -public class SzCheckingController extends BaseController -{ - @Autowired - private SzCheckingService szCheckingService; - - /** - * 查询水闸巡视检查列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查列表") - public IPage list(@RequestBody SearchParam sp) - { - return szCheckingService.selectPage(sp); - } - - /** - * 导出水闸巡视检查列表 - */ - @Log(title = "水闸巡视检查导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水闸巡视检查导出") - public AjaxResult export(@RequestBody SzChecking szChecking) - { - List list = szCheckingService.listByIds(szChecking.getIds()); - ExcelUtil util = new ExcelUtil<>(SzChecking.class); - return util.exportExcel(list, "checking"); - } - - /** - * 获取水闸巡视检查详细信息 - */ - @ApiOperation(" 水闸巡视检查详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(szCheckingService.getById(id)); - } - - /** - * 新增水闸巡视检查 - */ - @Log(title = "水闸巡视检查新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查新增") - public AjaxResult add(@RequestBody SzChecking szChecking) - { - BaseEntityUtils.preInsert(szChecking); - return toAjax(szCheckingService.save(szChecking)); - } - - /** - * 修改水闸巡视检查 - */ - @ApiOperation("水闸巡视检查修改") - @Log(title = "水闸巡视检查修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SzChecking szChecking) - { - return toAjax(szCheckingService.updateById(szChecking)); - } - - /** - * 删除水闸巡视检查 - */ - @ApiOperation("水闸巡视检查删除") - @Log(title = "水闸巡视检查删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(szCheckingService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingItemController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingItemController.java deleted file mode 100644 index 327edd62..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingItemController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kms.yxgh.sz.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; - - -/** - * 水闸巡视检查项Controller - * - * @author sy - * @date 2023-11-09 - */ -@RestController -@RequestMapping("/run/sz/checking/item") -@Api(tags = "水闸巡视检查项") -public class SzCheckingItemController extends BaseController -{ - @Autowired - private SzCheckingItemService szCheckingItemService; - - /** - * 查询水闸巡视检查项列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查项列表") - public IPage list(@RequestBody SearchParam sp) - { - return szCheckingItemService.selectPage(sp); - } - - /** - * 导出水闸巡视检查项列表 - */ - @Log(title = "水闸巡视检查项导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水闸巡视检查项导出") - public AjaxResult export(@RequestBody SzCheckingItem szCheckingItem) - { - List list = szCheckingItemService.listByIds(szCheckingItem.getIds()); - ExcelUtil util = new ExcelUtil<>(SzCheckingItem.class); - return util.exportExcel(list, "item"); - } - - /** - * 获取水闸巡视检查项详细信息 - */ - @ApiOperation(" 水闸巡视检查项详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(szCheckingItemService.getById(id)); - } - - /** - * 新增水闸巡视检查项 - */ - @Log(title = "水闸巡视检查项新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查项新增") - public AjaxResult add(@RequestBody SzCheckingItem szCheckingItem) - { - BaseEntityUtils.preInsert(szCheckingItem); - return toAjax(szCheckingItemService.save(szCheckingItem)); - } - - /** - * 修改水闸巡视检查项 - */ - @ApiOperation("水闸巡视检查项修改") - @Log(title = "水闸巡视检查项修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SzCheckingItem szCheckingItem) - { - return toAjax(szCheckingItemService.updateById(szCheckingItem)); - } - - /** - * 删除水闸巡视检查项 - */ - @ApiOperation("水闸巡视检查项删除") - @Log(title = "水闸巡视检查项删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(szCheckingItemService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java deleted file mode 100644 index 18e777df..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kms.yxgh.sz.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; - - -/** - * 水闸巡视检查计划Controller - * - * @author sy - * @date 2023-11-09 - */ -@RestController -@RequestMapping("/run/sz/plan") -@Api(tags = "水闸巡视检查计划") -public class SzPlanController extends BaseController -{ - @Autowired - private SzPlanService szPlanService; - - /** - * 查询水闸巡视检查计划列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查计划列表") - public IPage list(@RequestBody SearchParam sp) - { - return szPlanService.selectPage(sp); - } - - /** - * 导出水闸巡视检查计划列表 - */ - @Log(title = "水闸巡视检查计划导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水闸巡视检查计划导出") - public AjaxResult export(@RequestBody SzPlan szPlan) - { - List list = szPlanService.listByIds(szPlan.getIds()); - ExcelUtil util = new ExcelUtil<>(SzPlan.class); - return util.exportExcel(list, "plan"); - } - - /** - * 获取水闸巡视检查计划详细信息 - */ - @ApiOperation(" 水闸巡视检查计划详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(szPlanService.getById(id)); - } - - /** - * 新增水闸巡视检查计划 - */ - @Log(title = "水闸巡视检查计划新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查计划新增") - public AjaxResult add(@RequestBody SzPlan szPlan) - { - BaseEntityUtils.preInsert(szPlan); - return toAjax(szPlanService.save(szPlan)); - } - - /** - * 修改水闸巡视检查计划 - */ - @ApiOperation("水闸巡视检查计划修改") - @Log(title = "水闸巡视检查计划修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SzPlan szPlan) - { - return toAjax(szPlanService.updateById(szPlan)); - } - - /** - * 删除水闸巡视检查计划 - */ - @ApiOperation("水闸巡视检查计划删除") - @Log(title = "水闸巡视检查计划删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(szPlanService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanOperatorController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanOperatorController.java deleted file mode 100644 index 40b5652a..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanOperatorController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kms.yxgh.sz.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; - - -/** - * 水闸巡视检查计划执行人Controller - * - * @author sy - * @date 2023-11-09 - */ -@RestController -@RequestMapping("/run/sz/plan/operator") -@Api(tags = "水闸巡视检查计划执行人") -public class SzPlanOperatorController extends BaseController -{ - @Autowired - private SzPlanOperatorService szPlanOperatorService; - - /** - * 查询水闸巡视检查计划执行人列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查计划执行人列表") - public IPage list(@RequestBody SearchParam sp) - { - return szPlanOperatorService.selectPage(sp); - } - - /** - * 导出水闸巡视检查计划执行人列表 - */ - @Log(title = "水闸巡视检查计划执行人导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水闸巡视检查计划执行人导出") - public AjaxResult export(@RequestBody SzPlanOperator szPlanOperator) - { - List list = szPlanOperatorService.listByIds(szPlanOperator.getIds()); - ExcelUtil util = new ExcelUtil<>(SzPlanOperator.class); - return util.exportExcel(list, "operator"); - } - - /** - * 获取水闸巡视检查计划执行人详细信息 - */ - @ApiOperation(" 水闸巡视检查计划执行人详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(szPlanOperatorService.getById(id)); - } - - /** - * 新增水闸巡视检查计划执行人 - */ - @Log(title = "水闸巡视检查计划执行人新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查计划执行人新增") - public AjaxResult add(@RequestBody SzPlanOperator szPlanOperator) - { - BaseEntityUtils.preInsert(szPlanOperator); - return toAjax(szPlanOperatorService.save(szPlanOperator)); - } - - /** - * 修改水闸巡视检查计划执行人 - */ - @ApiOperation("水闸巡视检查计划执行人修改") - @Log(title = "水闸巡视检查计划执行人修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SzPlanOperator szPlanOperator) - { - return toAjax(szPlanOperatorService.updateById(szPlanOperator)); - } - - /** - * 删除水闸巡视检查计划执行人 - */ - @ApiOperation("水闸巡视检查计划执行人删除") - @Log(title = "水闸巡视检查计划执行人删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(szPlanOperatorService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPointController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPointController.java deleted file mode 100644 index acf45ec3..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPointController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kms.yxgh.sz.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; - - -/** - * 水闸巡视检查计划点位Controller - * - * @author sy - * @date 2023-11-09 - */ -@RestController -@RequestMapping("/run/sz/point") -@Api(tags = "水闸巡视检查计划点位") -public class SzPointController extends BaseController -{ - @Autowired - private SzPointService szPointService; - - /** - * 查询水闸巡视检查计划点位列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查计划点位列表") - public IPage list(@RequestBody SearchParam sp) - { - return szPointService.selectPage(sp); - } - - /** - * 导出水闸巡视检查计划点位列表 - */ - @Log(title = "水闸巡视检查计划点位导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水闸巡视检查计划点位导出") - public AjaxResult export(@RequestBody SzPoint szPoint) - { - List list = szPointService.listByIds(szPoint.getIds()); - ExcelUtil util = new ExcelUtil<>(SzPoint.class); - return util.exportExcel(list, "point"); - } - - /** - * 获取水闸巡视检查计划点位详细信息 - */ - @ApiOperation(" 水闸巡视检查计划点位详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(szPointService.getById(id)); - } - - /** - * 新增水闸巡视检查计划点位 - */ - @Log(title = "水闸巡视检查计划点位新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查计划点位新增") - public AjaxResult add(@RequestBody SzPoint szPoint) - { - BaseEntityUtils.preInsert(szPoint); - return toAjax(szPointService.save(szPoint)); - } - - /** - * 修改水闸巡视检查计划点位 - */ - @ApiOperation("水闸巡视检查计划点位修改") - @Log(title = "水闸巡视检查计划点位修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SzPoint szPoint) - { - return toAjax(szPointService.updateById(szPoint)); - } - - /** - * 删除水闸巡视检查计划点位 - */ - @ApiOperation("水闸巡视检查计划点位删除") - @Log(title = "水闸巡视检查计划点位删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(szPointService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java deleted file mode 100644 index 30a37ab0..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kms.yxgh.sz.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; - - -/** - * 水闸巡视检查记录Controller - * - * @author sy - * @date 2023-11-09 - */ -@RestController -@RequestMapping("/run/sz/record") -@Api(tags = "水闸巡视检查记录") -public class SzRecordController extends BaseController -{ - @Autowired - private SzRecordService szRecordService; - - /** - * 查询水闸巡视检查记录列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查记录列表") - public IPage list(@RequestBody SearchParam sp) - { - return szRecordService.selectPage(sp); - } - - /** - * 导出水闸巡视检查记录列表 - */ - @Log(title = "水闸巡视检查记录导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水闸巡视检查记录导出") - public AjaxResult export(@RequestBody SzRecord szRecord) - { - List list = szRecordService.listByIds(szRecord.getIds()); - ExcelUtil util = new ExcelUtil<>(SzRecord.class); - return util.exportExcel(list, "record"); - } - - /** - * 获取水闸巡视检查记录详细信息 - */ - @ApiOperation(" 水闸巡视检查记录详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(szRecordService.getById(id)); - } - - /** - * 新增水闸巡视检查记录 - */ - @Log(title = "水闸巡视检查记录新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查记录新增") - public AjaxResult add(@RequestBody SzRecord szRecord) - { - BaseEntityUtils.preInsert(szRecord); - return toAjax(szRecordService.save(szRecord)); - } - - /** - * 修改水闸巡视检查记录 - */ - @ApiOperation("水闸巡视检查记录修改") - @Log(title = "水闸巡视检查记录修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SzRecord szRecord) - { - return toAjax(szRecordService.updateById(szRecord)); - } - - /** - * 删除水闸巡视检查记录 - */ - @ApiOperation("水闸巡视检查记录删除") - @Log(title = "水闸巡视检查记录删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(szRecordService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordItemController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordItemController.java deleted file mode 100644 index 8abc41ad..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordItemController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kms.yxgh.sz.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; - - -/** - * 水闸巡视检查检查记录子项Controller - * - * @author sy - * @date 2023-11-09 - */ -@RestController -@RequestMapping("/run/sz/record/item") -@Api(tags = "水闸巡视检查检查记录子项") -public class SzRecordItemController extends BaseController -{ - @Autowired - private SzRecordItemService szRecordItemService; - - /** - * 查询水闸巡视检查检查记录子项列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查检查记录子项列表") - public IPage list(@RequestBody SearchParam sp) - { - return szRecordItemService.selectPage(sp); - } - - /** - * 导出水闸巡视检查检查记录子项列表 - */ - @Log(title = "水闸巡视检查检查记录子项导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水闸巡视检查检查记录子项导出") - public AjaxResult export(@RequestBody SzRecordItem szRecordItem) - { - List list = szRecordItemService.listByIds(szRecordItem.getIds()); - ExcelUtil util = new ExcelUtil<>(SzRecordItem.class); - return util.exportExcel(list, "item"); - } - - /** - * 获取水闸巡视检查检查记录子项详细信息 - */ - @ApiOperation(" 水闸巡视检查检查记录子项详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(szRecordItemService.getById(id)); - } - - /** - * 新增水闸巡视检查检查记录子项 - */ - @Log(title = "水闸巡视检查检查记录子项新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查检查记录子项新增") - public AjaxResult add(@RequestBody SzRecordItem szRecordItem) - { - BaseEntityUtils.preInsert(szRecordItem); - return toAjax(szRecordItemService.save(szRecordItem)); - } - - /** - * 修改水闸巡视检查检查记录子项 - */ - @ApiOperation("水闸巡视检查检查记录子项修改") - @Log(title = "水闸巡视检查检查记录子项修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SzRecordItem szRecordItem) - { - return toAjax(szRecordItemService.updateById(szRecordItem)); - } - - /** - * 删除水闸巡视检查检查记录子项 - */ - @ApiOperation("水闸巡视检查检查记录子项删除") - @Log(title = "水闸巡视检查检查记录子项删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(szRecordItemService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java deleted file mode 100644 index e46e29c1..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.kms.yxgh.sz.controller; - -import java.util.Arrays; -import java.util.List; - -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; - - -/** - * 水闸巡视检查检查记录轨迹Controller - * - * @author sy - * @date 2023-11-09 - */ -@RestController -@RequestMapping("/run/sz/trace") -@Api(tags = "水闸巡视检查检查记录轨迹") -public class SzTraceController extends BaseController -{ - @Autowired - private SzTraceService szTraceService; - - /** - * 查询水闸巡视检查检查记录轨迹列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查检查记录轨迹列表") - public IPage list(@RequestBody SearchParam sp) - { - return szTraceService.selectPage(sp); - } - - /** - * 导出水闸巡视检查检查记录轨迹列表 - */ - @Log(title = "水闸巡视检查检查记录轨迹导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水闸巡视检查检查记录轨迹导出") - public AjaxResult export(@RequestBody SzTrace szTrace) - { - List list = szTraceService.listByIds(szTrace.getIds()); - ExcelUtil util = new ExcelUtil<>(SzTrace.class); - return util.exportExcel(list, "trace"); - } - - /** - * 获取水闸巡视检查检查记录轨迹详细信息 - */ - @ApiOperation(" 水闸巡视检查检查记录轨迹详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(szTraceService.getById(id)); - } - - /** - * 新增水闸巡视检查检查记录轨迹 - */ - @Log(title = "水闸巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查检查记录轨迹新增") - public AjaxResult add(@RequestBody SzTrace szTrace) - { - BaseEntityUtils.preInsert(szTrace); - return toAjax(szTraceService.save(szTrace)); - } - - /** - * 修改水闸巡视检查检查记录轨迹 - */ - @ApiOperation("水闸巡视检查检查记录轨迹修改") - @Log(title = "水闸巡视检查检查记录轨迹修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SzTrace szTrace) - { - return toAjax(szTraceService.updateById(szTrace)); - } - - /** - * 删除水闸巡视检查检查记录轨迹 - */ - @ApiOperation("水闸巡视检查检查记录轨迹删除") - @Log(title = "水闸巡视检查检查记录轨迹删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(szTraceService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java index 13a38762..3c35b63f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.mapper; +import com.kms.yxgh.sz.domain.entity.SzCheckingItem; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java index 4fd340dd..f4c53a03 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.mapper; +import com.kms.yxgh.sz.domain.entity.SzChecking; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java index 0ad2e74c..76c0f597 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.mapper; +import com.kms.yxgh.sz.domain.entity.SzPlan; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java index 736bcc05..3bb07e1b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.mapper; +import com.kms.yxgh.sz.domain.entity.SzPlanOperator; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java index 0ee740aa..84c4bfff 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.mapper; +import com.kms.yxgh.sz.domain.entity.SzPoint; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java index 9f35e899..b2293ee3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.mapper; +import com.kms.yxgh.sz.domain.entity.SzRecordItem; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java index 43ad8207..930b2c1e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.mapper; +import com.kms.yxgh.sz.domain.entity.SzRecord; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java index 750ca335..f194495f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.mapper; +import com.kms.yxgh.sz.domain.entity.SzTrace; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java index 96a07176..8d8786b0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java @@ -1,5 +1,7 @@ package com.kms.yxgh.sz.service; +import com.kms.yxgh.sz.domain.entity.SzCheckingItem; +import com.kms.yxgh.sz.mapper.SzCheckingItemMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index aef2c838..0f779fdd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -1,5 +1,7 @@ package com.kms.yxgh.sz.service; +import com.kms.yxgh.sz.domain.entity.SzChecking; +import com.kms.yxgh.sz.mapper.SzCheckingMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java index b3d3a8d6..424c9c2d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java @@ -1,5 +1,7 @@ package com.kms.yxgh.sz.service; +import com.kms.yxgh.sz.domain.entity.SzPlanOperator; +import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index 5d330f36..a5faf68c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -1,5 +1,7 @@ package com.kms.yxgh.sz.service; +import com.kms.yxgh.sz.domain.entity.SzPlan; +import com.kms.yxgh.sz.mapper.SzPlanMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java index 92e93db9..fc4e8ad9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java @@ -1,5 +1,7 @@ package com.kms.yxgh.sz.service; +import com.kms.yxgh.sz.domain.entity.SzPoint; +import com.kms.yxgh.sz.mapper.SzPointMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java index ee74bf74..0ecdfd6c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java @@ -1,5 +1,7 @@ package com.kms.yxgh.sz.service; +import com.kms.yxgh.sz.domain.entity.SzRecordItem; +import com.kms.yxgh.sz.mapper.SzRecordItemMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index 00d06752..574af808 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -1,5 +1,7 @@ package com.kms.yxgh.sz.service; +import com.kms.yxgh.sz.domain.entity.SzRecord; +import com.kms.yxgh.sz.mapper.SzRecordMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java index 439f6742..41d1fe9f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java @@ -1,5 +1,7 @@ package com.kms.yxgh.sz.service; +import com.kms.yxgh.sz.domain.entity.SzTrace; +import com.kms.yxgh.sz.mapper.SzTraceMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; @@ -10,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class SzTraceService extends BaseService{ +public class SzTraceService extends BaseService { } diff --git a/shuili-system/target/classes/com/kms/cms/domain/CmsContent.class b/shuili-system/target/classes/com/kms/cms/domain/CmsContent.class deleted file mode 100644 index a6d45ff4e79719a48fbaa36b95b7f61bd59b7e51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1860 zcmah~ZBrXn7(F-HWJ6d=ij+zP`-YVy!1_|PB~S$lEtOCNWk$c~67G;~lij$xsqzE# z4>*4D2iPx6r_R_g+R@Q3I^+Lf#vh@r=kBga3OF*b_qlhUm-C$G+~toaKmH8hGS;)m zVXg;B%#SLZUa8p?~bu4F*#asrr)cS4)D{3w4SQW_m(zC7Fru2N< zbv{_WE+B3R^ewoKA6QPXY1NuC#hU6z2zG#C!Cd^jB5O>cIaXZ?qz}IQ z;^4s#0{Io&HT}=5ogL|Q`TOQv!!EnqvbN^A4e15Dj7{BBa2Y&fJ9cnQAUU4jWXc8l z3G}bnj$Cclx1{&JMRckMx5DNvQowzDs0CGsN5FApAzH>32=j41uk3 z^5nIbgn!)b<^2E6pAkkRmOmdnJoxEr125vNfgzk07*&${&lwtc9R&k<^>_)FNQ%L` z^@hOd!_uCoXtx#7&vp76k0H()Si^gyDsNyKmjw9Yu+A&4C;!#ZyyeS9-jZOK*RNA3 znkm_~8V%`e3rrrTmLmd+k(F?sS3k!~n!p*H!~lpj+zs-CTyXz9_i8sx`;3nlFhXNg z89EJ;#^*Wum|O+dRAC?DI~oZl2h!o;ATH20A_rW=7cahk6fr!o3Mt~A4;W@gDidUYgMsvD2=_MYX0n6=ls9E6vt4 z+@l>TolNvyAF<{@Xtnng@LorH9LJk+VPl1tYS?PyaBkzAT_Tr?+d{!?#eJyh!E~Z| z_D6nSxY~M9aK7waGM1i9G*w4;&T$fLc2U7)$)UyQgK_P1(3V~~Y%nGY#A)z^OY$5| y;xLHZ#WupPqaVY&q6$uTqbrbz|H_^zP%x3&lP`ndzTgB7ARBuQhtf0QrvP7luX~sP diff --git a/shuili-system/target/classes/com/kms/cms/service/CmsContentService.class b/shuili-system/target/classes/com/kms/cms/service/CmsContentService.class deleted file mode 100644 index 0bd742af0f4f2a6bc1c196addd1297149e2e452d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcma)3Jx@Y06g}lr5k=9MI64@S!7gqP5+!kZI*4H}j|vsqlC}@y&vG(x@CW##jQ2gz zKwN0kb9+zD{c69yKRy9m;i!T<4$7#PamY|=E2Bb(A>X*@GZeaZC>d&zGV(sr1L+>c zU`k9qvay)PBkw_#|ey3Jk#r^wMCri;<0GK3}ac;*Ae<~!IM5jm6zOGE=TY!OzodlB2H Uke9~}VUF0{%rp31Sg_6DOOJ6jcGWA(^33HOus4P zOcZb7r!wA_P@S>T5@MZJKCRlBoy&HqomM)n=UXMrviIBT_9gY4V^}6798k ztM9e)yVZoQnYOx9OFCA5zp4cX)V6|S?KSdxiejg%FigW)Ni7;0w@8?@#!8XiJ)MTB zcNMY;J-tNwloa#pu(E$xyliSrLr zmoguO`TE9BSy|06%WY5VOiySw`T7o&u(iQe)$S=68AJ88)rZ&B)#2T(jTQDLt-P-K zaBaJ^eH(SVka374k$zK!19uWGVR=QT@6{7(!Z1@|e+LSb95K09%M=J%n<&_HwOxu* z3ERe2a!tW@tZX22VrsUGsbaZkI-uLplDju(IX~iN_js|?Wwl!cGZnCq&=!uRV18ok zW`@G6BtpXDcQm!Qwi(?~yDZS&NK5N)EZ)J$)bK}vhaB5;)myW}=5&&s*H1&?F7gau{gv2uo%P~$3IaEy$)mhKm)-%)TD%N2Y9UzG7P1?TW{ z8Rr$ei}w^<5RWI&CgT?hF5;ImekE2e$#`GEWwG;$f~&YD7OyKvrlya-&E&s%u~f5Ll$ z^09-(6IY7woc-+L;bF0VR`3`6RmR^Ge2l-#_y_kDPYxEZpYV2j`$C~GW^*Cqp9=nk ze@nQxWI2zCgfE3_gMUFnSH^D@yqO@D+`eOKF0Xf(%<>LhSQe9Gw`}aCM6<(7Uje*v zyM#s|Ze-->K@AwuNwCF9>%1zWGn>&6zU)Dh6Xk{t!);K*XvvlP4hfTW;U?bNFiBtP zg!-4J(U>J|%IdnXNmz>x)6uHmP!2~&%aaP{%^JY}AVhDRvPu|)q+GjVkrf9jGZl)Ml6;6fC z0?Ae zW_Ds^w`DSJIw4qWIC9*3+G*ILc@9+pF+z1ZM*lqQo>ZS@V@XeSBFD+O-8eA_9o>gTQQ$s-XG-;167zSO04^dV?{5*x@ zV;rY(WHZ2LE8kR(635B$en?mOp$aSb6q|tu@nt?0Zv$3h72hOL=lK+eZSI@IvF-+{ zwly{1K=rnMOzOwvu9iMbiGKi@V`OVdY|PyrM=hE#6U~^178fG!iSZ#Q5Ua7qg{{L{ ztRtyf)Sw+t@<$E{>(Rj(L7O zX9Bbt_zJ#Cxxz{{96R~H;TcFtceV>palb(8_0d`c+I0TccxclHaL;KMw?^QK#Xj6C z)(224XjHp4^^{*l8c&eIYAU}rM5iU7(?U8=lfu{BlhV8jyu|WGbo;z^_`K?`Ax6~u zng%hW8u8dn@j{BV((AF=J{8X*H9P^rOs9sksc*?D^#P4~u5TjFXsc}I>=tbG(X&4K z5~AP097e$XvAKPCfZ(6w(1*_tVqO*L)Oj8_&9ZCMt|5h zx)?@8p=a|XZJwgd^$>Vn0A6=Tn+s1oi*NW!Is_LUjC`Ztf@;f0||9u^Ir!vgGaxzu|S11@oLd5);_7_iX-bF?ybiUSQ^Wk$LQ;5Tk_wqlILYAmZFH7$p!vGRSW8xm)~AjV&I) alIw_xR3wEm+{2`v;#?ISGMprL0{;iYPB`2E diff --git a/shuili-system/target/classes/com/kms/common/api/CommonApi.class b/shuili-system/target/classes/com/kms/common/api/CommonApi.class deleted file mode 100644 index b55ed7288e927ef4caf7c18b3fa7a9450d94821c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6925 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 diff --git a/shuili-system/target/classes/com/kms/common/api/ShowFileUrl.class b/shuili-system/target/classes/com/kms/common/api/ShowFileUrl.class deleted file mode 100644 index 763a5a072c882e3b9d742aae6c44d0041ab7afa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1614 zcmah}U2ofD6nk?~nR_-o5i=`@26L-x0{pyS^J;6v&jy>jLT$ zBk8x|`p(r}d&3Few^>-W7c^{d-40!OPA}D{<+790D~+IS-E4O)>UQ8;cE`2WTEXqh z2{<;8YdTSS5*RO)hk?y?2Ye<C&tK`#&a?nw!bVZ3m7fC+e&C6XIGf`+Vv}|%dAX0 z8#>*d7tw1kqY(wkKuN<|&?tWfQOBBw_4@ zCtQ;SyVG&}O@Z35DIOYZTCa|2zMN4$D*;8~p+3&j2=y5MpXp*8It}8bJi$*EwV>82 z+YsN=Q1C2eHoi1aplv1&cn;6=BqVss{lPy#xql$o92$HIQ)%!VODVEcrTPHM@Y0is zM_O98m4M=lA=IRa`}EP6XQ^8G7Mi+M{TZ3N&@x-qpO9Idsq~@7M;hAI8Hzcz_A5pT z>MuBc4`!{P_K}S})GemT9Kt`Fq~C2~2`}Ibi%;Mj&XN;_atbf6vX~YQOeOsnwpu5w|P8GhDmj@Fc z`~ZF^4|6n1Yb;zA>nt`{JYw-UOPg7G zB4|W6jiAZ;vG>VyJ6_Os_pDJt`vpE(uPrDW_I%$nXM!9VSY=_1_KocT2U|*Z_RqSq z8XVSiVDSZsTPjfY6)Kb~2ZGWyeJBNu*Hs|j_xy%5`(C4i$YfnNz0QGW6#M7Fv^`Rx zprv|K`|gP!y3oE3pn{fayVXux8)c7t(BR{mrM9#?3AdOkSCU>;3X{`I<$tsJ_63yR zjvmhME#UN}=iu8e_s>DNZy>VIZR1E}2H+!0v`i| z?4P{_?r^enwl&&fG}|x^O!uH;IrXk#bxdTvW;AhV+HRw%(HllncC*v2nuX|F zNH~W5WhnV>$d=hPEsfqY(rTSnk^KSW7(+w2MXA-X_lwPKXy9(}Bs)u(Rz)zQkg5ZN1BAtQz+OqZ!MOL?aE4MBm{@0V4BO?D3$>`+mkna7>=~ z38PiZi$nb^Omxg)9AO&tQ?L1+95xpg%XXahJ+bR&igW7bX7(%`}}*! z=FzF}BwEnplDqQq9P$f&k>u49cW4JzOWDg88I?rvzIWn&^+nKwx%{vf@C13Y5f6nM zrh)V?vQL5iiA#~VQH;(GbPJWTGi1!Y0RV+TS)rJzV@ij=A>D>qohC2^$0;lEfRvET#v zD8!_oQn6w&*FIy<)y#Z+zP$rD!)^t6Y?QHC#uh{E{>mPXukC)%_3VMm&~#?}nOgx@ zQ_It_RMT^YYBy4e=1PxvkO~9a4CbQ7c5e-|sdAAScL)7Dr#I{w*kLGLNG0_pL;j#M zVkmT@2f5M zf})KAilC8+awroUOT0o{S>jdtNsC04v_=)yoPpxuE7;52qE1?(bY|WlHRtyt*3cwk JSSQV)^#woJW_ADo diff --git a/shuili-system/target/classes/com/kms/common/entity/Chunk.class b/shuili-system/target/classes/com/kms/common/entity/Chunk.class deleted file mode 100644 index e9a100516d150dc5fbe604dc8067e43e2569f1bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2650 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 b2k3mqr*M8ffh@U`Sf_PM9d`OfWo z&-u=&`p5tN_!j`r;HP<9#C8q_91%Mrc17%oa7En9Vn5HdCZaBQPc&adL&U2h0ufE| zhFP@oC}Z2eeOX@;i+mecIG zicP<|?{uCg?%OqY+YX&;JE0S-cy={(@4Mjx4VlZX=Z04`49v`KYDh2p+x)GeRo8QF zw(46>aNFLh(NbRZt9EVE4qSOojOlRCZEARWwd&U^`}JmpYu)!Mdtun1?(Mj{l^fKT zYp&ykw*tT61flCRdBwq9N3NHoVQgkrnTRo>o>Syvg!bjWbe!wh6d4(&ccV8cXKC6z zDKCS~?(>b$D2^xj8Y4`3K-!NTuwzplkly|S(sbehGc37XWA?|o&-UWhJyK+8_9YFP zFIDT%D{*Pi{cz6-G!&(J(;Y6BB72u%A_AzmI2l7#uF)tcq2>`+&%^=!<_q0mMN%&I zged^!XoEhskH%4b*7Fhc#74Lf2c76IZiIGqf6Z=0+~OH%;7q<_4 zX@z;dwZ5`;orR#D37jSyT0^cYzoXNt1P)F2XUS|^6bUFz_g!;x`ot?3p}!FZuD7e< zOi#nbR(556!*2yu=XqCJ-c+^jB_R}j>n$(jAlh`BF6Y5D&*MA`c|H!>KI$^@i_pBJdZlE5Td7AIbm;orAE_IGP)bl$p{BqMz!S zCz(dz?6?O^uneC|4d1U7@CkgffRACSfG0#eDdOWIrbRr3DGf5RKFa7S;6+?6U=f!J zSQ4!w+NVT3E#lK6J|p55zNTTK(|>W2pKZCdZRx&?s_f3RyYWf^Kf&uF-e89>OdTi6 z6%8W`Q@vE7?c9;=7+L5YUYP2k3r%MircNLXo!V>x-^9xd?A#-sBc!z5XgJ=shQ;my zlu)UAocCOuCGWwv2Ugdh>cz8k2H&zk1}Ui}wUm@IT3OL(Wl^J*b&Xb*mg@*Kp#bF! zpDJ86uKL`2(0)%Pg;~l>WGrHidLag29t(WpNpXp?H~0@o{jM+gj53(SPy`S32b;=Z z5=s%A?hn483?>m3!Fqr26Utx`SP`7*4}MA+OyVnov;Dzy%HU`4*(BIvZBkO3x%qdI zQrBucMkKY8Itn?Y#Gg~|GjQ5{gj}-E=hge9PrHwhQ}+3SdLR9?`v|#ZpD(KS$((i{ zX%5-PQty*J?LN|6vJb}}CA%Y)W-W$TugCLq??6vKn*SS&-#{ODH2+r^YYTIS$VHD- z@;4VKtn}jFF=(dW$H+qz7R~e_2HS{&r4v%HGNvw=%=;)mMA6jEOc$tVWeF-;hM5(R zk$|$M(FH15If6=7-pmOopMY{^z6&&D4H7hD70f{a6%r7&F3_-5Bxu+wnMDDW5>U}B zwL$4ey#K(liSp|>FGnnWj4Qaxtc~Hn_!6f~im#%7;mfoQuqXbBYt+(s0q^2jYC6{N zTP#z{poU-IIcix1_!+KKGw@67<9TX1{0a`Et|E^^T5eDq#GkqE3bg|M&4Kw9YDN49 z=kQf(C9Lwis~F1~k5S5E?E{Qwag%?B_5mhiHTRKJo|~`6m=WZv7WJntRFKphAGUD= z>qn{4nGi{hCU4Goo74@)*6l8EPjp& zyhP2AGHOqv@F5LpmQmAKI%wL5+^qAQ62lnuHlU43_nHz|rVG|V_FEHhwin#ND;!CP zaV(@0rS>I(IaOdM_CzHqW)y GMD_pgSY_t` diff --git a/shuili-system/target/classes/com/kms/common/http/config/RestTemplateConfig.class b/shuili-system/target/classes/com/kms/common/http/config/RestTemplateConfig.class deleted file mode 100644 index a87bc81597eab902853c03deb944b87ccef890f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4039 zcmbtX30Kr+6un__AjSn0aj9DsI}T!MwQ2>ailt%)M4(i=*oGktk(p%7WE5I!ZEe-= z`@Z)VwCA)Vr=HUv&>z*)`;s^d1gNKnL*{#5-n(zR-;%%o`SULT2k?uEHk@q4PCOAq zuZmhc8N(@+a-WKNoL2D^k`3rrF@Q573^w4biXjY(FcQPlDpp}s#WOgk;yj)e@i`Hn zm(dF{x*($$RlEd4#4!~qjLXQB(S(fBGMbc!rQ#x{ml<}f!4i7%5&VA&fSrwSIjXz z6Jvt(R**MRf_H?79 zs-G|on<1?aBAuU{g06UUe*ZB_RrG?=DQF9^jGU30G^?sBt^+lO)8LwEEAP283by;1 zR2c;H8wypZ-o(UgGbOqA8@7=)T?O6q>?|@sxNGZ!j+0@V%Pz@^YI}mNaDy)M9oc@b zq*Z|gEh3~WhmaJ3I_=k0({(0ykFw|HMOH!xlJ1I9u=Tu?nle3|4#HT6{fT=l?50n3 z*eSRvv)7XK(ppKoAgsL?jmw6DgT8~gTxS$>*%4S3T%T5*8sfO5VHX}!&>po~7NES? zu_L`vCY3Dm`{87Bj?HZ-ACN)js+XIFLpUsu`4~J61zhHyAuusq(J+k}4KL#r1@$sV zovSkWs)lQLjbxS>DtmZ8q!6dqV|ZP|8@Lg}n;PE2O%1njTf^J9q2V1Fy(^>la65+g zHGF`NHGCr4pKACFpKJI+UVka0uVnPKjIQCE7`~NUzSHnMe$enEev;{*NxMaM;Q0+! zuv%KIXAC>7pBcNzMWLWJF8k`y|Fgrbvw3`5 zmo1N{(?%LC_|o4at6IJAfg!7*koTM{uLq?CqVn=DW0vrE~@`t4^?ThfRs0n?vGUkwMRrdx37b4cxBH_+2{Zg*iR+X!C zUrI&zm3^?BaCyrKjUqO)rJV0yqE7q#cx@1X8i3IXIYDuN-Ep&Cn2jo61r_U+F(J8|q_Z;+69 zMm!<$goM;rDxo|;1*rrQf|nxkn<(WwGwW-N6v>)7bLKnO@67t|e}DZQz$;kya0u5^ zu(2r1k}Nl5dDp>BkNbPFyf3I*BHfnd16e*4-A4{S_RxpxEaNUIpu)E0)8Bt&QcddLvjasqmG2P`VjZi*k;Y zW>hFL_VKxVWh1-3QOk1QsFbsXDB8@1<)|2ao)w3SVQs4<(VW#V(h&}1##%CN6yy=G zRIh2M4b!a3CTLy?6L%L>ZSC$F)j73#yrInQa8j^GL?hsEE2th%P&QFIA_X0>&0!o+ zLBmhCf)cyZ6>!^tQ88duqC!|T;7bEX8zlBBb@QB3*P4G%-|2&^E)=;bt=F{4Z`nh!4(WqkU@w;qENGRHnfaMVW{Px*KnhkZOF(z7^X;Mksq z$;Snp@-c>SAFqmZ92p-IvP@#i$3!=H2rHc7uuYCgjg*Wr9}CFPOVhue0K$XK&9J;;V5)VN;`!b^@^M0Z8g2OcJnfp< zIvz*)DLKSXk%@$Kky1h$sdn~K?QAFaUKrABuFvt5@@D}YD_x27@M8OeO-+?23?G;PUHTr#wS#x zq~;tOo8WGbPyB*J_l^x~MBFjyrcfe{ei1LlNwoP%?$wV_Dt=CO&&S-W9~lYp^D_Ut zG?#7pSbOy&BPD+L_vgw7G*+9pU9HLcE-vwgh88!r*=MrmeKy0_w>*1ohN)D=+#aT)&zTrcBgHj6L^104Z^6)0}IE8-4{Re#x z&OOGkgY*2k#$z1PV(NcHM&@TQX7n_7nN&+Ckm3@%iqnH?HHx!Xk|vbj%b3tFY3I;- zb71<6IiqMhJTP4#Y3{(peK=D)=)EI)FK5a{+Kg{pp;BM<Tq{DF6&(4jFZ@4t1mNCiw(a*DZvKb#oMexsGP?;luS1JB<3htxP^n%3LVns zAK*Tr!epBbgRO;OJfUIpoDjtjtU92MG22x!%x-}-k)7HY?6iZM_%0VTVU7Hc(VSq7 zb;?(J_BZt1dWinPfgS7<3b+jpYMIl&fAD~odqh8^Wnc8ely`8j^W)e0!JmzLY~ZSz HoooLAjK$dz diff --git a/shuili-system/target/classes/com/kms/common/http/utils/HttpClientUtils.class b/shuili-system/target/classes/com/kms/common/http/utils/HttpClientUtils.class deleted file mode 100644 index 2ef3f0b27a5c8efcd66fc5dfdd719034434ab5bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7977 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 diff --git a/shuili-system/target/classes/com/kms/common/ir/Node.class b/shuili-system/target/classes/com/kms/common/ir/Node.class deleted file mode 100644 index eeeb5a57b5e87d95bd1202d208270043782bf01e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2132 zcmZ`)?Q+{h6g~2{W#!ARL(>2uv?;bjqn6S_ahuYHq@;Dy52t~I8H(ZvTa7InTken< zUWETVKw(JAzzh$-Lou8yX>8djf9~DAd-v`+XYWe?{QKwM06xaPiX3jG@L3uf$|>9y ze@D!!n7b-I$2}GIu_n_m#H=T=q0)2L1My#`v5AK=dZeO)tt7S;#GCE9Ra20yyfj`J zdegA$de!M#cD>BSS4OjMDu^DL#|qNlTW0fc=eWa&+B1!At>I7H8ZR94M@K>8wq;w+ zDmN91y9#1!?L+2IRV>@w?zaxi?v8QLWF%W@*No<_(Y0jm2V+jd>M1y1skK}BQLCrZ zx7xODb@gr5AtbGCIvYbA=L*Fz;974aD_{73k_*mp$xN_jHNavMA8?AP{*q+vdU{FJA0`-mBOO#HFbSrYb8s_n~0_7(S7m(-Rs)jk_HJlf74*4V=Yj}dENj%d~ z#g2wqS$Rv6XT$G=U2@rIb;=r+v6RGf4ZHYCLlGB~_*%mrmK016d+YJROS8r{xzz5~ zb)#d{8m52AJ-7L;``!24v6@stwR+oaXT8;NDB*nY8rK>|w`%^-H|?5PF7A&U;x#Ze zZ<==9X}G<(Iht|YbIcYO+I@n_dpBXV^(X9nhuck~#b(R7xJSbZk{wBE+F0aM%JFq3 zpon-JQ6=9~GIvg8T~C?mBceO~6f=1hwC`~CfN_O>rt}6%DH}OKw3LmVApWbn`voZ(zIF{$qV5HFjBl|}nayw~0CmAXsO07<7g(21%0FiWb8;x4hxr~c-#-Jh zbf(|7hS$LLit9=`5uPyy&29oIt1i(K!bd(0FYqU$~Q-Z|AfFI`1C)L CSw5Bk diff --git a/shuili-system/target/classes/com/kms/common/ir/OrderItem.class b/shuili-system/target/classes/com/kms/common/ir/OrderItem.class deleted file mode 100644 index 476344178630f850ff5a4fcbe0731b41694f8eca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmaJ+J!=9%5Pfsrhn^QtY=ebeOp$Hu3^sv4;LyTgzjrQi&Fw9$r~k_;kis939~GPv zv2+IB%zHEQVE+DpPXH$9$7tapLN7u}2w!!j>lvZ-G+q(>H@jAZG}D!u?@g}Ur_4)M z2AM5nxspyd{3`nOM(+s2tguFWo1NflY$dc43%6G8qgG~0h?jQn3iYlVquy=uvXuv! zz(+uMyyHOVH=ClA)t6Z0TUFE;!Q(HQAWpVm44H`w2ZHAx(2)fX5o5?Q_@K?0T>1bV L#LNg?Mi0pu9P&1z+4IOS5gVn{GBB zqEaaGQd>Y!sJzv7&^UlXI^e+IV~FA#@qvt^|L~9hIOBiLQ0wnI=ia@$w>P#kopZnQ zJ$~mq-|KAp=6_##4ZuY>mOvK{#*x77vfLrdAzAK}ki+-n z@`cTInGn?{2#3;Gt}t$d(Sdv+U*4cl*S%`DLU>bgoF+}f`9f~T?9`rIX_vicQs1yR zW>4<6OL^Hl%y4-kKclenEPPT(?#-3AdNFV9UR4#J@Joaom= zRpKvDUdU72ZK}8ZI4r;-jEF`G1#Z5$VrY1aX-KR%K z5>!t$FFvi+S|&WA)Zk({0jdFW;^Tr+YtqqD zZf16}%(PU8G~VT1sNM)1&*NQQTpPQ5(Tf{~j$FLUyN%UV@!TpG&CKA5qs7_MSZ-@x z=2WY17@jYaJ;~?j;v~+)hm!a(x|3LiY!W@P?UiLU&QIb3tWDxVtW{Wk#u1xD5!WTL z9s@~yT&O{8Na7>7Jc%oWw^5c&*qp>xT$#jGvP|QE!V>>OvvHOWLyk|xGN0q!m0BH4 z;#>GOTfeu{jizROhdJx*^q!$Xt>T82yHsyyO<;|JTZ3lj2A8`;Z>JMpZq%wIzJLLO zcpjU{!Cc$Z)6`U0T|IuB5q|nqcdp21r$*nML#NF-S0Bsy#&_|zgoTjgj#Nm}r@zdg z{xXUB%RK5YQwfDWO|PLov#Mz(mftqYSPEP(;qF3y6~B?}38)ve+NE3*Gy_ryqZ#W+ zC5;j;LqB&)vd&ci`uH^fFCz3j86gNjR5M!xjaeuG#&v$1{$-V1B|172ss0U$~mFu*wOH(nEH zJcN%r#v6DIsf}p1=Ou*v6>||HEG?;+cBAD~j1+{Fuhhym3#{|#qy+?P zJ9Y$Nh5c9q#2Q=#OWH`Vb_U-u;>Wt2SXV59C9Nn}Bf(fvKh|bqZCM0M+F7u!#x+jq zj8w-yCRla4*-W=yMXaGku*^sprG@F_DChkeVw>99Me17Y<|+kRlVQv6@i0%>zQ`#u zXvE`>1!KkiSR=%`dJ!xcR)WQ+g)9B4dz!be=kVFqlRbt=c&_KiNE}6^Zm#EbB)0cv z=TWb>B$7LNx%7uuFQ7gXUO@UdnpbDS^JsV!(c@x6rAAR|)Jlm=_zk4$=8TSu($pWJ zMpJ(@6Inna6MX~Cb#s|WCQ2MvC)FRLPO9I^#N;e%0WHUo&crfS?P1MYulbC6X|0z& zqh5>FYcYC>jAeW?$GX0?_Q&a4YkwjW7ylDRC!R^T{)gw>5>jc-Ctw#7axG#^Un7&4 zV(8m&Jb zHD)QjiMyM*eipal7QU;u;%YKSMw7<(Npymu$>l4Y}H zv5c|E@>x8B75F46{^gAhe2SDsKUXkH!h4lGiIqj)Rxo11dyhO@^M+K2(G$F#^mB|< znDO}sqnTy=58$tiSQb(Gy%{%>iqZQG*h|WyznzSB7IAvL40%!sw9)&0e3&_w)i!tF zlG;zHVopGmB{A!LG{!J>674Y*_^4y@J5RpEWLaY8^@YAZUmnkp5DyYh9m|4spicZ((P1oby@IZJ_w{}Nr{RA7^O7$E^ zZ1p_aZV)~jSp?GUT4G7N8xi|hi`d1EDB_Az{ZTE7Rzz%WW5tfuBKEao6>~*wPc34% zJ0f0xz>er5*>_PdAf_@T^1ZS=J+UC)l}C%ZK>{e2$dG6W6kn zS&uw(3Hw>iILeMlH>h`0)_PPmrks70&PJWW5>QI6Fr zd-?$a$HY3##Ip*PIfn5dL(g_mv16WC#N0#pe;N)*{o)`V&KZ;l#hTz>JErY8i$kP< z=^vr}x)WHEUOJDAv>!j|Wrl8?#|P3KhHeu297Cr>=YxiB7W!O6r$wjJ&@DnQH*~Ae dD@e~{rT^#X-*gR|A1%{P4J&++o`rDR{{VA2Ck_Ar diff --git a/shuili-system/target/classes/com/kms/common/ir/SearchDate.class b/shuili-system/target/classes/com/kms/common/ir/SearchDate.class deleted file mode 100644 index b0dc290f4c2ddb1aaa408c9dde4b3f4846ac026b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2559 zcmaJ@Yfl?j5Ixu4UE9k-z=@$w2%!ljfFVwkv}t%Xg^+}VSAdciX|tFWI2b!ICY4(C zb5-#R+8+?4iVv;S5~-D{_Ddr5A5|(%&+IPt;+P6Fckb+&xifR-UijbNF&@D!lk05}69SkNZA!$nY-b|4W5UAqC}w4y6EPpfr%^0KaaVTtBDk** zTXI&i`T6X+qtH0<#C~q4H%r-E`kGyG1{5Mre%bpND-m-&n{$>G;vO((=U38mrD8U} zLZ~sA&1Xx)3gNEq1qE%iu*{f8CbD^FYIA+bDbCwVIa=Zqg^ZnBu!~vQ`$ny_n%z)n zo5&Q_(`)M+X|C&qd^%f9&pCE6v+Cz#tvIETO2+Z7?zeL`i5c5ZTO6bSKl5Yz4hM6$ zHV%Y6+EpD@Dl!SG#N{RsH{p8(!-|jLJlnK$tn2__dg+OiDGhW#P-u|CI|3vGd+X!a z#X@P-DF$Jd>sMx{-UF2PUf2L-euRKUcU=@zL7{%GWM|eU?WZms94>b@q8U3sCiyEw zSM7~ek5SS)uAtA%j!%x!o4QeSHa2r5b|{!(w4 zilnDAqx-iP{bm0?QQq#8B(x%+shSktGX?WqLVkMa)8Gjn`1wHN=JphS|jq- zMe;M^eL8^OpO{1Oc$Zf{!3QIZko1gNNZRJE>>SrRC}}C>N$xIkRb2I+mry^sur^AQ zZXz|pPf@cx5ZZYFsI#|}5+Kdh3-B{SKhh9_1Tb7HRGllldr>cWq+iznO&%^u1xT_;*Cbt24uBdNcJ znKWLZDZG=^lLq6s7;T5?gxvx8(v_Vo=q!`$LIWGx$TlQcz)6;H3g>xm-)Czs;2g*F zBL4<{$e)jK86&*l*D!=}wriS}Ib6j(e8L+#iVVLvxPdj?#4{qE;}*WcZG4SMe1j=` zi#u)u7ZGFpcE(OKqaHTzJT;9TBRo}X(-`F0Vp}8bA~l^6k28-n#~{JTAMiHF5N(ym zV~ZKejkru}3T7nw4;mu)Xb;U1T;Xrs-%xu&{*vrSyIz;;r zZTu$zGh|UlKSrjmvXU_UFOX5`{tz$82sPd9>K8EH@D6J1s#5G8lzKyWWgikl0{T8+ zAEO;K`7k2@t01eb1T#&(?OtnHVu%|5E&C1D{g!3YrF^clHVG|Ar{)l{sT;Pwj2Ne diff --git a/shuili-system/target/classes/com/kms/common/utils/BaseEntityUtils.class b/shuili-system/target/classes/com/kms/common/utils/BaseEntityUtils.class deleted file mode 100644 index 2a4633499fd711edf9edc8658c084e7a1ee3aa95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1312 zcmb7D+fvg|6kVqcqz%C$6pE;{T*S6qf>(5Ke1OpzW-30^^59$AX5c`YFiFY`pWQtu?{++#n|yZs~br-v^MO}dE-SgI&P?ZT_AfHIE}-$9T9N398ZONUFpiR z!ImF5R@?8`(z`Ieu9T&k9ID=YhF-d%69}yQW5$UkTJ__w!G5Y7u19w3;GKOKyVSAN z6Tao~b0jcix7(Y6LlYav0!H2M1}*2URGXB)VtHlXKC(>=!PK#AVpPQy6Bbr=JTmbZ zPl#^v*q)hqjx`fgFipI`n!x-`wp3t5F<7qc?ON}f`%a7cmek~*xAn4Jf%4zm`;G*r zf2&FDT719)`mPhHRA9AS`QL4yyDp@6kLpn%z1@T&E5mI++U~lpz<9ZK)&6?rqrd=V zY_)kD6wze0YE0F&!5GmB9$4phHD zeCA6Ex3~_*MIAZ5t5!B(1h*Npyar>esNsEfrx+)zCrF(lU0Xbb_6bAP#S;viU{K+u zW4sB@gR~maGMvq^S|FmrpXgyAk8x%hRwwvPU^33c4-|CVA@9^V?@_{ABCp=(9ZPsK z*ZHUD2xQR6ks*GL3H8ifBT(WxL-(_s Wp1;7CPx!R!p2rlQz&%c?0EcVo+P;aTD|D|D zJ8c=lJkNnZTBZ`y7FsB+lK_jwGY_oAQ~y90iznXt(1Et!xmOY)b|0{o&pvza@9eYB z-rqUWm;d?Xa{%r5EQVb;B5}8bDKQ>H2H7YqB_|{%W0-;+#nBjIIHHDQ5;-OF%2QB- zQ;#C)R$D=qA!wSqu%*JpMKUbb#Nc>XbUWxl8?w5E#;*`XL5)Vl{ zEb)lMqY{rvJTCEs#FG+FNjxp_jKs4N&q+Kl@q)yQ5-&--EOA=m6^U0R&Pco_@w&uW ziC;zW>nPq3sNHE7Y;Tu9X!Dj~fpE8zwFDZHcEReO&W~HAL32Dui=K2cW^ULl*-9@P z!`_tb3bZ6MPCjug?V8 zxtWq(^lYb~j<8@y0b%ohpMX@`ByE>lH3m3!h=j5*kYELtU9!A)CS&5~(7&gwVw zgw$u8g2znMsRfq*xMZ}I%hq$*20MTH*>-W`C27yh97~x+KWr3lM)4NuBya^Q-Bof< zxa^*vNmQjcRLZfMo^Obyo#|4>+C#Iz(n?oUqvEPY8g9jH0-7^1VP~vwPCxq1Tki)EWinleqgWm|OzpVQ#g6o+DFQGcoT~;)_i*qbwoOx=P!+QcNE^kK{o13*t z8h(r4G1Yk1$!PdJ-q-Mf8vcMk@`M^b#77$bgpUQTQ#=0@PH6bEiu4!EtK8ogX!;?C zYELzsSEol57c^YNCmKFg&~SX9XAkd5F*~7@uGD}M`v>|2A{4!pg!EH{jut1Ck{W0a z#Pv#y>{jhFQMU?oa_7c4yKYS042qgmsd=P4~`NO@@71xj4DKEMtRm= z*3X5vnRn!ex*Z%pYN;D~i7B|xB%+V1UZis9A2+NVom5fubICgOPEZ{-bJJw!{zV>& zOKxKM=~!r4^f9T#?lv=1jJ|Z51+B=a$3#f++IE_WTEEuw-Vq zRm;M=7_>GxTe-P0+wFI}-h9!U{Xdmta2|Jvwe*jRwYY^}!0Imqq248qyQw88c}Wpz zJrD5_CpGBeSnC@b(9O9P0MLV8YIWFyK3cd~j4@a(ZTIUndPomnKqRS$E+Cp})#W_u z&SJ%IZ% z^SH7jvNFOY%g#Vk`tsx)>K+P-x&MAO2bnVFaaG%g%qNE9nB`A^u%G`PEM;C-(|QdW z(TtV27F)3f+gXTPu?`2&f)T987&c%M8~qe;a7fk;;rhr+D&;YzJ*T8Iv@=I#2*Wa|Z7eMYpgDyve4eho`q^9Jhl z=H#4MZs^x4{Y|Vj^wq&^g`uwrW=jlxZ3VrKh5XjgTLRAxLth`v+6;X|Fk^&`!Hf|$ z1v5t2tY&JzEsSu^(3ytXkC?V9hHVKjTZuVk=(W!E7UD%+R-2G1pfy?G?-p zVmb`{hN|brisvSJ))@ND6}^LcqoH>Odab@QNq#8WD_);wzkwU6-Ne4!j0SYDvz=It zo$UNAxPh1CHZr7-V~QO<%vD*kpg{J|kpHL1{>SNkmTWjnKAa;LK45P@CKJBkiZ987 zugQeJk_CSw556M@{*E;Mg+U=PBpNU*mSIG!#;DkULn490Vmt2gdA5dGHHa3UHRO+I r#~nU@LSh^4^!cOMvI-5~W3|tgkxh}#NVETGiZuMwr`BDB)L`s?pA^N) diff --git a/shuili-system/target/classes/com/kms/common/utils/Itext5HtmlToPDF2.class b/shuili-system/target/classes/com/kms/common/utils/Itext5HtmlToPDF2.class deleted file mode 100644 index bde80c14696562c1493e056bda8461d1d22a4341..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7877 zcmb_h33y!9b^gz2q&FHpN%mM{`Pq^;jFA_4ynqlRW3Xf!8)P9Y*}_H;o<>j7*t2=w zlee&A_OLh@65Bw6lg5NCu@lAu0|`w_Nt%SV30-JI(-s4z3vH7&37h-hHzR3e4U~Le z{h>Ga-R0b~{O7;tK7RD^b1wooTORSF7vJ;a`*=w`{!qgY{P5y?8ve+S5;anSKQ6@t zyzIlDsFznX{Ll{_Kl0;G@nbdjCmMe0=M46|ia+z=&;9rd{7jAf+>h7rm+J9Xe*885 zMm=8F@V7qf@M9|e&WB(4@dp0hhhM7Se^8Hq^y8oKrXMHqmU?jYNwwOGx7FhvZ}TgF z>icK)`mTn5@nZr0RlWS15C87Ndm8@3kHyM@|McO%yem^`{!;u(b^h9i|Mua3H2g+& z{Z?uAJN0^(0iBKu=@Lh_O&YUq-ygn&b-6g8$XMWMd=aW+P z>(`{rk2dAEHqkXH_v13DP>)K#Opu9X62L2J;v}C`DG|X^nJm?QnIeXIok}fbnqO+9 zR?V6o0Ax;?oGEj?E0y7Lmegr7Pm}qAlI77v)L9`Ys++e-;B86vT7t^fXu@h6jQ3dS zPO~S*o8N_ob$XqFs4Y0FHIj^nw#Drbf8)tSXwZqq?9e*L+U1759Wzmy(?m+oMx;&$cGDRUl&j|IU5=Hoxf6$alaayfPBjH| zU6mW%LQU#5S;X{X(g^$`ZdHy@NNVrxW3xDJ zMiWZ~lk2V+?>`k%EtO72Eakqb1ypJuNSn6OrzA2knApZy6S86yutKd-+u@kUK3hGO zsRy?zroTlD6!@7!e>`QevlKQHL@n70_0R zUm_@Ttaz#=nP6wp0`@3$uHo7aH#W&M74Y`ORODm}|90_j zH!X0Yj!HFePqJ6Nx?0hPV>54eYB>8AoaU3|1$J&x{%cy%q~TFg8hJ&NkS2>Yq3#ti zGv3o{&T(TkXR)BB?h_@bm=(LhD4cfLeF%t-u> zQ9DX9S(!*A9aH5dJvrYEpPf>4(3fUH>`bP&g>1)4TSHR5HORH0iL=r^!-X zmdV+=oFl};RK-MN8DThY1l6afa`Rv`)@!A8X^?YuX#~;lUBqDNa-M_*Q{4H{WJsBF z>7bJubjVYd8RyQ@q{(t!&X*OsTmaIUo%Yne^DTr8L9(kknz;3u$=E^W%VvR>0M!%@X>4B`S^E|qpdhr%zD4Z3tlrzRV9 z*(6W7j1)#Y=b-B&A9R<90sFFEhLsMG!C&{J<6 zc<${(UwQBOgG(1LS$6W-@3QOUp%>Wu&do2pz5khaj@|a)|e3|nP%RUbrM>3{f1=ROz2`tk1i4E<(bye*^x~2cR0QEtEi{f-J3~8Y6B(9(xp%NvR^o#$5J|)V*h{&ZB({0+6i-q zjwcm(WTpVRY?GLdrzEaRLiPHV6Az2#U$8>Q(~{IArOS39YZNc=Ruw>g<~Y$t7|)?3a%ve&LGk=rN89sId-0)}+COTIu_ z(dBNrN0WPXxli^9&QuQlKg$A2AI0OPJzIGkjp@pk2F%9OlVdcojnSdgjz9Wnd{jqH zJPI8@nmv3-kFHiDCl0f7{9L!%5X>Dm)ZR^|iidg#nUI+psys1y>r2d3%1RLG^`A*lj{S(EQrk+IX_NUwggVJ# zk5|@w=TZlrwMSm?MJ4r;CxB>CnOZ_~U2C)Ait z)X~awp2b(?C@3yg1s;=(M%p}==I0E^F*}8hPR&+$N62+UR6`FE@#zS%8s>GmbSdMTg!2PC1?=`c+%Fb%MVpH zi<^*QTVd_@`Qvb1u{@SE=57TPVA zA*xjK)~!*+OOe^j#F$DJN8_!h@$gtKZJFsV*7CkyuiJMx&$EF;FQ7s#7|mZ9<1ya&ne@uX-v}C}joIh)8ednhplc-k;=vydY9wP&HO3R;TK7KLNGshgV*F?E-X5Y4>RsZ%T;5c#^eDYPhm zG>3#j*)ej-Q{3j>A1FF7?17PUm#P^#iEdv@GNvxL>Lx#Li(kGd_n$^s!!h3EM@04$ z^kzg|{dqo(k=-|#aHa4GLoP5q`5&|B4~%BFSez-$MLl;f~_@$00}A z@L+(?61Q^-qHOEg3D}Bl?syDw&f;Rvt^9yEfgjt-7YxBOgrc?+@NPbi;;{DwO4!gA zX5c%9QaM&6GlY_a~^yMjjC~GwZA;^z#~{tU8=U7+ozsq^|^Br zfx4}Yl}1H%Wd`#Muj-rMbp-x!g=#L`TP8Vq7hon0c>;^@3|GC1C3uIQ zVBfuxbM+)3LeQsT9^jv!c!U*LN771N&Q zaRY87fVSW}xCu8yqis)OFK(gz1NZ~nO07!y_Xuv|(@$MMy-Q9}0bRo#8txqa?=H9T z1r2v=xX0t65+9*a!@cbO0GBjtxbJr;d7qo^qX;jRT)@9CjzD_>dlj_D!Fod;tR-h@ zDelMqEUZg5QRHmGI}%vbnnU#Zg$l5NP!6!fHSxNb5MR<(A6OPRdkE)b&`=*ZH_%w5 z-okw2q+r-v)IhXn(9~F>ewH`7h@RZ&Q*YIcrTM7$8~(ug8LY_Qf-W{MWCCQH8LSL6 z2U;>%6)rQFM5|q-bLtv*T+iU5z}gJf5#74Vn~RA`!u*m0@<>rbWw6pHfAO%~Zpsuhw-iv2v#i(2aVtm)*rxYC(uSy zFAYyNCMyNoPvEl6#^mGJU<5Ph$e{CCY!rm6jp`w63QsYn1iI7?hGB%K8dG0vm{!zK z6RZhNJB&Mxsll41;aY>)d3kucG2PuDaSWSP&laP0*v=Wo41;NX#X(dXWd`$?t@3P( zSzY37C=M1Mz&SYq_4UT|47$TJjhPu-8J=a#8p2fvP-)D14xa;_#nm1xRAckI_SP^{ z2lrO-8Kh^Jyd;tBN?6RO2r|1}CZR*JOft!sG{PjRJ<23}%P~n+wa;Lr6pzfR_A%^p z`}iPns7{wSf<{#}T{Ul^>Y@&na^&M}oI|ou$W@H{F)0D)Vp?rs3UwLS4`X@QQRuqahqI&+vOnckcV-X z9LC-9IPQ^SxL2OVeex3a$xrwR<>y@YI_3Tnhvi*-P2R)TbV>{Jy+o+PY-^rQc{{RlX7R1h#q9?Sxm#1@MX;6{+HtbZJ0r= zY#d~3I(6JbJ9na%7W@zo;bBas4UdyncA}b=d<|b=YYOc-h_B*N7_|6x9A;mT`)e*a z2C3ndE)fQ(XQxYqlc?olmoTgFn%qn|J9);vA$#z3N|}h4<;yNjRw{xZojuB^6?v|v zHi{<8Xp^Eu56<+gU<{5ho~t}FT>A6kB2Nt-!#7DUZJr=?O_C-z(mPMErJ>uSxe@ds z;(<$!rAW!ITsrk*zr0Es-AQa5l2`DQOWwywZBJ8!a-5LIT(Ygex2O+K?40+$%_D{c zOFPO>;blzFaMUGLQtL62s(AQM11XlIOJ3#R-SpEbGHLL$Om)|B(NUg3T(udszvn7f zz<1myH5iukG1d=v-Rb!VAr0Tv@XRTC>;FgoDMsM;x9_(o{s`x1&z}#mR6|B-^ch_` z=9rq`SH&;kqAIWkf`#6LZ+^hcpr>oJ2=j9UJkT_rO{0aFk977N`@KwURjxgc7x=3R gHvZ3PIl#7`;s25xB2W#P!FL6RnJAK3GF#60UsDW8uK)l5 diff --git a/shuili-system/target/classes/com/kms/common/utils/UserUtils.class b/shuili-system/target/classes/com/kms/common/utils/UserUtils.class deleted file mode 100644 index c73325bfce1d646175c574a7d51bee4289d00395..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2064 zcmb7FQBxCF7(F)$S+cHyfM^SfT8a`>7KPeYC{_?#OF(M?JAGS{+i)e>&FpTl^bhnm z^cVD%>P(yILx(qK`lC8Mce5lZu_H1=_TKM)d+s^kckbQ4|M~MT0Q30H#4zSF7{Vt8 z?wa@%pXtfx2JZD^!NelIFtB9eKE5;=e_$esWdkb)9-7EvRR z()0K1mvW~Yr{^uAr5BZ}!X<&^RDN3^wc?e@W}u*4xzVWYNPpAWsWLKD@Jdc~+wqm2 z$H7#%s{(;5?X9Vy=DBtwRMo)Nw72w#+hi*;?2;jnpUSu2dY9s}#n373tvmI2+Y1C^ zS$gCM-0ebruQC`hKY`g8BG_%Hs=b z%De`?v9N}Mh4Z)|aOe1?(|1ZBaqG5$bqgDKA~1Ne+6JCl_!iGBT*eg(MQjS()Z3i4 zWCFt-%yy$JY-y<DHNFK<`5#u#Rx{@K^M&aXcUnqtsD~(>%5K zaTxrafQB3-=oqFMo1*YMqc@_WoaYw$D|!vrnR^*2uID+@+WL_k;|Fv)#f%%c$xL18 zdod}iiNQ5$;^w)IE|aUe8!61Ti=HCVEzCr5-I!UX@r@JR20WGjB N!3G(*!*~L7{{rSy4mtn; diff --git a/shuili-system/target/classes/com/kms/framework/aspectj/DataScopeAspect.class b/shuili-system/target/classes/com/kms/framework/aspectj/DataScopeAspect.class deleted file mode 100644 index 66f2c601077438fd78693acc70272e871212bf38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2979 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 diff --git a/shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory$2.class b/shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory$2.class deleted file mode 100644 index 13ae1a9f443fec8ffe67f6ecf0ff4c80d8fa65be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1012 zcmb7D+iuf95Iviub?Ta4Qp%;=dW9r~ZmD=dMMzLl2`OzKQi|XKY2$2@ZSCD^*9ppJ zAwfYrAfEXs#Mnt8NFd6C*E8eeGc#vqzkUDw1;7K`A43t>e2n3G5jT9?#4Qi=J{GX( zV+2bcmOZR6jCVz}Y)+)DnHIxhEi^GdjvaSBm&lkmO)Qk=^`6`7V>TH^A1SSp#|$gw zf5R&W423Pzlnj$KrR8oXZb-W?8WBZGH4}>HKvn!1ca}G((!A|xI?HJhe%*9zD7RIbczPJRb|kuj z%6q26$T+22J2GjTria@B?w}mN$9RAMvkdT12~fo%J$`#&OT-OA9|W;#KJhvyku z?GK4b&-t^=f7=dH(aEI0DxpY}A^B&^eYQyG7Oy9k1l~*svNR+hnX%DXr;gW8Qp^kL zn&$4cWb#xB;-PKJs>*n>z1XY_MfMs;Gy^KK;6#^3{9D?=$I5H0)3q3*8^Wfh(z%kA zqbI-xFid1OCznP1>goru>PO_>Wtd4iM+pPG!W5lBX8V}N40#L}F*{(W(f=uKuKFIV zls`qGH1Y|fUonyfPT{@$#W;aHA>U9%0#^|ZG0zQ{^SDHa94_Muy$ghzLy0V(aun$e G6n_9~hXf)3 diff --git a/shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory$3.class b/shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory$3.class deleted file mode 100644 index ad0393a68a6478d19e1efedee28081e91940f0f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1444 zcmb7ESx?kZ6#g!QbSPzCMBD{r8K4NbvM3Co=m6>Ft2LnHXZ!Ut^+! zk;M4yk20RyS(qVe^r7uJr)T-jIp4iMet!K1U<^;I(TJ-$n$V-6S4RXrI{MJBBZdJT zgBVgaQ`v@XUWoS)o@m+4F zxtlWQ3g&T!stMb*gDHmg-rsuktuj=`y>-D*pRirAlyTOCzrxqjWNAux7EiBo-&T6w zSQ%{ElEGMTUE#;mTuMReNW$_QbK8;ThR+?b=lR>F!(E;dzPZ7z!1MRbX}RxO^Est! zl)y#&3_*|dDiB7onS_^O=qcut`!W!Yx$ZgKcFp9zEVf6EltfQ@8Q&7~wnE%kT4P9! zg!-Cut+Xd?H?=5&O>bSp9RuT-Fwl$^1Fg8g&|N_P*J>Ij4NT##hI0)* z=5gP^10^lsAwylbj7(ss%~>7@1CNkk7(7u#3V+wO#L1qLIkSdE14~#o@EA`Rh6};} zI$wt7V-zd4qqZuy8HWBZ5j9iX%$)CgKEuEtsFWjE*mbcUEhq=0oS6*KlnCNHBWY=; zd;3bbxw7eddx~!q+Hg$j<+Uwg1^GC|I!as?7gCX8>W^bW6N5&jmWY%LEoBkOz$a2r zh$agTt);EyN{%ab>Xc$pNJ)Gqh1`ouSwuc#$Y*j2=cNdsu$D|mnZmT4Y8P@dW2bGC zM8|VYH9l!3cNDZ|O3vY*5uA=ncPYGF!=DM)PdmM<$Om|hGxRn>Sw{!Xk;ZTy7xEbn=-yH} zCyx+$afr%9tp5{O7N@eP%0kN`nm1Hup~sF;Lrz8(wM}(jQ2!luu`C*%9~bSQvcMZe zaX^LNq6_a};yottAq3KvE0zZmrOWanE)kRnE>m0uuAq~?l@!;Fvn1*CuaUk$^cRBJ Bc#Z%7 diff --git a/shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory.class b/shuili-system/target/classes/com/kms/framework/manager/factory/AsyncFactory.class deleted file mode 100644 index 47f4a69ce963e8492d3837f3c67daff7a33249ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2323 zcmbtV+fp1=6kQDiJ=1BqB{3o9Vh{pDfI|Xa!XSzWf{sBm5XD#(o1Vka(3i2hCkb!9 z_+a@nY94~7Dj$%KvRsGmK#N0VC|~+qdhfOOUT5udUjF^p3jovjzJMM~8|cNm2HwN_ zd3n+k!n1sfQN@;J$3eI! z=A%8|UP=}W+Y?GV2&+tk;r*?E>HRQL-mxB8!nORGsKlY;*GjGIJjfWWZth4sE)|ol zM(ns^&GA$b(JrIr6(2rRRQ3EP7|DoYD{inN-IGzo{7Hxv*0^!DNfZqQg*RW5eym}* zEE{6ei62|;F6&l*2;j#miAb!!GGrEQPF;hM5U^TTCv#`ykU^eWEIm;TJj?M#WiL_| zr0K+(^dK?NFz|X14PEkyE$gup_={nvXdlbczWD0riQx)|{u<6_I6U%XZI*45zro4L zNe$;lip_MFpS9goc}68@gtlCAl+JpyLYYu!Wa2E&nK+L(b$o8(3zQi_@i~6LypAtT z+{LPnuS|T6dpas6*04@lo=%m6w^R`Jz-j$%E5C0}?>D9VzNIR8=Hp5)IyOvvhX)!a zPM13S=}65<4`>)v7}0jaaUH>_7x*I4Vnv3JTp6z`VUo(4jPJ=G8#1DZi##la^h7Wn zWhA!axGt9YNxf22%6O70O>6zRNwS&F`hQnpi?@=x`-fV&g=lv% zo9|KID~JonUzqg9PgIaRIwz^%xN8a5`84+OmDF%a-2t3+a?Xo@-wRv`jvB{~(PwD; zos%|POpSmm=;z!_3<&TRSHIvg_Y>z|`KESqZ+IW=eYro;(T06=&g8hAk16>g{!#6e+0$boT=P~S;aMas@VYEp>H>n z9K;ZE^zOk8{_Q}4e@D{9rf8!)3(sL}u(C5pp;h_7My9d?iWpVKxXF}~$}#|^0(j#% zz)$}I7-tRW$&<~=6yWkf7$EltH08@9=Qjy{g|yu|Jb~+}WudQYAKg!(sZ+?BUuEgH Wxz~m%^l`kz;!KVpjFFD{Wc&w27;$$1 diff --git a/shuili-system/target/classes/com/kms/framework/web/service/StpInterfaceImpl.class b/shuili-system/target/classes/com/kms/framework/web/service/StpInterfaceImpl.class deleted file mode 100644 index f4c321fdb74c4ff0ed65818228200eae9365cad2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1687 zcmbVMYi|=r6g}fOSz=uCZV4^W5FSoiGL)p0;uI7`s+88H6)utZxV8r~WOv4zolWHL z{XrlhsHoH*&>vOx%-X?DC`2I3dw1^Kd+xcf{pa7;e*;*>4;9Q}v4SOhHH#zox`OLi zjvy6|1b=z`RwdKe_wg%a6%B4EX zv^A}vS3_X#L2kTG)t1h5J5lS#SRZ?uWCFLF*7ao8ciQyEpluZ!28lb~x`B+}ILP(f z+gaAxK(dHjdx<1#HJ^IZ9i2V-dJiHQ0YY!eh=kOE0ioWRX3|b)qF(lv+dKllsr2?~0_g8Ju->clhe$%xH-XmUj=|0=iJrn!fu>n7Q zRCV3~e3a#XU=uYge9iH7GLcHl=B}fD)S>fdS_j&<9I_Nx`ro0;*k@%uGnE@Q?OVgL zHL5s<;}O2C;ugNE;wY*SZddU=?g*S3*KFOncn~NBdpfO!`{hHn;|E7TV7_By zSM98<$Sn4DTN#=8zMRZU;KE*<+ z$u9?H>|XuDLQk&Ca3<$QgH(*^hD{Rg89yV9u>N5!!(5Dq0rUK{%|f8Ue<`$%@)Lgl zW+-cvQdl!9`4=@rCtzLap1&tMFk#wk7n01bFLL&+V%XS52=e-Lb%^6Z}| z-Cufvsp~IMzEl1S(~suLuQ2nBcT)vkjS~1AWqd&r=L_7`q3;NnDE!S8vCiTgZA-L1 zP5blotudVoxJb>H#0iXsnt5t2QB%SKb(i1EEP4;KOT<|q=H-uKcI7Q*SJ;Lzvl6Zr L9Iw4;L>>4KAb+)y diff --git a/shuili-system/target/classes/com/kms/framework/web/service/SysPermissionService.class b/shuili-system/target/classes/com/kms/framework/web/service/SysPermissionService.class deleted file mode 100644 index 2129a8d92b0c3667940a176b407a5f1aa7714d6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1871 zcmbtUU2hvj6g}hE*~Ho6rZg#`1xiDRP)jA*6zBI ze+nW2ZBNXu5}D-%df@{*pV^(#_bS*blyPnGN@#*=lO zFlx3-yTIyyizAS;da{_pk%;q$OYe1tDV7b;6kiDfmwTWS3CrRxA{vJ z_`_y6C@=VJa5u^I)znH&|7M%uo}I(_HF`*{f@`ky9O9?+$^vH_01WjyXSeTw^SHpB zz#Djz$?WCtF~PwgzasO^b4+YseunIKD3s6SUSKkVuYbT?x%4v}+NYjj`UUbdmVe}x zENq&29TSH%rl2DyM4^3UV`~5vtB3WHR8KL%TG_-F4SfD2el zBZIjVVz{VbK22MZCkxVBOyiRDGPo?g%NpKGBaOKvmZV)y;)=BIYgiFb9kXo-OjNI% zH%+5uIt^nZ@NB115y)QaI)UA`Hf`VDYFSH;;|6A6yN)kVsM@aKe_=KnmS>pzH^x%O zuDRP*>#FB=EHAjlJn@@mtIHy(C%33QMO9HWcVUsYfFh*d!YCG0? zx4mU~ADb*Gfw^_FwP|{`+((CM(6ou+WVP#>Xt@o;BG%xRQFR+DeUF8;h83*$ z`5n&}hB4Iqe;-WdkKRjQ3G4H&*yp(8B#|QY33=2Bm!n8nM*7KWu zZX0ylu0!Kl#pHYS%nt&o{ z)4ssn2<>tHPx_dGMu)O+&GO2i6}0iOzcbG7CM2QPw zp#hv4&f+z~n8X~;Q5^-d)aE?TV*IJgB2Q06fw?HVmi!B28j7jEF{Pozza)P?g&l?666xkv>P>$yy&NwUdI=`OT# z52?=xz3(|;#17eP~~u@vd;!HmDdyqxiOp8@to BJ9+>B diff --git a/shuili-system/target/classes/com/kms/sys/progress/ChunkController.class b/shuili-system/target/classes/com/kms/sys/progress/ChunkController.class deleted file mode 100644 index 2859c60d8fe924477f50ee24762985fc58701d47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2684 zcmb7GTXPge6#hEdWHy^2Kp?<^+~i^|B!dcw2_Q)T6G#ZMAqse5b~BruWOiqm=}EF$ zKIoI>rSw6|(kH0WD$5t7iV7%{KfpiW9{?)6`z(Gvv*e;nMIL6l`}8?I-?@CJ=a0XC z`yIdmyq`iELmGxts8QqD25iDe3JILk@J0$6hScJG5}8Jf;z9~zcvI=VmBd9gUP|FI z-d3-7l=izy_MV0-Nthb4N#rz)Yp?{8dE2qhnX(|zJTz%en}%bSCX9^q?b1Y#K>B=G zl6KJ=vjaQpSiPl^D@|#;r9j}okn2wvfu~gSzFD+pTz|^QT4pIQ@@7uDe%UY=42&_; z2`wI3H?1ZDYj=MT6hhmvyFA}jFg_HhKVp|`c}$?TwQWow(eI8^bM=s2vd)IZtmTiI zM4_;{Inx<4eOs+7!h|f?gtd1l=N65rVqgU2z~I>vz7+&Ue<3VQ^}8kMyN+Y|1k#vO zq6?nmn&SfBwpODd`>Q-l6nPDmv*psuKl~cLm87)hadvZ2sc@=pb zJu`~}Pr zH56F-tVj7(NwIU>-&OsXs4gl>G)j088CGSanVT9my{NV#w&XQTXef}CBqV95!6u_f zCxOFNnJ{BzjjUZ7UrK^XZSY_(CYWw4tHM;q4gFk{K7sWSw#Az5QUraruLW|^oZi*P zU(>MzI|a5>B}yDuhA(Odm2m3Vj4jG+QebCQv!!v=F$G6pqqJrfJ&I0Gu3-9sC68Vh zJ=J-bQPfeyq=u3X7oLu*@JZ_V>pwmC;+u!p?mf8o<)g2^o4;{GN1)X5IwTw&AtrT9 zV@Ag;$}HNdK&ml-J!JUA!H3tbKl=Ie2S41LzxAWQy2W<4zzBMM|IVlP?_GPMw7cpj z{*@PjHH&ABWGBfwa-*u{e+eb9M;Wi!PT1I1(tE zI-#sw1M6GcVj?ZS2%4BZRZ3P#j+Q;r>9}hCrf22~mLc6@&Xh(dZ71%AijiT|SQolv zr8z2YK54nlOB!3{Y=QQb`$ODb+t>)T2$i}c60L*EpA-edZ1?5_Wvl4i;5ZT6dD~)v zHE?s(45kLz?zb+XU0+%8(Hie7ORF!;=aufrGhPSFBU>$kNd=Af8Huqh8*#z(w2fgW zZ}~KT00eJq(v9PDTs3ms%4b`E?c5NGyL>;-ErX-rSl50V;wC3G*u{5!By7TN&h=OU zd$5-)mL*!LMPu4?l$VX>+V9MG}&FBuA4(cx7OL5 z`W1~e*mno|p=3+)d$gnzYsFu4Sd~sRH_c&nI`K-=q+?$BW0Tynay-?3$3^F z|7izaWsG|1<^Z+N(D@8^uh97%+F+rb-KT>sWgk!OM446}F_xcTe-tv0AwR%%8}*XZ zZl>-&&dSlOlQRab5>Pekit?al`|%=!t7b3ZWg>0B$2{pEz1qOubqKGZj`$oLCcb(i zvd~S;8hU6mfZE4|+MwZxhNBveX?RV;aSgp1`ZV-2&yVSB@@e}J8ct+1oQ#U5iK#xt bXWM0n0Iw6(0KZX#!DzRcv(sEJYMl88{Nn9K diff --git a/shuili-system/target/classes/com/kms/sys/progress/ChunkService.class b/shuili-system/target/classes/com/kms/sys/progress/ChunkService.class deleted file mode 100644 index 745ed495fc4e4effac4e239a8896fe14998a92c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4384 zcmbtX3wRt=75;CsyR+F$(soPQE^UEQph?-r{&Ynh?TqyLmGzVc_e}dFd{Oa)$lnD zM-@V=t&HVfqEK30vrQq;Y$r{HX{}bqZ0k>VnNFwCmEumc)lL|xZH8mXy095=d##+p z!q$YHj`yW=@!Z~AJnPs!j+x8Fn|u2+eI2H=$4ZzD3iA`P-kMF>MzU$|CL^0Q`E<>u z{_bwmQE0E8TFs{Zlxt-T$K7b9%*}>lq#Igy8+(j+%ED`QD9MxRQ5QVe{%S%RNx^d0ZZfxc zpCxJ7wMDkg9PlHivI<(p9Pl;HNc5VC0;h=3?I#;I|35sM0usGf7XP;}ObI*F?OU#t z=~xO#9M*srFds*&m2>HShu!Za3hvJsUl2=$W;zuW?MnZ*=??ztix09e=>X z&q-MSiRUF=|I+aSPO-?BN=kL6;VE4yRidj>Rl>p?3$=7B`lbS!3hFAPG+l-9gu;R; zQI5~H!t^mU?OnTxdBT?8#S|7zscCWtWHA%P72mqGWxdq6*N^-~w5WAd!0Tmp(ZjOb z7=j5FijABdKqE@O%9c}`?exTRS?TiKY{KS%?exV5%&vI4crL^z#E0hM|Klf&7A>|r zR*#i2Qes(p7SBdGqcRLt-S|)xflg`_g&LG@oHBB5OD1U!wzF|h=_b2LS+2h;=N(@n z)AAzO7-S=1Hh4TU_MvoN(sH<5GzFqbfEwgPkI=QzgJD52J1<5Yg0J*G;8E?L|DI{0 z)r;F5)-{X`@yNNsO{oeZ3RKs~$#HJ= zIN(@vB+V(fKT$-8^O4%9{A5Phsx( zj51+P2Mf{6@aiOquOR%Eq?vK8Zc8ppYVFKeQyMc(^nx%&Tsm?D!b}!~Ut?X)DYa z3!4;{-$AIo({_!N*CH8YX$q}orbjMI0TPIL3*=0bQ3Qy z+Xx~%hEVPc>2-C{iaaXwn3jhgoz5YT8TEk?M0YG1!p!<$j0(=U9cA*Y+V1Vg0z;Tp z9~!~z9kEb!&JbetT1?C1%=$33&J855=VP9=s?0Y!U!lG{7M@j>$64EB;aK@F&d%c; zP6K%?h=ubwSH50YySQ#i9_OvptMmhC8o~M0p2r14SX5sTs~ARgePxVTYhsnds6Bw$ zu}bRaU*L9>k6;O%s(Y|D7OKl*Y26`ph+!)A!kEEa&ZC&gfAcX5i}<^w6?3o+F-n)`*9;)fgK2Q=UU!~cA<>e9lR1(pqywo(!;Ar zo>wsf>kyn-_5wC)FucF6Q&d=~A)z5z+~b=r@6XiG9njFDH1zT%c#8?cqLvVG?q(#E zTz@zUe~%Dnkk1Xw#u*0?;Uj(k`u(^tx-5^24s*Snyo>HAaE~eC%N2QC%!CW!glU1r zG4f&McHzIDxU=XW(7>>*X4=*;ZEKmTb(}Rau}xl}SNMjDLFHbWA(CR+fQ%Q^c}$<} z1$7Nw$ntH#3r7GYm0?Qqs_0jeYNW0(zZ?{(bp@<~FuJM;bC#3_X&>-u&+4FWFS$OC zmwGedejfF);PicYtd0eSv8FyGm9wyPrBn{7>qv@A=|>y?b&xPuk}AC<$!^ZGB*q?6LOR73`ml|( z&cXHKH#i!b!6M->=+Uf1eD$bTN=v)Y@5QE;QhP|QAfL4uAdx~|ycVML6cvXj5{7Ic YReBikna}YPVTkm$-TXhuc?tIZ8xqunVE_OC diff --git a/shuili-system/target/classes/com/kms/sys/progress/MultipartFileParam.class b/shuili-system/target/classes/com/kms/sys/progress/MultipartFileParam.class deleted file mode 100644 index 9c6bcd4d59e318048ffad3097cac2c43a44c6001..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1757 zcmb7@ZEw<06vzLUM`49c+?Z~>A^i3`cO_a4r}@BZ)U?>|3(0occ395L+1a0`2E3T*b-JZE#j=0y}Q zqj)6{u~n;GY6zst=jumQ>8QPyQn5|F*E$lItDg;e?RSH2O)~{VNg(EUD*9)Q&Lk1;MeUXiv!z&lF4;8Iu6ALVZRJ9%DcwQG*88eyD{sfU zH^ej8$+&X$s?uC@%8{UAr7P+uDB$WjO8>LE0tLF@&7UMn z_1ye@`Nrvdg?Pmnn03vqu{`zS&NJkB{v<47NkSZR5+o!fBrz{xfp@prm%<%^o&S7T zfrZITzptHZbsHNr{4x4UA_#C7+6B0gvr;c-rFPCr9i5e$(wcx^II?LvDYOb&!`UAY z-<_~!vJuybyR?@^`+HcSlfWwOlbue!MBtkzIq94H0BfV(7VA4A7cvA=y zEw@j*QE=Nc8sC?x*YVH?B>2SxlJ*7Jz~(iO)ggjjkQD-1odLpvGsqSm{R0Wmj^(^W z=&J{0%@^b`wnxcD1nI|$tPc_Lf@~7V)(jASaR%A(RV3_HWZM@+_E#kA1<4XfZUzXC z9D`(hXC&gCk-RTR)_+DKUXVQkDa-)jnP-q3o{;qpYt##J;0y8;`BC!JutvQghXiso O1B5?122q@0c=i_=cNb{@ diff --git a/shuili-system/target/classes/com/kms/sys/progress/NotSameFileExpection.class b/shuili-system/target/classes/com/kms/sys/progress/NotSameFileExpection.class deleted file mode 100644 index 82dcee324d1b37179ffbc827a27ab879f10e87a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 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 diff --git a/shuili-system/target/classes/com/kms/system/base/analysis/FileUtils.class b/shuili-system/target/classes/com/kms/system/base/analysis/FileUtils.class deleted file mode 100644 index 2320093e64eb906f6920dd9592c3c02ebcbac8e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37284 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 SddX+%hT*rvv_+Xz?fxH4na}e8 diff --git a/shuili-system/target/classes/com/kms/system/base/analysis/ImportsNews.class b/shuili-system/target/classes/com/kms/system/base/analysis/ImportsNews.class deleted file mode 100644 index 1dcc94079d385c85c1cd626de0079c3c316ec7af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2982 zcma)7Yi|@)7=F&~+;(?L%R+%gRFtZ{vWkkjrOK^9wJk`Y3f`D*hj!ZC*}5~UlK5Hu zqR0n>(U_ng#27-5U`a4B`UMmJhgJTAh|igso!*9|Nqf$7-uHRmd2i?Jpa0$Z6~Hs7 zWw8Y(Gte+Dm)GR-x?E1_IGyGGhFsp1thXe3TQ2X&<&2bBIwrDMhm!`%a-TF{8#pWB zl!0jjj)XHhW(8E=@hi4Ket5=u&ni|dcd9t%*By7NU!ZWj;rdS19(O!vqGIoJ-I{Ot zPR;cMI)=-&YSEi+I2ETzSgpB5D<%{NKPcN3x=>uJO845rrH}7?_a%W>Yt+k>v@U#c zZQ;|a3%5RBxOD#SudfQ|bB&3EmQP(<7)--=Dn%)wAM>yC7ykM7hlPvtcP`!_w_J05 z+x6*ikK;Q2ivsD+u5o_vKy6ZbA9h@Ov{9X~>nALRE)%Skt;)DncjP$|D*m*?T)Kl? zW~*M&JLma!wK!pUHnXuR=RC(N4prxBb>ADc-}e}aF=hKF!lG^L>`E$IhK#W&%`EY; zW?uOwe`#itaiE!v;l<9|J6HRb8D>a{y%WdYH$(=D&LurdO6*><-)&eGX1vV#(TN$m z?Duz_77(@NqY$Y$CpCZCuG5{YSVuH8xj-170#&oWW~hsgfimuJOQ?;{W}uFn8mSl0 zW4=|M9kJ$uzVQ+Svul(scTgt8rc7Jjbl7^%!4Ts;c6?}LkO>iMb=zxH@&xfC-1SKIF(DYFjc2JLQEj@faRAQNUIc56k5dJZho?TLn7h{aDLP znK*(MO!T79#PbsEl&FX&O*|#h5MCD8yz+YP=f#_p9my|=sWWKIfQbsKoRr?}VVVO> zqj!6hXrOfiNt7?uqRYf_^fAN5?}WW))vUQW+np5XOPa`4LmCCfo3f1G9J2fJSvrl6 z7oZ>|3krb;c*=3##{UOBJVXVHyjroH3Ko8~Vh0s$Mv|h1LiUd96Z}e%yWp;N--P&y zAcan@S|BvgMQnxybfbqSA^XL3x$zC8uB|XO6OGy81mpBdL;86foHKhDIR65 ze!`&)ag~zKNn^b_wqVQ=x46&_y&7;Bji2%3#TSAz*59F8mq(+k=cR8u5Y=KN}_0CmKH+Xqv7H?B?awJn}jAuSuTob+7j9#bEPyQ>&wZD`~(F}m?M9u z!k%D;dCFIN?=M()>LyzAZSz1ROeSSlTbMx4kZx694<(s(7WAn<#Z|Q@- NH>$C~STH*${s-Mc8vOtO diff --git a/shuili-system/target/classes/com/kms/system/constants/AuditStatus.class b/shuili-system/target/classes/com/kms/system/constants/AuditStatus.class deleted file mode 100644 index 902a8d11483c61364f2189b44bbe68e6f4bd0fd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2765 zcma)8-E$LF6#w1qCfTH0+Aigz(DG%W`4B=26=+K(R4S!uK~q{QC~QM0Dfy_`4T>K# zKBzqK;0zBwI5?xc_~JMk1d1r~?2AwOAAs^ti09m0(k%^RGnsquIrp63`Q3BQy~*$Y z{(K+6UVIdSir2$PV>}(;CDHSc-EZSBgSvi-p)3#|>tbPG?DmgMi(}`p{P1A64 zBqb0mnuY9`IWN$Znlmq%iHe=eCrCjKp>%GxNY3S~z{t|w0Y}W6#o0vKF6WA~{VSs} zNVvgF>6{Z&DRAW8|HqcpywMm(W$psTaxS#TF(_2$WHNQ~2%Wd<)XE471TLBRO4bsH zMxrZrQio)`rc|z&9j_E-vgHYLCeI8c+VS%OeUarvqbnt4q)HhxKWUb84C`VC26Dxm zJy;*wt(Z4yb>dG_s_Y9nI&D`Sdi5QGvsrswroJ^2U2Z~Www@ZSsRJ6Nm<-`$jBTA& z!@OCxvWG7_&`%|2PqRx-n+a$GnY?>!CBj%rX=aX^)yz|RoWeCy&u1=D6T5lZ?;&}l zSSbvwEbH83;dH4|&SZykT+3$9h1$g}snZ)l&qA*b3${S#N^YW#K2&rZ#3dcw=+Uu< zhZy2PysP6qT-LD*aRITL4)yT?ZfED=_uoAFdO=5*RQ3qy zj^^>lU;gvk6&(?&-&4~+x_a&Jdtd2@vc6^UwjVXE3zRGl@xG1(;yPZ!J{?IM*6{&8 z)Nurd1y(IyLQbN9Ka(#NDJ@I8;P}j3He*xjdcCzD%A1ze@2P|PYIysHQOR$u*UvQ@ z;X*eqQYN}ocxobg|GegIa4%|&j~bCE%6x^q_Sf<9uzNnvp>BGHJL%UUe5j4f0nkhp zkTYdm&Xi%Y2ys;*@FJ~!*hw-Kc8N^6uF1Q}hWbI;QcD2M8@RhjZXi!82wCnYX&cS_ z30EO*!}kEn4elsIdk3A3$Y$-xB))(&&y=jRW-?S#iYE zP~fN8h{fCQAP{R)Zy^}lc?;T)H6(+w0y=eoa>1R~LT6{xE#ym{cv)tIS9~@{$EQ`@ z>>Q%#)NeF$#01UE*&q7}!Ds32l)w&MzY8odgjZZ=rtKr=KrBu?7b%9NwwsR9BN5g* zRyAq?d2|j;?e1cEiD=If>8(p-xIPh2t{fr_7BDs#8>ON>_$z@ZRWzrk)hb%k z)BY;fr>6r|w5M-E+(XB7bNCK6-9*TbNpFH4RQ{=@OL=&x7(KTqI3)@Uh-$HGnBZJi_ zVGX^i>u?1daTV>jPJj5m!zTQK&G>`lKe4se7T3u$MOQ~9%VQXm&%rn$uZQmmu0ah# Wp|7CMctQo@kI%hO$8kbRul)y}sX^5M diff --git a/shuili-system/target/classes/com/kms/system/constants/LangNumber.class b/shuili-system/target/classes/com/kms/system/constants/LangNumber.class deleted file mode 100644 index bde0b5e46f1b8ea29ed423cceec0ba6b0c8df585..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5281 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 Mao*Y}#baswKZk@@7ytkO diff --git a/shuili-system/target/classes/com/kms/system/constants/RedisCacheIndex.class b/shuili-system/target/classes/com/kms/system/constants/RedisCacheIndex.class deleted file mode 100644 index 7290704a46beea321f0b88e9f8475a469816ccd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 515 zcma)&OHaZ;6ot?5rWSdK4|L@YS=fy`jfp8}Od2qN#9cF#2@LjO+QI10a%JMeAK;HN z-WF8i%Eg?_cV_0^JLlu`?H#}g4m6~(oySfdy9~wQ#g%>CZFlY%YSx@Ta>M2R)EKBx z`qNW}k{S4s;=USjcOeScW6%e^+rHUZJ}aQXptU`tBBL)RGBUX{ z6W9JkJkgZeAXtQsxRi0#`k(XT_**)3lo*=-Ey_^&O`|uS3rCR^#+_}&r?!kc+YDPv zD@ywRxYeaQ5f5tR;Sebb9<&$hGm@rI{{m5Qca{JE diff --git a/shuili-system/target/classes/com/kms/system/constants/ResourcesConstants.class b/shuili-system/target/classes/com/kms/system/constants/ResourcesConstants.class deleted file mode 100644 index 13304c96fcc0acf6d052502f49f681b295db596e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 662 zcmb7>Z%@-u6vm%3Hg*|9V1kIKh@kv2*r;e+FeIfb(0JF%Rz~)!>1u<;txa}26F-)( zOnl)7@Ix6-7l=)G#f#@je@{;DJ?Gp%e}DZ3u!o%rCa_w@lQPx_s(^mM%R$eC$nMcZGjEK ztZN!4wj-V6u6M{T@Qmv|+RnK&8^@-1>gfW{3DeCp=~`Yh`%_?(P<2ntrtVsXC#^$) zEkeoRs3ovXnEVjMQF=g_*xK$8ibnD|vK|*N#OT8{xHh;DlDd7 zB1PDhK{C+34wR<8t27*F!PR_9YlSKq4TDf!kF0q9N_(6gMcKhiH%ne-JFDUzmIyCy zaWrA>|F)gpWf-Icdc}Ipdc)ddy=A>)z2}+h^*Yv2;I{(=mQh3ryc4DZ%FH6iQ_Phd zPcv6@Ji~k^$Ft0HIi6>(<@hf1LXH>tX3B`T}u)MjpI47I2GZrWo@2?vD2mF?Nl zH9u>f3<$ZlKeh-J)%L81*d19xUyK~?)K%XU&Oiiq!i#1udbUGCQ#E~8VSgo@hmqwf z<|0(6^n5@1i5PO;lJ3WWY2DhX=bziNWIP#bs1T0-XGp02?nE0+Ei)oei-!@8!+PH0 zT22O^`|->&>@kjz;q?MJH2CDf8(_+Smknu&SC~snyvi&uahYFI5|*{f4ob>E{`3v> bnp)Oa3)}{OSZ9^fI*)a1FcCIcGuZkDexqtv diff --git a/shuili-system/target/classes/com/kms/system/controller/LabEntityController$LabData.class b/shuili-system/target/classes/com/kms/system/controller/LabEntityController$LabData.class deleted file mode 100644 index 0260e614d208c2ca48a18ed40f639135d79f4e98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1590 zcmbVM+iuf95IyU}b`nezQb^0aK!7BrHH9LOTJD(Nk?kPmuRsDJ z@xTZ0QHUAa3B^epg$H|gW_Qki?{6GmGC#Y3m($!HMR0vnm-ZL90|&C`BphQlzj`{uFVmyTyzvU5Oy zTRRl5x{h}m>R1=ZTQn6g_C3!I+O7;k&bd1awCj6O;JdCJFz_2Ma-v~-?5i_qoJos5 zIAQ&%fSILrF#?g)wjIxjb_AX^=8SC~k*+q06(|!E`(V)T*ui_*amiD){H}D5WZ- zqNpe;I%;Ga6vN&nT&Gds25!<0Mls3aHMR8>xz99FzyKOMmC~7DH4RQk-lFx}xRZjs zqmij-OeM!OaxqFmV*#pCj*)7~t`v#0Btq{}L_(20Wx`IftkCSUNlhu*=;IAdRXtIQ;$(B7^ScBb4yR@AN|CJ^# zCO-HF_(vJfDHRqh54@an@45G!`#C>yfB*UU3&0*a8gh7;hlWQvGc} zEKC9EoC=h?XVw?XbS-aS9z}uU4PFSSp??|lZCXTDFt8(m+(qDD*g-U6+h-?iJP|Ov zeSc`44?{B?g^@ip`@R>np}FVM+!mmfR7bGQJj zDdpbbzUnBVq~jK-UC@z7K_^Ax28)|0WU))#Sg4P2F$7A}x%tpLv->n8OHIzQy-+mN zXe2e7Tm_Q(XeAjj)@z2 f8Mo#&fxMXm!m~+#DH`!GY+;pjo-8@EaR>4*ojmkg diff --git a/shuili-system/target/classes/com/kms/system/controller/LabEntityController.class b/shuili-system/target/classes/com/kms/system/controller/LabEntityController.class deleted file mode 100644 index 357ac686f35d58d540fbcddd02d56699869723b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15429 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 diff --git a/shuili-system/target/classes/com/kms/system/controller/LabLaboratoryController.class b/shuili-system/target/classes/com/kms/system/controller/LabLaboratoryController.class deleted file mode 100644 index fe237b813e66da366b5a108ceaf040213215b485..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4379 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 diff --git a/shuili-system/target/classes/com/kms/system/domain/CmsDataSource.class b/shuili-system/target/classes/com/kms/system/domain/CmsDataSource.class deleted file mode 100644 index 59fdb73d3b8bc5bf52c7555d846f025b11a5a05e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6860 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 Yhghe<)=%T+A77_cT?%^4?ud{74?Lj~=l}o! diff --git a/shuili-system/target/classes/com/kms/system/domain/CmsMaterialEntity.class b/shuili-system/target/classes/com/kms/system/domain/CmsMaterialEntity.class deleted file mode 100644 index a9cd68c7ffbbf1c8a0bae8753d2820a6b9bf9269..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2383 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 cwDoVILXZ;?JVR?DjBo8h`UBd>XWxz=Ha{vGU diff --git a/shuili-system/target/classes/com/kms/system/domain/CmsUserCollect.class b/shuili-system/target/classes/com/kms/system/domain/CmsUserCollect.class deleted file mode 100644 index dfd4b0cb6a0db93a455c1f7605328a15e9dceb72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2357 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 gf|pI>)qd1ZUjz<4h+ui`yU%m diff --git a/shuili-system/target/classes/com/kms/system/domain/LabDatas.class b/shuili-system/target/classes/com/kms/system/domain/LabDatas.class deleted file mode 100644 index e2dd01e018b6ae0438cb3abefdd63e9d73b75378..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2685 zcmb7GTXPge6#ja5W^dV$5J+GJxhU#xHeo=5KsJeT2?A~cCKv=onQX?*!0yaCGYgeh z9<9L-p~H*VR^4Q)a9^foB% zqN7``X;^+Kj!}zJAAa^yX2M;5If;kAef{8zZ^&cJv`lY8Af7MG2`DGYSD>eCTE=v< zK5sY|b(Sm8SGFs9ZBBPg`5ihHZ_#A^dp6eZ6zgzVcB*Q4QcFhn~h@Tc>Zcv&Wl7?AnV=Rk?Jk+?)k z7@s!v8Zr7qjGAs$we$1Wjfz()ToDkqJU#zHv@fw0ZEw+V1Tyjz_k~xd%Xda!oBSnb zwcmPz5E(UGI9y`mt7iP{*O_CVxgk!kP znnxo_nc3F{p7QKjPu>iHt4~OU zTaaS+L=^MB;Nw|bgD!`8HpS4MmD|?vhT9t?6fnGsZJLHmsmz-AsG-^#X-#D%>ZkCv24ei7j2yT5 zU)z!6+{5n|Ah5&5PQ2(ZQ0A4O-JL;u{Gc><@LV{)%q<#c!C4)=2l2g+v5#ZIcXr_w z+Swogui`a+Q92ZuW9{Z25WCy4xp$q-0sBFM@LbmciFbl*-4JAmAj8-nf|NPOB=5oE zkBG@S;^?eHDkCck>X4R{lz%Pg4QiC0?eqjR570Weeunt7W{~HxHp4FLUdiw}Ep|Ic zspezyOLBIKgWp0`?iBxk@)gwho#O9MriKPvQ2o!r;yok+tA*tB5QkA^_)m1@l>6Ac zjO=huX(1Iwq(@bTq(>7uRmLRlqi-4AIW?Dvf|NVV`lMcG0yZmpIXH|r$h99=afH1P zqc*2-l)gA?n7}bw{67bqYm}CXOW1)Dtpvu1zZaQg>R)V1Vm$o_14&HqUrIc}_P|W@ z52d{Sp%}+F%i~g|3X)%JgY#5Z_^D(i`3d=6gfM?|pUU0iy`?dBcxId`CZ~7ymKG^k zs<*g|p?$60W4Aj9l8ezC0rVaF{;MqEFx?)21lXDOxdf;{YZ}DbAQ} zI896Or8o!WF)yw{DTHA45aKa|R=;D?(GN8Wh+>qrE`~85pR=&o8RnFCIsXf?m+zsw vZ&M3Bvfvha`!)x5TH1ZITiDWh+1jsrKCCN-v%dJ}{Kuq=`0wzSFHZS?Fj+M8 diff --git a/shuili-system/target/classes/com/kms/system/domain/LabField.class b/shuili-system/target/classes/com/kms/system/domain/LabField.class deleted file mode 100644 index ca0a1ac67d130be4b41385cfd1bea47065960bad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2265 zcma)7-*XdH6#j0qn@z&Dl+uDhK%!OCq-7ED2WgA8rATXAu%$&*)J?j!3(0QW-JpHb z7kqMt2cLXFeXuXgfHPVgo$<#D&iGIG0;vCkh~Ld_N`J)BPI~XT_nvdlcfNDZ-CzIy z?gs!z@Mao2F_D6Tm*p_2VJgjeT5g|`(&;o_38fjiH!GL38qTDlV0v*2P*=A+l@_gHM=Ejc;hzWtVQP=SU(+TFyO5IWkK>i5<#WAavKXR_>84S%U_S8Rh~)pZPWO~Dv@ zzid@_h5qLkm+xG?dgsc=zpva7=$*7(!++0QT(rD(>b@~tv!~nzt8&_NYnB%*(^S1A zp%P)eZZGhrJD*&?{p|;LKl|v9>z4%*gSKM_#{}ZJ-gzpG(pq5qr0rPK^=irT&X|NO z19Quy!z3wON1IBpWHW{XjTkOgeZyb&1FLE*xK-13j7hU}!nP_41feZj!E}S6u3T>` zj-6FSvE1x?Ex@ z`L#;jUsni51DhnA+@~sL>8*EUA_TJkRXEg-YVG!qpWprPx{gQjn2rqg=s18q0{dmX z{(G)<4B(IsLk_*jlN%icUNMQHo?igX+FUUN!H^a=yTny=W1Lv9Pz5|jST8dsB zqsR;7w)RWe^{i&ijhMbQ#%>Fi*~1UKg?T6aX02v9B%;4nZEY#H2;Km)d`EV&)8p8K zE_6d+7gsUt=0CaN`eClSxY|oO<6|H8Q+PxQF-hE3jcijRixf{uGshm@VsI9m)%;C} zuNrP1=a^`0cHs%idZ>UWk>iT*0rDI-8h?%0jZMb;S{gGwEsW!vjk7I{`_La57a3?w z;>;JmL98|IU7<#VTgDWUCvdR!J@Nm0Pe?J_1BW6!_vuR`93GCNiqjN!&u` z3feMiCec(r zah4_a9Hj)F=lxlvwd7xD*Kjm-54$uJ`Adp>cqkN8e9L7kMr0i2ER&;379_sd7JOlD z)HQr6QAvD4wr+IIZ?uyiy`heQK~`sah%9Q;dpib}NLaF?umY`r72DpH`>CQL4>C%0 zl9V*^Xm4wJj)WIS?&Bzuf*0sENg`gP6hj-M878DS3vo9_C@BppCZODBgDIp!2u9D( z@qH>iSjXf>H`Jy=Q%BjjMK${4BNGKXL!Yt_bKgThcN1-$?W@=>1LoA(5y~kk@8GbC g&dm+8zEyKkTrs9tl0UZgUYwv0J`*qDWGIaP0|F+s{r~^~ diff --git a/shuili-system/target/classes/com/kms/system/domain/LabLaboratory.class b/shuili-system/target/classes/com/kms/system/domain/LabLaboratory.class deleted file mode 100644 index 8b64018e4adb33c4cd2925f755c1812162aa7d1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5238 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 C1_T5E diff --git a/shuili-system/target/classes/com/kms/system/domain/LabNode.class b/shuili-system/target/classes/com/kms/system/domain/LabNode.class deleted file mode 100644 index 5b3d0d164c1dfbb8269ff4c217a30c582542d9a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2927 zcma)7Yi|@)7=F&~+;(?LFH&F>1hi_ej8~K`#R7s<+k&)I!5hpZH*m ziqTIdCi2PHgb)HmOO(Xu7fk#gP4z#B_?$V@+jdm4?V0DixAVU5^Uj&y|NiM`0MDbC z#a5ikz`&SX-jvH*ayf0{OqS2Lv_@mBOItj|H`0yx<=!mCB(P2IW#s zpkpv7yR{46)RbR!y;Y5Suo4WFC;h^SYPsT9!;6fgpZ5xLzJT?|CzqBk{V30K2g}td zw^orSovV69|3bMs>rQ&1wnuv9c;%n!mhs z^NxU7@Ww|YMdRZ2D}P@7Z1MWHR4iWkRKVCDl!EYpK)StSi~$ZaS%JpEpyUtF703PR zsK;7mN6HgkVa%%ravuw|a5`Y|I|nDqMR&GXb88oCp9>=L@L!R5d)}=UQ_<9?Hk=?+9vgJ0HQbm(MkZr|6tB5FxPbvj*rjy z6Jc-1839pV&w8w4>g90Sukr|4Ynvp?iX;)tL_$SHR*BU{DZ;4fu|jR^$YX_&2IaK6 z9|^sQ*&(kIb(nJ<&7?Kqm5#^)c=)ten^q)|u>t0H;^e^45f(sfRQ=jqAtaemc6ysi zMsHJRTWu@nSYcVswLo^HJXf9Yj|P%vn;ny!?UC~@u>1eUn%o*{1Z_NlCv9wlV`HaW zcFW~)I08HVb3AMu#fvt&(PLw;M0+H1U za5tB{*7F;3j&>K#^RRmyZ2_5Oi)>z}Nj7gdy0kIwqGcWpj_w$1jBRmS6Pc)@pTB*u@Fg#UgG3p8#h3pOQ5J`p$6hp= z)?e6U;+1>YV&Vw@EO8Ip6wLe!MO z%FY{+%2-j6TY7CzrsJ5(CC)gFA_njpGu7Gf*NIYW;5iJkiZs6{L;OiP4sgteiFBOi z&3l~4h}wJ=)_n>zwpj?a7DC*o+e9PU6i9+Y+~OS-_V1%Wv(4 Z-yiolg*T$vIT?MWay)m0|NKgg{sT)T0YLx& diff --git a/shuili-system/target/classes/com/kms/system/domain/LabRelation.class b/shuili-system/target/classes/com/kms/system/domain/LabRelation.class deleted file mode 100644 index 7eca8473d58d191712fa376099ff7acbb35b2221..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4018 zcmb7G+ix7z9sbTQmoK;X89?cGtUua3%Y9zH@%R z@7#Xh@9g~Jf1m#az@2zCi7i-4z(7%&k~C#$D$-P?d0Iy;$+j*-8xl2>IIhqM+5L?) z%hLQ-n%~K|lQQI_j%Sishb05g%Jw+}&l@;p;Ix4k4E)}}i*oo6I$jcpxbp)2Q^)M% zcA;pO7Yc_OHMhJlDUd(dEH~VebHuH?vqfijxm;=34YyLR3ye&;l|uc5y|Cca3U=F5 z*j;s}EAvkAK&?`BYK>*i6F+Vjn~s21uQY3O1m?AOKfLz&>tCHYef{*G1(Is~@N%{7 zyMFQV)%RW{r(xF?oCZ19-~Q;@`!BUPYTV~2U%)Y{{@P@HdHJ=g7vH=3;wRTXxy;#i zx@EUC{b)Lf-h zSSr;E_2qiQDHY}`CEG0*rtH~+PSLv`d1h{UKQDIO@JQIzCg?uo-$uHH)oG;fuzzal zQ&{;@><2f?Me1sif#KdY(H=-2YS?p2({|O<01Hyb%RI%LUEV7%g>ccXFDe;PQ~P=5 z0|)m{@8zWsYc;3dEKQzHH-G_lQmzw0)yXI+mgbP z`s&o1U;g!jYo{)lDBxBTTQO+jN7CFP&4@H((oA5Gvwm;cm^g~PChn8w$JoKEHt`ee zFmbmumNb*n?3CtFPU2)m+iQhVRwF)iC1uj6*0b57R_*{4tC zLHXJ`VLvs#HOK{fV#LHeb_fj1Gu0Qls9PW`RmyB?PVgk`vFpxWKB0|eCaS$vRUedx zU9CE0R>eeE{q~f!f3`^s^0D8-Ul9!vdFK$=#$Jl;P5d9Kb1)+F(CfIF4(6uUF-!;Z z)$16ggE{PVjMKrq_BytskAoBh?QPswfvsR0AH4)|ksyNGX*F*!i#v!-6~LdxyVw&l z`LwIapCa;c7kMC*OvQwdquu0 z2wCqY4~3F<;U1rCF*gyJo6)h)5DCxKdKKa4O6E~XP~fNG^F-G=k5a6_&%)=4t#uwH zaDm<7^TgLWkE#cOJ>m0cYn?}xkHEd*^XO}xM^&4U@1x3BB+Fc6Suonz=vl;L=g0mA z<1NIa=f}Q)F+D!If`r!{9lM02LMuqkjMG@LiN7P2k6l6EIhYgq*b2-bB5lPPlD4#b zT*hcu(0>l;d_1pp1Z6CpK^e=)>oUmjgY>-75tOwO49Z%`d_o2#{h&lX*%6epQVhyj zWjdEf8U<2le44F!?4dyqv0Wqdh2xbpLe8b7w{fHbG zKs*QtVq&X@{4lK}tR2}s>IdtqgWK^T4xeK5P};0;pHEDL5!>AFbd%2e=4X=<7Ebfd z<#)l+%UJj5B@FbhU%>_`E;jue6;4Z>SD1yqq5lSjvl4GoI4ALDh5ID_Amb6Sm4)$Z?+a=j(E|6xFQ`Sh3LN_u|2gim diff --git a/shuili-system/target/classes/com/kms/system/domain/LabTeacher.class b/shuili-system/target/classes/com/kms/system/domain/LabTeacher.class deleted file mode 100644 index e5337d7d7d5d472aac8f42266f04e8ac15d398d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3200 zcma)8+jA3D9R5z4y(Hb(Qd=MjV}T025-(LWrC2USifus(RZxL#x^1^jvLU+xI^%=9 z0M4l6gFdJah!1wgVFsMh!YJeA1!w#_DB}Mh;&*m8ZPP}jZO(q@obUI`@4o&0?;m~w z(2etPBylnZ6{qBKS}vws#x!K&e2zGqPo-0+ukmLn%1^anzEOg1?mRvyfs|PjakK`CcTorI~hjIWZbw952N0cO*c3D zZqDS~lsoHsRxUN};WaTRcQ%KQ(Hnq5-pYAr+ZFN>;mx- zr&P>X`)yefbxY~pF8e|t<=4TO>E!HjrvD`^Zu(O4GdwIfnK>h zk8TFhzzgU$@SsvmaE# zy3Xe1VdaTvGw=qw1zJ}RiHuXU%3ZX_bgh1l7;lzexnxXGjZCOnC|G&6dRMh}Sk)n+ z^*z|c!I|WEQ}6_TpM<~$?jqR84+F~mChi-#+f2O0MGKxL*eXFpMte15TbZ$q45nf= zqpi$nBZGNb&FCmII*{Nk^UHNRElKeyq`mDoA-?rZO>tHI!$v$qYy<>6i|4o#GOb)I zg}+1O#tPw$RfSm#RfKC+3U96|%o?g999=2At*S6y5L z-)kA4+a2v+Ly2DN_!a8sP-?Dq`~r2Tvwa?#zisch2|Ymbhz)mgNk_YWLv1p82W#eF zbS0znh?g0)X@!*9w3<{TN43A|G zN%4>rOUBEj=r!73!`7(mgF@ifVpebC74*^TCd^?sdn3Z0_y~J=R>M-ejJ-rryp9>{ zBT_h(Ec6qpoM-#_+XoHra($H_9ba%T93YC}D#ykEQ5*+p!4A}G`d@fV!)vhzSgT=> zf4X>p^#P3i3*=XG5{E@Ai#I}Lip+-eF0#tIpk|dt?-cqZy%Ta?2WrIol+!5f*7xk> zym+ja*^CWusPCC#;`I8CIcQz;s5>psYtvDAk&K2nx=d$qWuz7Vikb9<^rTY0N~Bf) zN?p8Sekrw~dP)ui=7dJqpn$^+INuNq`VpcCr`-fb=tvE=G9E{XqJFZD5h-{Z>o7{B z`l0>?`a=%wC_^m-qs#wMA5w5>ACU)5P|AcdCt7(F($rBjD!SnRTO zVU-&D9QOno zUBfZ;(xTzGrfuDw7!wea0`;S|<$Aj1E$XF;p%Q@n69S5*mkoiYsr&jvy-?DvwZeku znATcRAU$8PJhN;pny$HAGKMY7_H>VKU4iVBX&2nj^tCm^Dd z^0MLF(TPCfv{#s&&K$W8Hx+N)B&17ID|Wf?pzIdhP1iHZg;l$(n^s}gTQ{6xk6A5O zJcD>HXU=AOc1PlfuNmHqPf$xHdsamtK?R>u>bh0k)*Ak$w*)mp<(TnlMK2Nb3EkP{ z`^Jh_%zntC*(Zw<9+6C2rbG5*(mg@-QvP0b;U9#Q*99lxs(!)KR~}638$NMtxHvu_ ztQFlFmvAVq>+X8MJqt0xXmj%u)8m9gIp!E{rQ~rlj1=n${U$s+Xc~dkf?aV|j2ot` zR`W^fugD$~=>D(PVTrV7pMST%^HtCx8oJP}A&m|V7tkTl^M4AhVGsokSLBdEmZ@sU zA*-Q?YXa@3`+cNhmR2RPEhj-|B*jA-mcXhcdb|9ThsX#$jUX$Kkzm|)nwtfRW!vK9 z7}f3@(OqMl*T~!CoPY^wF)kG)2MUGuaGHwISq|2_rEObc+VJ1?N z&?5}MN`_$yoCBQSBl4K$5lEadf3vM7MwY*ZarCrtx~6d+y`k|SLrF4XesV{71)&>! z>$X7SFqc@E3kzM_&oO@f-A_0 zyiNbzNW~L>p&^cUlF!i=$5s9(#B;n5h)I4f7WWzGDa)Pz;cX}nQSHnm@DK{W|ffIuzxb0g$rNacCRhIaPS|O7p}}5 zzB+$akl)H!S-dr{_|n05Up_7f+g(x|lMmAeX}QtzIUFQ}D+^Mcw$)b>(W6&=z| z-CWS7$@&OMy&T9@$W)ho!C8fS$|1R;S|PcnhuT?cZ9=oxP%WN_Tt;m?VVRTr z#?2YKEYMfcoD8>sPIUY@;ZJ3A<{zNCkD)7w~HCx*C0o z#x(j6-Ko(>S$v#@!D0=Ids%#v#X1)2S=>)|q6c#ezFCjZ=tFxtvu zg2gr#+ga>j@mUt1WAPA+Z_-nOx*P9?b?Ew2obo;O+v%?)|5}ZHOK%|}!+mzp*P=Rx z`)XmwI6T}}2|Pw^!+oyMV?r73Re7FMrZ{t@BtDuNMT&bLo^J$3fF84 zt;QeD7UR1x4&(V@{M}umk3fO*ZdQB@3gkeu;vOiF7tM+hD3B}7inUN6f0`AafC4$y zthf&fI^ z&}iJ}X^cwtFjg9kS9%(w19%v#jmCF)8l!V~7zZ1T2R)6^aXgGejmE1zjnSz*jKht_ zcX=A`q|ZCX2J*Ot^Ko$K0=0POXP0C+`N_E}OIy$vy#2H;)sO51g1+eO$G22JvT+Fd zlD8lKQvJw2Bk0TCegaGNBioXohrRtMOZ6kWm>|>JkGfPpvgrxh$=`Zv==Y?J4-YO- z#2x~)Z61a&e5?LMVcqvObW~y&b&+C55Tuw9(t}J2Ii#Q-a*;ZXFi4$-riYoNIV2z#DQ-kSiW_Zugh_1< zDWbQzNC~4Iq=XUG+nE$~NbP#mMd~s-KI3+#z-9 zaTlq_NPyI1bm<8ubvdMj-c=#_PNB!NQsd2cO`cVyvxqs`L(@3Pgm|1XxD8tlJY}jMUMc5Xo3Dh zMW8UfN$*ezNTa{f1+su5^mjT#WuP|P*mLwKP`e1wx9KZDQE?mIzaOYW3?buYfns7K zz5*Tt>J(e>Y4JEvTomwO^i`mQDAO(UHJ~o~I`+SxRw(L!s7;}7yhmLMJ%N9!c#nD{ z4F2CBVutTwr{mv)CwF{5mj)k8OVhE)hL7;tA0(jSF!)#me;P|SJ}$Hf3N02LS>s!4 zm(%j-$TW&cjSkI|vTA|!hj~6~_*kL)9F58)CRH7V-&UczY$H|oS5z@0V53ge zbsCDTLb*9sN<|enR9mH1RVYGfl`w*~3ian$1uLp9BV?;WRTZjIT6G&?TZMvjtilyl zkD=Krt*X*&)pGAtKOm#!#I#kk(*gPxV(AwVdK##OLPDj3h;u8gq<_*OARj(s-=SxK z{P<<^1`?4|-J%opERaG+a2nqMQt1`Q!}tr*AMu9o0)^;r`1U>m6sCWp%;tbJPQ#X+ z6u*uMAJR|=q#pjS*mbyVXta*gkya7@%DlbV&c z&M^#n8P;rXsCLXlH!!bxct3{YBz$8hH9t2YIj*$#byf3rbDrZcax;fDpG%^`E%F&Z zJ!OZW*O1fv%jeK#TK3RIx+S)JfqJ=7;1Ro3V%$f)u@6Yx!MIOiTtU6D6%uzc{-DIT wb$VkfB~CC-N{ox9H+GxE-HdOSxQFo_5DV1b_-X9^@pZ_lOF`eWJL32M2ahgbZU6uP diff --git a/shuili-system/target/classes/com/kms/system/domain/SysConfig.class b/shuili-system/target/classes/com/kms/system/domain/SysConfig.class deleted file mode 100644 index d587b735358df1e1eaa92aa8a2ac36fd664a3dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3082 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 JA76~o{{Tt3m$m=^ diff --git a/shuili-system/target/classes/com/kms/system/domain/SysExceptionLog.class b/shuili-system/target/classes/com/kms/system/domain/SysExceptionLog.class deleted file mode 100644 index e61bf54e2a812ea3deb623e2695efb7d83ff7f26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3187 zcma)7U2_vv7=AX{WVdNrO1~h8(rSS=ZHRm*8on%01Z>Jjp#mbXO_p{`HXE`Vpfld+ zy)#}o)6qLGv^UIvGZ1EUM)U?}{2hYwA4Gi4?k3rUD0b4b?>Xl=@B8fYzVF%J{{G=7 z0J~6*VI9tQAc6~G_(%*F6?`1y^OD%REUYUrXr47Mra7^Z7i)P1dJNq-ui~nBE{I`K zg`r|e#WgW2C@>|+Ma|SD^iD5nH?(v?D=wr@%rEIVXOD!$=}OTtOnuIa=(^_LEJy|lcR$echEL$bL>@3qyc>}DFrIX_~R zO-(4Glr)FXqJ+L>{-v_nR6aj+^k~L3Gd5L;?lp>rvtL4ZbZm~|9-*X^Vg%omIIju0Kl?^fX7iDMBppUICr)#F2wwKAvOy@0AGm7ciWm`y65(${L#H;Tf zeKBi+6C7H6CJE&$zIlLReHH#EyOX3u{hQv z5yvJB#qm1ckg!>F{!2?dj$_yt$6hhKiS3jzjvd$;=k@qj9LMp2gmsN;%M;@uZr`!G$X9kBD{Nw@t}Uk$IiJQ(38OFGQ8}xu*P8O6X6sYDB%Nhm zHw`Xc(J`4?siYV4yl8^eUn}fD<28||kWKhn3I8h|!@T_0@w*X5NJtF{8#wFd>=oJ@ zZM=%tXsj1TNaW!~#BdEUOaznUBVMIX-^U0xb8(A}tu^Qf;#^^ZIVKr!C!Z3Zk>mqN z-_rrKElb=eaH=egFFk2 z5V;v0*urnwR`k(}@SXI|`@V$+o*u#y?=6`0yYClfOjea2SupUZ-$UpwK_2y}yExF6 zHcPS1;c)BW4Q&szgxegJTMut)d-!ea_77*sQ@m2t6{{hU$Gh7-J?J6ol02tzxg!Et&@D}RVInn_XtXd7@&gzR>qUxAtK)%{{@k+ z5eeTO{~3|&M6!ygJ57#1fZ|zIs528BGIHuybSC6SSi6dNDj`?VQA5Ns5kg{_Xd)so z(MRZAMOPw{hz3BN8HJ$EjG9mcNcBNVLal-1+oTqDi#_YaB$vA~0I7lmk54m@URunhbK8I;3_=N2^MN1_L%x{;X{)KJ@?{_@I zpn{|PsnRp7_sou*zvuBZ_t3BhZP*PQNT@mZCj4U=1vcIE>RCrsRnTWf^EVzf%M8w_N z*k0KEUQA!uFwSBcSu#>_5;L?y=pw@tWE24zWoY$mG=_HA2 zL6V*m-k68P!T=&QKn)`|FZr-&0MgfQ!-_DubQaF+4-L6~E4xyHGF078a> A{Qv*} diff --git a/shuili-system/target/classes/com/kms/system/domain/SysInfo.class b/shuili-system/target/classes/com/kms/system/domain/SysInfo.class deleted file mode 100644 index ef4aef8a5b6d0155521858efae3f2df2e8571855..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2702 zcma)8ZEqA+6n^gR%+7Q>g;LwXYAY`m>H7%c3tNhoQn1jL%0hV&f$4VG4(!g(Bi0gWR74TSJplc%Ul}vxW;uIZ|X329+ zs|GN~KFQlf9$~EBy0`kx7Z1Ps^3l>Afu0G+GyRXPLcuPtf&1pjf-~vO*~RIyw_ulp zMW(7ZBvpZwU-Sx=TRST^aq`&66q$3|WB8!sI>8})x0p`8E(y%cC9TrR~3N%PTo^Ud1de&axr>g<{2D(@thcQkILA(^=BX4y!1z^Z&Y!@RmnE z-hXue_QTuvR&Oo;_3O8*pM7uORqQd)fldRj$YnP=1v+K_|7Xh>7{!|g-jK@x2C0?- z6N3g`lgklMn62x-xWoLG=49=f;yZWC@(ml9hr@#Q?}#)TW;gclkgCxVJq9K)DA2v} zbIf~XyV}WzE#DsF#~dtjL_B?Q)HW=TwXk5ja{>eP+H^zb#!QE>lk=&agG9lL*otl7 z%%GQ`mymkVf0=$Oz3sF+eC%L~z%FSdq?j8KT~$OE5mb63Vs{m>8;y*zI9$8=9+OYO zr`mfL;)jq(57$(<*@|A;Mg%|~`swk$807kF@=r+IS(n^dH<<;klbl?iysK_98=+3J zvOalF-Q>O47bj<_QbJy`x9?{p>R-A&Ld2Jrf<(0uc)k8P$>%*Ms-WPXwz_nH>i{Sy(>tCZg1aRXpyx7eX5^JRvGvM zjTz+uwk*LI$S5mls3Ou?m5_8cl~E-o^#CnPXv(OW)EZD@RwJk}t7kL`(qoX8(W@Y3 znbeY4-(43Y$~B>H;w`+*3$@{M9AL*KSaSzi?j zAEKq^t=7-l8(sgCBMd5W$#_boviSV7Yjxu4D| zGLTW?h%QSJg&MPJ7-AK|Bt4^sp^o~(9*W)>GfUzOB|An&I;Qa+tpu8I0^?+x?v~nF2SV9 z2_4CYOQb4C)c*U}bp9?jw=}O{i69;FhL3#W2Us=?9~iz<%5(OttlKhUJodZq zIq&nFJ?Fih^`HOq{)YhW$B)9e6IKWsY#|neSQO%<5T}GVt>U>bpWhPD=Y{s|Fuo(T z7sT+45Z@KzMIl}ixU&LsR>k+i=zyi+`{MbshF3J4({NtH1r0yY@T!>pp^DcOBrKz3 z>iH?7WSPanW1|NZC=V%!9ViwoTQAsCdVawOaMR*PQP4JHJYyD&gT*=BEKKNghNYl= z?6|(Dr}KJYHa%&V%);!Dg5;5ff^E(jQ>JB3=Z$@ZLebW3zJr9Gv21ZJZRHlsyqTst zS1hFU4M2M2RMyCI34ej>E7(^4-O}nG&XwPOyLbKC2jy3OyS{X`eDT%w<*R)P;w8Sd zW;+UYme1T0*z!A<)~{S%z4`le`RZ$HZ(dEWU0V73rR(XnH?MOS(e-6`ty3pDA>YZw5{GezyAKRMDPUSl;aC|+gudBo>8z{ z(#pSH;!%26KfLhITT81q-&yY0({**Pd}R8# zk+p~Vo?tB%>&wG6DF_tpoKaG+MYz7lqo}$ZfS0Aip)}=vrzAAZ#~gSyr&}eiIuUXJ zA`6+Q(kKUU$55NP32CmKlDiRvI?uSfX_}8s+IsfHxIXWs9($aMi!8aUUKkOsq?*&M zoXlRP@+duZ_{iw^2wh1%STZbD3VrJ3m_$$0;X^&ua|U|ku_8US`%gHtb$i$BqHJUI z$7FG#lr;{SqIR}>7s4*l{S@3aW){=dNqu(KDAjZ`E4^>t9A`C(juvoAoGm~$GT8#6 z_!7Px#b>ZHiUA?gLi7o7zYt%*P6a8^F*jS9QRtY6VqA!?U@u)9#XjtfV!sdvgg7X~ zh!E4rD(GtL;QQH|XGDVbc^|sBDP@PFcpYyrG^y@}FbuOhrn)PE;7Cn%i%?LDrMj!Z z;F#owl;Nb(7sVX*D(G##HnPQ%QR!3rb;}sxrDLCFhprw-)*O>ZpPx4h?5~4f{h_I4 zxE>h7UA$fIQM>6FdpDY5y?YYPreS{)duobPck#kgWS?czQdEuO!Xl98_D;0l9}NiJzc)A9xQw?^tb-2sc(Djxre)eARoM zmd&msb63Hr_d5Q~t|PNt!9(8b1U9>ltOo@Td#@AR>^ic16pVSVqi%K`S#65wuQFb~ zIAak9l;A-BWd!_J2L1?b34xX?10O*fPxY@LAz0=3y-qj_}Cf$iX)tBVWayCCaL*pc@Iaa1@JYzi^r%1v51S9qNd_` zoag*uHt3(=1ddS);TJIQIJGc7!XZ3CErQ!D%db<5qRa;VB()g+f$jJPwN`wS`yIy? zRr@zuRXi2?m^z;3ucmyAtx^sBUn)1w8`v#o(SJoT2Sio~-}st*BWpQO@eNP=D0e2> zHE(CRjPGIcLS+9YF|>yrynUEi6`9zP7|Jn$w8X$N)WH>e>S-|_%lL&M>31!fNGoY- z%>*11Gs+=p$w0*v&jcM)aKpqrldMEWbxce#m!(!rZ5homX&WXc9$7oQ)8I*Y2=}Nh zxQrPFjNg3>+%wdC49!n5%j383QhNzGYJPsbx?r^)T*Z4BT#D92 zsj|FnE-~aqtaAUSnRNP_A5=22@FIOKz6*|hfR4v+ptF6;3c5sc@zK6j>M@}wrOra{ xYTqXHxX`ytJt6cRQg0Lb9TY40bmQe$`>Aov%>y3_PGJ-`zNO~5r)Mpc{tFr%mX!bi diff --git a/shuili-system/target/classes/com/kms/system/domain/SysLogininfor.class b/shuili-system/target/classes/com/kms/system/domain/SysLogininfor.class deleted file mode 100644 index 8f52172c165af6dafd34e131508a335bf95c091f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2640 zcmai!TW=dh6vxjvu^l@u&7}p(wa^xvwCT3on>J~i8%c0dh!YnO2uvo2#jvU4X;>Q>@IXE!RHJMRc>JnezlFIeGl(tPp&!1*=V8YRDMUyj%rA({x zd0jVbZo{<2=x{1)Xp%MSD5@f1s2RG%s~e=j#jLEtM5FGSPn3SRQ(WHITKlE2vcV_< z9NU4FMCrz6;n9z!YwN`;SK)vu^BiawWYd<-!Nqw-ttWbl%hwCnZXG+>Q@DM9Ywc$o zSLS&xXI76FZr&^WbOny8MqbfVM%IPgsV;r}2czh;X!sTdi|fn9tH0rpYkd;&0H_x($5vEnfZH-W?Q#P$ z!!3|6YN~XJXXmWlK^et-$S^f-V}Ep>+t{izYG1;yYiz75mpeE-+^uQdmO$FN``6>u zyT#S@$E$0M!k3ktJsUaKTh1QEbGX;DhKQU|bj9ukd9ovesP`K=Q0`4Bx;*Y^)3Q0q zkwB4V1V_zqlnLhL#YTHp!G%X$2j(WFzOeZQ=dVAW-&TVfIuEo=aV`k+c#SQze z7#Yln~Df@w^Z(3h|NVeUj zK#)d1$XFmqPcTTMA7la`={g`@=`rdJ1PS{=E(U^}4F(DOK|TSwtKz#i%b3Bo0m!#?K)k0aM5FG5@m}?z LO~LY*MdSYg1I^w! diff --git a/shuili-system/target/classes/com/kms/system/domain/SysModule.class b/shuili-system/target/classes/com/kms/system/domain/SysModule.class deleted file mode 100644 index 255335c3041e09727a541b3611cc235e1b1617d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3130 zcma)8TXPge6#jZMx7}m`bA0K+9nFbPN?3Mw$!49O(BJIl^2kSZUo zLLNZN7ptVG5+97ERDq==Rfv?nV3q$PT>gWIUr*15TvjE?_I};{ot|^PbNWpF{QK4& z0G&9OKnlm>FmOT+C*@$vVc0}A!S4}Ca3ngFz^FoFa_Y)qT<%WDjR_OE1nP0zLSB9s zEO-`*7EW6z$pzm;AW-i+CD+akIVIoq3P*bP2#Eaxb-TTSAJ~Op$j+4=ovz6rA)poP zyd%)iH*TM?(>c2^njQ>FZeg@bAa$r*2;96gTgc!3@8SYM#2FYD#g{#e<~ zxoN_@S4i7)gmlljtdrvr$$Q^joxSqq?B^HnPu&n`>2tlbf7TuybxQN-etKuo?e|8U z+`*DpbV|V_P4zR5eKgxq8SB0NMJ35lsfW{B3=v2+>bJ6LHNk%7Rk55zUxKd%|428j;O~W|J~MMJ|ho{_2HSHnt$Yb9Q#a8lyc3fD=zhQl=0E^dYM+kbbYaSZQ=<#TlIJ$8)G N=IiSNiW!2B{sErwL3;oI diff --git a/shuili-system/target/classes/com/kms/system/domain/SysNotice.class b/shuili-system/target/classes/com/kms/system/domain/SysNotice.class deleted file mode 100644 index a16fe6c16bb02328395c46cfaf485cc4ff06bcb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4331 zcmb7H3v(0K75>(iv@2;Xgn0xdBtYVVv12bGgfub`Fql@vHpI_B+mN-qwHNE*XjcTM zY11?zwB+3vY5Gdj7N#9%rjOJxblRrV89LMUPh<*({)eXNcXn3~+ae_l+;M6nSkWq3-4Q!>n{cshzN;h7l1__Btt#JKsaEWWCtOBT;*Fl7Fk zhHWxGui-wKU(j$`<`*@bk@@Qyz9I8j4KK<3vW8b=epN1eEru<4T^@Wx#W!X9Te9=* z7``LJMtoP6=VW|$Xwb3lP|NI}c~V!?6Ef;(pB%2t?e$sa{Q zyij!QtTkf0IZHun{|WP?Y2?hplrij;2VnNY@MrGzMzTD=mV+un1i<7ivMZaCJ2Fv*gtK?lOJ{GeK zkjXIdkzh0APTRC@lV{yb-Z7jx$F=gtWHE2r1!H*5@gJo*iK!(PtZv`B+yn(%yv#-l*m+$1$g9?Ye8H=dZnS_Fr$G`S&|-UcL0njpzSx z_0r|*zqqX6o{zt7*nZmLRn2+3AftIo;%Wu4~aQeod&OET~>ZM;^d-vS+`SS|y zT%55Hrg~AoJ#2 zLB;o2eOa^6C-I;-Z93CF`5D9v-90jt8R%m?C`U?`Q_it&^~FBMD@)IrM6jxwthQC` zi?-EFi47Oar7Y`IT1TQC!f&&{-;FUKL~U9rx3sqYK?S3>mh`a38wa zM2e*;!<;p<(-vzgpJ!QlJ?nmBqHO0Tt&%YkFsj#It9VPt_wfTANAN?2$iF-@spCg@ zSjUg?wvIg_9g?A6hCw_mVJ%svYxU0Q_=&7z{(6MXO~*U>4qQEZ*+VSqdG<~$~5a3674BWD`*!*XPWNWK?pdN ztV+Y`H65#uP1v0y&1*f~F98MJw;aG>cTTdK92o5%$sF&`4E7x#9y!|IC!PG0UBU$S z)%WV496#wT(iXyO3zrf}sZ#5vN@`8z1T_7u|`W8Q8D zKQTJd!}VGpgOF+`FnhOpN(Fr;~@A$<)E8E9-sXsIEGXviZs zF+|uThOpl?FeJ3pki!iPVOI;3|AG)D!2UhLM>~Fl$VI5FTE_yS3y8JGDd-}!P)LZd zfqJOVxLt%hD6FTjfIDjj?nDb89zg=5xD8{htZ`P< zV{EiXY4kB1z~?Z4&-3I9IF83*ahxW;##=k!ts)(ISu`%}lF1<|o zJ#461>ML(F`8#is$b8V*aUS8&eCMCB@hya# z=R4oW#({eo%1z#~qw^x}_9bR%@Lmq-P}g4(Plc{vO_Bo!7+ zWo9hGbGRBlr(-+93+j#5#y$>@hztHR=6P5BV(d@=g}MOwxWf`DBQaTbDvC8OeeeLwb{_xVww zCZTj$oLA&4!oNnjPCbpy*h~-eltOI611L}mGm+a-q!htZ>=Cn+R4+CEMC>E}1c#U! zMPWAhU*nH>MQz!AEUzUQ9g diff --git a/shuili-system/target/classes/com/kms/system/domain/SysOperLog.class b/shuili-system/target/classes/com/kms/system/domain/SysOperLog.class deleted file mode 100644 index 4af301bb307ae9b1bb7c67ac0852b3721675a6f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10313 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 A*#H0l diff --git a/shuili-system/target/classes/com/kms/system/domain/SysPost.class b/shuili-system/target/classes/com/kms/system/domain/SysPost.class deleted file mode 100644 index e9237d189748bbbf5f08aef208ee22b3c3229534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3842 zcmbVPSyL2O6h0T21soJ{*BIACKx5+?6OhcNEO7!woJ z7`H4BNhM{L(kf#`q)607L~H4r zB3ev(AuXa54@Y@0crbaect{7RvyeWZt|AIjCP>GMuz8#pCxTSQi<3cG$@8foRq}i~ zNUM216Qr{|e;A~5Jbx6V^E`hXqzgQM5~NRgzR1Qt3()5Q>K0UDDuya2S{1`ob*-gg zt01vmP;srUnU<_st#Tr*_<){&grHzbH?3MdrU)txACWs{DIsfdDPkF_7OxUCrzx#j zYEo%cO|?CtY|%8`k}a4v1uYFn^`vATPOAx3f|%4bNgh#<>bjyz0wxMHISKQjf%`Z6 zA9WA?d1L6iv+l!<-jjhV-9ta!b5A0=VU64wymWP-@3J62T(Hu3**|o#XYdTHlo*N} zgKwRRVJSvkS4z;-%1wiJe;DZPU9oD@z}atyuKf%MhZ1rek=QS&(gxiw>q#}Hr=?`3 z9qyQ^MB4OXZv&_1a7A@Pkz#sMRy9dMpskD)$(Sv8qN*C^mgTs@h*ir$+^FwPD@F#I{*9`pTGfK` z%gS5fu#?g$VO3Ka)5&(lusz}=>rs@4j3R-D?q-2?SVdG9*spaYP07rdmXaI>21L71 zC3t00T(MYmtWPg1&s8$Z?9DEzQ%L#%^Tm6Lruz7|sn&BC)O)n?dT5cUU{p%*r>0fX1I2Ef$QsJDBPsO@QPb!Ar zcPtOro5KdP2X8$d`myiX_kCak?>nQg9mPVxi?~!#2#1DcziQUoM1Up%6$EhPtP9Ha zvs*z+cZg3=QAAH0QBXjFsmtwvl}wO=r01s)b_3PvLocLZD2T>tW5x~9X4(>>_4Im( z%BVat?Wih;GnLXrxnU zWLx8wt>LU4jjve4ZzxIG=m^o*Y*uBZ`TTL1kW2)XjsJLf*|0`7l{%Xd1+9GUKt!wz zC#+;gOSrkAE!@yp*A{8s7p`O8e=#G-TAjE0ceWom zUc>IE*2ARkQ{~V9mYaWI4&kj@JD)8oUMe10aWXVbW_jKvj=FkZ^!XAAhh42dIAc zpak=B?7-9-T5Hle$Y>hRwGEKp*iUcb06m0plZ~j_MluEK5rwyKFd5qDJd8D1ZNRa> zTvYLpL`D7s%KOc}T+4enBbrSG@L?;YkfTX;RF9S5PNICk+#%XNv}q zyi<)G=as#X_R)Tf47J+(N`7|K>+nkb1g|({CYZ!>#NU_gb~uOIS@AzGCawoL{_l;C z|ADOdyLy7!ay#YAc4{}AYMQ_)r$q#lat^2b*-q`5z$tD#x2R;>gJKe+6(r-dJvUf? zHrN9IdvF4RVLF5vEX;&3i-p+`=CCjq!aNpUf-s+jmmw^G&_fGHqrRSs@o*Yc z*GaSRpXWmA0-a_+s>jff$Kk>W+CeAL@TX9_rxCp~2tnEt9Mx^=JUU{Buw#VP6L2bN GlJ+l{AeN#4 diff --git a/shuili-system/target/classes/com/kms/system/domain/SysRoleDept.class b/shuili-system/target/classes/com/kms/system/domain/SysRoleDept.class deleted file mode 100644 index 08129bda150475ff0f8ce30632fb012036cfd5d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1419 zcmb7EYflqF6g^w|W_gu|fQlAW+5#OEpTUrb)`VomgjOQ)Lo;nBWw5*3?1QBLN{vFI zi9f&}WxTU2w$>UUO=srL+_~qRd++RzpI^TNxQ{1kjN(oTBUn~LE`fXs1+1hI#cC2` zY1&*M2lf5@x=5}09 zn5T-ADfXo+Nz60LvOVre+afJ2&{E^JDI2!W%ubC?+;+=% z8UO9a0{y$(6r?M5%v(MIjga`NN_ti0R!0VtI>s=rV*=wE)@`TBc$?P`1*3GCgcj6f zgVlW5Y6yo_LIK-nb^;qZwZQ`w>7kA}%~89_q4o&v TtBPi^Nb@iOEz$p$i`%~d+L1G* diff --git a/shuili-system/target/classes/com/kms/system/domain/SysRoleMenu.class b/shuili-system/target/classes/com/kms/system/domain/SysRoleMenu.class deleted file mode 100644 index 754ee3d26c1f555377b87af5a9861b7a904151ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1419 zcmb7EYflqF6g^Y=W)Ub41)mkswjhH%d;~)xrY0l{CbSZXADU@9DTCeJW*;Q|S85az zP5c4=DC3=Fk%~1!n$FCfxpU7s_uknbKfitlu!3h=v*1uCiNebZSXE(5K1g%2xh5 z!$6_9%MgF*G$q5Zscg9&Sas=EMZHZsIn!x~_O5W1wxi9szpp%o8MEP7{JrIIuj~2J z;!VdA%I1}>w?ibh2#O#xE$M4hqmCDf{a9tZGna|N-yWKw4x=OLFxvlgo%Wp*bqv{x z6SxieN@?OFJuDV%d|C@J)g7)$DDW-~WX>#Rh zjW&cQ%ajej%dl`^iWR>b=636iS>3Feo7?4DrMhR9Nv3(ZAe6vzZ>3+?4`jn%yKEHQ z8A;LUNSoT?ZEwJ+<$Ibbf+$`bBdW+6^7PEE(CduRk4hV^sJb*KL2m?OG>((SX=XGh zO2=RyL$`^@2^3(G*2akguHqV5)RdT}@z2Yj5&LlN@>Ji;*Ks4dydH8RKBc)Yh@C-a zX&=-z3ET-IOonzcg4g`D9?hECs}GTZ^F(I*61ml%$iR6bb3|nRA4GIQH4$p@h{!wo zu<3N>zahR?`h>(WlDSmr2mo(&7ll8Occk0G24(%cOCIRIQTor5@7xNPCR- Sbw%^IOYEDJ1;SRS)1 zvgBBnSe6sClAtGo(!O1HtV+?Y`;O;stt|->PX+boJl78_Hz-<_h8;r|{s}>ez}vIk zwUVHL{2S|?WmYV=Y!-sLZB z&vzCS$Egl6{$i`l%z4m>VP*q`h+&XzsueFhfq{;#HqRi{N)Y;F+P5lQS{r5j@T^*! z342DtYt(n_6-ORVN3Ey$LZ#>&olnsKWl}WAGQ={>a)RX~%PE%AbS6b-DI;j~KMqn* zmc9JlhEs7&G^?HqQ@2~kzG(UOvKu(TK3&8MN#VX5$k9*72saD82&M4{m~4YhTHr|w zLTLdhEjXnGs#Kbp@~F$a8=cx`6OiWRNK>NL&SZp#?GZAaNDsB|u(v0pYj6AUCui2^GZBg51=DBvg>s z04a9?;m61zx3nO=D#)G|5lhyVZp diff --git a/shuili-system/target/classes/com/kms/system/domain/SysUserPost.class b/shuili-system/target/classes/com/kms/system/domain/SysUserPost.class deleted file mode 100644 index ea1193a5776746f2a22f53ee39b29edd5a147879..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1300 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 WX;bH)3-5p6XMW#$B!NHd z`6Fe{`DI04s8nFH8zhmuic*>0q&ke`c@p_5mg7Wz4Yl7(_}s_VG{p3cL6{kY`pkka zwA#}eD$*y#Vu7tOacOdr4d_yAtJ-ODJqp5OW#*Z)WS`AuJj|lz!GY^x2Cl&R3-buf zPd56!e;EcEo7{YrzoW#DPFY1WW(UGNz&OX#9n z8#MA~B(vrGiP9}aB{JDzfQ>@Nw^+!V52-fuI2qpr%}%++MQvveO{;oBa&jcWO%#EY e{{`t3f;5Xkp6$qjNP_JC2gGc|Y~Wos`qCpu9)#-v diff --git a/shuili-system/target/classes/com/kms/system/domain/vo/RouterVo.class b/shuili-system/target/classes/com/kms/system/domain/vo/RouterVo.class deleted file mode 100644 index 436c26036ce661059e252b140c1da2f91dd9c8f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2723 zcmb7^TXWk)6vxjxzDJ=YX##DzwGH5;CE}8{fu^R3drNVg)DC7S%)rLp#!6)=BgrY@ zffx8VJirW{&hWqo;6pL|k7QYnDoxV|on7soJ^MSCJ^%jq_di6mOy87gk~T_IrUxv( zVo_(Y$)dqxi^VpJhXraDs3jA1yQP+~XGw41fct7}do|s9 z(;j%rf&D6MXl-KZMe5SH67MM|#3vQ?|TX}Jx>Da`!p9+E_|wkFiHdox-tky}5B0LbcEb&M(3SQ!g(8 z_B7C+ue?+}^tCoBo9U2uyl}3+uz1pP;m}3KXNFEjwi#fqeymiE4#IL-iL0ONR<>Dg z*#oDe?iyT+Q(*-!@mm#iwmGmoqp#YAYoIvSEX($!XV?~MbIFg{V~H2${M0w~ec5^9 z+LkUyO8Nu*Z&)33&{cR4xkG6VRDr%mxeZqZX&aWMoSG?JSHbADS28*u880=q8b93G z+}`6?ElQj?o2l(n&PmB4yYm%rfkiKf*D8gm3-`_xuqa`Xik5NBBv|r9VH1 zNC=J)i#pfjc^i|%0%=?QPy^FaPDA0R=AhNK^_96nF7LoxeF7OzO(71lp9u0PeKtHC zr3S@Xh=bSwIYepbm!LD{{cJS^CJKN diff --git a/shuili-system/target/classes/com/kms/system/es/DataSearchEntity.class b/shuili-system/target/classes/com/kms/system/es/DataSearchEntity.class deleted file mode 100644 index 07d95eeb91df52ed3e2852108e198f58e65ffb6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9873 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 diff --git a/shuili-system/target/classes/com/kms/system/es/EsEntity.class b/shuili-system/target/classes/com/kms/system/es/EsEntity.class deleted file mode 100644 index bfabc02572921ecbfc21de7a3d1bcde4f9f9af05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6737 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 IIwf@OW%*+_jsO4v diff --git a/shuili-system/target/classes/com/kms/system/es/MessageData.class b/shuili-system/target/classes/com/kms/system/es/MessageData.class deleted file mode 100644 index c5ca519390d79e976b156fe8655068526fe3b195..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1458 zcmaJ=+fEZv6kTU}qorIdrDC~*Kp8G0(ZmN0FAx$-uH}T*3nvWiwnK$B zRg8xT@~K9Wd-Fu0K#i~UU8+~&Zr-LqoPNP{3^4d!Ac}-IimzN`_0>B6)b-qGU*Yi( z^RR8hI|99tLYZEfX-IwP*zW}`=g1ZRCI<}Jl@69MfypxNpi;(^gjKB5sGH4InE$V} z#MKA13$ISkofbP?)myG_9qT!Bze>lj%#j=c4MG-mlrYM5nFD5EjDKp;Ys%4?ikOS6 zsbZS3#wUweG3U%5P~UXfUB7KfGLtG~5ld-8jHHlR3Yoh_h^&=J%a)!AJF*QvR4v!BC~GlTkr=&{ z9?eiu)WLOqz*;<`A?MiRH3hyO+lz5wWdepFL^ik-L)zkv3AYq!A-%7;xGWURHvOIM zlJe1y`R3Hw+KhtZd2gdO{HTMjI=-@2Vlp8%C^#*}HyE7Pwt4bo_(l8*ldflpgJYbt zlc1ycAt|1$fB9zZ%lseG3J!lKp&)(yuP8DF3MQ$xQs|IyJK+R&AR9S{-Nad%PXRsw DSQCMp diff --git a/shuili-system/target/classes/com/kms/system/mapper/CmsMaterialEntityMapper.class b/shuili-system/target/classes/com/kms/system/mapper/CmsMaterialEntityMapper.class deleted file mode 100644 index 18b47257e7bced53c477a78b88ecc7243fb16017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 423 zcmb7B%}T>S5T31?*s9=F@C`)g;w>Vm=qW{L!TTf~!?xL-u)9(6Y94$5A4;5752ASR zFh4Lq-}lYDy}!Hyz&RY`Fv(#rhkXO%xote9KCl5_F6oJ|CEwtEwd6V#Wi1XX5@#3E zqZ=wpHg;_vv6jH-sOvc3HAS9o(u>W&%0-MrOzdzWj;zNU7pIgsSZZ&5vS}zT3j>q6 z^r7ZE+ba6;ub$79XKPXhj%K|MI)1RxRxMw7FGJba{Me|g^C|o z($F!^xRYp;gh5eH*P6aj{1Wj8yn(}?S23XK|8t}{4rH5{!>-0m H>tlcq8p($0 diff --git a/shuili-system/target/classes/com/kms/system/mapper/CmsMaterialEntityRelationMapper.class b/shuili-system/target/classes/com/kms/system/mapper/CmsMaterialEntityRelationMapper.class deleted file mode 100644 index 27178589d6f42e9c263c1d2021691527a2453d18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmb7>!Ab)$5QZmJcWqVh>fM{*T=cXesOYJsum$h4+i^*|$%G_Z*;n)61Ncy4x_S^n z#6xBRnfd3NKX30ZuK;iXM>$M#ILP5p!FZt?OR@8;U^89OhOi~u;JjLK9gAr#1}hSy zm(ro>D~dX}whLH`XEfv-d%UHtK!m@K#pH9eVD zkQX~)cYM9YE11qZmyD&QiKc4l-Z@T!Wfv7(l^hz3J{Z@$25sq`!v=*Eh*R$g=j1t> z#Gx0|<<|Y4nP0p6Oa*s9>wzo6h;yj27(c!~%udf%jD*e1KP>~56&H4pv(f0Q_hJ*ar` zFdr~8@4b2NAFpo!Z~;d-%yKx$;ZVVJWooBW7f3-&2`eK4+m3fj^OhX#c?5U1V~ zF3EE=i9;`xr^7ej#BJsO#jW7@w;2lL>3_MADNrzx*b(1B@~-3w>_Ilx9QLJVGM@r` E0$m7$3;+NC diff --git a/shuili-system/target/classes/com/kms/system/mapper/CmsUserFavoritesMapper.class b/shuili-system/target/classes/com/kms/system/mapper/CmsUserFavoritesMapper.class deleted file mode 100644 index ebe22ef49bcec9f2554aba1697464de8163d71cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmb7A%}T>S5T31?*s9=Fd<4b0c#8-s^b{$y=zWupVcYD^va_k=)jaqBK9snP9;A5j zFh4Lq-_OVA+dBYU!$}U49FB50RxnHqR1Q=nj!VlTN5DetE|f&<8gn!{nLS(=Xl Fz5rg2h1mcA diff --git a/shuili-system/target/classes/com/kms/system/mapper/LabFieldMapper.class b/shuili-system/target/classes/com/kms/system/mapper/LabFieldMapper.class deleted file mode 100644 index 7e9ad9ff00c40efe487651b99def1ce1a0494d44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmb7=ze>bF5XNUuO}tY2G@-riqc0pJo&a+u|Cl*6%t>DshTr#_GZDmVH`W2aq<_tl2#RFpMatTbEG zaF2GVbTZL*eZ-mrq1E0~z*`;ZZfvi{g{_SkhnUD>!&V!IrLLBSx~8};6wKD#hnkkA z6X@CZ=<~qEPJ)8@s&~m)dN9#c9o;y`Nzm+~g7cC?i_r(;+Q*0j###NxlaX9^TdB=+RXAbDT%1P&k@YYvA}Gnr2TJ^(Zv BdpiIC diff --git a/shuili-system/target/classes/com/kms/system/mapper/LabLaboratoryMapper.class b/shuili-system/target/classes/com/kms/system/mapper/LabLaboratoryMapper.class deleted file mode 100644 index 0621daad1ae8066cb031a3a9bd11814dd9455a1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmb7A!AitH49%?Cx~qam_Y*`g7jG3o51uN*E_hG7u}rr!8D^$Rf6ap*;75tGT@NZ= z7LvR`NZ!l)_=`iE`LiAjXmpx~ku-(YZF+veGm;aBl%OuU{Y4vulb zPJ$je6`XH=`62CF{6EwRPX9WgAbq@(6`2ABlazbObVzkS)d?IxHewEk39~ex0(=3d CB7yq= diff --git a/shuili-system/target/classes/com/kms/system/mapper/LabNodeMapper.class b/shuili-system/target/classes/com/kms/system/mapper/LabNodeMapper.class deleted file mode 100644 index 0669245168868f19e366eb19f7ad93710245bc7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmb7=zfQw25XR315?Vk)Y|M;E+`<-w1Orn5sg>9-$q~7YeU|Nj@@fn`KpzU>h7N^| z;r>XUPQUNF_1DKI09?aK4znDNayV8nUFg^&=J$|b!Kc4S+8u9jTKqO8SWMPhU# zJ({7SsDtbJfVFr=L(Z|sdkXwGt~cYs$^;BUh-|PCL)v0V)sr+_+!hLE3+a8$54uat zv#s)Tezh^6;C$ZOs13j9psSAWtd*F+VuOOqQhbZSd2QQQPln&cuQ0JZOB@{IoSg(6 z#Se*fvGKoSXKVNuRKe-r+zL{@e+ADJD43+$OD~4h_fwz10c7LM;V{iC=~IAjjh%WP diff --git a/shuili-system/target/classes/com/kms/system/mapper/LabRelationMapper.class b/shuili-system/target/classes/com/kms/system/mapper/LabRelationMapper.class deleted file mode 100644 index 37b601ae95f95bbd365763696d3651e4c5e27788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 405 zcmb7Ay-veG4E7aBXaR`{sZYRwgcr6TBp8^2kWz`=NlmymcRt-+KzTI=9)O2JTmwS| zQwM*xWZB=(=hyoO09?UI4znDNayV8nUFg^&=ZDOdDL*pY4Vv0iZ#i?R`eHHpzn z>Cp@|MIBt%2W-SM8gh<3-cjI(al9T6)+S&WLS%zWF{CY)R9D=kW3k0epxe=mZUiCI=!%sTsy5n1GC5}IWf{Rjoi@|wq+hiSK;lV@uYr@PEV#PXA`0AbH&>giL{gNvgdRHzeFoIDrGm#-77r>RH-P0lop; CwSQ6o diff --git a/shuili-system/target/classes/com/kms/system/mapper/LabTeacherMapper.class b/shuili-system/target/classes/com/kms/system/mapper/LabTeacherMapper.class deleted file mode 100644 index 97b0ea0f04a53acdd82faa6d826d64f5830b9d50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmb7=zfQwI490y05?VlFVc-Q=knqA5gaiXq5K@cSoz#SDbLZ3D1(a7~=mYRjh-->e z)Q!P^B+LGN{=U9HR{(GgCpk=VILhHz!FZ+{OR@8;peYyhPS}!d@TppG9gDISgB6L< zbLr6Z6-6Cf+Xbw}Ga7P^J>FB`$DzF$7M3Pp=tE?Kb1|eXmQ+16)o<*J+d{!)CY`VO zLAMEewjFMcT&-m&IG=VlYQrx&=&I#AYb7SU*r4FD6yIQQUfbr?li?5XOH4%15_`uu zWhX&L@qNNwtiSjp>R0wISHbD70SeNi|8gKxpkS0@FL@0q@25P11IUJ&!(pmfnvVf~ E0MSQ%$p8QV diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysConfigMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysConfigMapper.class deleted file mode 100644 index f7b8fb8e684ffa3ad90f55dc68184cebffe0449b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 947 zcmb7DT~8B16g>mj6|7pcpy;b6H73pj`cz^f8WUoT35~q?G~K;jhVINPGqalgYdrV^ z{85D4Z9&qIP#!jS@6G)>=iK>se)bo@d%R5WJi$(a7Xs}-1*P$`vtykLeCZ8RXXL~L z8R`(p$jlj~tsK^2meYT8YlcAQde?ytQDAqO&L`@(l2z1&oEG&3)`vQ`DpsBZj_%%J z@77&E@{n$NOzC6>?;F)Wtv;=I-iO|x*{4u8m&53_&6fh-);5s8qV&}gYag%>Rhg+s zmqK(h*5%UOuMaYTt(*4Y%FV^pAh6y0b;I(UJiZqGF*;%C`wd4U<&4f;B~3k2QHQdq zf=rz!X;fK~m-{Nv_vUvwQa6UK@+p1Q1yk9*I-gmKcT-{ob`C2WwV@*&^r)au*1E{U zon-`X2hQg*lvCQrUK#r1{6z9edUCNYNgh(^f{xDDEaB^gtDP^sFqRMVzoIkr0*ung zJHT%V2(0k8%8w~o6IjDNfNcv2NAGiV1?%i@;6W2_<6&bT&Fy1!8h;Z{ICphk@f6*r NatqsRTiodxZ~<#eB{Kj3 diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysDeptMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysDeptMapper.class deleted file mode 100644 index 77028418ddda7b2af26ec4249ca693f62bae25a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1710 zcmbtU+invv5FMAMX+v8|OIr%%)(a#QVIlE?QXxnIDN-n?p?!C8|D zt0HRpi3kP7-$+SZG^c@zn2?l9D{M;Jsd1O;wbnViU^KBJqz<7@V4*E~lG#La0`Y&s z9TsEr9Mf-1mefd3RLGkFfxT+RHDt0!+g1zNn@0cHUmQCeLuyLPdtBFD?lCzVsms}z z3RXzrVMRxM5eAw|r+bF}VJiA$L;gX*?M%UAr6U&pnRR_y)+T|KJ~RGwBXtyA`K#SN z?+#q_`U{%l)NoB;ZMb>NB7Q2xrv#lct(GyBhy5z3-OfpZhK=}{FrpLk_e^6>%k@hs zm1R~aX$b7Mlm}l655zMbnVh8dLj$UmI(;xl5Ti7}drR20hvdaNZ zmaLe}tY)m6?>gr=b?W|ccbJMqpb{FTUimmoOg3>M7ROxE1~dGv|1C@iHEpXzcljF; zVzXBBsg2340iwk diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysDictTypeMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysDictTypeMapper.class deleted file mode 100644 index 7b89fa95bbda0e258131ce996e8d7718137f374b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1158 zcmb_c$!-%t5UoyvjS~o24Pm=tgp|I($tY5+$WkODq&RTl)SfAvj(eH(LNdR`fe+xL zqSVaTS+Fm*IE<=mRP*Z9tJm}Q`u86I_y}+7@Tv~4>+pubmPdt2IFd;?%`@yt9~d09 zdWqHCpGB!8r=zxpfVRl$J{<8-DH^*qgKu~0<$@jm5w(*arwqESN+Bi8koSX=W=NvVtuuq2hx2su zVsSK5N}CKgSxD7%cUIG52HVrco0{w1y{G)x6vio zm5OLI?-{&8-7ieeVDBW-4bb>qdO1*dXp9ZS#~KpxL(jS)_gS&vpH67Jv~I+GK!-Na zruYeF*2`dBPUd`97+|D5_c@hlKAvN$F@ufrewFU2BwS5T31?*s9=FU!mY!yhQ{BJw=2Dyl>JmY@6L#b~kEX&4Ul%Ly6PagA^|w z<_G5I`}zEO{{VnXILTp_!%+^$3Z|85olboq1zow)FB&`TT70Zm)TE+p*kY~OnkDyW zhgv5Seb+~9I1pOxJq5hgksikOYCKrmh;fLCEH2q<zH_mYqBJ84qdC8&0=!0?XbI_JvIjm8z192KW z;etFzlQ;~5Ip65{MQ E28^tPrvLx| diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysInfoMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysInfoMapper.class deleted file mode 100644 index 7754fdc51c3d7321378b1f10119fcbf4dc404ddf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmb7=ze>bF5XNUuO}tYgt+==?6wFHQLro8+ z6Xw}Y`98ne8c=Y)>|HXJo=r4WM|aL~5-_`{;BwBP#pr`^?J8(XuN*cgtU#OwPq-w{ z(IgIour9X#f7sa>{smQV`Zu=%$@j0|nF0k9sXciyNZ*$}fdk0KnZu#XO!O(h7ZUk; AzyJUM diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysLogininforMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysLogininforMapper.class deleted file mode 100644 index b8bbf826614da61a914789563f062f0c7435c191..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 764 zcmbVK-AV#M6h5P-X+PSJQg5IH%}vmS5#&W6Yy=A41i`o-m(iV>WoEY6SL>n&=%J$H zDrnJ#burADZ_dwmzH>f4-`)Y>3R)F7slaIknhY9JJG4G9k^-h~>Sg_jW6)|pEt$naM||k5)KRz7XHXAg6ngE?px9pEvkmvh@r)Gd z<|M|#C^<1HSJ_y2>5@2gJTw-$5=nxV_k_cT+}xgZZD>*(;=PPXqqA=_S*E&NsLJ4c zkZLa#j--?081J+;o=6x?9bN>+M%*Qf&Zbr*o<`Q{8)z- z`Cm%YKIJ3Lg S>gN#Zxkm$z=q^*lF~ApbbntNi diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysMenuMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysMenuMapper.class deleted file mode 100644 index 102407a7daec51dda6800c3eb20aaa69f496e77d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1691 zcmbtUZEw>s5I&Es-3oi_*vfckZ*)w;LgE8bC&Yq;G^vBB-T3Y{ruCY{!FGo7*Z9B> z;71|OPPKGfkQVkKI-l=+_dJ)o`~BzVF93K8dsS#wVYdpe2rOtG@V+_XQPLLL5ctq+ z_hm@+FcE>EcnoEPLUHQLkco)$$Ox0tZmR90)^7WZoimyk5l|bUMPRNg1`#uf;soMb zhTAWP<~^og%qbmn6>0+YW&z5bYnS^Om4HP9+BHf1OWlBfKjP`d4;VFoO3$45!l=0%c|Rv0k_qi=u9uQ z7hWNNQV9tx4VnHp6oK!hwta2f)uOnE1ZpC}AMHkiz?-stYy%{*&kVPDkdBXomMIyX zmHv?TN7ne6h5R%U-xHjdqAC~lQc2nyodm}=#qGeSlBl3HU(AGXJPI_uc3bTiv1qUU)UGWzBu8(g!=M?y^i|Igl_%s z!zuvEHE1~b0M?y+IF^sb_mANT=6Q;^8W!#|{GMxgksmjZLI!&iwjBIz*g;uAmzMy4 E0RmG4C;$Ke diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysModuleMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysModuleMapper.class deleted file mode 100644 index b3d0a10b6264c7371edf6bd661978bb485328cba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmb7=%}T>S5XWb$CblYg@X`n9NpLRSB7z<~r3ejp-z3wpZFXnb4<)bW!3Xf6#BC}f zy?K}q7-oL||9pPEe*nNOT;wpz;Vg%90nG#0<`xoq>23JQ2Fj zLvN+-w~jiIQGBQzce(SZcx;rAnuob7S6gFH9qBxS)8^E@qmnH1GU1~o0;-3yuZ7Pn zGU)yv;bJQ1C6O#k?a)@j865n9=Z3bjG!`C9%_KP{_rA)~z3oZv(dNeZsAI6xe4Jo4 z4L|*A-}eUeK&?VlPZ%X*lW~>zgqJQ&GRGrhkt>m=Xn9*Wye)qJ=E7oVG8^HwOvvlT z_iL6AC!-iJ*nh~hmkPVm$zFn2S{qN~Mw5c$jA-~3e!3=$~6#3d5gE^Q7ptA-6br+~R19hqw hVX5dZSLX_>7WEpe)68r&xdEHS#uhY2c!aPG@Cj1w1#JKT diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysPostMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysPostMapper.class deleted file mode 100644 index 93a63a7c51040bd884bc116e92036e1b14a21047..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmb7E-A@xi5T8YCrAUE7QT!Hos4-z<@WqsvP@_qc`jIy9;?wqSJ(u3@9=m&z``3K% z5AcsN&feAbkOs=bWo|aJ^ZS^&`~BzVF93KAyH$8rh38e+AyBtG=7Ia7t?LQv2)t_b z0xjuCT52=vxTK+$Oei|YtgmXn=$*13jHXV+)L&^6SQ>~(F_#)npnuc*hu7e}MSztl z%cD3Z&}hwIad7Eyp4KG;I$1X)aL_6Q#!N+Y;EYfaYQEYN0$Wpt-jq&uY`O96_GY%b zWZ|1R$_`7!y2|m0o3?kSImNaG@Fym56z}Kid9^a%zaHX_IPRxkSk#==xJzL5VxdJ_ zT3<_~|G9~!wKNG?(UZW=wL9Z)2!)pBn@V6K_|AioXXK?GD{+>h;OXf*9ZpWe5`)jf zQ{47;KF%T2QiM9CG8-}{Y!auI2HJ2cS(0!=JIwNr`RhE3R2%5j1pI@Dkx66xwG`L) z{kREi_fzGBxw27!q{JMQJsOemr5ykJ%aP6{$(>_nM6;7KB zC$jtB(8h!>fD%~Cw=Cb|LN@`_C+Q7@R|pVTz~>hJIhGd*EW&NfDwr)m74ti=G|6k2 zFT-5`j4M!|oUdZOR?62gZ@@-gw+YQWZo$1g-XF*9ai0f1B6@-N5FX{okKqZ%3L-oO F_zU|6c6|T< diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysRoleDeptMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysRoleDeptMapper.class deleted file mode 100644 index 0f4c4a801413aa4a0a0ae6c18bf5d4d2f547be71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmb7C!A=4(5S=1|pdgBn7(YOaiM@C*Sz{s^6B3LGBwjp~WrV_ZyJ@?c{WTAMfFEU? zT_7NO&_mPdy|T&yE5yS`R@sw}sOb*T7ID zgzQKg1+nG6HprETA~d`$EZ%43-^3V{`#Ls0-pPP0H&?98XwK45865T~6sho0S~&>t zIt;ZV13I(}PP^KSxQ)`tpN&xXs?C(s1r2JKM96y>X)B#JiO1l0ErYr7AHoc3%lDjR zz<}#pJ$MVO)3}^pqTAj^K%KxgxV%l4t5AVt13{F-9gn{mf8$@jfBXc17x1_W`&D>Yg+~O|ERXom^>oC$!a4$P zTHT?R)Sf0H5)_wGD>R1FKuabR<;n?{(tc|FruLKW8T-a);zUG!hBkraz6cd_iQxp| z|4jF4Ha4&E_@xt}g1nd&zdVSd9Bmi1e&R+7YlT*w^w@H97!cTR<)uVSg|zRCP~o)d zjxG^42kX^>91#tD`cuyld=dj z3Z^!v`GH9k)#mV&4@X{p9v>_5H9>EE;(f={zs_0`2h4FFOW^seVmu^J6AJZ_4G5MQ z;I!n~@-iFK%EVpk=L0Q)X6wrodHK+gXW5H;u%*C{gEJh@b~XhArlkmULS;H&PS`j~ zY(AQj#W6Ru!z_QFE$5I$t*;X^KMN}c5kF8$JLI7i zmiM%)O-OC*r{=`qt$f#JM6Kh7YnR5H_IRwVaN49Ompw0pk+jsN7$WJI|G7g6Y!p(< z+d#lSNOXoiR0t4Q!0!saeCvw@7U3$Q3Zez5B3`FP>q%7^BSZ-?*_8l_G)TvtZ6%7)_a+ z($H!yr~dhfz#zdCEta6NV_1~gC?U{^n2l%aI)VO*Ah$fFf#a>(TOprHW^?UETyG<8 zf>;T<5Qdt=$Gy`XMEjmj1o(g|kDaI19T6FA-SU?u$5U;^Er2U>bS!0jsNKTK#6AW(Cs p?tVqRL7)LU04_FH(Su!g+j6%xXgkz0+k^e8(t!gPn+|aZ@C_gJx2FIA diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysUserMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysUserMapper.class deleted file mode 100644 index 5a4e8fa095a192cd27bd127321427f80ec4ac88b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1747 zcmbtU+invv5FM8`NkeGUJLOI{ePQAC`2DquoVE{!k=Z6(@Xs#P1u?1a(S2%p*rH3HKu(Ur`^5hoD- zXSm(*(7eL*g(D%ol+5CQT|KdIKd=Bn)hj7zpUEz5nMlYk@)(OYvh-C~NE?*E*Q;0t z%Hvocd!w$rWc+OB`czN$Jpx4`F|}(Pf#+A{zu2^W3=oGNGdv|w9w>V!%rNA%HKIr( z%7&5F4q}{%fPWHNw0+)W5mwpoXirLIm=Q{90-FsLbtwy3r^l&iqghinaG>rMc5mv0 z`7!pW5TCUxhXdvyl_IXWque~j5)?wF^{I;N(fx7O8LTvBx4hCyEsY>jMcA{$j)-x& z@_97F1q9vc+mLpE4yE{JA(oxB*;De&^kv*ej5~E{&bRmy{Xa0K&%hCw?{f1-sgOsm z?&&Mo7*&AF&-UeCxb0r9k9~4QY&5Sc)wh$W&-r|8ALDkZIhJjv0^zBc28nBb=*K$U zECCAm&l2&@i|>Ckj;yXn-ST?I#Wd~vM$ zRO1kHWs;E710E_ZjEWMZyKYxSKhRVs=n~Kj|4>pK54RZIj!DZv!0uBzMjdhl2u$F2 z4Hx&^B!NkoLM?~d1msaKT+pYX2!QtMP;&A{rq95v)61EhgL#azfN@rA_(lAdG%OE} zD;VVFRZgqubSsN^8}7Iacj2Cs_cQwgcFy*LGp diff --git a/shuili-system/target/classes/com/kms/system/mapper/SysUserPostMapper.class b/shuili-system/target/classes/com/kms/system/mapper/SysUserPostMapper.class deleted file mode 100644 index 94585f306b944fc28b4f6de4a229e3226d035fdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmb7C!A=4(6nsSlK|v59@e9P5*oy}fjENjfNY-fB=*3fa_qi0d+fCcm?5}z71NRxIy%<^g!5a{-uDSKfw zVsS`aqj($+PDTXUzD#4Y!spoLcM{9mfBL<<;W6V+mfZw83zgLHh&o)GLZjyLFlHuI zNZ?`6O6g-eA6`8febrPkT z`cfekEJ;w&A=7wUlz$T=PlqYx15FPg;+ZI~dhNP6QLj^PlsdM3g6of<%NRbwS62XO&vzaDt*Xxz-ZMA=m z13!Qtg%~@jlC&Jk!Sd{Q-kW*P-rs+I{sMrv@H~Mh2|P{UnSl0)a`N=ek?otDPU{f$ zMgm%$^juy_%w;jgfw!s{cVG7e>?{MAq4VS4m95NFg`YDA{=mFFls=nW=LIxpohq+# zOqKJo&*ngl3+XFM0^Z%Mc%NoQ@SboE6$97SDicH zgV^S6v=i`R(VEn-F^dkwL;xT4S-#TrT{$((>8rF-v(@%vQ5Y}1G6i$JOpP6*EM+z! zRP2m$DCY$jQC$J+mol%|iiVxJm{jqim}0VE|Cix8WxgBb4W-d)WGd8k;>{2 zS~9*a3HwwUr@XN>t3JMQ&9lL8H5RZtf2>mv1h7_(|6xKyfPfWVtNfQV)i diff --git a/shuili-system/target/classes/com/kms/system/service/CmsDataSourceService.class b/shuili-system/target/classes/com/kms/system/service/CmsDataSourceService.class deleted file mode 100644 index c04dfa32312427cf7cb6a0b0ffae6e4a73b283e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmb7BJx@Y06g}lr5Jl0&(G4-$#SKED7$DkE=VJ&^8B z45ozCx;7HizHlmuzrb7=E6;G!jjZMq?YUq0AT{^W%~d3MNBc_=M9;=9lD#F^WGMC2 z$cPX-s{54Y`f;qLic=YF4LK*jYg`DwN^Pz8(PB1}?q{3p6l<8JKrm3n2H8q_ X&ZC4fMOkc;%@Dek`fXw@`8&WTHVvpn diff --git a/shuili-system/target/classes/com/kms/system/service/CmsMaterialEntityRelationService.class b/shuili-system/target/classes/com/kms/system/service/CmsMaterialEntityRelationService.class deleted file mode 100644 index 8c7e69919060a72d8d8dcac97fb9e064e050cb45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmbVK%T7Wu5IyB7h@$Amr3({vVK*kmKuDD6>f!b diff --git a/shuili-system/target/classes/com/kms/system/service/CmsTagService.class b/shuili-system/target/classes/com/kms/system/service/CmsTagService.class deleted file mode 100644 index c8708c5645734da6b8a96cd8fe6acecf815bcc35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2229 zcmbVNT~`xF7=DHXf?**M3rasMC~88~wbg!xVj*I&2DAq8oZd|~Lo#M}XV3109)3#y zLvMOxTQB+pditAs`p)iR^MR7ni{zbo=ly)pGHC)dlhZ}j6 zP@bnFdj@y#Ne-XpaF=0fUHVdQFl0*Q1BPr(wFE<u=S`P1^L6EL_kf4e z>{De{cVxtHz3wQ_?s}0O9Ya<5wckztyrJBG3S7$zwdrxJ_xm;8v^JuO|kE+b9F zEDm;b9GrBuGiF)q!)>Q!CtX)JD94?lv}3rOYsj|GbuT1@9*^7UnQ;w*#Xj^OB(Pj4 z4HXzeJ=@US>F)9%z2>{aR%4|L-Uj0dJGOWvQf`a{^mq`6FeMOGLYwN@aOWGU7dqmh zj2Sz?zT4*h8J3>)d@Vh3AR|dU-t>K?xt7W&j+E*uY}-)~O22(bv=cw6uxk^cL!mU$ z!#*Lhg>%T~aL>YL_}sz=_%MerEPRQt2;?oLbfiNb>VPMD|s&Jb-9fsxpZbp5} z2RS^n@EsmosAHGmN*pR~P5MWwE9^S=nk`OD;D_ANDkO+zy#IDNJfV*2N_BeygZ0Sw zMObrr6bS6R*uW{FH zNG%BGLN9*yUr60~CS;2mymi*=W*&%b8drTx1j^wl!?h8FPeX*^^1JP@LSMvb`W6Bi zFf+~cKV!a)BpJ!cwco&grNsm+`k#uGvzVo|l^9?S1=`WT<2+dzXGJnYa<=jc6T53S zUm^1%`wJ;Dage$Au!u==n8AD;Y&mgAgOMxgFHq1)s_s23P{2jIAAEWl~JL?kgcB%7;;@Zk_^?JGV&(TL+S3s zFeaqdvyq4g!l`Ax26JJeJVUb=SU`OAcC@nRH*l?8*@K%%8VbJ(DKQ;DJMOg zv|%xm{QLbC8-Cdh{CaJ{T@~frP4~82th%+8;$qPBYb#R<*=4U)Zu$+ODQLBj z+0*o@p<%1yH(CmZ=F0We;;q$Iv2~{vc&o*h*SzhQz2a;w@Pj*-Vm93w$NicgoKQ%Q zj9#I?Q}tz@+&AafyoI&ZC9iqeU8;t$)XQ%5ire(%J638z#ph`UpMKhDH*k5kiWptmp2ff|-5n~v4a0;i{ zuI?Lsa?P(UOC$Gh#xkFU9hy{F$597!I7Gtc z+0huWzHX!8)s__|lV*S0b%=xIW$xg&=k04#UrOpv*=hU>Qa^PWTZzVOS%Pu8+c=YG z%vL8DYu(0nqA^D#!C3D$&L$d9U@|r?v9Kwr(AfB|NF`TnPsBh}F{!4sL<)U4*-v_> zex#-1rNJ3GwqXUZIp;cI2h+)Q^mm_~CVo{HQOOdzSw0jgS2RUAsH}7mV+q zr|*vc31fa@Yy)QaNnkBZP?WUEzmY9y57563XR@GeAk${pC7l$zWE6Da7!QzNM^8a7 z7+Xl$l1WmwWED&ySux2hSX)R=DMOM|vI`j@*)b_ou-hctD zWv&DG9>;hiQr!6(uTz)iEA$oKAkuIax9}#Bj(K>j?NQD^6=yI-WTJ@~94E5y4QoG5 zl)<;Wt|y3Wyu~<?6gd?KSx@O%}{p)M_usB{?N;Y2-$INjsC)joj36Z8~h*zT8xWO|x?2>o6xb&~sh%c1e?sf)?*s z(#mKnThhZVb}=-v3VM6XDH-9G@py~9rPaRVcASf1i6c&96|*cWf74j-vqUKt@CME? zi!?9tJkAqoEbI}yL!{#>_TpV4BP{ceupUvNvCK-bv{3314L842q8NbQCbT(Prz)ly zTWFiiZf#69JIR~;gbkW7NB+h{J;6=pDX;d-@94dHAAR}U2KuEnT=Mw{bFlmKyCR$w fygS0q1_ttbh&Qme`|;DaJbp8AjTNgXv$OC&l6Eqe diff --git a/shuili-system/target/classes/com/kms/system/service/EntityRelation.class b/shuili-system/target/classes/com/kms/system/service/EntityRelation.class deleted file mode 100644 index e0cdda8bbaf745cbfe3e6ce6e0aff4cabd9f11a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2451 zcma)6ZBtuS5PnW_-x4kb0-;1vp;8M3h*s2^096nw7AOL(qvJSU!j;@MFPL1a{So~G z{s8&H2c1zmqce_vsWbj2Ykl_KP)Kq=Fq7G{XV0^Hcc0ztKmYyq2Y^|8mc#%S6VS0F z;v*5uCRUO>Z;AL=0IQ;XBI34O*G#M@VPnz4hMadSY+Cr#!j{~&P3$P7ie;zK@V@bi zj_=i~8&1WgaqYhI(8-mZ>V9t9uY1+~f?i6G;)nc z4d1Qg8gBieS9EjXhqjtIFrW0k>n}wlKQKNKm3}|rr`~53^w7G~Qbf8D9X37Q8C9z6 zCq5!Bt*vnl_uE6K%nDlq-PyhG7X8A+7YeG@N__K4L9h8Gx2|wm7#fS}*HD0nd`bsS zovj-TT{<870*BVdrb2M5v3uKhiVxPEgP?(&#bBPSqElU#N)@b<(&vW^x>0uUtQXxCPsXdibyQ|#mThG4l8rP5 zZCn;Hgh7R?7n(I2?_$En2u5v;i*`k{*G0UC8|+K_pJnmTEAL6iuC!({-r2i(8+Rd7 zG&Ry*@I3!IQzPd~rbY4dH!;e88+zSMeHeO1PtJb^ZmhpW2)g zk>r;~_FoG); zb7P7kuTB4ru8j5+eMhjTGujEPQ$!-K6Ozaq8C@{OQ>2d2ozXMKIZ!fh5|qqa8B;)3 z6J%zrQ;>GdgyLwQsV~DsU(ov)lgP4+G``0a=PZUXc$lUw&X*!)sA;%`6%K5cBfgFg z@Fq0_WzNJ~)J)V#!gXpE-sU&6uubb` z%3t9Jke57w1g-=Uf|nxk8~7PKQp%a#wPQPORoS|C?%cUEXU@#M``3TJ{087Ub`nTo zISvggGOQX{OK`p|!)LO0N2GO;?i%J8CE- zix2I`cCP8Um0Zzncm;*{w!2@oy=L7}nD5(OD3)pmxkm?$T;r(WIS09hQ-AE1oZOo4 zaMkwg!V-NLrCQZv5QS9Wp<-9}bK73st?qL>w%}G>Z%HAVnch**R%&|;Hd1t}&Svvq z*Qr0ScPrGSinWqm*|F=ctV5;dm0co#=jBkgoJO-E=_K|YFF?mbsmyd=MzpwbM)|5~ zitm+nrWe|7dUH)Qy5gVD^oN)H$9vN}I&7zUv)}yHfQe5D+krL~`sqd{Mlt8xrd=T~ zJqGu7A37zkF#WZHs`XYd+)~hMUfHQDSW=9sPCE_x>eF?w-D!q!`*gkS*`-Gt_Mu-| zwzc1#X34Iu2`~k-Y&Xh5cd%8~8TbCy`oES$#$3lq4gaOI_49-Opr1G5$`;j)FSNLMgr;U;b=O!#-I zi|pm5TiFx3#=2u?LfRHBY~z6pUlQu&rw?Qxk;ON!4>gg-I_CgHEfxh7eZV_?Y0`5J8c1 zMDWgJe?~;`N70X8QkRSZ{2~R!yhm-2n`p)fCxDlsG>w@MUcNg*bTC6_BM8+(EL$z~ z^AG(Pj9AXjd=Fha$^HTDJLu7q?C;PvW@lQ^{UwFi<}8Q2HuoparM0IRJ%%-x)><&y z7G_?jiJ6b3b+L&(Md}zsX+0fl8)+v4xwsQx=x|ZS9Ig`K7~46=`bJomRa~PkN(Pqj zJ|%v&Sn&@i>DXY&KBN@mcMj}?xMBW_VFUBeFmB)@{!R4^7XvZQZ-rdDkbzsAr4qWN zF7P5RD3#uUrxTRGQ*u*7H-Gb-&eQp1VL@B;>6%Oy$|TE7W{+XawGjVC^k!a@jkFf- zm_i}9CI?e|h@nJ_PfPv|j%PyYv)SFP9p diff --git a/shuili-system/target/classes/com/kms/system/service/LabFieldService.class b/shuili-system/target/classes/com/kms/system/service/LabFieldService.class deleted file mode 100644 index c19ecdc36f0d76f2a44a117188c1863ae64fbc08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 564 zcma)3KTpCj5PjvZAc`W3ql-ZXySPC})PxBg#IP5ra6((s_J`qPIhi>40sK(L;|DS@ z*(TS%mv_B;*YBUtF90{FmyyM35w#-D1PX1k6gvXh#??R|ckjkppxPs=9}_dw{#gy@ z%+z{rq~-(VX^ppJE>0;3G-CqUhmTHRM6Yh_I?SY77Oin6&_O9+EQHDh@bS(t92ylo@4l R$T7q0QFQ{t^gy~h zF_;q4h-@sTec@Evv5(8S+iD2ELw*=b^m7W?I z5fVpnpR%`poT#bd6h>P^o0H!$E`*n>r=9gYTFhqB{Y-P6VeNJ5&}yN~PinhM#Z-GX zak0EoX_p7TRebs&=7R2S6BCq{edQHNaBhqZA}DJ}fo5dgi2IpSW_0g_mXFp=IBDUe z4U3uNU(MH0K#}42AA&KoQuf~@!Xa|>z3E^yDH+)kc|7xhV(SI$nSdP1WJ?4Cb!?EW ZW#=L)sFIh*CfOXJTiL!%tR;U3_yqZesO10v diff --git a/shuili-system/target/classes/com/kms/system/service/LabNodeService.class b/shuili-system/target/classes/com/kms/system/service/LabNodeService.class deleted file mode 100644 index 05c8585e8e2a8d7496ab2fc0da915f94cdf8ba00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcma)2u};G<6g;O*1EtVXCPoHCVZaL;2niuEMMa`0yAvM4ZDUuqThz~DLSo7MVNb@$|t&$o8~XBc+TLO;PE!LC5(LK__}1zMxyOrU*jA4s5|YD42?m6N+y z`J9zuY6~^bl+!i;5!>NOdx4|0u$7!uUi!5UR7p>6r3;d&%E#eb%B!827 zXd@Ol{MTLrgF0Hyl_}+IKBXey01^LEeFPVqF?N{Ah6C}*E5r*65fa7@%Rmns4c7M< So9J?nu+?A>+uZASJHQtMA7YLG diff --git a/shuili-system/target/classes/com/kms/system/service/LabRelationService.class b/shuili-system/target/classes/com/kms/system/service/LabRelationService.class deleted file mode 100644 index 27458e7f0fc7c2bd243ff0fff43e0c990f20d217..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcma)3O-}+b5PjuS5Jl0%c=QIC*o!v^iJEv?J%Hg}mI{?^OWIuw{wq%=9{d6RDC6vc zhTz3End!W|`FPXMulElCmpHB>kHaz=WgIb-y2_}y$B=Kfh75%pJC+RfKpAQgV*I*%@D$j5pgjVyJ_S`RhEH(GiEmSCZAVz%|iC9@PSV0|z%0Nww zh!aOuU$RU;O;n^f717p^bMm*sweWJC+THG=#e6Q^W|O-N>1-3nRtse|iJcw|QXSaD zh4NOV`cD4NdhsL{g5k8Em{@5!R9=zvD`RY&Nh0OVz`6?X z1UI(HOy}gx<4ixl-ai1~5{|2ohr=>7%5Ws0)FDHmD_z4S{TP)m<)K{3im4g09#3A)}2X$z?IXlztS z92b4b68$8h8A-08tzqZzx4^aXxK8bCH_>W7N4L@AE(6-zyph$4%m%OB?>nzP=Tyr)y>GdvGj9CX8h=s#%JrMlJz^ZVL3so&LGGCnI6HHJFzWsB(oTx*m?u;%0LdvY)cFS)M1BhEqfQC W0#%Oku*){b=w9acnYH2{0DJ>QhN0&G diff --git a/shuili-system/target/classes/com/kms/system/service/ResultView.class b/shuili-system/target/classes/com/kms/system/service/ResultView.class deleted file mode 100644 index 35fab2529f1388bb4d5c8b5f490a8cd6efa19002..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1850 zcma)7T~k|C6kR8|UkMi)QlO1e1wqXRX{xp=380qJmI~E@4m0}XC0xmELxRaoo&FVn zfV}XaGfHQ4#?hBL<8Sb1_-L(b-+Pll$czrmIqU4RKh|D5C;8)_pMC*w9Umt#j>QBt zlx3-ySW0qVmSsimJ`nVwppQ)4Od^Rz3#+o2`i|4`g06B`;*;=Zq={kK37o9vywzt z3VPG8xh;iJ>1n>N-&kNjWv~N>o`9p_egC}eJJm;<&S9VthZqi|>NM7b8fQ~;+O<$- zYQE0OpKh&hu8|tC(F!C}NSvx@&G)ifelr{*``&JLT2)sh<-qz|?0EG(QEQ@KH`~>0*~U8Vk>J8i#Cw^| z+EcXQX3BVNBOFWgh zEAD#!Db)9Y+hwjsU^I{+wnGQJgqL|zq5{{m!9O7O-9T_+XfTBv5*!~4P7V!z6*EzA zIcSVL^MxM~8_s)*KGI3ZTaXAL?amI*6aT+?L`ccQj{;Xw;xE=Rxz`H$Z=q|)h2Nlk z13i9R_!ZjbLjDALa3nD9FK{Vq#osZK(Vk)a2zD`}oxtpRSY@3qR@unt;$u8R`Us;L zJ!5p8v}4waV{lS;Lk_);YnaFDWH^a!yus}%96Gm$Tgj+)F_sfDjdNqo*?ms*sZcA7a1+Ou|z^%O%IpmdYCn;9mjik z3vaWgjvIJ~D8}E1Yy71VY34Z68$?}hx z8|(3%N1bl5ro6oD&q#ju6eDT-1f$Y0xAa(uEx{MKoFFy$L{2}>Y}A)xU!wf`{{qN| BIST*) diff --git a/shuili-system/target/classes/com/kms/system/service/SysConfigService.class b/shuili-system/target/classes/com/kms/system/service/SysConfigService.class deleted file mode 100644 index 78a9d16b5d5b80e3d686baa037d3721e250acca6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4900 zcmbVP`+po&75~oWF`M0K^Jtnjfc6!`=GCur(iTEDp*9Z-XmPTcB-8Bfq&u@| z0|i`bo?-A_9d>wjlR!261D$GaW!iyq@g(%M9ygU|V!UHn;V1%uQr1kL#9>ycm zdQ>bvA)k*$@JW0sg01+p417jfpVjfXFg_o_7x1`Dd_r1Zl-85-cuL2Y!gyM&zbuch zh~Zbo@M~dwU1oeEf^T9;$AvJS3FBKjz8ygf^I<$I@9)UtyE?w7+++B1%D;-a(f%xd6J6JNYPebd;T*kB0)`acalPRk|lW{!Lvz?5q z;g*Dxor$~iSvxZ`oi)?eIVU?8pR~-38=p3lo|9dSn?-|of6jBx*;#9f%SQOJ-9a-s zYia0EXx!PHowDNumUc3HWv#fH6hB#oLBrm(3*wM}upntfX`?HwG4mrZn6X^C6_n%uIaLlhF2U z;H!eqVc%z2qG{s_1Rmck~lVjGdO&=q9G^ri# zA00b-QbXf)kM&+v|C?6Z<#%=R)Ne5Z)5PZX-cw8KK5VOEHSsf<~ukgiI` z3i2{wx>lep8>03O0(@0?%2U5`j@cr7TZVf=fD<4ZMP% z8u%GrHSlxf4P3^Gj#UG%;fjG@;Fktom$6^r4Gnt)zP==imP-{7|f z?!|ouekZNd(z+iXW43Qxgem8GX2y#%B~*i}7(5H__j9qg(}0QJ8~6kMXy8xc!Jh?A zsAr#nS=>nxFz}}I#Qw+H;|zSs`r1C$5=q@wt~>)g_@?Aoj+P)W@E82mz~69*$8}j4 zxNgPsiWO1`4o}j8MM(;3*u4H=qH?cw3^6fGp5PR^a=04aSB9r@@@fd%#Z_8jrP5be zon@-en(l~op4H70{a&g?Mtw9F=BvWHd-4qBg0l^&ICWg9l3PD3IIieeaaJJTioo@0 zRPlmAQ#UASe@k*-;qWLCoB)~JMQUg&=ik-}7BX&>9!(mKT#NRU5xqg30$)Xg3V^S6 z+7-F1P+N)=j{%UnSm1#{uRMpmmK~x6uS1d4=<9$a^ikeWy~RKa>gKc7kUH!%^!OB42z)@~nsuKIOT-F!mH}#&+n>i!SH{}#H zotL4#qD*e#Qx*WO$E|!C{si=*k6#)N(Kw`x^ZbEQ&Ax%oR}s2`s(UV@dKEPxB)V2n zt6{i%6}pBc>|rCU;SE%caB5v=PacuWi1KCRvFYM}{vkV8Lw0UK4WAuoL?^n?jl*=X zpDqfLo!qYrTW}kDtN1+-U}~h(x8sAv*3VwS>-P+>HOQXL2)&K%I*#Z#`Y--SDo}Kc zV;b(joq<26`IdFJ2fhqQYbg8dAA}=1e?f90Ud1vOwt;{U0gqm z28B4J_T9vu9R;;4%R<0(nDNZ z1Xqv3)mzKJ<)H|rSZAI*4o z2-v=z?+~X&#Stb9^Ja};KLJlG1TFrwB7&&eO~WY~hj0%U8 z_7HBn;aRl!QUOnEfakh*f#(6@d60M>BA$nd=h6QQ4=+Ulo(se(CEFHYxxNHT(|huG zuPRU$=8jW}o6@3u98o+$EKkzwrx@v{6_!q}*NQsco+cIZZAF&aki-=CjdI*lEEUSr zpFhp{Mc#G`Z!<+*nj}t1j%Ep(0+x^#!?xp;h=m_BzYLd{(HF?iGbP#59H5ABOpvWf zgWogF9*q|}n@_2|7Xn^-xx>yC>{>#&Y4=6w@;R)yV&1G`PY5GDs?-|E(a!EX+Lln; z)V|zw<64FJne-f*@jO|&NCke8d%RR+3&iG&skB7QG|p{TauK4%c4nXmoN&{Cs`^1y zLVNg>5(>%HIzTPLrC7Rx7{#}vsWXo*Lgrt0c`fBDutR=>YOV^ZDaEXps>&2a(gFSp DKH=8_ diff --git a/shuili-system/target/classes/com/kms/system/service/SysCorrectTextService.class b/shuili-system/target/classes/com/kms/system/service/SysCorrectTextService.class deleted file mode 100644 index 30b65cb88d318987303703533e64bbb6a7b26e41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 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 diff --git a/shuili-system/target/classes/com/kms/system/service/SysDictDataService.class b/shuili-system/target/classes/com/kms/system/service/SysDictDataService.class deleted file mode 100644 index a1b700e404c339840d2714c4bfb4ed7363eff921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3289 zcmb_eZBr9h6n>UO0%3&~6^ccxq7?$TYNc4CROH2C1E>M&TWgo(0t?A*y1PMRwN5|w zC-4jW(hu!SN3fmg59n`lI(^P&0|COcw4Kb{x14*<^PIQ4fBgCD?*K00WgJH_-iQv| zY{F-lkl~gLpEn>C$0Vj?n2zHhZpU#4cSSxeXEQO(%JH}ib1{6;fP1pMAIAecl;Kev zU*apd@K{z~%gT&lK8B2j=B$A;_YAM(`6_SZgFlRP$s64! zn$*y7w`luTUd>saHJ?+%w(a<)Z#lN7;d07x7Y(oATK3|CYv$Dx$6Ybzm1%p%f|>Ch zw`7=`7mVSe?>wb%a)5$=Df-=!rf)EIn!P=(!K;bx%(vaNVQPtlbKQ>2x8!|?f*B5&*scrQ3SRO zOP<~+O=LBU*RWmA+BL{d($Ls=$)uPR9(hL}ig-4AP!dcd?~aTFLHfhr0pd#Hw} z2nIy!UF8*X%qxwT52k%Hv%;DSvNi@%YPM|V=w=RT82C5A7GR#aO20K13t4lEj)ouh z3VfwBZkV15YoeSa|D+4-rF8Eak!*^mouZpjG&4UbzB!%FJ$!{ zmf3`N^x#T_b~{Q#qLy_wsmh(IsA_m;XR&EGyTjIA{a!=YZcEbWys-FZWzEo9-jw5y zbUXv#oY3ns>M8CRgR1RTWlzM+hg-IpXBxW#F3@z}^Nm?0G_`$*YE1Q;IKHBc)jQ zevu$g?&VDBKcOr2Q0s`9Sz?`>srJ*hh8sW)-Wz!^n=?6Ox}qn%c)Ai|&hm(fxMxUW zj0I0vXs)r~s)?WpY3TpE=CgG>DK_QqY|wC+0p-pk?!-xc(j4U{j)pp^PR_@;tLJ>2 zbBr?!m*Yw949+Z897wD~`SY0(#u@H3DRfH7d5MQIy_7gg=@Ml=i(rG_p&p5okS8mfO^- z<6OW;AfM-|jvCpELcKe|9@q``${t`p3f*)G17&4e6HOl=$ZTuH%MlQYq z6;JhVpkWOS{jbqDnV>*?9Zf^W)-cew0euaoM-e5ywrm^JDcmCWtyk2TqdoGzM{-o$U@K?(!s! zN0`B5%wit*0(L`;Z95%wfdPn6vJ)S36%{U z!!<#-3+VU$6X>UeR3hkS1pS=gUJ&$mg!Pi3zuyOFark!7k+5QJV1!ibFuGaUW58cO Ckv>5H diff --git a/shuili-system/target/classes/com/kms/system/service/SysDictTypeService.class b/shuili-system/target/classes/com/kms/system/service/SysDictTypeService.class deleted file mode 100644 index 1ad34abdad4a4a109af783c424409014d3c7631f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4891 zcmb_g{dW}Q6@K2`O(xllK{gPRG+5N2`B+>8L`e8fpr%ct5|V)QgUMzH1G_tMW)|3L zwSG~oqWx~8^`n-Sw$c{b9!T1w_J{t|(_i}^lyhqTf}S4KK6hqzvq?5bVtY8uJM+Hx zz4v*ad*6HS=C2?9@jU>WaV3s6Ow{5om~}XY$vPZ|RfiKeDUXbXtgPkY&|ueL3XjF% zz!gzX-tuvr!fE+DBacFy!hD;;S2a9dgC{h6O}0K6$5Z%v91VC{#Ga9@&&Kf_o|n(F z^7ajpJ11LTkhyPac(DdAX*jRpWrg|)EA1UDOqqkm)RgHcbPS~JZ0cmzO}PcvGqb6z zzmOU(xP9|PdlZ@vGJj>3x3R?$kXENnZIaY4+m}6wk)3$Rm zHEtR?H+9TNd$v8^CXnV(~Laf)G zFcnq|SUGbjpB*=yg9f20BnIrXkr_1{OTNR&n0MSF_O68-xTbT;N}J^*3u``^?^K>2EJ8TO3yN&3-8r{NV1-%?oX zV?0yt|A%eY>t*10PChMkC0sLOlFu;Yf))tek(uJ(&!T-ChCj{za3Y(&DN)i{j|L1;L`w)*f(_F>;fsVNY&sPX!o>#Zn4~ zZes89(3V1QK?v+E^iL@4uV_zF)-vx?wcIDsSVoG_Q6!~df&u86#Q+rRyx5KHM;5ct z(XXHd>L}7sK|-M_Z8KLYsD2HPD8$nl({Or?^l|cEZ{?U^O0lkR|ECE`f`~fyX{yUl zO&D{?iOtST$T?VZ6uK+sWzS(=W>#kIF29ur=cbJeZ%za8rcV|*8Od3X<%yp@S+)bh z_$m)MW>O(h;f1Bt71Quu!!^VF8^qSll&htbE}e8G55|Y>ypuNfTT(M_D=UJb{d*m$9{ZH!)rQzjMsJS!fqXJ$jqBM-oj6Gd>&uWF({9>@l#g3#n#L-X>-aC zh~B*G+1Y)?Z-th1_qDm#ul?@&xw9WUe?Iw-ne+dA_TB5}-uhtr0&AaN`h3SeG=73P zT*n2$^fMhl$3;2+FLVsyAsxR&Qp2xwyn{S4w+|oC)mwA$_tY7KUNjx%UGs#-K1HTMCJ>HY5kJ` zO7bmsU3V;IM;aP8CHH?s-q@A6fypqFt*elo7uH|t%JdLvxb3c`ECr}TTXD-Bvb}xT zDX+lRGqmKlSiN>engu4W9$~4$&$WWGyvnVvfK4)Yk+mWAsPm#XFwTzhnC)Z@`e0iH z4dux`2=`*?oS)h%S|=0rejyO7As21M0OBZ(VL-V=;y%AE49TdSa?F0eY$&Y%r2IR# zyGPiUy(4~&U|pgoqzWeHiiVIDGzRxnIB=!%hdcP|q>Vp&BK*hH28J2GsyVj%v&>8j z=5&5D6Y{y95-E;~V^!xhs4M=Kd-)UvKns@v*+2noz3; zr%{!>EOZkrxen*zU0kb6URGi#VEazg@O_Xz9HN&WCL;&XjA5+B2!m;qj2!YotPKp5 z4%WegJxCB$^niFG;&Ux=63lGlj4)h_$PLt!;iiy-eu}XE@mY!36^n^YFG1{pZ=Zp- zq_SHVE6XjREI5pk(ikH97k{{GJiyVe!Q^{8qg!IDV{6{Vp5*G-#_p=l=Ble$*!<8V)M8eWHI>d1 zTyp*?foC~XIty>!4KxaVHY>C%5p|K)V;r~A{uD@kW{`40PR6k{R2 zwGr%G6Zm7zoIh^&{r?WNT|$E0Q5&116nmphxI)%{@8gtYL|Y}CTf_UFU><&yQV~i8 zh@;_kP#?jOw Mk6^r%&eFht0UxvM1ONa4 diff --git a/shuili-system/target/classes/com/kms/system/service/SysExceptionLogService.class b/shuili-system/target/classes/com/kms/system/service/SysExceptionLogService.class deleted file mode 100644 index 0b485bd27350baa35a1a443e496d1e97cb29d5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 599 zcmb7ByH3L}6g}<}N}*6#5EEOe1YX!$RRRQ4U?8Zwo0`_Nwj(OY zDu##wZ0TN~qx(Gm_oa-&H~lLS<}_EfKq!`z^G{XYt#>7axkPQvd(} diff --git a/shuili-system/target/classes/com/kms/system/service/SysInfoService.class b/shuili-system/target/classes/com/kms/system/service/SysInfoService.class deleted file mode 100644 index 40e542346904b07c46be36d4973d967ad53eb9ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 559 zcma)3O-}+b5PjuS5Jka@M-N8i;9k5zNYuo{WcA=0?ga`|XuD~<7=D%~6A%6Xf0S`{ z0TVgVCeyx`H=TLY@1M^v0M|IFB9G%T8f7#YN?oa??=j?Cmwkr9of!#+dMLGcO4LBu z7e1I1(+JIw&->iU6tBsGpGwDY5e|(CX37O_>AX;Z6LukoB8ZmmL61$ef*poRBqy5t z#L|m4%W~61&SgLkD5L4H;xGG_JF!mfZdXt|j)mP6c+5~|TQo9?OT7_wdelHQGKn3E zdzpG_{_pSVl`lBM>2spJRH84PB&#=C8_&Honw+*mV<&-&t<;mT1m?;+)t3 diff --git a/shuili-system/target/classes/com/kms/system/service/SysLogininforService.class b/shuili-system/target/classes/com/kms/system/service/SysLogininforService.class deleted file mode 100644 index 4465e4cf7c08e2d4e885310a0b3524e080a519e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1728 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 W)KDi>#6HCWu?P8iNUD|o2>1oG0HGuR diff --git a/shuili-system/target/classes/com/kms/system/service/SysNoticeService.class b/shuili-system/target/classes/com/kms/system/service/SysNoticeService.class deleted file mode 100644 index 0e73cc2c6680bbaf8e7ff77ea5077e70de05efe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 569 zcma)3%T59@6g}lBh@hwom#zdB&c+>tL`__cE*!(Y3>7N0owOYcpXJKLg&*KY8SjiJ z2`k#<-g{2&>$G3rAD;lOa8gGRM^&_|IA*8}q?UfjQ0#O^45eE$5e%(RYVnY&v9M2k zydb6>nwT#}+{z5E$&#N*$IuO9qk_3|fm=B*RN#bN%2))^$~_oQQS?jn8ETQ7YVK1@ zJ(qc%o27Cg18Sj+CTGQe{S9}2rGxDmiYJM%n-TXp?r*0}jN(#n()vSMq8^#l#^O$9 z%1*bpynNwH&T#gaYA=--NheA2wbsUSFO4R}ozU26;1VnK^x1MHUX7gxq}>YRR|zR! z3vQrKm!Oy9L^;Oz zW0F6n7|f`Ei8N17MreABhqMH%9JU09Ju?w3#VNKp9l;rl^V_@p_8z~zFX00T9|}a$ zrtR!g(`n5TSlbsjQ_5J%R_t-x(Napv{h-9g?fo-m?E-a!8N<<2+Ckmchm%^DVVI8U z=%!%{Z0j?vQN>PMx-mLpsVVKWX^knvnrhg}h#GfHYg|!h9F(q%W1iM6EkUr)WNgiv z-AJHeZazbKrsN#%&<)+`6bMEe4hn>N%!DRT*{2&?et0Z11s25gQA2ey7V#f^+KoEqf$tD+nH?mt)25RmI){wX^&=w%y}g9&Ej)w=tK-MD_!yT&Kb8HEp`Xl9zUa7*Kbs%v+;C87=*Eaid5Jk{ ze2m)Dty2kSC47{-5f^!Oqs4KPx-#1rUaV_M9jBMdH$mm=Xw20!tju4aUZ{;8%{gZ_ zPvk3knIMzu5*88$NK|x#;^}sWz^ZuzK%kLKI-z=m1S~gV_VJ9K)D;R|$~5RkVOmeGs7GG4=8fu>?O?Mz%t zvw$l-8QU>aJF|0vWouj4*bnaf{NU2XhZiQA|D2lm>)hQ3mu@_~{=L8=x0Bq`9T+}A zf+*t)Oz`oq$mqj9317;%imzn6jzJk;^IHsqbkh{{1f8OU&BLWq) zOIAHd^U2(FJddz;GNUp^*2KHq*3U^ks{*7P?!_J+F|CwJcTFjM%kAPUo#NIn;GGo& zx@y;CY0#5f)jK=)=uY~T;Eem{Uy!!6URM_cT0Bk2kC~fTKS8tJ?R=ZF?~tnySV_Nh zR?|$;#6cqlqr_VO-&m8*`?1bVU^Nx% zk^pYeQFDvcnInPOYM}d~1Q=I-O)=QndBEsC@WJjwqCa4uXvdxX5w zSVsK}T&5sTpdMF9Ca%)8dzlh`Z6?t56n<{XFj+OaMZx7XFjF!E=%<-*%i|dYAE8{r zej&E}O=TzeKJyQ=n!)FN5Ad;|Co`CEZ> diff --git a/shuili-system/target/classes/com/kms/system/service/SysRoleMenuService.class b/shuili-system/target/classes/com/kms/system/service/SysRoleMenuService.class deleted file mode 100644 index 09eed6a0fadf52b017e98a638cf08a5f96295bc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 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 diff --git a/shuili-system/target/classes/com/kms/system/service/SysUserOnlineService.class b/shuili-system/target/classes/com/kms/system/service/SysUserOnlineService.class deleted file mode 100644 index 740499b76128360d9ddc9586ae37f198761496e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2809 zcmcgu>sH)U6#fna3=E;%(O#s*TIDj3YQ5A>FBY&$JB79bR9cmWAwXaznI@Sc^@f+1 zs84}^QkJge1NclXm)}k@Fhgk<{PE8@-`QuMecwCz``t6t3c0 z3VrxQj@RWlCTKi~i4>Y5u1^KskmWO3J{N{bK{o~65|kBmThNrCX+d|Ia5sf}$fYoY zS)t6y@xCbeB87Q85Zc2ezD(jPg~rR4ZTVLf5(9&C3iad8lBv*^wQO^$TwFBW8Dp_P zN@v!|8-+Q;wd5QV>-|;BQy9tSoua;8^mK32^Ub2}neG!SZ|b>CZK)9B4!l2 zJ+olu{fIoaIaxB6mRyC^f$W;`#Lx?dy`txQ*RoeKp=58hY!xh>N{Wun%{BEUr)XHV zUZk}JJ?pGkwkXOB?zbf7t1*NYG+MFF&KFfO2xZDr(2uBGp*80l`SsgIDUMHXt)pV% zlu=|fn?yqdJ8O9+?PW*d=|Q3Rzk<_KsKj%|5tE}lDa;KVF(8M{Mk~vvTG6>fWs$w2 zkjgn_H*emsq(+a|q&XMW+o*(%clXM+Zxzis%d=R(*KOPJ4c~HX*6%>paaVM&Bo(*p zGC>=TyRNg6UDNS5ORVF#bTynoe-dA7Siqws3=NCOYj_VAG%Vqf1{2E~Rz zREQcZd9;Rg4Fy?>ve-g%1eF9m7UT-@1ogZXu$;tC8h#cLzhGTqc%Nw$@X~HoXx}Tl>BTj+E&E*r9J(nLnpaG}(&XI( zg9o)-7_M58W#1}z@f?^H%(gWjmkj|Is{3Pn)o^pXG3~sWsS;j8AAF$DLOZ0+?63zL zEpMt^C@Az)3yXZr2zxSSS2$0jU+uHW;_^2u1CJA?iH~QTb<<{|yckX{?Nb&HIT^ey zWD?t=q0r1zC1UNA6izsqz*4cy39t8&Qsf$QoeheJH0~Z6cr(qIHSm$_T1DOr+ku0< zCLvjeLzg@i1rbkIb%a6|F*$vdkVMg+^zP)vONIUyA4dtFu=0MKZn0F3S!2;;o-S5f zQTaaXRc9rbRTU7E_M$t(ZjKT=VU}3QM@g)_U}&0IHjW=v&Y>d^X_NXB6y;blUOAzk zKLe-vn*cOG$&}&xCQmwdCDftkP`?w@;Vjq2kl2Q|h_#3T=kPX93h!Wmt2|yLcY=G@ za5_NU4ieAMJVaQ(t+q){grbgxEGN){Q|O=-BJxc1EEY)t7{pMhrVGPJQ|w6iUUiT- zda%BRSLz$0zBKiXzC@q?a((CVZtUL%4XLLgeZwOa|GLwJ71e|XxSByPuF%}v$XmlZX#5SW!vT^+&(NT@|3uULb2Q&h zlb8z7B6~vsP4>C~t+F2r&?b9(fDYL^19ZvW9iS)O*-MlR@Y)Vu4{$s>oY=w1XAv{6 zP6Rj=;EnWNMlazQ?YYV5W|_GuoWwLUeTPomrPcS4K@Q{mIlP5gqB-PopP!m}el8wX rWn*hMBwL~TigHZ;#(ofIKZQhx`Uh)Cd`QYi)L4g$_?WvC=Oy4jJ0sgS diff --git a/shuili-system/target/classes/com/kms/system/service/SysUserPostService.class b/shuili-system/target/classes/com/kms/system/service/SysUserPostService.class deleted file mode 100644 index ce4bab18089fd39fd2cfdd87444f871ddd506501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcma)3O-}+b5PjuS5Jl0%c=QICxEF5_5;gI(8Y9ZREEOuW-Lzc{{wq%=9{d6RDC6u( z48aR+GBfYx%}i(d_5JY);2eilT8ziCW)NMfQl%i$yxDN;gUPCOzp0BQ9O=?U2SrcF`aec$S5xLs<6|ehgAC} zv5~lz>3m23-+K1U=bYjAKG9w(F_2Eu=oeZW&%HF7CU1tujsq84smD*2EAe9NG@u<= zVf-Sd4J^m5p@1SoYvV;Rv{UV7tHB9!^r`7#bg32D5}_c&K(YM}_C`bwWwIrrfeNJbD96?8O^|L`^)c9$4jGmI|ZWcGGq-_^&*fc<=}Kql~jF z8iE(vWMB>wbgJytQ-ll3S z?VT9M#IynviFhO|W_U@K{0tp~(;za6KPkuE!g;B@W41cH|gIb7F zEqrRJ>Pw#KW+}$VsfaR~oRxnSE`|F|?XP!HB1xoOZE}+{y>;QlD1mxa*c;G8>Y+(( zB(E`>@96(q&mP5GFgPBj+M|*qbV#FLXl=akXf#dU4vd|0msr%(2P>3(Huj0r4y-hO zkh4#Wd@y%7sa5PX*XL9oIrs-H9L$hwIW*~#B&T#?!EzgC87XTvK68MYOqDN ak;i31bwWkhCR-qOC-=M1B%kT`0KNh5!lfSo diff --git a/shuili-system/target/classes/com/kms/system/service/SysUserService.class b/shuili-system/target/classes/com/kms/system/service/SysUserService.class deleted file mode 100644 index 2865004e822ceff2385f38a596ed9f8abca0caa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14862 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 W8}JNf!TPiKCRpu8XZCge#{UBtIUOee diff --git a/shuili-system/target/classes/com/kms/system/service/upload/FileUtils.class b/shuili-system/target/classes/com/kms/system/service/upload/FileUtils.class deleted file mode 100644 index ec1d22173afab1b8f9441da897448296fb04ebe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37162 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 z 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 D{?&H- diff --git a/shuili-system/target/classes/com/shuili/aspect/LogMongoService.class b/shuili-system/target/classes/com/shuili/aspect/LogMongoService.class deleted file mode 100644 index 894df176b308faf5b207dd2c30dc4fb8869af544..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmah`%T59@6g}lBh@!~GC2@l+?8Y60L`__cnuuXvhB{PeJ83%@KFgJf3qQb*GTuQ< zh#T7E-kx*cw_o2Mp8zh=uA_+KDq2;XFjNN0s4!$GcF)HQr5ihy49!Rxd7tTtbWdWk zAf^@BSS-fEsT^;}QkW^va2CZ@b3e<}LUG|!83!KOu-1oYlFt2)fFENkm$U!? diff --git a/shuili-system/target/classes/com/slsoft/App.class b/shuili-system/target/classes/com/slsoft/App.class deleted file mode 100644 index 59b60145b2ccaad221f9e920e0db411c87e47d09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 535 zcmZuuO-sW-5PjRPd>CzQZT;5PQ}tjjf`^JAf_MljRO-RgHeKtMO|~Sd;Lp;7f(L(q zKT4dWLMe0)Gdpi)-n`lU`ThC^aDoFHC9GMfqhVs*#s)SGY#G>QD4oerCg%+K_F<2q zaH$7^q3p>}+)RSLi0*k`5mNQE&sC2{GL8SiLh>wQhKlFwz>QU`pAz?CJnj%rz-7qL zXg_)*{=!|w!=c+vA{h=l*&H4Xsk62q&0u%+B=W_TOb44pc${)LFkl+kaj=U$2IpER zrJD~rQiGO(eFsgn7*^(`kht0W+x|%S$sE*ujS~^j_Ig5z`c$mc?j0#jNUz`lZBxrQ z=3xe7oE9lsv)*2`C0Z!byQe1yDu+qdqR1uB$QO@3!QQg8O}3PQ2A1gVObf^_Q)FQU mWkS;C(~OL;cjT)14-{quHl;xACbi8-EL5;cIQ=2n9BO~wK5kh6 diff --git a/shuili-system/target/classes/mapper/system/SysConfigMapper.xml b/shuili-system/target/classes/mapper/system/SysConfigMapper.xml deleted file mode 100644 index 08db9aca..00000000 --- a/shuili-system/target/classes/mapper/system/SysConfigMapper.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - select id, config_name, config_key, config_value, config_type, create_uid, create_time, update_uid, update_time, remark - from sys_config - - - - - - - and id = #{id} - - - and config_key = #{configKey} - - - - - - - - - - - - insert into sys_config ( - config_name, - config_key, - config_value, - config_type, - create_uid, - remark, - create_time - )values( - #{configName}, - #{configKey}, - #{configValue}, - #{configType}, - #{createUid}, - #{remark}, - sysdate() - ) - - - - update sys_config - - config_name = #{configName}, - config_key = #{configKey}, - config_value = #{configValue}, - config_type = #{configType}, - update_uid = #{updateUid}, - remark = #{remark}, - update_time = sysdate() - - where id = #{id} - - - - delete from sys_config where id = #{id} - - - - delete from sys_config where id in - - #{id} - - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysDeptMapper.xml b/shuili-system/target/classes/mapper/system/SysDeptMapper.xml deleted file mode 100644 index 146310d3..00000000 --- a/shuili-system/target/classes/mapper/system/SysDeptMapper.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors, - d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag, - d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background, - d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date - from sys_dept d - - - - - - - - - - - - - - - - - - - - insert into sys_dept( - id, - data_type, - begin_date, - end_date, - ip_end, - ip_start, - is_comment, - is_download, - parent_id, - dept_name, - ancestors, - order_num, - leader, - phone, - email, - status, - tag, - create_uid, - name, - pc_logo, - pc_background, - admin_name, - admin_logo, - create_time - )values( - #{id}, - #{dataType}, - #{beginDate}, - #{endDate}, - #{ipEnd}, - #{ipStart}, - #{isComment}, - #{isDownload}, - #{parentId}, - #{deptName}, - #{ancestors}, - #{orderNum}, - #{leader}, - #{phone}, - #{email}, - #{status}, - #{tag}, - #{createUid}, - #{name}, - #{pcLogo}, - #{pcBackground}, - #{adminName}, - #{adminLogo}, - sysdate() - ) - - - - update sys_dept - - parent_id = #{parentId}, - data_type = #{dataType},begin_date = #{beginDate},end_date = #{endDate}, - dept_name = #{deptName}, - is_comment = #{isComment}, - is_download = #{isDownload}, - ancestors = #{ancestors}, - order_num = #{orderNum}, - leader = #{leader}, - phone = #{phone}, - email = #{email}, - status = #{status}, - tag = #{tag}, - update_uid = #{updateUid}, - name = #{name}, - pc_logo = #{pcLogo}, - pc_background = #{pcBackground}, - admin_name = #{adminName}, - admin_logo = #{adminLogo}, - ip_end = #{ipEnd}, - ip_start = #{ipStart}, - update_time = sysdate() - - where id = #{id} - - - - update sys_dept set ancestors = - - when #{item.id} then #{item.ancestors} - - where id in - - #{item.id} - - - - - update sys_dept a - - a.status = #{status}, - a.update_uid = #{updateUid}, - a.update_time = sysdate() - - where FIND_IN_SET(a.id,#{ancestors}) - - - - delete from sys_dept where id = #{id} - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysDictDataMapper.xml b/shuili-system/target/classes/mapper/system/SysDictDataMapper.xml deleted file mode 100644 index 7043e901..00000000 --- a/shuili-system/target/classes/mapper/system/SysDictDataMapper.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, remark - from sys_dict_data - - - - - - - - - - - - - - delete from sys_dict_data where id = #{id} - - - - delete from sys_dict_data where id in - - #{id} - - - - - update sys_dict_data - - dict_sort = #{dictSort}, - dict_label = #{dictLabel}, - dict_value = #{dictValue}, - dict_type = #{dictType}, - css_class = #{cssClass}, - list_class = #{listClass}, - is_default = #{isDefault}, - status = #{status}, - remark = #{remark}, - update_uid = #{updateUid}, - update_time = sysdate() - - where id = #{id} - - - - update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - - - - insert into sys_dict_data( - dict_sort, - id, - dict_label, - dict_value, - dict_type, - css_class, - list_class, - is_default, - status, - remark, - create_uid, - create_time, - update_time - )values( - #{dictSort}, - #{id}, - #{dictLabel}, - #{dictValue}, - #{dictType}, - #{cssClass}, - #{listClass}, - #{isDefault}, - #{status}, - #{remark}, - #{createUid}, - sysdate(), - sysdate() - ) - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysDictTypeMapper.xml b/shuili-system/target/classes/mapper/system/SysDictTypeMapper.xml deleted file mode 100644 index 3c8e8085..00000000 --- a/shuili-system/target/classes/mapper/system/SysDictTypeMapper.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - select id, dict_name, dict_type, status, create_uid, create_time, remark - from sys_dict_type - - - - - - - - - - - - - - delete from sys_dict_type where id = #{id} - - - - delete from sys_dict_type where id in - - #{id} - - - - - update sys_dict_type - - dict_name = #{dictName}, - dict_type = #{dictType}, - status = #{status}, - remark = #{remark}, - update_uid = #{updateUid}, - update_time = sysdate() - - where id = #{id} - - - - insert into sys_dict_type( - id, - dict_name, - dict_type, - status, - remark, - create_uid, - create_time - )values( - #{id}, - #{dictName}, - #{dictType}, - #{status}, - #{remark}, - #{createUid}, - sysdate() - ) - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysLogininforMapper.xml b/shuili-system/target/classes/mapper/system/SysLogininforMapper.xml deleted file mode 100644 index 376fccc8..00000000 --- a/shuili-system/target/classes/mapper/system/SysLogininforMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - insert into sys_logininfor (id,user_name, status, ipaddr, login_location, browser, os, msg, login_time) - values (#{id},#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) - - - - - - delete from sys_logininfor where id in - - #{id} - - - - - truncate table sys_logininfor - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysMenuMapper.xml b/shuili-system/target/classes/mapper/system/SysMenuMapper.xml deleted file mode 100644 index bd04e9f5..00000000 --- a/shuili-system/target/classes/mapper/system/SysMenuMapper.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time - from sys_menu - - - - - - - - - - - - - - - - - - - - - - - - update sys_menu - - menu_name = #{menuName}, - parent_id = #{parentId}, - order_num = #{orderNum}, - path = #{path}, - component = #{component}, - is_frame = #{isFrame}, - menu_type = #{menuType}, - visible = #{visible}, - status = #{status}, - perms = #{perms}, - icon = #{icon}, - remark = #{remark}, - update_uid = #{updateUid}, - update_time = sysdate() - - where id = #{id} - - - - insert into sys_menu( - id, - parent_id, - menu_name, - order_num, - path, - component, - is_frame, - menu_type, - visible, - status, - perms, - icon, - remark, - create_uid, - create_time, - update_time - )values( - #{id}, - #{parentId}, - #{menuName}, - #{orderNum}, - #{path}, - #{component}, - #{isFrame}, - #{menuType}, - #{visible}, - #{status}, - #{perms}, - #{icon}, - #{remark}, - #{createUid}, - sysdate(), - sysdate() - ) - - - - delete from sys_menu where id = #{id} - - - diff --git a/shuili-system/target/classes/mapper/system/SysPostMapper.xml b/shuili-system/target/classes/mapper/system/SysPostMapper.xml deleted file mode 100644 index 04357e93..00000000 --- a/shuili-system/target/classes/mapper/system/SysPostMapper.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - select id, post_code, post_name, post_sort, status, create_uid, create_time, remark - from sys_post - - - - - - - - - - - - - - - - - - update sys_post - - post_code = #{postCode}, - post_name = #{postName}, - post_sort = #{postSort}, - status = #{status}, - remark = #{remark}, - update_uid = #{updateUid}, - update_time = sysdate() - - where id = #{id} - - - - insert into sys_post( - id, - post_code, - post_name, - post_sort, - status, - remark, - create_uid, - create_time - )values( - #{id}, - #{postCode}, - #{postName}, - #{postSort}, - #{status}, - #{remark}, - #{createUid}, - sysdate() - ) - - - - delete from sys_post where id = #{id} - - - - delete from sys_post where id in - - #{id} - - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysRoleDeptMapper.xml b/shuili-system/target/classes/mapper/system/SysRoleDeptMapper.xml deleted file mode 100644 index 8a97c77b..00000000 --- a/shuili-system/target/classes/mapper/system/SysRoleDeptMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - delete from sys_role_dept where role_id=#{roleId} - - - - - - delete from sys_role_dept where role_id in - - #{roleId} - - - - - insert into sys_role_dept(role_id, dept_id) values - - (#{item.roleId},#{item.deptId}) - - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysRoleMapper.xml b/shuili-system/target/classes/mapper/system/SysRoleMapper.xml deleted file mode 100644 index f208d77f..00000000 --- a/shuili-system/target/classes/mapper/system/SysRoleMapper.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select distinct r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, - r.status, r.del_flag, r.create_time, r.remark - from sys_role r - left join sys_user_role ur on ur.role_id = r.id - left join sys_user u on u.id = ur.user_id - left join sys_dept d on u.dept_id = d.id - - - - - - - - - - - - - - - - - - - - - insert into sys_role( - id, - role_name, - role_key, - role_sort, - data_scope, - status, - remark, - create_uid, - create_time - )values( - #{id}, - #{roleName}, - #{roleKey}, - #{roleSort}, - #{dataScope}, - #{status}, - #{remark}, - #{createUid}, - sysdate() - ) - - - - update sys_role - - role_name = #{roleName}, - role_key = #{roleKey}, - role_sort = #{roleSort}, - data_scope = #{dataScope}, - status = #{status}, - remark = #{remark}, - update_uid = #{updateUid}, - update_time = sysdate() - - where id = #{id} - - - - update sys_user set status = #{status} where user_id = #{userId} - - - - delete from sys_role where id = #{id} - - - - delete from sys_role where id in - - #{id} - - - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysRoleMenuMapper.xml b/shuili-system/target/classes/mapper/system/SysRoleMenuMapper.xml deleted file mode 100644 index 8704677a..00000000 --- a/shuili-system/target/classes/mapper/system/SysRoleMenuMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - delete from sys_role_menu where role_id=#{roleId} - - - - insert into sys_role_menu(role_id, menu_id) values - - (#{item.roleId},#{item.menuId}) - - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysUserMapper.xml b/shuili-system/target/classes/mapper/system/SysUserMapper.xml deleted file mode 100644 index efe3a0d5..00000000 --- a/shuili-system/target/classes/mapper/system/SysUserMapper.xml +++ /dev/null @@ -1,366 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select u.is_pc_user,u.invitee,u.is_first,u.id,u.password, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.remark, - u.real_name,u.card_no,u.department,u.post,u.professional, - d.id, d.parent_id,d.tag as dtag, d.dept_name as ddept_name, d.order_num as dorder_num, d.leader as dleader, d.status as dept_status, d.pc_logo, d.pc_background, d.admin_logo, - r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status - from sys_user u - left join sys_dept d on u.dept_id = d.id - left join sys_user_role ur on u.id = ur.user_id - left join sys_role r on r.id = ur.role_id - - - - - - - - - - - - - - - - - - insert into sys_user( - id, - is_pc_user, - invitee, - dept_id, - user_name, - nick_name, - email, - avatar, - phonenumber, - sex, - password, - status, - login_ip, - login_date, - create_uid, - update_uid, - remark, - real_name, - card_no, - department, - post, - professional, - is_first, - create_time - )values( - #{id}, - #{isPcUser}, - #{invitee}, - #{deptId}, - #{userName}, - #{nickName}, - #{email}, - #{avatar}, - #{phonenumber}, - #{sex}, - #{password}, - #{status}, - #{createUid}, - #{loginIp}, - #{loginDate}, - #{updateUid}, - #{remark}, - - #{realName}, - - - #{cardNo}, - - - #{department}, - - - #{post}, - - - #{professional}, - - #{isFirst}, - sysdate() - ) - - - - update sys_user - - dept_id = #{deptId}, - invitee = #{invitee}, - is_pc_user = #{isPcUser}, - user_name = #{userName}, - nick_name = #{nickName}, - email = #{email}, - phonenumber = #{phonenumber}, - sex = #{sex}, - avatar = #{avatar}, - password = #{password}, - status = #{status}, - login_ip = #{loginIp}, - login_date = #{loginDate}, - update_uid = #{updateUid}, - remark = #{remark}, - is_first = #{isFirst}, - - real_name = #{realName}, - - card_no =#{cardNo}, - - - department =#{department}, - - - post =#{post}, - - - professional =#{professional}, - - update_time = sysdate() - - where id = #{id} - - - - update sys_user set status = #{status} where id = #{id} - - - - update sys_user set avatar = #{avatar} where user_name = #{userName} - - - - update sys_user set password = #{password} - - - AND user_name = #{userName}, - - - AND phonenumber= #{phonenumber}, - - - AND email= #{email}, - - - - - - update sys_user set password = #{password} - - - AND user_name = #{userName} - - - AND phonenumber= #{phonenumber} - - - AND email= #{email} - - - AND id= #{id} - - - - - - delete from sys_user where id = #{id} - - - - delete from sys_user where id in - - #{id} - - - - - - - - diff --git a/shuili-system/target/classes/mapper/system/SysUserPostMapper.xml b/shuili-system/target/classes/mapper/system/SysUserPostMapper.xml deleted file mode 100644 index 3455cbae..00000000 --- a/shuili-system/target/classes/mapper/system/SysUserPostMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - delete from sys_user_post where user_id=#{userId} - - - - - - delete from sys_user_post where user_id in - - #{userId} - - - - - insert into sys_user_post(user_id, post_id) values - - (#{item.userId},#{item.postId}) - - - - \ No newline at end of file diff --git a/shuili-system/target/classes/mapper/system/SysUserRoleMapper.xml b/shuili-system/target/classes/mapper/system/SysUserRoleMapper.xml deleted file mode 100644 index 11452ff1..00000000 --- a/shuili-system/target/classes/mapper/system/SysUserRoleMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - delete from sys_user_role where user_id=#{userId} - - - - - - delete from sys_user_role where user_id in - - #{userId} - - - - - insert into sys_user_role(user_id, role_id) values - - (#{item.userId},#{item.roleId}) - - - - - delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} - - - - delete from sys_user_role where role_id=#{roleId} and user_id in - - #{userId} - - - \ No newline at end of file From a5f418248ad6f05778a133f4e3eeb9bbb8679c46 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 13 Nov 2023 09:32:03 +0800 Subject: [PATCH 06/35] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9controller?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{CheckingController.java => DfCheckingController.java} | 2 +- .../controller/{PlanController.java => DfPlanController.java} | 2 +- .../controller/{TraceController.java => DfTraceController.java} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename shuili-system/src/main/java/com/kms/yxgh/df/controller/{CheckingController.java => DfCheckingController.java} (98%) rename shuili-system/src/main/java/com/kms/yxgh/df/controller/{PlanController.java => DfPlanController.java} (98%) rename shuili-system/src/main/java/com/kms/yxgh/df/controller/{TraceController.java => DfTraceController.java} (98%) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/CheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yxgh/df/controller/CheckingController.java rename to shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java index d0d35d45..6b786d5c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/CheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java @@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RestController; @AllArgsConstructor @RequestMapping("/run/df/checking") @Api(tags = "堤防巡视检查") -public class CheckingController { +public class DfCheckingController { private final DfCheckingService dfCheckingService; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/PlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yxgh/df/controller/PlanController.java rename to shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index 11e8656f..c0fde726 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/PlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController; @AllArgsConstructor @RequestMapping("/run/df/plan") @Api(tags = "堤防巡视检查计划") -public class PlanController { +public class DfPlanController { private final DfPlanService dfPlanService; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/TraceController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yxgh/df/controller/TraceController.java rename to shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java index 8819c808..8bcf0456 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/TraceController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java @@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/run/df/trace") @Api(tags = "堤防巡视检查检查记录轨迹") -public class TraceController extends BaseController +public class DfTraceController extends BaseController { @Autowired private DfTraceService dfTraceService; From 2be2d2b6dd9f9fa6f98e5f5715fa9dad4475be20 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 13 Nov 2023 09:36:49 +0800 Subject: [PATCH 07/35] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9controller?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{CheckingController.java => SzCheckingController.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename shuili-system/src/main/java/com/kms/yxgh/sz/controller/{CheckingController.java => SzCheckingController.java} (95%) diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/CheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yxgh/sz/controller/CheckingController.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java index 675d53d7..a734c790 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/CheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java @@ -24,9 +24,9 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @AllArgsConstructor -@RequestMapping("/run/df/checking") +@RequestMapping("/run/sz/checking") @Api(tags = "堤防巡视检查") -public class CheckingController { +public class SzCheckingController { private final DfCheckingService dfCheckingService; From 69dc8111a1959a3457ad2fb5417e043aad9da4af Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 13 Nov 2023 09:46:49 +0800 Subject: [PATCH 08/35] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4api=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/controller/DfPlanController.java | 12 ++++++------ .../kms/yxgh/sz/controller/SzCheckingController.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index c0fde726..c975724b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.common.utils.BaseEntityUtils; import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; import com.kms.yxgh.df.domain.entity.DfPlan; import com.kms.yxgh.df.service.DfPlanService; import com.shuili.common.annotation.Log; @@ -50,7 +50,7 @@ public class DfPlanController { */ @ApiOperation(" 堤防巡视检查计划详情") @GetMapping(value = "/{id}") - public Response getInfo(@PathVariable("id") Long id) { + public Response getInfo(@PathVariable("id") Long id) { return Response.ok(); } @@ -60,8 +60,8 @@ public class DfPlanController { @Log(title = "堤防巡视检查计划新增", businessType = BusinessType.INSERT) @PostMapping @ApiOperation("堤防巡视检查计划新增") - public Response add(@RequestBody DfPlan dfPlan) { - BaseEntityUtils.preInsert(dfPlan); + public Response add(@RequestBody DfPlanDetailDto dfPlan) { +// BaseEntityUtils.preInsert(dfPlan); return Response.ok(); } @@ -71,7 +71,7 @@ public class DfPlanController { @ApiOperation("堤防巡视检查计划修改") @Log(title = "堤防巡视检查计划修改", businessType = BusinessType.UPDATE) @PutMapping - public Response edit(@RequestBody DfPlan dfPlan) { + public Response edit(@RequestBody DfPlanDetailDto dfPlan) { return Response.ok(); } @@ -81,7 +81,7 @@ public class DfPlanController { @ApiOperation("堤防巡视检查计划删除") @Log(title = "堤防巡视检查计划删除", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public Response remove(@PathVariable Long[] ids) { + public Response remove(@PathVariable Long[] ids) { return Response.ok(); } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java index a734c790..1afe31f1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @AllArgsConstructor @RequestMapping("/run/sz/checking") -@Api(tags = "堤防巡视检查") +@Api(tags = "水闸巡视检查") public class SzCheckingController { @@ -35,7 +35,7 @@ public class SzCheckingController { * 查询堤防巡视检查列表 */ @PostMapping("/list") - @ApiOperation("堤防巡视检查列表") + @ApiOperation("水闸巡视检查列表") public IPage list(@RequestBody SearchParam sp) { return dfCheckingService.selectPage(sp); } @@ -44,7 +44,7 @@ public class SzCheckingController { /** * 获取堤防巡视检查详细信息 */ - @ApiOperation(" 堤防巡视检查详情") + @ApiOperation("水闸巡视检查详情") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(dfCheckingService.getById(id)); From 092c2340832840a28825f998e4ccffc36feee8c2 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 13 Nov 2023 10:03:33 +0800 Subject: [PATCH 09/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=A0=A4?= =?UTF-8?q?=E9=98=B2=E6=96=B0=E5=A2=9Eapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/controller/DfCheckingController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java index 6b786d5c..bb5d026f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java @@ -63,7 +63,13 @@ public class DfCheckingController { // return Response.ok(dfCheckingService.getById(id)); return Response.ok(); } - + @ApiOperation("堤防巡视检查新增") + @Log(title = "堤防巡视检查新增", businessType = BusinessType.INSERT) + @PutMapping + public Response add(@RequestBody DfCheckingDetailDto dfChecking) { + // dfCheckingService.updateById(dfChecking); + return Response.ok(); + } /** * 修改堤防巡视检查 From fa07218c15a2fb3129c5ba7a8ae30c4e341d14de Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 13 Nov 2023 10:07:49 +0800 Subject: [PATCH 10/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=A0=A4?= =?UTF-8?q?=E9=98=B2=E6=96=B0=E5=A2=9Eapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/controller/DfCheckingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java index bb5d026f..4b54f460 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java @@ -65,7 +65,7 @@ public class DfCheckingController { } @ApiOperation("堤防巡视检查新增") @Log(title = "堤防巡视检查新增", businessType = BusinessType.INSERT) - @PutMapping + @PostMapping public Response add(@RequestBody DfCheckingDetailDto dfChecking) { // dfCheckingService.updateById(dfChecking); return Response.ok(); From 172aa9c256aac478fe3c00acf0f97b7558d5a89f Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Tue, 14 Nov 2023 17:00:39 +0800 Subject: [PATCH 11/35] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=A0=A4?= =?UTF-8?q?=E9=98=B2=E5=B7=A1=E6=9F=A5=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-system/pom.xml | 167 +++++------ .../java/com/kms/yxgh/base/DfException.java | 17 ++ .../df/controller/DfCheckingController.java | 25 +- .../yxgh/df/controller/DfPlanController.java | 18 ++ .../df/domain/dto/DfCheckingDetailDto.java | 4 +- .../yxgh/df/domain/dto/DfPlanDetailDto.java | 2 +- .../kms/yxgh/df/domain/dto/DfPointDto.java | 29 ++ .../yxgh/df/domain/entity/DfCheckingItem.java | 2 +- .../com/kms/yxgh/df/domain/entity/DfPlan.java | 2 +- .../yxgh/df/domain/entity/DfPlanOperator.java | 2 +- .../kms/yxgh/df/domain/entity/DfPoint.java | 2 +- .../kms/yxgh/df/domain/entity/DfRecord.java | 2 +- .../yxgh/df/domain/entity/DfRecordItem.java | 2 +- .../kms/yxgh/df/domain/entity/DfTrace.java | 90 +++--- .../yxgh/df/service/DfCheckingService.java | 144 +++++++++- .../kms/yxgh/df/service/DfPlanService.java | 13 +- .../java/com/kms/yxgh/util/BeanCopyUtils.java | 178 ++++++++++++ .../java/com/kms/yxgh/util/StreamUtils.java | 259 ++++++++++++++++++ 18 files changed, 810 insertions(+), 148 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/DfException.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPointDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/util/BeanCopyUtils.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/util/StreamUtils.java diff --git a/shuili-system/pom.xml b/shuili-system/pom.xml index d9be2550..7e2d2cd4 100644 --- a/shuili-system/pom.xml +++ b/shuili-system/pom.xml @@ -1,84 +1,91 @@ - - - slSoft - com.slsoft - 0.0.1-SNAPSHOT - - 4.0.0 - - shuili-system - - shuili-system - - http://www.example.com - - 4.5.16 - - - - - - - org.springframework.boot - spring-boot-starter-web - 2.6.6 - - - - - mysql - mysql-connector-java - - - - org.apache.ant - ant - 1.10.10 - - - - - com.itextpdf - itextpdf - 5.4.3 - - - - - com.slsoft - shuili-generator - 0.0.1-SNAPSHOT - - - - com.slsoft - shuili-common - 0.0.1-SNAPSHOT - - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - - - net.sourceforge.htmlcleaner - htmlcleaner - 2.25 - - - - org.jsoup - jsoup - 1.15.3 - - - + + + slSoft + com.slsoft + 0.0.1-SNAPSHOT + + 4.0.0 + + shuili-system + + shuili-system + + http://www.example.com + + 4.5.16 + + + + + + + org.springframework.boot + spring-boot-starter-web + 2.6.6 + + + + + mysql + mysql-connector-java + + + + org.apache.ant + ant + 1.10.10 + + + + + com.itextpdf + itextpdf + 5.4.3 + + + + + com.slsoft + shuili-generator + 0.0.1-SNAPSHOT + + + + com.slsoft + shuili-common + 0.0.1-SNAPSHOT + + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + + net.sourceforge.htmlcleaner + htmlcleaner + 2.25 + + + + org.jsoup + jsoup + 1.15.3 + + + + cn.hutool + hutool-core + 5.8.5 + + + diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java b/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java new file mode 100644 index 00000000..5719b899 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.base; + +import com.shuili.common.exception.BaseException; + +/** + * 用户信息异常类 + * + * @author shuili + */ +public class DfException extends BaseException { + + private static final long serialVersionUID = 1L; + + public DfException(String message) { + super("Df", "500", null, message); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java index 4b54f460..deefdcb6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java @@ -6,6 +6,7 @@ import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; import com.kms.yxgh.df.domain.dto.SimpleDfCheckingDto; import com.kms.yxgh.df.domain.entity.DfChecking; import com.kms.yxgh.df.service.DfCheckingService; +import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; @@ -49,8 +50,9 @@ public class DfCheckingController { @PostMapping("/list-simple") @ApiOperation("堤防巡视检查列表-简略信息") - public Response> listSimple(@RequestBody SearchParam sp) { - return Response.ok(); + public Response> listSimple(SearchParam sp) { + return Response.ok( + BeanCopyUtils.copyList(dfCheckingService.selectSimple(sp), SimpleDfCheckingDto.class)); } @@ -59,16 +61,15 @@ public class DfCheckingController { */ @ApiOperation(" 堤防巡视检查详情") @GetMapping(value = "/{id}") - public Response getInfo(@PathVariable("id") Long id) { - // return Response.ok(dfCheckingService.getById(id)); - return Response.ok(); + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfCheckingService.getDetailById(id)); } + @ApiOperation("堤防巡视检查新增") @Log(title = "堤防巡视检查新增", businessType = BusinessType.INSERT) @PostMapping public Response add(@RequestBody DfCheckingDetailDto dfChecking) { - // dfCheckingService.updateById(dfChecking); - return Response.ok(); + return Response.ok(dfCheckingService.add(dfChecking)); } /** @@ -78,8 +79,7 @@ public class DfCheckingController { @Log(title = "堤防巡视检查修改", businessType = BusinessType.UPDATE) @PutMapping public Response edit(@RequestBody DfCheckingDetailDto dfChecking) { - // dfCheckingService.updateById(dfChecking); - return Response.ok(); + return Response.ok(dfCheckingService.update(dfChecking)); } /** @@ -87,10 +87,9 @@ public class DfCheckingController { */ @ApiOperation("堤防巡视检查删除") @Log(title = "堤防巡视检查删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public Response remove(@PathVariable Long[] ids) { - // dfCheckingService.removeByIds(Arrays.asList(ids)); - return Response.ok(); + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") String id) { + return Response.ok(dfCheckingService.deleteById(id)); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index c975724b..409b7352 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -3,6 +3,7 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; +import com.kms.yxgh.df.domain.dto.DfPointDto; import com.kms.yxgh.df.domain.entity.DfPlan; import com.kms.yxgh.df.service.DfPlanService; import com.shuili.common.annotation.Log; @@ -10,6 +11,7 @@ import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import java.util.List; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -84,4 +86,20 @@ public class DfPlanController { public Response remove(@PathVariable Long[] ids) { return Response.ok(); } + + @ApiOperation("堤防巡视检查计划巡查点设置") + @Log(title = "堤防巡视检查计划巡查点设置", businessType = BusinessType.UPDATE) + @PostMapping("/points/{id}") + public Response addPoints(@PathVariable("id") String id, + @RequestBody List points) { + return Response.ok(); + } + + + @ApiOperation("堤防巡视检查计划巡查点位数据") + @Log(title = "堤防巡视检查计划巡查点位数据", businessType = BusinessType.SEARCH) + @GetMapping("/points/{id}") + public Response addPoints(@PathVariable("id") String id) { + return Response.ok(); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java index 077e4295..f7f0e6da 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java @@ -26,11 +26,11 @@ public class DfCheckingDetailDto { private Long type; @ApiModelProperty("检查项") - private List items; + private List items; @Data - public static class DfCheckingItem { + public static class DfCheckingItemDto { @ApiModelProperty("主键") private String id; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java index 32de4e0a..626508d7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java @@ -23,7 +23,7 @@ public class DfPlanDetailDto { private String id; @ApiModelProperty("巡查ID") - private Long xcId; + private String xcId; @ApiModelProperty("巡查类型") private Long type; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPointDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPointDto.java new file mode 100644 index 00000000..77abe92c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPointDto.java @@ -0,0 +1,29 @@ +package com.kms.yxgh.df.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 堤防巡视检查计划点位 + * + * @author sy + * @date 2023-11-09 + */ +@Data +@ApiModel("堤防巡视检查计划点位") +public class DfPointDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("经度") + private Double longitude; + + @ApiModelProperty("纬度") + private Double latitude; + + @ApiModelProperty("海拔") + private Double altitude; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java index e102b514..ea475553 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java @@ -28,7 +28,7 @@ public class DfCheckingItem extends BaseEntity /** 巡查ID */ @Excel(name = "巡查ID") @ApiModelProperty("巡查ID") - private Long xcId; + private String xcId; /** 检查部位 */ @Excel(name = "检查部位") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java index 6320b37c..2b804445 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java @@ -28,7 +28,7 @@ public class DfPlan extends BaseEntity /** 巡查ID */ @Excel(name = "巡查ID") @ApiModelProperty("巡查ID") - private Long xcId; + private String xcId; /** 巡查类型 */ @Excel(name = "巡查类型") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java index ab0052e0..532acab1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java @@ -28,7 +28,7 @@ public class DfPlanOperator extends BaseEntity /** 巡查计划ID */ @Excel(name = "巡查计划ID") @ApiModelProperty("巡查计划ID") - private Long planId; + private String planId; /** 执行人 */ @Excel(name = "执行人") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java index f40db412..e38e7d9c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java @@ -28,7 +28,7 @@ public class DfPoint extends BaseEntity /** 巡查计划ID */ @Excel(name = "巡查计划ID") @ApiModelProperty("巡查计划ID") - private Long planId; + private String planId; /** 经度 */ @Excel(name = "经度") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java index 95624b5a..8cc9ce49 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java @@ -28,7 +28,7 @@ public class DfRecord extends BaseEntity /** 巡查计划ID */ @Excel(name = "巡查计划ID") @ApiModelProperty("巡查计划ID") - private Long planId; + private String planId; /** 巡查记录名称 */ @Excel(name = "巡查记录名称") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java index 2a86ba69..30f2fff3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java @@ -28,7 +28,7 @@ public class DfRecordItem extends BaseEntity /** 巡查记录ID */ @Excel(name = "巡查记录ID") @ApiModelProperty("巡查记录ID") - private Long recordId; + private String recordId; /** 检查部位 */ @Excel(name = "检查部位") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java index a7531399..b10b78cb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java @@ -1,15 +1,13 @@ package com.kms.yxgh.df.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,39 +19,51 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_xsjhjgj") @Data @ApiModel("堤防巡视检查检查记录轨迹") -public class DfTrace extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 巡查记录ID */ - @Excel(name = "巡查记录ID") - @ApiModelProperty("巡查记录ID") - private Long recordId; - - /** 经度 */ - @Excel(name = "经度") - @ApiModelProperty("经度") - private Long longitude; - - /** 纬度 */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") - private Long latitude; - - /** 海拔 */ - @Excel(name = "海拔") - @ApiModelProperty("海拔") - private Long altitude; - - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; +public class DfTrace extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查记录ID + */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private String recordId; + + /** + * 经度 + */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Long longitude; + + /** + * 纬度 + */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Long latitude; + + /** + * 海拔 + */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Long altitude; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index e71b3588..fa286f03 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -1,9 +1,29 @@ package com.kms.yxgh.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yxgh.df.mapper.DfCheckingMapper; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.DfException; +import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; +import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto.DfCheckingItemDto; import com.kms.yxgh.df.domain.entity.DfChecking; +import com.kms.yxgh.df.domain.entity.DfCheckingItem; +import com.kms.yxgh.df.mapper.DfCheckingItemMapper; +import com.kms.yxgh.df.mapper.DfCheckingMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.kms.yxgh.util.StreamUtils; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import com.shuili.common.utils.StringUtils; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 堤防巡视检查Service接口 @@ -12,6 +32,124 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class DfCheckingService extends BaseService{ +@AllArgsConstructor +public class DfCheckingService extends BaseService { + + private final DfCheckingItemMapper dfCheckingItemMapper; + private final static String PART_SEPARATOR = ":"; + + public List selectSimple(SearchParam sp) { + Wrapper wp = Wrappers.lambdaQuery() + .select(DfChecking::getId, DfChecking::getName) + .eq(DfChecking::getType, sp.getData().getType()); + return getBaseMapper().selectList(wp); + } + + + public DfCheckingDetailDto getDetailById(String id) { + DfChecking checking = this.getById(id); + DfCheckingDetailDto dto = BeanCopyUtils.copy(checking, DfCheckingDetailDto.class); + if (dto != null) { + Wrapper wp = Wrappers.lambdaQuery() + .select(DfCheckingItem::getId, DfCheckingItem::getParts, DfCheckingItem::getContent) + .eq(DfCheckingItem::getXcId, id); + dto.setItems(StreamUtils.toList(dfCheckingItemMapper.selectList(wp), (o) -> { + DfCheckingItemDto itemDto = new DfCheckingItemDto(); + itemDto.setContent(o.getContent()); + itemDto.setId(o.getId()); + itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), ":")) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); + return itemDto; + })); + } + return dto; + } + + + @Transactional(rollbackFor = Exception.class) + public DfCheckingDetailDto add(DfCheckingDetailDto dto) { + DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class); + if (checking != null) { + if (checkNameDistinct(checking.getId(), checking.getName())) { + BaseEntityUtils.preInsert(checking); + getBaseMapper().insert(checking); + String id = checking.getId(); + if (CollectionUtil.isNotEmpty(dto.getItems())) { + dto.getItems().forEach((o) -> { + DfCheckingItem item = new DfCheckingItem(); + item.setXcId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + BaseEntityUtils.preInsert(item); + dfCheckingItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new DfException("存在相同的名称"); + } + + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public DfCheckingDetailDto update(DfCheckingDetailDto dto) { + if (exist(dto.getId())) { + DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class); + if (checking != null) { + if (checkNameDistinct(checking.getId(), checking.getName())) { + BaseEntityUtils.preUpdate(checking); + getBaseMapper().updateById(checking); + String id = checking.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(dto.getItems())) { + dto.getItems().forEach((o) -> { + DfCheckingItem item = new DfCheckingItem(); + item.setXcId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + BaseEntityUtils.preInsert(item); + dfCheckingItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new DfException("存在相同的名称"); + } + } + } + throw new BaseException("源数据不存在，请确认id值是否正确"); + + } + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; + } + + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfCheckingItem::getXcId, id); + dfCheckingItemMapper.delete(wp); + } + + private boolean checkNameDistinct(String id, String name) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfChecking::getName, name) + .ne(StringUtils.isNotEmpty(id), DfChecking::getId, id); + return this.getBaseMapper().selectCount(wp) <= 0; + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfChecking::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 0f9256a1..1dca5394 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -1,8 +1,14 @@ package com.kms.yxgh.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yxgh.df.mapper.DfPlanMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.entity.DfPlan; +import com.kms.yxgh.df.mapper.DfPlanMapper; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.mybaitsplus.BeanToWrapper; +import lombok.AllArgsConstructor; +import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Service; /** @@ -12,6 +18,7 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class DfPlanService extends BaseService{ +@AllArgsConstructor +public class DfPlanService extends BaseService { } diff --git a/shuili-system/src/main/java/com/kms/yxgh/util/BeanCopyUtils.java b/shuili-system/src/main/java/com/kms/yxgh/util/BeanCopyUtils.java new file mode 100644 index 00000000..0e45aef9 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/util/BeanCopyUtils.java @@ -0,0 +1,178 @@ +package com.kms.yxgh.util; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.SimpleCache; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import java.util.List; +import java.util.Map; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.cglib.beans.BeanCopier; +import org.springframework.cglib.beans.BeanMap; +import org.springframework.cglib.core.Converter; + +/** + * bean深拷贝工具(基于 cglib 性能优异) + * + * @author sy + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class BeanCopyUtils { + + /** + * 单对象基于class创建拷贝 + * + * @param source 数据来源实体 + * @param desc 描述对象 转换后的对象 + * @return desc + */ + public static V copy(T source, Class desc) { + if (ObjectUtil.isNull(source)) { + return null; + } + if (ObjectUtil.isNull(desc)) { + return null; + } + final V target = ReflectUtil.newInstanceIfPossible(desc); + return copy(source, target); + } + + /** + * 单对象基于对象创建拷贝 + * + * @param source 数据来源实体 + * @param desc 转换后的对象 + * @return desc + */ + public static V copy(T source, V desc) { + if (ObjectUtil.isNull(source)) { + return null; + } + if (ObjectUtil.isNull(desc)) { + return null; + } + BeanCopier beanCopier = BeanCopierCache.INSTANCE.get(source.getClass(), desc.getClass(), null); + beanCopier.copy(source, desc, null); + return desc; + } + + /** + * 列表对象基于class创建拷贝 + * + * @param sourceList 数据来源实体列表 + * @param desc 描述对象 转换后的对象 + * @return desc + */ + public static List copyList(List sourceList, Class desc) { + if (ObjectUtil.isNull(sourceList)) { + return null; + } + if (CollUtil.isEmpty(sourceList)) { + return CollUtil.newArrayList(); + } + return StreamUtils.toList(sourceList, source -> { + V target = ReflectUtil.newInstanceIfPossible(desc); + copy(source, target); + return target; + }); + } + + /** + * bean拷贝到map + * + * @param bean 数据来源实体 + * @return map对象 + */ + @SuppressWarnings("unchecked") + public static Map copyToMap(T bean) { + if (ObjectUtil.isNull(bean)) { + return null; + } + return BeanMap.create(bean); + } + + /** + * map拷贝到bean + * + * @param map 数据来源 + * @param beanClass bean类 + * @return bean对象 + */ + public static T mapToBean(Map map, Class beanClass) { + if (MapUtil.isEmpty(map)) { + return null; + } + if (ObjectUtil.isNull(beanClass)) { + return null; + } + T bean = ReflectUtil.newInstanceIfPossible(beanClass); + return mapToBean(map, bean); + } + + /** + * map拷贝到bean + * + * @param map 数据来源 + * @param bean bean对象 + * @return bean对象 + */ + public static T mapToBean(Map map, T bean) { + if (MapUtil.isEmpty(map)) { + return null; + } + if (ObjectUtil.isNull(bean)) { + return null; + } + BeanMap.create(bean).putAll(map); + return bean; + } + + /** + * BeanCopier属性缓存
缓存用于防止多次反射造成的性能问题 + * + * @author Looly + * @since 5.4.1 + */ + public enum BeanCopierCache { + /** + * BeanCopier属性缓存单例 + */ + INSTANCE; + + private final SimpleCache cache = new SimpleCache<>(); + + /** + * 获得类与转换器生成的key在{@link BeanCopier}的Map中对应的元素 + * + * @param srcClass 源Bean的类 + * @param targetClass 目标Bean的类 + * @param converter 转换器 + * @return Map中对应的BeanCopier + */ + public BeanCopier get(Class srcClass, Class targetClass, Converter converter) { + final String key = genKey(srcClass, targetClass, converter); + return cache.get(key, () -> BeanCopier.create(srcClass, targetClass, converter != null)); + } + + /** + * 获得类与转换器生成的key + * + * @param srcClass 源Bean的类 + * @param targetClass 目标Bean的类 + * @param converter 转换器 + * @return 属性名和Map映射的key + */ + private String genKey(Class srcClass, Class targetClass, Converter converter) { + final StringBuilder key = StrUtil.builder() + .append(srcClass.getName()).append('#').append(targetClass.getName()); + if (null != converter) { + key.append('#').append(converter.getClass().getName()); + } + return key.toString(); + } + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/util/StreamUtils.java b/shuili-system/src/main/java/com/kms/yxgh/util/StreamUtils.java new file mode 100644 index 00000000..3fbfc020 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/util/StreamUtils.java @@ -0,0 +1,259 @@ +package com.kms.yxgh.util; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +/** + * stream 流工具类 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class StreamUtils { + + /** + * 将collection过滤 + * + * @param collection 需要转化的集合 + * @param function 过滤方法 + * @return 过滤后的list + */ + public static List filter(Collection collection, Predicate function) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + return collection.stream().filter(function).collect(Collectors.toList()); + } + + /** + * 将collection拼接 + * + * @param collection 需要转化的集合 + * @param function 拼接方法 + * @return 拼接后的list + */ + public static String join(Collection collection, Function function) { + return join(collection, function, ","); + } + + /** + * 将collection拼接 + * + * @param collection 需要转化的集合 + * @param function 拼接方法 + * @param delimiter 拼接符 + * @return 拼接后的list + */ + public static String join(Collection collection, Function function, CharSequence delimiter) { + if (CollUtil.isEmpty(collection)) { + return StrUtil.EMPTY; + } + return collection.stream().map(function).filter(Objects::nonNull).collect(Collectors.joining(delimiter)); + } + + /** + * 将collection排序 + * + * @param collection 需要转化的集合 + * @param comparing 排序方法 + * @return 排序后的list + */ + public static List sorted(Collection collection, Comparator comparing) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + return collection.stream().sorted(comparing).collect(Collectors.toList()); + } + + /** + * 将collection转化为类型不变的map
+ * {@code Collection ----> Map} + * + * @param collection 需要转化的集合 + * @param key V类型转化为K类型的lambda方法 + * @param collection中的泛型 + * @param map中的key类型 + * @return 转化后的map + */ + public static Map toIdentityMap(Collection collection, Function key) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection.stream().collect(Collectors.toMap(key, Function.identity(), (l, r) -> l)); + } + + /** + * 将Collection转化为map(value类型与collection的泛型不同)
+ * {@code Collection -----> Map } + * + * @param collection 需要转化的集合 + * @param key E类型转化为K类型的lambda方法 + * @param value E类型转化为V类型的lambda方法 + * @param collection中的泛型 + * @param map中的key类型 + * @param map中的value类型 + * @return 转化后的map + */ + public static Map toMap(Collection collection, Function key, Function value) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection.stream().collect(Collectors.toMap(key, value, (l, r) -> l)); + } + + /** + * 将collection按照规则(比如有相同的班级id)分类成map
+ * {@code Collection -------> Map> } + * + * @param collection 需要分类的集合 + * @param key 分类的规则 + * @param collection中的泛型 + * @param map中的key类型 + * @return 分类后的map + */ + public static Map> groupByKey(Collection collection, Function key) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection + .stream() + .collect(Collectors.groupingBy(key, LinkedHashMap::new, Collectors.toList())); + } + + /** + * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map
+ * {@code Collection ---> Map>> } + * + * @param collection 需要分类的集合 + * @param key1 第一个分类的规则 + * @param key2 第二个分类的规则 + * @param 集合元素类型 + * @param 第一个map中的key类型 + * @param 第二个map中的key类型 + * @return 分类后的map + */ + public static Map>> groupBy2Key(Collection collection, Function key1, Function key2) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection + .stream() + .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.groupingBy(key2, LinkedHashMap::new, Collectors.toList()))); + } + + /** + * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map
+ * {@code Collection ---> Map> } + * + * @param collection 需要分类的集合 + * @param key1 第一个分类的规则 + * @param key2 第二个分类的规则 + * @param 第一个map中的key类型 + * @param 第二个map中的key类型 + * @param collection中的泛型 + * @return 分类后的map + */ + public static Map> group2Map(Collection collection, Function key1, Function key2) { + if (CollUtil.isEmpty(collection) || key1 == null || key2 == null) { + return MapUtil.newHashMap(); + } + return collection + .stream() + .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.toMap(key2, Function.identity(), (l, r) -> l))); + } + + /** + * 将collection转化为List集合，但是两者的泛型不同
+ * {@code Collection ------> List } + * + * @param collection 需要转化的集合 + * @param function collection中的泛型转化为list泛型的lambda表达式 + * @param collection中的泛型 + * @param List中的泛型 + * @return 转化后的list + */ + public static List toList(Collection collection, Function function) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + return collection + .stream() + .map(function) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } + + /** + * 将collection转化为Set集合，但是两者的泛型不同
+ * {@code Collection ------> Set } + * + * @param collection 需要转化的集合 + * @param function collection中的泛型转化为set泛型的lambda表达式 + * @param collection中的泛型 + * @param Set中的泛型 + * @return 转化后的Set + */ + public static Set toSet(Collection collection, Function function) { + if (CollUtil.isEmpty(collection) || function == null) { + return CollUtil.newHashSet(); + } + return collection + .stream() + .map(function) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + } + + + /** + * 合并两个相同key类型的map + * + * @param map1 第一个需要合并的 map + * @param map2 第二个需要合并的 map + * @param merge 合并的lambda，将key value1 value2合并成最终的类型,注意value可能为空的情况 + * @param map中的key类型 + * @param 第一个 map的value类型 + * @param 第二个 map的value类型 + * @param 最终map的value类型 + * @return 合并后的map + */ + public static Map merge(Map map1, Map map2, BiFunction merge) { + if (MapUtil.isEmpty(map1) && MapUtil.isEmpty(map2)) { + return MapUtil.newHashMap(); + } else if (MapUtil.isEmpty(map1)) { + map1 = MapUtil.newHashMap(); + } else if (MapUtil.isEmpty(map2)) { + map2 = MapUtil.newHashMap(); + } + Set key = new HashSet<>(); + key.addAll(map1.keySet()); + key.addAll(map2.keySet()); + Map map = new HashMap<>(); + for (K t : key) { + X x = map1.get(t); + Y y = map2.get(t); + V z = merge.apply(x, y); + if (z != null) { + map.put(t, z); + } + } + return map; + } + +} From 842ec068e9a50ef72f6a85cb4ec71e5f6a3fb480 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Tue, 14 Nov 2023 17:31:22 +0800 Subject: [PATCH 12/35] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5createDate=20to=20createTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java | 1 - .../java/com/kms/yxgh/df/domain/entity/DfChecking.java | 4 ++-- .../com/kms/yxgh/df/domain/entity/DfCheckingItem.java | 4 ++-- .../main/java/com/kms/yxgh/df/domain/entity/DfPlan.java | 4 ++-- .../com/kms/yxgh/df/domain/entity/DfPlanOperator.java | 4 ++-- .../main/java/com/kms/yxgh/df/domain/entity/DfPoint.java | 4 ++-- .../main/java/com/kms/yxgh/df/domain/entity/DfRecord.java | 4 ++-- .../java/com/kms/yxgh/df/domain/entity/DfRecordItem.java | 4 ++-- .../main/java/com/kms/yxgh/df/domain/entity/DfTrace.java | 2 +- .../main/java/com/kms/yxgh/df/service/DfPlanService.java | 8 +++----- 10 files changed, 18 insertions(+), 21 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java index 626508d7..76b9e031 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java @@ -56,7 +56,6 @@ public class DfPlanDetailDto { @ApiModelProperty("用户名称") private String name; - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java index 67ad44ec..78c15220 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java @@ -44,7 +44,7 @@ public class DfChecking extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; /** 最近修改人 */ @Excel(name = "最近修改人") @@ -55,6 +55,6 @@ public class DfChecking extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") - private Date updateDate; + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java index ea475553..fffd6f17 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java @@ -49,7 +49,7 @@ public class DfCheckingItem extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; /** 最近修改人 */ @Excel(name = "最近修改人") @@ -60,6 +60,6 @@ public class DfCheckingItem extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") - private Date updateDate; + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java index 2b804445..21ebd6c3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java @@ -65,7 +65,7 @@ public class DfPlan extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; /** 最近修改人 */ @Excel(name = "最近修改人") @@ -76,6 +76,6 @@ public class DfPlan extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") - private Date updateDate; + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java index 532acab1..08f63a4b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java @@ -44,7 +44,7 @@ public class DfPlanOperator extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; /** 最近修改人 */ @Excel(name = "最近修改人") @@ -55,6 +55,6 @@ public class DfPlanOperator extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") - private Date updateDate; + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java index e38e7d9c..61245584 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java @@ -54,7 +54,7 @@ public class DfPoint extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; /** 最近修改人 */ @Excel(name = "最近修改人") @@ -65,6 +65,6 @@ public class DfPoint extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") - private Date updateDate; + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java index 8cc9ce49..494714a4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java @@ -49,7 +49,7 @@ public class DfRecord extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; /** 最近修改人 */ @Excel(name = "最近修改人") @@ -60,6 +60,6 @@ public class DfRecord extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") - private Date updateDate; + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java index 30f2fff3..f4cfd9fc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java @@ -59,7 +59,7 @@ public class DfRecordItem extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; /** 最近修改人 */ @Excel(name = "最近修改人") @@ -70,6 +70,6 @@ public class DfRecordItem extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") - private Date updateDate; + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java index b10b78cb..ac99ee0d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java @@ -64,6 +64,6 @@ public class DfTrace extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 1dca5394..7fa0cd94 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -1,14 +1,10 @@ package com.kms.yxgh.df.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.entity.DfPlan; import com.kms.yxgh.df.mapper.DfPlanMapper; -import com.shuili.common.core.domain.SearchParam; +import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; import com.shuili.common.core.service.BaseService; -import com.shuili.common.mybaitsplus.BeanToWrapper; import lombok.AllArgsConstructor; -import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Service; /** @@ -21,4 +17,6 @@ import org.springframework.stereotype.Service; @AllArgsConstructor public class DfPlanService extends BaseService { + private final DfPlanOperatorMapper dfPlanOperatorMapper; + } From 42a50e51c278a0152871aefa380f044b1c96e531 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Tue, 14 Nov 2023 19:00:07 +0800 Subject: [PATCH 13/35] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/base/SyBaseEntity.java | 21 +++ .../yxgh/df/controller/DfPlanController.java | 21 ++- .../yxgh/df/domain/dto/DfPlanDetailDto.java | 7 +- .../kms/yxgh/df/domain/entity/DfChecking.java | 92 ++++++----- .../yxgh/df/domain/entity/DfCheckingItem.java | 90 ++++++----- .../com/kms/yxgh/df/domain/entity/DfPlan.java | 149 +++++++++-------- .../yxgh/df/domain/entity/DfPlanOperator.java | 99 +++++++----- .../kms/yxgh/df/domain/entity/DfPoint.java | 100 +++++++----- .../kms/yxgh/df/domain/entity/DfRecord.java | 90 ++++++----- .../yxgh/df/domain/entity/DfRecordItem.java | 110 +++++++------ .../kms/yxgh/df/domain/entity/DfTrace.java | 4 +- .../kms/yxgh/df/service/DfPlanService.java | 150 ++++++++++++++++++ .../yxgh/sz/domain/entity/SzPlanOperator.java | 99 +++++++----- 13 files changed, 664 insertions(+), 368 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java new file mode 100644 index 00000000..fbb56c39 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java @@ -0,0 +1,21 @@ +package com.kms.yxgh.base; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.shuili.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @ClassName: SyBaseEntity + * @Description: TODO + * @Date: 2023/11/14 下午6:57 * + * @author: hxh + * @version: 1.0 + */ + +@Data +public class SyBaseEntity extends BaseEntity { + + @TableId(type = IdType.AUTO) + protected String id; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index 409b7352..75012320 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -52,8 +52,8 @@ public class DfPlanController { */ @ApiOperation(" 堤防巡视检查计划详情") @GetMapping(value = "/{id}") - public Response getInfo(@PathVariable("id") Long id) { - return Response.ok(); + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfPlanService.getDetailById(id)); } /** @@ -63,8 +63,7 @@ public class DfPlanController { @PostMapping @ApiOperation("堤防巡视检查计划新增") public Response add(@RequestBody DfPlanDetailDto dfPlan) { -// BaseEntityUtils.preInsert(dfPlan); - return Response.ok(); + return Response.ok(dfPlanService.add(dfPlan)); } /** @@ -74,7 +73,7 @@ public class DfPlanController { @Log(title = "堤防巡视检查计划修改", businessType = BusinessType.UPDATE) @PutMapping public Response edit(@RequestBody DfPlanDetailDto dfPlan) { - return Response.ok(); + return Response.ok(dfPlanService.update(dfPlan)); } /** @@ -82,9 +81,9 @@ public class DfPlanController { */ @ApiOperation("堤防巡视检查计划删除") @Log(title = "堤防巡视检查计划删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public Response remove(@PathVariable Long[] ids) { - return Response.ok(); + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(dfPlanService.deleteById(id)); } @ApiOperation("堤防巡视检查计划巡查点设置") @@ -92,14 +91,14 @@ public class DfPlanController { @PostMapping("/points/{id}") public Response addPoints(@PathVariable("id") String id, @RequestBody List points) { - return Response.ok(); + return Response.ok(dfPlanService.addPoints(id, points)); } @ApiOperation("堤防巡视检查计划巡查点位数据") @Log(title = "堤防巡视检查计划巡查点位数据", businessType = BusinessType.SEARCH) @GetMapping("/points/{id}") - public Response addPoints(@PathVariable("id") String id) { - return Response.ok(); + public Response> addPoints(@PathVariable("id") String id) { + return Response.ok(dfPlanService.getPoints(id)); } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java index 76b9e031..b9f5d2e0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java @@ -22,6 +22,9 @@ public class DfPlanDetailDto { @ApiModelProperty("主键") private String id; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("巡查ID") private String xcId; @@ -42,11 +45,11 @@ public class DfPlanDetailDto { private JSONObject otherConfig; @ApiModelProperty("执行人") - private List operators; + private List operators; @Data - public static class Operator { + public static class OperatorDto { @ApiModelProperty("主键") private String id; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java index 78c15220..c28d5bf8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java @@ -1,15 +1,13 @@ package com.kms.yxgh.df.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,40 +19,52 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_xs") @Data @ApiModel("堤防巡视检查") -public class DfChecking extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 巡查名称 */ - @Excel(name = "巡查名称") - @ApiModelProperty("巡查名称") - private String name; - - /** 巡查类型 */ - @Excel(name = "巡查类型") - @ApiModelProperty("巡查类型") - private Long type; - - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; +public class DfChecking extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查名称 + */ + @Excel(name = "巡查名称") + @ApiModelProperty("巡查名称") + private String name; + + /** + * 巡查类型 + */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private Long type; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java index fffd6f17..eabbe1d3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java @@ -1,15 +1,13 @@ package com.kms.yxgh.df.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,45 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_xsx") @Data @ApiModel("堤防巡视检查项") -public class DfCheckingItem extends BaseEntity -{ - private static final long serialVersionUID = 1L; +public class DfCheckingItem extends SyBaseEntity { + + private static final long serialVersionUID = 1L; - /** 巡查ID */ - @Excel(name = "巡查ID") - @ApiModelProperty("巡查ID") - private String xcId; + /** + * 巡查ID + */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private String xcId; - /** 检查部位 */ - @Excel(name = "检查部位") - @ApiModelProperty("检查部位") - private String parts; + /** + * 检查部位 + */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; - /** 检查内容 */ - @Excel(name = "检查内容") - @ApiModelProperty("检查内容") - private String content; + /** + * 检查内容 + */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java index 21ebd6c3..bd988c34 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java @@ -1,15 +1,13 @@ package com.kms.yxgh.df.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,61 +19,88 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_xsjh") @Data @ApiModel("堤防巡视检查计划") -public class DfPlan extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 巡查ID */ - @Excel(name = "巡查ID") - @ApiModelProperty("巡查ID") - private String xcId; - - /** 巡查类型 */ - @Excel(name = "巡查类型") - @ApiModelProperty("巡查类型") - private Long type; - - /** 检查次数 */ - @Excel(name = "检查次数") - @ApiModelProperty("检查次数") - private Long frequency; - - /** 周期 */ - @Excel(name = "周期") - @ApiModelProperty("周期") - private Long cycleType; - - /** 提醒时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("提醒时间") - private Date reminderTime; - - /** 附加配置 */ - @Excel(name = "附加配置") - @ApiModelProperty("附加配置") - private String otherConfig; - - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; +public class DfPlan extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查ID + */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private String xcId; + + /** + * 名称 + */ + @Excel(name = "名称") + @ApiModelProperty("名称") + private String name; + + /** + * 巡查类型 + */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private Long type; + + /** + * 检查次数 + */ + @Excel(name = "检查次数") + @ApiModelProperty("检查次数") + private Long frequency; + + /** + * 周期 + */ + @Excel(name = "周期") + @ApiModelProperty("周期") + private Long cycleType; + + /** + * 提醒时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("提醒时间") + private Date reminderTime; + + /** + * 附加配置 + */ + @Excel(name = "附加配置") + @ApiModelProperty("附加配置") + private String otherConfig; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java index 08f63a4b..a20091b9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java @@ -1,15 +1,13 @@ package com.kms.yxgh.df.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,40 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_xsjhzx") @Data @ApiModel("堤防巡视检查计划执行人") -public class DfPlanOperator extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 巡查计划ID */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private String planId; - - /** 执行人 */ - @Excel(name = "执行人") - @ApiModelProperty("执行人") - private String operatorUid; - - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; +public class DfPlanOperator extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; + + /** + * 执行人 + */ + @Excel(name = "执行人") + @ApiModelProperty("执行人") + private String operatorUid; + + /** + * 执行人 + */ + @Excel(name = "执行人名称") + @ApiModelProperty("执行人名称") + private String operatorName; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java index 61245584..1f94a19b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java @@ -1,15 +1,13 @@ package com.kms.yxgh.df.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,50 +19,66 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_xsjhdw") @Data @ApiModel("堤防巡视检查计划点位") -public class DfPoint extends BaseEntity -{ - private static final long serialVersionUID = 1L; +public class DfPoint extends SyBaseEntity { + + private static final long serialVersionUID = 1L; - /** 巡查计划ID */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private String planId; + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; - /** 经度 */ - @Excel(name = "经度") - @ApiModelProperty("经度") - private Long longitude; + /** + * 经度 + */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Long longitude; - /** 纬度 */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") - private Long latitude; + /** + * 纬度 + */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Long latitude; - /** 海拔 */ - @Excel(name = "海拔") - @ApiModelProperty("海拔") - private Long altitude; + /** + * 海拔 + */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Long altitude; - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java index 494714a4..7b087195 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java @@ -1,15 +1,13 @@ package com.kms.yxgh.df.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,45 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_xsjhjl") @Data @ApiModel("堤防巡视检查记录") -public class DfRecord extends BaseEntity -{ - private static final long serialVersionUID = 1L; +public class DfRecord extends SyBaseEntity { + + private static final long serialVersionUID = 1L; - /** 巡查计划ID */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private String planId; + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; - /** 巡查记录名称 */ - @Excel(name = "巡查记录名称") - @ApiModelProperty("巡查记录名称") - private String name; + /** + * 巡查记录名称 + */ + @Excel(name = "巡查记录名称") + @ApiModelProperty("巡查记录名称") + private String name; - /** 状态 */ - @Excel(name = "状态") - @ApiModelProperty("状态") - private Long status; + /** + * 状态 + */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Long status; - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java index f4cfd9fc..0fddc997 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java @@ -1,15 +1,13 @@ package com.kms.yxgh.df.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,55 +19,73 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_xsjhjlz") @Data @ApiModel("堤防巡视检查检查记录子项") -public class DfRecordItem extends BaseEntity -{ - private static final long serialVersionUID = 1L; +public class DfRecordItem extends SyBaseEntity { + + private static final long serialVersionUID = 1L; - /** 巡查记录ID */ - @Excel(name = "巡查记录ID") - @ApiModelProperty("巡查记录ID") - private String recordId; + /** + * 巡查记录ID + */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private String recordId; - /** 检查部位 */ - @Excel(name = "检查部位") - @ApiModelProperty("检查部位") - private String parts; + /** + * 检查部位 + */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; - /** 检查内容 */ - @Excel(name = "检查内容") - @ApiModelProperty("检查内容") - private String content; + /** + * 检查内容 + */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; - /** 状态 */ - @Excel(name = "状态") - @ApiModelProperty("状态") - private Integer status; + /** + * 状态 + */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Integer status; - /** 存在问题 */ - @Excel(name = "存在问题") - @ApiModelProperty("存在问题") - private String problem; + /** + * 存在问题 + */ + @Excel(name = "存在问题") + @ApiModelProperty("存在问题") + private String problem; - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java index ac99ee0d..ef24fcb5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java @@ -2,8 +2,8 @@ package com.kms.yxgh.df.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; @@ -19,7 +19,7 @@ import lombok.Data; @TableName("bs_sgc_df_xsjhjgj") @Data @ApiModel("堤防巡视检查检查记录轨迹") -public class DfTrace extends BaseEntity { +public class DfTrace extends SyBaseEntity { private static final long serialVersionUID = 1L; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 7fa0cd94..44f69bc9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -1,11 +1,30 @@ package com.kms.yxgh.df.service; +import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.DfException; +import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; +import com.kms.yxgh.df.domain.dto.DfPlanDetailDto.OperatorDto; +import com.kms.yxgh.df.domain.dto.DfPointDto; import com.kms.yxgh.df.domain.entity.DfPlan; +import com.kms.yxgh.df.domain.entity.DfPlanOperator; +import com.kms.yxgh.df.domain.entity.DfPoint; import com.kms.yxgh.df.mapper.DfPlanMapper; import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; +import com.kms.yxgh.df.mapper.DfPointMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import com.shuili.common.utils.StringUtils; +import java.util.List; +import java.util.function.Consumer; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 堤防巡视检查计划Service接口 @@ -18,5 +37,136 @@ import org.springframework.stereotype.Service; public class DfPlanService extends BaseService { private final DfPlanOperatorMapper dfPlanOperatorMapper; + private final DfPointMapper dfPointMapper; + public DfPlanDetailDto getDetailById(String id) { + DfPlan dfPlan = this.getById(id); + DfPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfPlanDetailDto.class); + if (dto != null) { + dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig())); + Wrapper wp = Wrappers.lambdaQuery() + .select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid) + .eq(DfPlanOperator::getPlanId, id); + dto.setOperators(StreamUtils.toList(dfPlanOperatorMapper.selectList(wp), (o) -> { + OperatorDto itemDto = new OperatorDto(); + itemDto.setId(o.getId()); + itemDto.setUid(o.getOperatorUid()); + itemDto.setName(o.getOperatorName()); + return itemDto; + })); + } + return dto; + } + + + @Transactional(rollbackFor = Exception.class) + public DfPlanDetailDto add(DfPlanDetailDto dto) { + DfPlan dfPlan = BeanCopyUtils.copy(dto, DfPlan.class); + if (dfPlan != null) { + if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { + dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); + BaseEntityUtils.preInsert(dfPlan); + getBaseMapper().insert(dfPlan); + String id = dfPlan.getId(); + if (CollectionUtil.isNotEmpty(dto.getOperators())) { + dto.getOperators().forEach(insertOperator(id)); + } + return this.getDetailById(id); + } else { + throw new DfException("存在相同的名称"); + } + + } + return null; + } + + private Consumer insertOperator(String id) { + return (o) -> { + DfPlanOperator item = new DfPlanOperator(); + item.setPlanId(id); + item.setOperatorName(o.getName()); + item.setOperatorUid(o.getUid()); + BaseEntityUtils.preInsert(item); + dfPlanOperatorMapper.insert(item); + }; + } + + @Transactional(rollbackFor = Exception.class) + public DfPlanDetailDto update(DfPlanDetailDto dto) { + if (exist(dto.getId())) { + DfPlan dfPlan = BeanCopyUtils.copy(dto, DfPlan.class); + if (dfPlan != null) { + if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { + dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); + BaseEntityUtils.preUpdate(dfPlan); + getBaseMapper().updateById(dfPlan); + String id = dfPlan.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(dto.getOperators())) { + dto.getOperators().forEach(insertOperator(id)); + } + return this.getDetailById(id); + } else { + throw new DfException("存在相同的名称"); + } + } + } + throw new BaseException("源数据不存在，请确认id值是否正确"); + + } + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; + } + + @Transactional(rollbackFor = Exception.class) + public Boolean addPoints(String id, List points) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfPoint::getPlanId, id); + dfPointMapper.delete(wp); + if (CollectionUtil.isNotEmpty(points)) { + points.forEach(po -> { + DfPoint point = BeanCopyUtils.copy(po, DfPoint.class); + if (point != null) { + point.setPlanId(id); + BaseEntityUtils.preInsert(point); + dfPointMapper.insert(point); + } + }); + } + return true; + } + + + public List getPoints(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfPoint::getPlanId, id); + return StreamUtils.toList(dfPointMapper.selectList(wp), + (o) -> BeanCopyUtils.copy(o, DfPointDto.class)); + } + + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfPlanOperator::getPlanId, id); + dfPlanOperatorMapper.delete(wp); + } + + private boolean checkNameDistinct(String id, String name) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfPlan::getName, name) + .ne(StringUtils.isNotEmpty(id), DfPlan::getId, id); + return this.getBaseMapper().selectCount(wp) <= 0; + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfPlan::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java index 16c4572e..984a5067 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java @@ -1,15 +1,13 @@ package com.kms.yxgh.sz.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,40 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_xsjhzx") @Data @ApiModel("水闸巡视检查计划执行人") -public class SzPlanOperator extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 巡查计划ID */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private Long planId; - - /** 执行人 */ - @Excel(name = "执行人") - @ApiModelProperty("执行人") - private String operatorUid; - - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; - - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateDate; +public class SzPlanOperator extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private Long planId; + + /** + * 执行人 + */ + @Excel(name = "执行人") + @ApiModelProperty("执行人") + private String operatorUid; + + /** + * 执行人 + */ + @Excel(name = "执行人名称") + @ApiModelProperty("执行人名称") + private String operatorName; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createDate; + + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateDate; } From c2a0f1714bb6199fbf4e6cf5106c30168f825919 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 15 Nov 2023 15:12:08 +0800 Subject: [PATCH 14/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/base/enums/CheckingStatus.java | 26 ++++ .../com/kms/yxgh/base/enums/RecordStatus.java | 26 ++++ .../df/controller/DfRecordController.java | 88 +++++++++++++ .../yxgh/df/controller/DfTraceController.java | 104 ++++----------- .../yxgh/df/domain/dto/DfRecordDetailDto.java | 54 ++++++++ .../com/kms/yxgh/df/domain/dto/StartPlan.java | 20 +++ .../yxgh/df/service/DfCheckingService.java | 4 +- .../kms/yxgh/df/service/DfRecordService.java | 121 +++++++++++++++++- 8 files changed, 360 insertions(+), 83 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/enums/CheckingStatus.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/enums/RecordStatus.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/StartPlan.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/CheckingStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/CheckingStatus.java new file mode 100644 index 00000000..0cf416e8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/CheckingStatus.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.base.enums; + +import lombok.Getter; + +/** + * @ClassName: RecordStatus + * @Description: TODO + * @Date: 2023/11/15 上午11:56 * + * @author: hxh + * @version: 1.0 + */ + +@Getter +public enum CheckingStatus { + + NORMAL("正常", 1), + ABNORMAL("异常", 0); + + private final Integer value; + private final String name; + + CheckingStatus(String name, Integer value) { + this.name = name; + this.value = value; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/RecordStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/RecordStatus.java new file mode 100644 index 00000000..6e40c8cc --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/RecordStatus.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.base.enums; + +import lombok.Getter; + +/** + * @ClassName: RecordStatus + * @Description: TODO + * @Date: 2023/11/15 上午11:56 * + * @author: hxh + * @version: 1.0 + */ + +@Getter +public enum RecordStatus { + + CHECKING("检查中", 0L), + FINISHED("已完成", 1L); + + private final Long value; + private final String name; + + RecordStatus(String name, Long value) { + this.name = name; + this.value = value; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java new file mode 100644 index 00000000..2fdc2495 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java @@ -0,0 +1,88 @@ +package com.kms.yxgh.df.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.domain.dto.DfRecordDetailDto; +import com.kms.yxgh.df.domain.dto.StartPlan; +import com.kms.yxgh.df.domain.entity.DfRecord; +import com.kms.yxgh.df.service.DfRecordService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 堤防巡视检查记录Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/record") +@Api(tags = "堤防巡视检查记录") +public class DfRecordController { + + private final DfRecordService dfRecordService; + + /** + * 查询堤防巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查记录列表") + public IPage list(@RequestBody SearchParam sp) { + return dfRecordService.selectPage(sp); + } + + + /** + * 获取堤防巡视检查记录详细信息 + */ + @ApiOperation(" 堤防巡视检查记录详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfRecordService.getDetailById(id)); + } + + /** + * 新增堤防巡视检查记录 + */ + @Log(title = "堤防巡视检查记录新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防巡视检查记录新增") + public Response add(@RequestBody StartPlan startPlan) { + return Response.ok(dfRecordService.start(startPlan)); + } + + /** + * 修改堤防巡视检查记录 + */ + @ApiOperation("堤防巡视检查记录修改") + @Log(title = "堤防巡视检查记录修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody DfRecordDetailDto dfRecord) { + return Response.ok(dfRecordService.update(dfRecord)); + } + + /** + * 删除堤防巡视检查记录 + */ + @ApiOperation("堤防巡视检查记录删除") + @Log(title = "堤防巡视检查记录删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(dfRecordService.deleteById(id)); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java index 8bcf0456..294145de 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java @@ -2,24 +2,17 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.Response; import com.kms.yxgh.df.domain.entity.DfTrace; import com.kms.yxgh.df.service.DfTraceService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; -import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.Arrays; -import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -34,75 +27,30 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/run/df/trace") @Api(tags = "堤防巡视检查检查记录轨迹") -public class DfTraceController extends BaseController -{ - @Autowired - private DfTraceService dfTraceService; +public class DfTraceController extends BaseController { + + @Autowired + private DfTraceService dfTraceService; + + /** + * 查询堤防巡视检查检查记录轨迹列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查检查记录轨迹列表") + public IPage list(@RequestBody SearchParam sp) { + return dfTraceService.selectPage(sp); + } + + /** + * 新增堤防巡视检查检查记录轨迹 + */ + @Log(title = "堤防巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防巡视检查检查记录轨迹新增") + public Response add(@RequestBody DfTrace dfTrace) { + BaseEntityUtils.preInsert(dfTrace); + dfTraceService.save(dfTrace); + return Response.ok(); + } - /** - * 查询堤防巡视检查检查记录轨迹列表 - */ - @PostMapping("/list") - @ApiOperation("堤防巡视检查检查记录轨迹列表") - public IPage list(@RequestBody SearchParam sp) - { - return dfTraceService.selectPage(sp); - } - - /** - * 导出堤防巡视检查检查记录轨迹列表 - */ - @Log(title = "堤防巡视检查检查记录轨迹导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("堤防巡视检查检查记录轨迹导出") - public AjaxResult export(@RequestBody DfTrace dfTrace) - { - List list = dfTraceService.listByIds(dfTrace.getIds()); - ExcelUtil util = new ExcelUtil<>(DfTrace.class); - return util.exportExcel(list, "trace"); - } - - /** - * 获取堤防巡视检查检查记录轨迹详细信息 - */ - @ApiOperation(" 堤防巡视检查检查记录轨迹详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(dfTraceService.getById(id)); - } - - /** - * 新增堤防巡视检查检查记录轨迹 - */ - @Log(title = "堤防巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("堤防巡视检查检查记录轨迹新增") - public AjaxResult add(@RequestBody DfTrace dfTrace) - { - BaseEntityUtils.preInsert(dfTrace); - return toAjax(dfTraceService.save(dfTrace)); - } - - /** - * 修改堤防巡视检查检查记录轨迹 - */ - @ApiOperation("堤防巡视检查检查记录轨迹修改") - @Log(title = "堤防巡视检查检查记录轨迹修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody DfTrace dfTrace) - { - return toAjax(dfTraceService.updateById(dfTrace)); - } - - /** - * 删除堤防巡视检查检查记录轨迹 - */ - @ApiOperation("堤防巡视检查检查记录轨迹删除") - @Log(title = "堤防巡视检查检查记录轨迹删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(dfTraceService.removeByIds(Arrays.asList(ids))); - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java new file mode 100644 index 00000000..f76d2ae0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java @@ -0,0 +1,54 @@ +package com.kms.yxgh.df.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + +/** + * @ClassName: DfRecordDetailDto + * @Description: TODO + * @Date: 2023/11/15 上午10:36 * + * @author: hxh + * @version: 1.0 + */ + +@Data +@ApiModel("堤防巡视检查记录详情") +public class DfRecordDetailDto { + + @ApiModelProperty("巡查记录") + private String id; + + @ApiModelProperty("巡查计划ID") + private String planId; + + @ApiModelProperty("巡查记录名称") + private String name; + + @ApiModelProperty("状态") + private Long status; + + @ApiModelProperty("巡查项") + private List items; + + @Data + + public static class DfRecordItemDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("检查部位") + private List parts; + + @ApiModelProperty("检查内容") + private String content; + + @ApiModelProperty("状态") + private Integer status; + + @ApiModelProperty("存在问题") + private String problem; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/StartPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/StartPlan.java new file mode 100644 index 00000000..fd65fda8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/StartPlan.java @@ -0,0 +1,20 @@ +package com.kms.yxgh.df.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @ClassName: StartPlan + * @Description: TODO + * @Date: 2023/11/15 上午10:43 * + * @author: hxh + * @version: 1.0 + */ +@ApiModel("开启堤防巡视检查计划") +@Data +public class StartPlan { + + @ApiModelProperty("计划id") + private String planId; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index fa286f03..ef091829 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -36,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional; public class DfCheckingService extends BaseService { private final DfCheckingItemMapper dfCheckingItemMapper; - private final static String PART_SEPARATOR = ":"; + public final static String PART_SEPARATOR = ":"; public List selectSimple(SearchParam sp) { Wrapper wp = Wrappers.lambdaQuery() @@ -57,7 +57,7 @@ public class DfCheckingService extends BaseService DfCheckingItemDto itemDto = new DfCheckingItemDto(); itemDto.setContent(o.getContent()); itemDto.setId(o.getId()); - itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), ":")) + itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), PART_SEPARATOR)) .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); return itemDto; })); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index ef5c07a9..b4021b32 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -1,9 +1,35 @@ package com.kms.yxgh.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yxgh.df.mapper.DfRecordMapper; +import static com.kms.yxgh.df.service.DfCheckingService.PART_SEPARATOR; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.enums.CheckingStatus; +import com.kms.yxgh.base.enums.RecordStatus; +import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; +import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; +import com.kms.yxgh.df.domain.dto.DfRecordDetailDto; +import com.kms.yxgh.df.domain.dto.DfRecordDetailDto.DfRecordItemDto; +import com.kms.yxgh.df.domain.dto.StartPlan; import com.kms.yxgh.df.domain.entity.DfRecord; +import com.kms.yxgh.df.domain.entity.DfRecordItem; +import com.kms.yxgh.df.mapper.DfRecordItemMapper; +import com.kms.yxgh.df.mapper.DfRecordMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.kms.yxgh.util.StreamUtils; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import com.shuili.common.utils.DateUtils; +import com.shuili.common.utils.StringUtils; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 堤防巡视检查记录Service接口 @@ -12,6 +38,95 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class DfRecordService extends BaseService{ +@AllArgsConstructor +public class DfRecordService extends BaseService { + + private final DfRecordItemMapper dfRecordItemMapper; + private final DfCheckingService dfCheckingService; + private final DfPlanService dfPlanService; + + @Transactional(rollbackFor = Exception.class) + public DfRecordDetailDto start(StartPlan startPlan) { + DfPlanDetailDto planDetailDto = dfPlanService.getDetailById(startPlan.getPlanId()); + if (planDetailDto != null) { + DfCheckingDetailDto checkingDetailDto = dfCheckingService.getDetailById( + planDetailDto.getXcId()); + if (checkingDetailDto != null) { + DfRecord record = new DfRecord(); + record.setPlanId(startPlan.getPlanId()); + record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); + record.setStatus(RecordStatus.CHECKING.getValue()); + BaseEntityUtils.preInsert(record); + String id = record.getId(); + if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { + checkingDetailDto.getItems().forEach(o -> { + DfRecordItem item = new DfRecordItem(); + item.setRecordId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + item.setStatus(CheckingStatus.NORMAL.getValue()); + item.setRecordId(""); + BaseEntityUtils.preInsert(item); + dfRecordItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new BaseException("查询巡查检查项数据异常"); + } + } + throw new BaseException("查询巡查计划"); + } + + public DfRecordDetailDto getDetailById(String id) { + DfRecord record = this.getBaseMapper().selectById(id); + if (record != null) { + DfRecordDetailDto dto = BeanCopyUtils.copy(record, DfRecordDetailDto.class); + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfRecordItem::getRecordId, id); + List items = dfRecordItemMapper.selectList(wp); + if (CollectionUtil.isNotEmpty(items) && dto != null) { + dto.setItems(StreamUtils.toList(items, r -> { + DfRecordItemDto itemDto = BeanCopyUtils.copy(r, DfRecordItemDto.class); + if (itemDto != null) { + itemDto.setParts(Arrays.stream(StringUtils.split(r.getParts(), PART_SEPARATOR)) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); + } + return itemDto; + })); + return dto; + } + } + return null; + } + + public DfRecordDetailDto update(DfRecordDetailDto dfRecord) { + if (CollectionUtil.isNotEmpty(dfRecord.getItems())) { + dfRecord.getItems().forEach(o -> { + DfRecordItem item = new DfRecordItem(); + item.setRecordId(dfRecord.getId()); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + item.setStatus(o.getStatus()); + item.setProblem(o.getProblem()); + BaseEntityUtils.preUpdate(item); + dfRecordItemMapper.updateById(item); + }); + } + return dfRecord; + } + + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; + } + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfRecordItem::getRecordId, id); + dfRecordItemMapper.delete(wp); + } } From b8f2334f4f1a94e3eac46d0b5caf726b482177f3 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 15 Nov 2023 15:52:38 +0800 Subject: [PATCH 15/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B0=B4?= =?UTF-8?q?=E9=97=B8=E5=B7=A1=E6=A3=80=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/base/SzException.java | 17 ++ .../sz/controller/SzCheckingController.java | 64 +++++-- .../yxgh/sz/controller/SzPlanController.java | 104 ++++++++++++ .../sz/controller/SzRecordController.java | 88 ++++++++++ .../yxgh/sz/controller/SzTraceController.java | 56 +++++++ .../sz/domain/dto/SimpleSzCheckingDto.java | 23 +++ .../com/kms/yxgh/sz/domain/dto/StartPlan.java | 20 +++ .../sz/domain/dto/SzCheckingDetailDto.java | 45 +++++ .../yxgh/sz/domain/dto/SzPlanDetailDto.java | 64 +++++++ .../kms/yxgh/sz/domain/dto/SzPointDto.java | 29 ++++ .../yxgh/sz/domain/dto/SzRecordDetailDto.java | 54 ++++++ .../kms/yxgh/sz/domain/entity/SzChecking.java | 92 +++++----- .../yxgh/sz/domain/entity/SzCheckingItem.java | 90 +++++----- .../com/kms/yxgh/sz/domain/entity/SzPlan.java | 149 ++++++++++------- .../yxgh/sz/domain/entity/SzPlanOperator.java | 10 +- .../kms/yxgh/sz/domain/entity/SzPoint.java | 100 ++++++----- .../kms/yxgh/sz/domain/entity/SzRecord.java | 90 +++++----- .../yxgh/sz/domain/entity/SzRecordItem.java | 110 ++++++------ .../kms/yxgh/sz/domain/entity/SzTrace.java | 90 +++++----- .../yxgh/sz/mapper/SzCheckingItemMapper.java | 2 +- .../kms/yxgh/sz/mapper/SzCheckingMapper.java | 2 +- .../com/kms/yxgh/sz/mapper/SzPlanMapper.java | 2 +- .../yxgh/sz/mapper/SzPlanOperatorMapper.java | 2 +- .../com/kms/yxgh/sz/mapper/SzPointMapper.java | 2 +- .../yxgh/sz/mapper/SzRecordItemMapper.java | 2 +- .../kms/yxgh/sz/mapper/SzRecordMapper.java | 2 +- .../com/kms/yxgh/sz/mapper/SzTraceMapper.java | 2 +- .../yxgh/sz/service/SzCheckingService.java | 140 +++++++++++++++- .../kms/yxgh/sz/service/SzPlanService.java | 157 +++++++++++++++++- .../kms/yxgh/sz/service/SzRecordService.java | 117 ++++++++++++- .../kms/yxgh/sz/service/SzTraceService.java | 2 +- 31 files changed, 1388 insertions(+), 339 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/SzException.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SimpleSzCheckingDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/StartPlan.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzCheckingDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPlanDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPointDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java b/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java new file mode 100644 index 00000000..a27e5e9a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.base; + +import com.shuili.common.exception.BaseException; + +/** + * 用户信息异常类 + * + * @author shuili + */ +public class SzException extends BaseException { + + private static final long serialVersionUID = 1L; + + public SzException(String message) { + super("SZ", "500", null, message); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java index 1afe31f1..ade4769c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java @@ -1,16 +1,24 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.yxgh.df.domain.entity.DfChecking; -import com.kms.yxgh.df.service.DfCheckingService; -import com.shuili.common.core.domain.AjaxResult; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto; +import com.kms.yxgh.sz.domain.dto.SimpleSzCheckingDto; +import com.kms.yxgh.sz.domain.entity.SzChecking; +import com.kms.yxgh.sz.service.SzCheckingService; +import com.kms.yxgh.util.BeanCopyUtils; +import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import java.util.List; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -29,25 +37,59 @@ import org.springframework.web.bind.annotation.RestController; public class SzCheckingController { - private final DfCheckingService dfCheckingService; + private final SzCheckingService szCheckingService; /** - * 查询堤防巡视检查列表 + * 查询水闸巡视检查列表 */ @PostMapping("/list") @ApiOperation("水闸巡视检查列表") - public IPage list(@RequestBody SearchParam sp) { - return dfCheckingService.selectPage(sp); + public IPage list(@RequestBody SearchParam sp) { + return szCheckingService.selectPage(sp); + } + + @PostMapping("/list-simple") + @ApiOperation("水闸巡视检查列表-简略信息") + public Response> listSimple(SearchParam sp) { + return Response.ok( + BeanCopyUtils.copyList(szCheckingService.selectSimple(sp), SimpleSzCheckingDto.class)); } /** - * 获取堤防巡视检查详细信息 + * 获取水闸巡视检查详细信息 */ - @ApiOperation("水闸巡视检查详情") + @ApiOperation(" 水闸巡视检查详情") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return AjaxResult.success(dfCheckingService.getById(id)); + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(szCheckingService.getDetailById(id)); + } + + @ApiOperation("水闸巡视检查新增") + @Log(title = "水闸巡视检查新增", businessType = BusinessType.INSERT) + @PostMapping + public Response add(@RequestBody SzCheckingDetailDto SzChecking) { + return Response.ok(szCheckingService.add(SzChecking)); + } + + /** + * 修改水闸巡视检查 + */ + @ApiOperation("水闸巡视检查修改") + @Log(title = "水闸巡视检查修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody SzCheckingDetailDto SzChecking) { + return Response.ok(szCheckingService.update(SzChecking)); + } + + /** + * 删除水闸巡视检查 + */ + @ApiOperation("水闸巡视检查删除") + @Log(title = "水闸巡视检查删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") String id) { + return Response.ok(szCheckingService.deleteById(id)); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java new file mode 100644 index 00000000..93330d96 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java @@ -0,0 +1,104 @@ +package com.kms.yxgh.sz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto; +import com.kms.yxgh.sz.domain.dto.SzPointDto; +import com.kms.yxgh.sz.domain.entity.SzPlan; +import com.kms.yxgh.sz.service.SzPlanService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 水闸巡视检查计划Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/sz/plan") +@Api(tags = "水闸巡视检查计划") +public class SzPlanController { + + private final SzPlanService szPlanService; + + /** + * 查询水闸巡视检查计划列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查计划列表") + public IPage list(@RequestBody SearchParam sp) { + return szPlanService.selectPage(sp); + } + + + /** + * 获取水闸巡视检查计划详细信息 + */ + @ApiOperation(" 水闸巡视检查计划详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(szPlanService.getDetailById(id)); + } + + /** + * 新增水闸巡视检查计划 + */ + @Log(title = "水闸巡视检查计划新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查计划新增") + public Response add(@RequestBody SzPlanDetailDto SzPlan) { + return Response.ok(szPlanService.add(SzPlan)); + } + + /** + * 修改水闸巡视检查计划 + */ + @ApiOperation("水闸巡视检查计划修改") + @Log(title = "水闸巡视检查计划修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody SzPlanDetailDto SzPlan) { + return Response.ok(szPlanService.update(SzPlan)); + } + + /** + * 删除水闸巡视检查计划 + */ + @ApiOperation("水闸巡视检查计划删除") + @Log(title = "水闸巡视检查计划删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(szPlanService.deleteById(id)); + } + + @ApiOperation("水闸巡视检查计划巡查点设置") + @Log(title = "水闸巡视检查计划巡查点设置", businessType = BusinessType.UPDATE) + @PostMapping("/points/{id}") + public Response addPoints(@PathVariable("id") String id, + @RequestBody List points) { + return Response.ok(szPlanService.addPoints(id, points)); + } + + + @ApiOperation("水闸巡视检查计划巡查点位数据") + @Log(title = "水闸巡视检查计划巡查点位数据", businessType = BusinessType.SEARCH) + @GetMapping("/points/{id}") + public Response> addPoints(@PathVariable("id") String id) { + return Response.ok(szPlanService.getPoints(id)); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java new file mode 100644 index 00000000..ad34817b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java @@ -0,0 +1,88 @@ +package com.kms.yxgh.sz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto; +import com.kms.yxgh.sz.domain.dto.StartPlan; +import com.kms.yxgh.sz.domain.entity.SzRecord; +import com.kms.yxgh.sz.service.SzRecordService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 水闸巡视检查记录Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/sz/record") +@Api(tags = "水闸巡视检查记录") +public class SzRecordController { + + private final SzRecordService szRecordService; + + /** + * 查询水闸巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查记录列表") + public IPage list(@RequestBody SearchParam sp) { + return szRecordService.selectPage(sp); + } + + + /** + * 获取水闸巡视检查记录详细信息 + */ + @ApiOperation(" 水闸巡视检查记录详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(szRecordService.getDetailById(id)); + } + + /** + * 新增水闸巡视检查记录 + */ + @Log(title = "水闸巡视检查记录新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查记录新增") + public Response add(@RequestBody StartPlan startPlan) { + return Response.ok(szRecordService.start(startPlan)); + } + + /** + * 修改水闸巡视检查记录 + */ + @ApiOperation("水闸巡视检查记录修改") + @Log(title = "水闸巡视检查记录修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody SzRecordDetailDto SzRecord) { + return Response.ok(szRecordService.update(SzRecord)); + } + + /** + * 删除水闸巡视检查记录 + */ + @ApiOperation("水闸巡视检查记录删除") + @Log(title = "水闸巡视检查记录删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(szRecordService.deleteById(id)); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java new file mode 100644 index 00000000..48e29699 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java @@ -0,0 +1,56 @@ +package com.kms.yxgh.sz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.sz.domain.entity.SzTrace; +import com.kms.yxgh.sz.service.SzTraceService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 水闸巡视检查检查记录轨迹Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@RequestMapping("/run/sz/trace") +@Api(tags = "水闸巡视检查检查记录轨迹") +public class SzTraceController extends BaseController { + + @Autowired + private SzTraceService szTraceService; + + /** + * 查询水闸巡视检查检查记录轨迹列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查检查记录轨迹列表") + public IPage list(@RequestBody SearchParam sp) { + return szTraceService.selectPage(sp); + } + + /** + * 新增水闸巡视检查检查记录轨迹 + */ + @Log(title = "水闸巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查检查记录轨迹新增") + public Response add(@RequestBody SzTrace SzTrace) { + BaseEntityUtils.preInsert(SzTrace); + szTraceService.save(SzTrace); + return Response.ok(); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SimpleSzCheckingDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SimpleSzCheckingDto.java new file mode 100644 index 00000000..a54175af --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SimpleSzCheckingDto.java @@ -0,0 +1,23 @@ +package com.kms.yxgh.sz.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 水闸巡视检查简短信息 + * + * @author sy + * @date 2023-11-09 + */ +@Data +@ApiModel("水闸巡视检查") +public class SimpleSzCheckingDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("巡查名称") + private String name; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/StartPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/StartPlan.java new file mode 100644 index 00000000..fa8fa34b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/StartPlan.java @@ -0,0 +1,20 @@ +package com.kms.yxgh.sz.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @ClassName: StartPlan + * @Description: TODO + * @Date: 2023/11/15 上午10:43 * + * @author: hxh + * @version: 1.0 + */ +@ApiModel("开启水闸巡视检查计划") +@Data +public class StartPlan { + + @ApiModelProperty("计划id") + private String planId; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzCheckingDetailDto.java new file mode 100644 index 00000000..d9face1e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzCheckingDetailDto.java @@ -0,0 +1,45 @@ +package com.kms.yxgh.sz.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + +/** + * @ClassName: CheckingVo + * @Description: TODO + * @Date: 2023/11/10 上午11:56 * + * @author: hxh + * @version: 1.0 + */ +@Data +@ApiModel("水闸巡视检查详情") +public class SzCheckingDetailDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("巡查名称") + private String name; + + @ApiModelProperty("巡查类型") + private Long type; + + @ApiModelProperty("检查项") + private List items; + + + @Data + public static class SzCheckingItemDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("检查部位") + private List parts; + + @ApiModelProperty("检查内容") + private String content; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPlanDetailDto.java new file mode 100644 index 00000000..57941ec7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPlanDetailDto.java @@ -0,0 +1,64 @@ +package com.kms.yxgh.sz.domain.dto; + +import com.alibaba.fastjson.JSONObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; +import lombok.Data; + + +/** + * 水闸巡视检查计划详情 + * + * @author sy + * @date 2023-11-09 + */ +@Data +@ApiModel("水闸巡视检查计划详情") +public class SzPlanDetailDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("巡查ID") + private String xcId; + + @ApiModelProperty("巡查类型") + private Long type; + + @ApiModelProperty("检查次数") + private Long frequency; + + @ApiModelProperty("周期") + private Long cycleType; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("提醒时间") + private Date reminderTime; + + @ApiModelProperty("附加配置") + private JSONObject otherConfig; + + @ApiModelProperty("执行人") + private List operators; + + + @Data + public static class OperatorDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("用户id") + private String uid; + @ApiModelProperty("用户名称") + private String name; + + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPointDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPointDto.java new file mode 100644 index 00000000..65d272d7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPointDto.java @@ -0,0 +1,29 @@ +package com.kms.yxgh.sz.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 水闸巡视检查计划点位 + * + * @author sy + * @date 2023-11-09 + */ +@Data +@ApiModel("水闸巡视检查计划点位") +public class SzPointDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("经度") + private Double longitude; + + @ApiModelProperty("纬度") + private Double latitude; + + @ApiModelProperty("海拔") + private Double altitude; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java new file mode 100644 index 00000000..0a2e11cb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java @@ -0,0 +1,54 @@ +package com.kms.yxgh.sz.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + +/** + * @ClassName: SzRecordDetailDto + * @Description: TODO + * @Date: 2023/11/15 上午10:36 * + * @author: hxh + * @version: 1.0 + */ + +@Data +@ApiModel("水闸巡视检查记录详情") +public class SzRecordDetailDto { + + @ApiModelProperty("巡查记录") + private String id; + + @ApiModelProperty("巡查计划ID") + private String planId; + + @ApiModelProperty("巡查记录名称") + private String name; + + @ApiModelProperty("状态") + private Long status; + + @ApiModelProperty("巡查项") + private List items; + + @Data + + public static class SzRecordItemDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("检查部位") + private List parts; + + @ApiModelProperty("检查内容") + private String content; + + @ApiModelProperty("状态") + private Integer status; + + @ApiModelProperty("存在问题") + private String problem; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java index b310499f..b344f197 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java @@ -1,15 +1,13 @@ package com.kms.yxgh.sz.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,40 +19,52 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_xs") @Data @ApiModel("水闸巡视检查") -public class SzChecking extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 巡查名称 */ - @Excel(name = "巡查名称") - @ApiModelProperty("巡查名称") - private String name; - - /** 巡查类型 */ - @Excel(name = "巡查类型") - @ApiModelProperty("巡查类型") - private Long type; - - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; - - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateDate; +public class SzChecking extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查名称 + */ + @Excel(name = "巡查名称") + @ApiModelProperty("巡查名称") + private String name; + + /** + * 巡查类型 + */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private Long type; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java index 3a7f753f..f3c720cd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java @@ -1,15 +1,13 @@ package com.kms.yxgh.sz.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,45 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_xsx") @Data @ApiModel("水闸巡视检查项") -public class SzCheckingItem extends BaseEntity -{ - private static final long serialVersionUID = 1L; +public class SzCheckingItem extends SyBaseEntity { + + private static final long serialVersionUID = 1L; - /** 巡查ID */ - @Excel(name = "巡查ID") - @ApiModelProperty("巡查ID") - private Long xcId; + /** + * 巡查ID + */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private String xcId; - /** 检查部位 */ - @Excel(name = "检查部位") - @ApiModelProperty("检查部位") - private String parts; + /** + * 检查部位 + */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; - /** 检查内容 */ - @Excel(name = "检查内容") - @ApiModelProperty("检查内容") - private String content; + /** + * 检查内容 + */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateDate; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java index 97ed7d14..5c05906e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java @@ -1,15 +1,13 @@ package com.kms.yxgh.sz.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,61 +19,88 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_xsjh") @Data @ApiModel("水闸巡视检查计划") -public class SzPlan extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 巡查ID */ - @Excel(name = "巡查ID") - @ApiModelProperty("巡查ID") - private Long xcId; - - /** 巡查类型 */ - @Excel(name = "巡查类型") - @ApiModelProperty("巡查类型") - private Long type; - - /** 检查次数 */ - @Excel(name = "检查次数") - @ApiModelProperty("检查次数") - private Long frequency; - - /** 周期 */ - @Excel(name = "周期") - @ApiModelProperty("周期") - private Long cycleType; - - /** 提醒时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("提醒时间") - private Date reminderTime; - - /** 附加配置 */ - @Excel(name = "附加配置") - @ApiModelProperty("附加配置") - private String otherConfig; - - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; - - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateDate; +public class SzPlan extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查ID + */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private String xcId; + + /** + * 名称 + */ + @Excel(name = "名称") + @ApiModelProperty("名称") + private String name; + + /** + * 巡查类型 + */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private Long type; + + /** + * 检查次数 + */ + @Excel(name = "检查次数") + @ApiModelProperty("检查次数") + private Long frequency; + + /** + * 周期 + */ + @Excel(name = "周期") + @ApiModelProperty("周期") + private Long cycleType; + + /** + * 提醒时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("提醒时间") + private Date reminderTime; + + /** + * 附加配置 + */ + @Excel(name = "附加配置") + @ApiModelProperty("附加配置") + private String otherConfig; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java index 984a5067..15f58e4e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java @@ -2,8 +2,8 @@ package com.kms.yxgh.sz.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; @@ -19,7 +19,7 @@ import lombok.Data; @TableName("bs_sgc_sz_xsjhzx") @Data @ApiModel("水闸巡视检查计划执行人") -public class SzPlanOperator extends BaseEntity { +public class SzPlanOperator extends SyBaseEntity { private static final long serialVersionUID = 1L; @@ -28,7 +28,7 @@ public class SzPlanOperator extends BaseEntity { */ @Excel(name = "巡查计划ID") @ApiModelProperty("巡查计划ID") - private Long planId; + private String planId; /** * 执行人 @@ -57,7 +57,7 @@ public class SzPlanOperator extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") - private Date createDate; + private Date createTime; /** * 最近修改人 @@ -72,6 +72,6 @@ public class SzPlanOperator extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") - private Date updateDate; + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java index 18343e26..87f26829 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java @@ -1,15 +1,13 @@ package com.kms.yxgh.sz.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,50 +19,66 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_xsjhdw") @Data @ApiModel("水闸巡视检查计划点位") -public class SzPoint extends BaseEntity -{ - private static final long serialVersionUID = 1L; +public class SzPoint extends SyBaseEntity { + + private static final long serialVersionUID = 1L; - /** 巡查计划ID */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private Long planId; + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; - /** 经度 */ - @Excel(name = "经度") - @ApiModelProperty("经度") - private Double longitude; + /** + * 经度 + */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Long longitude; - /** 纬度 */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") - private Double latitude; + /** + * 纬度 + */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Long latitude; - /** 海拔 */ - @Excel(name = "海拔") - @ApiModelProperty("海拔") - private Double altitude; + /** + * 海拔 + */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Long altitude; - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateDate; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java index d29f904c..cd32b5ac 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java @@ -1,15 +1,13 @@ package com.kms.yxgh.sz.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,45 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_xsjhjl") @Data @ApiModel("水闸巡视检查记录") -public class SzRecord extends BaseEntity -{ - private static final long serialVersionUID = 1L; +public class SzRecord extends SyBaseEntity { + + private static final long serialVersionUID = 1L; - /** 巡查计划ID */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private Long planId; + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; - /** 巡查记录名称 */ - @Excel(name = "巡查记录名称") - @ApiModelProperty("巡查记录名称") - private String name; + /** + * 巡查记录名称 + */ + @Excel(name = "巡查记录名称") + @ApiModelProperty("巡查记录名称") + private String name; - /** 状态 */ - @Excel(name = "状态") - @ApiModelProperty("状态") - private Long status; + /** + * 状态 + */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Long status; - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateDate; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java index 14674839..297ec145 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java @@ -1,15 +1,13 @@ package com.kms.yxgh.sz.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,55 +19,73 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_xsjhjlz") @Data @ApiModel("水闸巡视检查检查记录子项") -public class SzRecordItem extends BaseEntity -{ - private static final long serialVersionUID = 1L; +public class SzRecordItem extends SyBaseEntity { + + private static final long serialVersionUID = 1L; - /** 巡查记录ID */ - @Excel(name = "巡查记录ID") - @ApiModelProperty("巡查记录ID") - private Long recordId; + /** + * 巡查记录ID + */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private String recordId; - /** 检查部位 */ - @Excel(name = "检查部位") - @ApiModelProperty("检查部位") - private String parts; + /** + * 检查部位 + */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; - /** 检查内容 */ - @Excel(name = "检查内容") - @ApiModelProperty("检查内容") - private String content; + /** + * 检查内容 + */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; - /** 状态 */ - @Excel(name = "状态") - @ApiModelProperty("状态") - private Long status; + /** + * 状态 + */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Integer status; - /** 存在问题 */ - @Excel(name = "存在问题") - @ApiModelProperty("存在问题") - private String problem; + /** + * 存在问题 + */ + @Excel(name = "存在问题") + @ApiModelProperty("存在问题") + private String problem; - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; - /** 最近修改人 */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; - /** 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateDate; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java index 0f9cade3..3106b0d0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java @@ -1,15 +1,13 @@ package com.kms.yxgh.sz.domain.entity; -import com.shuili.common.core.domain.BaseEntity; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - /** @@ -21,39 +19,51 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_xsjhjgj") @Data @ApiModel("水闸巡视检查检查记录轨迹") -public class SzTrace extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 巡查记录ID */ - @Excel(name = "巡查记录ID") - @ApiModelProperty("巡查记录ID") - private Long recordId; - - /** 经度 */ - @Excel(name = "经度") - @ApiModelProperty("经度") - private Double longitude; - - /** 纬度 */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") - private Double latitude; - - /** 海拔 */ - @Excel(name = "海拔") - @ApiModelProperty("海拔") - private Double altitude; - - /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createDate; +public class SzTrace extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查记录ID + */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private String recordId; + + /** + * 经度 + */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Long longitude; + + /** + * 纬度 + */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Long latitude; + + /** + * 海拔 + */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Long altitude; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java index 3c35b63f..271fcaae 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.sz.domain.entity.SzCheckingItem; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸巡视检查项Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java index f4c53a03..bd1099f9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.sz.domain.entity.SzChecking; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸巡视检查Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java index 76c0f597..74046917 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.sz.domain.entity.SzPlan; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸巡视检查计划Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java index 3bb07e1b..e87296da 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.sz.domain.entity.SzPlanOperator; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸巡视检查计划执行人Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java index 84c4bfff..10da7f71 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.sz.domain.entity.SzPoint; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸巡视检查计划点位Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java index b2293ee3..f6908422 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.sz.domain.entity.SzRecordItem; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸巡视检查检查记录子项Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java index 930b2c1e..5bfdb8df 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.sz.domain.entity.SzRecord; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸巡视检查记录Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java index f194495f..cfcf1b93 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.sz.domain.entity.SzTrace; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸巡视检查检查记录轨迹Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index 0f779fdd..2664ce7d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -1,9 +1,29 @@ package com.kms.yxgh.sz.service; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.SzException; +import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto.SzCheckingItemDto; +import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto; import com.kms.yxgh.sz.domain.entity.SzChecking; +import com.kms.yxgh.sz.domain.entity.SzCheckingItem; +import com.kms.yxgh.sz.mapper.SzCheckingItemMapper; import com.kms.yxgh.sz.mapper.SzCheckingMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.kms.yxgh.util.StreamUtils; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import com.shuili.common.utils.StringUtils; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 水闸巡视检查Service接口 @@ -12,6 +32,124 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class SzCheckingService extends BaseService{ +@AllArgsConstructor +public class SzCheckingService extends BaseService { + + private final SzCheckingItemMapper SzCheckingItemMapper; + public final static String PART_SEPARATOR = ":"; + + public List selectSimple(SearchParam sp) { + Wrapper wp = Wrappers.lambdaQuery() + .select(SzChecking::getId, SzChecking::getName) + .eq(SzChecking::getType, sp.getData().getType()); + return getBaseMapper().selectList(wp); + } + + + public SzCheckingDetailDto getDetailById(String id) { + SzChecking checking = this.getById(id); + SzCheckingDetailDto dto = BeanCopyUtils.copy(checking, SzCheckingDetailDto.class); + if (dto != null) { + Wrapper wp = Wrappers.lambdaQuery() + .select(SzCheckingItem::getId, SzCheckingItem::getParts, SzCheckingItem::getContent) + .eq(SzCheckingItem::getXcId, id); + dto.setItems(StreamUtils.toList(SzCheckingItemMapper.selectList(wp), (o) -> { + SzCheckingItemDto itemDto = new SzCheckingItemDto(); + itemDto.setContent(o.getContent()); + itemDto.setId(o.getId()); + itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), PART_SEPARATOR)) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); + return itemDto; + })); + } + return dto; + } + + + @Transactional(rollbackFor = Exception.class) + public SzCheckingDetailDto add(SzCheckingDetailDto dto) { + SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class); + if (checking != null) { + if (checkNameDistinct(checking.getId(), checking.getName())) { + BaseEntityUtils.preInsert(checking); + getBaseMapper().insert(checking); + String id = checking.getId(); + if (CollectionUtil.isNotEmpty(dto.getItems())) { + dto.getItems().forEach((o) -> { + SzCheckingItem item = new SzCheckingItem(); + item.setXcId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + BaseEntityUtils.preInsert(item); + SzCheckingItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new SzException("存在相同的名称"); + } + + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public SzCheckingDetailDto update(SzCheckingDetailDto dto) { + if (exist(dto.getId())) { + SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class); + if (checking != null) { + if (checkNameDistinct(checking.getId(), checking.getName())) { + BaseEntityUtils.preUpdate(checking); + getBaseMapper().updateById(checking); + String id = checking.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(dto.getItems())) { + dto.getItems().forEach((o) -> { + SzCheckingItem item = new SzCheckingItem(); + item.setXcId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + BaseEntityUtils.preInsert(item); + SzCheckingItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new SzException("存在相同的名称"); + } + } + } + throw new BaseException("源数据不存在，请确认id值是否正确"); + + } + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; + } + + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzCheckingItem::getXcId, id); + SzCheckingItemMapper.delete(wp); + } + + private boolean checkNameDistinct(String id, String name) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzChecking::getName, name) + .ne(StringUtils.isNotEmpty(id), SzChecking::getId, id); + return this.getBaseMapper().selectCount(wp) <= 0; + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzChecking::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index a5faf68c..020e0d48 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -1,9 +1,30 @@ package com.kms.yxgh.sz.service; +import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.SzException; +import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto.OperatorDto; +import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto; +import com.kms.yxgh.sz.domain.dto.SzPointDto; import com.kms.yxgh.sz.domain.entity.SzPlan; +import com.kms.yxgh.sz.domain.entity.SzPlanOperator; +import com.kms.yxgh.sz.domain.entity.SzPoint; import com.kms.yxgh.sz.mapper.SzPlanMapper; +import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper; +import com.kms.yxgh.sz.mapper.SzPointMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import com.shuili.common.utils.StringUtils; +import java.util.List; +import java.util.function.Consumer; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 水闸巡视检查计划Service接口 @@ -12,6 +33,140 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class SzPlanService extends BaseService{ +@AllArgsConstructor +public class SzPlanService extends BaseService { + private final SzPlanOperatorMapper SzPlanOperatorMapper; + private final SzPointMapper SzPointMapper; + + public SzPlanDetailDto getDetailById(String id) { + SzPlan SzPlan = this.getById(id); + SzPlanDetailDto dto = BeanCopyUtils.copy(SzPlan, SzPlanDetailDto.class); + if (dto != null) { + dto.setOtherConfig(JSON.parseObject(SzPlan.getOtherConfig())); + Wrapper wp = Wrappers.lambdaQuery() + .select(SzPlanOperator::getId, SzPlanOperator::getOperatorUid) + .eq(SzPlanOperator::getPlanId, id); + dto.setOperators(StreamUtils.toList(SzPlanOperatorMapper.selectList(wp), (o) -> { + OperatorDto itemDto = new OperatorDto(); + itemDto.setId(o.getId()); + itemDto.setUid(o.getOperatorUid()); + itemDto.setName(o.getOperatorName()); + return itemDto; + })); + } + return dto; + } + + + @Transactional(rollbackFor = Exception.class) + public SzPlanDetailDto add(SzPlanDetailDto dto) { + SzPlan SzPlan = BeanCopyUtils.copy(dto, SzPlan.class); + if (SzPlan != null) { + if (checkNameDistinct(SzPlan.getId(), SzPlan.getName())) { + SzPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); + BaseEntityUtils.preInsert(SzPlan); + getBaseMapper().insert(SzPlan); + String id = SzPlan.getId(); + if (CollectionUtil.isNotEmpty(dto.getOperators())) { + dto.getOperators().forEach(insertOperator(id)); + } + return this.getDetailById(id); + } else { + throw new SzException("存在相同的名称"); + } + + } + return null; + } + + private Consumer insertOperator(String id) { + return (o) -> { + SzPlanOperator item = new SzPlanOperator(); + item.setPlanId(id); + item.setOperatorName(o.getName()); + item.setOperatorUid(o.getUid()); + BaseEntityUtils.preInsert(item); + SzPlanOperatorMapper.insert(item); + }; + } + + @Transactional(rollbackFor = Exception.class) + public SzPlanDetailDto update(SzPlanDetailDto dto) { + if (exist(dto.getId())) { + SzPlan SzPlan = BeanCopyUtils.copy(dto, SzPlan.class); + if (SzPlan != null) { + if (checkNameDistinct(SzPlan.getId(), SzPlan.getName())) { + SzPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); + BaseEntityUtils.preUpdate(SzPlan); + getBaseMapper().updateById(SzPlan); + String id = SzPlan.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(dto.getOperators())) { + dto.getOperators().forEach(insertOperator(id)); + } + return this.getDetailById(id); + } else { + throw new SzException("存在相同的名称"); + } + } + } + throw new BaseException("源数据不存在，请确认id值是否正确"); + + } + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; + } + + @Transactional(rollbackFor = Exception.class) + public Boolean addPoints(String id, List points) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzPoint::getPlanId, id); + SzPointMapper.delete(wp); + if (CollectionUtil.isNotEmpty(points)) { + points.forEach(po -> { + SzPoint point = BeanCopyUtils.copy(po, SzPoint.class); + if (point != null) { + point.setPlanId(id); + BaseEntityUtils.preInsert(point); + SzPointMapper.insert(point); + } + }); + } + return true; + } + + + public List getPoints(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzPoint::getPlanId, id); + return StreamUtils.toList(SzPointMapper.selectList(wp), + (o) -> BeanCopyUtils.copy(o, SzPointDto.class)); + } + + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzPlanOperator::getPlanId, id); + SzPlanOperatorMapper.delete(wp); + } + + private boolean checkNameDistinct(String id, String name) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzPlan::getName, name) + .ne(StringUtils.isNotEmpty(id), SzPlan::getId, id); + return this.getBaseMapper().selectCount(wp) <= 0; + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzPlan::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index 574af808..1b373a2c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -1,9 +1,35 @@ package com.kms.yxgh.sz.service; +import static com.kms.yxgh.sz.service.SzCheckingService.PART_SEPARATOR; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.enums.CheckingStatus; +import com.kms.yxgh.base.enums.RecordStatus; +import com.kms.yxgh.sz.domain.dto.StartPlan; +import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto; +import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto; +import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto; +import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto.SzRecordItemDto; import com.kms.yxgh.sz.domain.entity.SzRecord; +import com.kms.yxgh.sz.domain.entity.SzRecordItem; +import com.kms.yxgh.sz.mapper.SzRecordItemMapper; import com.kms.yxgh.sz.mapper.SzRecordMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import com.shuili.common.utils.DateUtils; +import com.shuili.common.utils.StringUtils; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 水闸巡视检查记录Service接口 @@ -12,6 +38,95 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class SzRecordService extends BaseService{ +@AllArgsConstructor +public class SzRecordService extends BaseService { + + private final SzRecordItemMapper SzRecordItemMapper; + private final SzCheckingService SzCheckingService; + private final SzPlanService SzPlanService; + + @Transactional(rollbackFor = Exception.class) + public SzRecordDetailDto start(StartPlan startPlan) { + SzPlanDetailDto planDetailDto = SzPlanService.getDetailById(startPlan.getPlanId()); + if (planDetailDto != null) { + SzCheckingDetailDto checkingDetailDto = SzCheckingService.getDetailById( + planDetailDto.getXcId()); + if (checkingDetailDto != null) { + SzRecord record = new SzRecord(); + record.setPlanId(startPlan.getPlanId()); + record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); + record.setStatus(RecordStatus.CHECKING.getValue()); + BaseEntityUtils.preInsert(record); + String id = record.getId(); + if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { + checkingDetailDto.getItems().forEach(o -> { + SzRecordItem item = new SzRecordItem(); + item.setRecordId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + item.setStatus(CheckingStatus.NORMAL.getValue()); + item.setRecordId(""); + BaseEntityUtils.preInsert(item); + SzRecordItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new BaseException("查询巡查检查项数据异常"); + } + } + throw new BaseException("查询巡查计划"); + } + + public SzRecordDetailDto getDetailById(String id) { + SzRecord record = this.getBaseMapper().selectById(id); + if (record != null) { + SzRecordDetailDto dto = BeanCopyUtils.copy(record, SzRecordDetailDto.class); + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzRecordItem::getRecordId, id); + List items = SzRecordItemMapper.selectList(wp); + if (CollectionUtil.isNotEmpty(items) && dto != null) { + dto.setItems(StreamUtils.toList(items, r -> { + SzRecordItemDto itemDto = BeanCopyUtils.copy(r, SzRecordItemDto.class); + if (itemDto != null) { + itemDto.setParts(Arrays.stream(StringUtils.split(r.getParts(), PART_SEPARATOR)) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); + } + return itemDto; + })); + return dto; + } + } + return null; + } + + public SzRecordDetailDto update(SzRecordDetailDto SzRecord) { + if (CollectionUtil.isNotEmpty(SzRecord.getItems())) { + SzRecord.getItems().forEach(o -> { + SzRecordItem item = new SzRecordItem(); + item.setRecordId(SzRecord.getId()); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + item.setStatus(o.getStatus()); + item.setProblem(o.getProblem()); + BaseEntityUtils.preUpdate(item); + SzRecordItemMapper.updateById(item); + }); + } + return SzRecord; + } + + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; + } + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzRecordItem::getRecordId, id); + SzRecordItemMapper.delete(wp); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java index 41d1fe9f..624239aa 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class SzTraceService extends BaseService { +public class SzTraceService extends BaseService{ } From ce1e6d39f74e0b4d516ec59eb5ab04a41c2b47d9 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 15 Nov 2023 16:58:25 +0800 Subject: [PATCH 16/35] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E7=BB=93=E6=9E=9C=E6=A3=80=E7=B4=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/DfRecordController.java | 5 +- .../yxgh/df/domain/dto/DfRecordDetailDto.java | 1 - .../yxgh/df/domain/dto/DfRecordSearchDto.java | 37 ++++++++++ .../kms/yxgh/df/service/DfRecordService.java | 49 +++++++++++++ .../sz/controller/SzRecordController.java | 7 +- .../yxgh/sz/domain/dto/SzRecordDetailDto.java | 1 - .../yxgh/sz/domain/dto/SzRecordSearchDto.java | 37 ++++++++++ .../kms/yxgh/sz/service/SzRecordService.java | 68 ++++++++++++++++--- 8 files changed, 189 insertions(+), 16 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordSearchDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordSearchDto.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java index 2fdc2495..6058bfeb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java @@ -3,6 +3,7 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; import com.kms.yxgh.df.domain.dto.DfRecordDetailDto; +import com.kms.yxgh.df.domain.dto.DfRecordSearchDto; import com.kms.yxgh.df.domain.dto.StartPlan; import com.kms.yxgh.df.domain.entity.DfRecord; import com.kms.yxgh.df.service.DfRecordService; @@ -41,8 +42,8 @@ public class DfRecordController { */ @PostMapping("/list") @ApiOperation("堤防巡视检查记录列表") - public IPage list(@RequestBody SearchParam sp) { - return dfRecordService.selectPage(sp); + public IPage list(@RequestBody SearchParam sp) { + return dfRecordService.search(sp); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java index f76d2ae0..a9874cbf 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java @@ -33,7 +33,6 @@ public class DfRecordDetailDto { private List items; @Data - public static class DfRecordItemDto { @ApiModelProperty("主键") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordSearchDto.java new file mode 100644 index 00000000..0f366def --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordSearchDto.java @@ -0,0 +1,37 @@ +package com.kms.yxgh.df.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + +/** + * @ClassName: DfRecordSearchDto + * @Description: TODO + * @Date: 2023/11/15 下午4:02 * + * @author: hxh + * @version: 1.0 + */ +@Data +@ApiModel("堤防巡视检查记录检索详情") +public class DfRecordSearchDto { + + @ApiModelProperty("巡查记录") + private String id; + + @ApiModelProperty("巡查计划ID") + private String planId; + + @ApiModelProperty("巡查记录名称") + private String name; + + @ApiModelProperty("状态") + private Long status; + + @ApiModelProperty("异常部位") + private List parts; + + @ApiModelProperty("操作者") + private String operatorName; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index b4021b32..3eb74b3c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -4,14 +4,18 @@ import static com.kms.yxgh.df.service.DfCheckingService.PART_SEPARATOR; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysUserService; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; import com.kms.yxgh.df.domain.dto.DfRecordDetailDto; import com.kms.yxgh.df.domain.dto.DfRecordDetailDto.DfRecordItemDto; +import com.kms.yxgh.df.domain.dto.DfRecordSearchDto; import com.kms.yxgh.df.domain.dto.StartPlan; import com.kms.yxgh.df.domain.entity.DfRecord; import com.kms.yxgh.df.domain.entity.DfRecordItem; @@ -19,13 +23,18 @@ import com.kms.yxgh.df.mapper.DfRecordItemMapper; import com.kms.yxgh.df.mapper.DfRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import com.shuili.common.exception.BaseException; import com.shuili.common.utils.DateUtils; import com.shuili.common.utils.StringUtils; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -44,6 +53,44 @@ public class DfRecordService extends BaseService { private final DfRecordItemMapper dfRecordItemMapper; private final DfCheckingService dfCheckingService; private final DfPlanService dfPlanService; + private final SysUserService userService; + + public IPage search(SearchParam sp) { + IPage page = selectPage(sp); + if (CollectionUtil.isNotEmpty(page.getRecords())) { + List ids = page.getRecords().stream().map(DfRecord::getId) + .collect(Collectors.toList()); + Wrapper wp = Wrappers.lambdaQuery() + .in(DfRecordItem::getRecordId, ids) + .eq(DfRecordItem::getStatus, CheckingStatus.ABNORMAL.getValue()); + Map> items = Optional.ofNullable(dfRecordItemMapper.selectList(wp)) + .map(list -> list.stream().collect( + Collectors.groupingBy(DfRecordItem::getRecordId, Collectors.toList()))) + .orElseGet(Collections::emptyMap); + + List records = page.getRecords().stream().map(r -> { + DfRecordSearchDto dto = BeanCopyUtils.copy(r, DfRecordSearchDto + .class); + if (dto != null) { + dto.setParts(items.getOrDefault(r.getPlanId(), Collections.emptyList()) + .stream().map(item -> { + List parts = Arrays.stream(item.getParts().split(PART_SEPARATOR)) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()); + return parts.get(parts.size() - 1); + }).collect(Collectors.toList())); + dto.setOperatorName(Optional.ofNullable(userService.getWithRedis(r.getCreateUid())).map( + SysUser::getNickName).orElse("")); + } + return dto; + }).collect(Collectors.toList()); + Page recordSearchDtoPage = new Page<>(page.getCurrent(), page.getSize(), + page.getTotal()); + recordSearchDtoPage.setRecords(records); + return recordSearchDtoPage; + } else { + return new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + } + } @Transactional(rollbackFor = Exception.class) public DfRecordDetailDto start(StartPlan startPlan) { @@ -100,6 +147,7 @@ public class DfRecordService extends BaseService { return null; } + @Transactional(rollbackFor = Exception.class) public DfRecordDetailDto update(DfRecordDetailDto dfRecord) { if (CollectionUtil.isNotEmpty(dfRecord.getItems())) { dfRecord.getItems().forEach(o -> { @@ -116,6 +164,7 @@ public class DfRecordService extends BaseService { return dfRecord; } + @Transactional(rollbackFor = Exception.class) public Boolean deleteById(String id) { boolean rt = removeById(id); if (rt) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java index ad34817b..10704ad6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java @@ -2,9 +2,10 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto; import com.kms.yxgh.sz.domain.dto.StartPlan; +import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto; import com.kms.yxgh.sz.domain.entity.SzRecord; +import com.kms.yxgh.sz.domain.dto.SzRecordSearchDto; import com.kms.yxgh.sz.service.SzRecordService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; @@ -41,8 +42,8 @@ public class SzRecordController { */ @PostMapping("/list") @ApiOperation("水闸巡视检查记录列表") - public IPage list(@RequestBody SearchParam sp) { - return szRecordService.selectPage(sp); + public IPage list(@RequestBody SearchParam sp) { + return szRecordService.search(sp); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java index 0a2e11cb..578f6767 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java @@ -33,7 +33,6 @@ public class SzRecordDetailDto { private List items; @Data - public static class SzRecordItemDto { @ApiModelProperty("主键") diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordSearchDto.java new file mode 100644 index 00000000..368f9efb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordSearchDto.java @@ -0,0 +1,37 @@ +package com.kms.yxgh.sz.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + +/** + * @ClassName: DfRecordSearchDto + * @Description: TODO + * @Date: 2023/11/15 下午4:02 * + * @author: hxh + * @version: 1.0 + */ +@Data +@ApiModel("水闸巡视检查记录检索详情") +public class SzRecordSearchDto { + + @ApiModelProperty("巡查记录") + private String id; + + @ApiModelProperty("巡查计划ID") + private String planId; + + @ApiModelProperty("巡查记录名称") + private String name; + + @ApiModelProperty("状态") + private Long status; + + @ApiModelProperty("异常部位") + private List parts; + + @ApiModelProperty("操作者") + private String operatorName; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index 1b373a2c..aa04b41f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -4,8 +4,11 @@ import static com.kms.yxgh.sz.service.SzCheckingService.PART_SEPARATOR; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysUserService; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; import com.kms.yxgh.sz.domain.dto.StartPlan; @@ -15,17 +18,23 @@ import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto; import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto.SzRecordItemDto; import com.kms.yxgh.sz.domain.entity.SzRecord; import com.kms.yxgh.sz.domain.entity.SzRecordItem; +import com.kms.yxgh.sz.domain.dto.SzRecordSearchDto; import com.kms.yxgh.sz.mapper.SzRecordItemMapper; import com.kms.yxgh.sz.mapper.SzRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import com.shuili.common.exception.BaseException; import com.shuili.common.utils.DateUtils; import com.shuili.common.utils.StringUtils; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -41,15 +50,54 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class SzRecordService extends BaseService { - private final SzRecordItemMapper SzRecordItemMapper; - private final SzCheckingService SzCheckingService; - private final SzPlanService SzPlanService; + private final SzRecordItemMapper szRecordItemMapper; + private final SzCheckingService szCheckingService; + private final SzPlanService szPlanService; + private final SysUserService userService; + + public IPage search(SearchParam sp) { + IPage page = selectPage(sp); + if (CollectionUtil.isNotEmpty(page.getRecords())) { + List ids = page.getRecords().stream().map(SzRecord::getId) + .collect(Collectors.toList()); + Wrapper wp = Wrappers.lambdaQuery() + .in(SzRecordItem::getRecordId, ids) + .eq(SzRecordItem::getStatus, CheckingStatus.ABNORMAL.getValue()); + Map> items = Optional.ofNullable(szRecordItemMapper.selectList(wp)) + .map(list -> list.stream().collect( + Collectors.groupingBy(SzRecordItem::getRecordId, Collectors.toList()))) + .orElseGet(Collections::emptyMap); + + List records = page.getRecords().stream().map(r -> { + SzRecordSearchDto dto = BeanCopyUtils.copy(r, SzRecordSearchDto + .class); + if (dto != null) { + dto.setParts(items.getOrDefault(r.getPlanId(), Collections.emptyList()) + .stream().map(item -> { + List parts = Arrays.stream(item.getParts().split( + SzCheckingService.PART_SEPARATOR)) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()); + return parts.get(parts.size() - 1); + }).collect(Collectors.toList())); + dto.setOperatorName(Optional.ofNullable(userService.getWithRedis(r.getCreateUid())).map( + SysUser::getNickName).orElse("")); + } + return dto; + }).collect(Collectors.toList()); + Page recordSearchDtoPage = new Page<>(page.getCurrent(), page.getSize(), + page.getTotal()); + recordSearchDtoPage.setRecords(records); + return recordSearchDtoPage; + } else { + return new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + } + } @Transactional(rollbackFor = Exception.class) public SzRecordDetailDto start(StartPlan startPlan) { - SzPlanDetailDto planDetailDto = SzPlanService.getDetailById(startPlan.getPlanId()); + SzPlanDetailDto planDetailDto = szPlanService.getDetailById(startPlan.getPlanId()); if (planDetailDto != null) { - SzCheckingDetailDto checkingDetailDto = SzCheckingService.getDetailById( + SzCheckingDetailDto checkingDetailDto = szCheckingService.getDetailById( planDetailDto.getXcId()); if (checkingDetailDto != null) { SzRecord record = new SzRecord(); @@ -67,7 +115,7 @@ public class SzRecordService extends BaseService { item.setStatus(CheckingStatus.NORMAL.getValue()); item.setRecordId(""); BaseEntityUtils.preInsert(item); - SzRecordItemMapper.insert(item); + szRecordItemMapper.insert(item); }); } return this.getDetailById(id); @@ -84,7 +132,7 @@ public class SzRecordService extends BaseService { SzRecordDetailDto dto = BeanCopyUtils.copy(record, SzRecordDetailDto.class); Wrapper wp = Wrappers.lambdaQuery() .eq(SzRecordItem::getRecordId, id); - List items = SzRecordItemMapper.selectList(wp); + List items = szRecordItemMapper.selectList(wp); if (CollectionUtil.isNotEmpty(items) && dto != null) { dto.setItems(StreamUtils.toList(items, r -> { SzRecordItemDto itemDto = BeanCopyUtils.copy(r, SzRecordItemDto.class); @@ -100,6 +148,7 @@ public class SzRecordService extends BaseService { return null; } + @Transactional(rollbackFor = Exception.class) public SzRecordDetailDto update(SzRecordDetailDto SzRecord) { if (CollectionUtil.isNotEmpty(SzRecord.getItems())) { SzRecord.getItems().forEach(o -> { @@ -110,12 +159,13 @@ public class SzRecordService extends BaseService { item.setStatus(o.getStatus()); item.setProblem(o.getProblem()); BaseEntityUtils.preUpdate(item); - SzRecordItemMapper.updateById(item); + szRecordItemMapper.updateById(item); }); } return SzRecord; } + @Transactional(rollbackFor = Exception.class) public Boolean deleteById(String id) { boolean rt = removeById(id); if (rt) { @@ -127,6 +177,6 @@ public class SzRecordService extends BaseService { private void deleteItems(String id) { Wrapper wp = Wrappers.lambdaQuery() .eq(SzRecordItem::getRecordId, id); - SzRecordItemMapper.delete(wp); + szRecordItemMapper.delete(wp); } } From a3b6e48da075beb4151a68fcc36432dd3abb1334 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Thu, 16 Nov 2023 14:45:32 +0800 Subject: [PATCH 17/35] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateAndUpdateMetaObjectHandler.java | 55 +++++++++++++++++++ .../java/com/kms/yxgh/base/SyBaseEntity.java | 36 +++++++++++- .../kms/yxgh/df/domain/entity/DfChecking.java | 30 ---------- .../yxgh/df/domain/entity/DfCheckingItem.java | 30 ---------- .../com/kms/yxgh/df/domain/entity/DfPlan.java | 30 ---------- .../yxgh/df/domain/entity/DfPlanOperator.java | 30 ---------- .../kms/yxgh/df/domain/entity/DfPoint.java | 30 ---------- .../kms/yxgh/df/domain/entity/DfRecord.java | 30 ---------- .../yxgh/df/domain/entity/DfRecordItem.java | 30 ---------- .../kms/yxgh/df/domain/entity/DfTrace.java | 19 ++++--- .../yxgh/df/service/DfCheckingService.java | 5 -- .../kms/yxgh/df/service/DfPlanService.java | 5 -- .../kms/yxgh/df/service/DfRecordService.java | 4 -- .../kms/yxgh/sz/domain/entity/SzChecking.java | 30 ---------- .../yxgh/sz/domain/entity/SzCheckingItem.java | 30 ---------- .../com/kms/yxgh/sz/domain/entity/SzPlan.java | 30 ---------- .../yxgh/sz/domain/entity/SzPlanOperator.java | 29 ---------- .../kms/yxgh/sz/domain/entity/SzPoint.java | 29 ---------- .../kms/yxgh/sz/domain/entity/SzRecord.java | 29 ---------- .../yxgh/sz/domain/entity/SzRecordItem.java | 32 ----------- .../kms/yxgh/sz/domain/entity/SzTrace.java | 19 ++++--- .../yxgh/sz/service/SzCheckingService.java | 5 -- .../kms/yxgh/sz/service/SzPlanService.java | 5 -- .../kms/yxgh/sz/service/SzRecordService.java | 4 -- 24 files changed, 112 insertions(+), 464 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java b/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java new file mode 100644 index 00000000..696c915b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java @@ -0,0 +1,55 @@ +package com.kms.yxgh.base; + + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.kms.common.utils.BaseEntityUtils; +import com.shuili.common.exception.BaseException; +import java.util.Date; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Service; + +/** + * MP注入处理器 + * + * @author Lion Li + * @date 2021/4/25 + */ +@Slf4j +@Service +public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler { + + @Override + public void insertFill(MetaObject metaObject) { + try { + if (ObjectUtil.isNotNull(metaObject) + && metaObject.getOriginalObject() instanceof SyBaseEntity) { + SyBaseEntity baseEntity = (SyBaseEntity) metaObject.getOriginalObject(); + Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime()) + ? baseEntity.getCreateTime() : new Date(); + baseEntity.setCreateTime(current); + baseEntity.setUpdateTime(current); + BaseEntityUtils.preInsert(baseEntity); + } + } catch (Exception e) { + throw new BaseException(e.getMessage()); + } + } + + @Override + public void updateFill(MetaObject metaObject) { + try { + if (ObjectUtil.isNotNull(metaObject) + && metaObject.getOriginalObject() instanceof SyBaseEntity) { + SyBaseEntity baseEntity = (SyBaseEntity) metaObject.getOriginalObject(); + Date current = new Date(); + // 更新时间填充(不管为不为空) + baseEntity.setUpdateTime(current); + BaseEntityUtils.preUpdate(baseEntity); + } + } catch (Exception e) { + throw new BaseException(e.getMessage()); + } + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java index fbb56c39..8b731aef 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java @@ -2,7 +2,11 @@ package com.kms.yxgh.base; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; /** @@ -14,8 +18,38 @@ import lombok.Data; */ @Data -public class SyBaseEntity extends BaseEntity { +public abstract class SyBaseEntity extends BaseEntity { @TableId(type = IdType.AUTO) protected String id; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + private String updateUid; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java index c28d5bf8..10be26e0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java @@ -37,34 +37,4 @@ public class DfChecking extends SyBaseEntity { @ApiModelProperty("巡查类型") private Long type; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java index eabbe1d3..aa59033f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java @@ -44,34 +44,4 @@ public class DfCheckingItem extends SyBaseEntity { @ApiModelProperty("检查内容") private String content; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java index bd988c34..2f4caabc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java @@ -73,34 +73,4 @@ public class DfPlan extends SyBaseEntity { @ApiModelProperty("附加配置") private String otherConfig; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java index a20091b9..97494391 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java @@ -44,34 +44,4 @@ public class DfPlanOperator extends SyBaseEntity { @ApiModelProperty("执行人名称") private String operatorName; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java index 1f94a19b..f7914cd1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java @@ -51,34 +51,4 @@ public class DfPoint extends SyBaseEntity { @ApiModelProperty("海拔") private Long altitude; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java index 7b087195..d2988818 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java @@ -44,34 +44,4 @@ public class DfRecord extends SyBaseEntity { @ApiModelProperty("状态") private Long status; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java index 0fddc997..2190b555 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java @@ -58,34 +58,4 @@ public class DfRecordItem extends SyBaseEntity { @ApiModelProperty("存在问题") private String problem; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java index ef24fcb5..5c9a661b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java @@ -1,5 +1,6 @@ package com.kms.yxgh.df.domain.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; @@ -52,18 +53,20 @@ public class DfTrace extends SyBaseEntity { private Long altitude; /** - * 创建人 + * 最近修改人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + @TableField(exist = false) + private String updateUid; /** - * 创建时间 + * 最近修改时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + @TableField(exist = false) + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index ef091829..62dfaaa0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -3,7 +3,6 @@ package com.kms.yxgh.df.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.common.utils.BaseEntityUtils; import com.kms.yxgh.base.DfException; import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto.DfCheckingItemDto; @@ -71,7 +70,6 @@ public class DfCheckingService extends BaseService DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class); if (checking != null) { if (checkNameDistinct(checking.getId(), checking.getName())) { - BaseEntityUtils.preInsert(checking); getBaseMapper().insert(checking); String id = checking.getId(); if (CollectionUtil.isNotEmpty(dto.getItems())) { @@ -80,7 +78,6 @@ public class DfCheckingService extends BaseService item.setXcId(id); item.setContent(o.getContent()); item.setParts(String.join(PART_SEPARATOR, o.getParts())); - BaseEntityUtils.preInsert(item); dfCheckingItemMapper.insert(item); }); } @@ -99,7 +96,6 @@ public class DfCheckingService extends BaseService DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class); if (checking != null) { if (checkNameDistinct(checking.getId(), checking.getName())) { - BaseEntityUtils.preUpdate(checking); getBaseMapper().updateById(checking); String id = checking.getId(); deleteItems(id); @@ -109,7 +105,6 @@ public class DfCheckingService extends BaseService item.setXcId(id); item.setContent(o.getContent()); item.setParts(String.join(PART_SEPARATOR, o.getParts())); - BaseEntityUtils.preInsert(item); dfCheckingItemMapper.insert(item); }); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 44f69bc9..6c795e2a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.common.utils.BaseEntityUtils; import com.kms.yxgh.base.DfException; import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; import com.kms.yxgh.df.domain.dto.DfPlanDetailDto.OperatorDto; @@ -65,7 +64,6 @@ public class DfPlanService extends BaseService { if (dfPlan != null) { if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); - BaseEntityUtils.preInsert(dfPlan); getBaseMapper().insert(dfPlan); String id = dfPlan.getId(); if (CollectionUtil.isNotEmpty(dto.getOperators())) { @@ -86,7 +84,6 @@ public class DfPlanService extends BaseService { item.setPlanId(id); item.setOperatorName(o.getName()); item.setOperatorUid(o.getUid()); - BaseEntityUtils.preInsert(item); dfPlanOperatorMapper.insert(item); }; } @@ -98,7 +95,6 @@ public class DfPlanService extends BaseService { if (dfPlan != null) { if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); - BaseEntityUtils.preUpdate(dfPlan); getBaseMapper().updateById(dfPlan); String id = dfPlan.getId(); deleteItems(id); @@ -135,7 +131,6 @@ public class DfPlanService extends BaseService { DfPoint point = BeanCopyUtils.copy(po, DfPoint.class); if (point != null) { point.setPlanId(id); - BaseEntityUtils.preInsert(point); dfPointMapper.insert(point); } }); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 3eb74b3c..45fd54f2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysUserService; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; @@ -103,7 +102,6 @@ public class DfRecordService extends BaseService { record.setPlanId(startPlan.getPlanId()); record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); record.setStatus(RecordStatus.CHECKING.getValue()); - BaseEntityUtils.preInsert(record); String id = record.getId(); if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { checkingDetailDto.getItems().forEach(o -> { @@ -113,7 +111,6 @@ public class DfRecordService extends BaseService { item.setParts(String.join(PART_SEPARATOR, o.getParts())); item.setStatus(CheckingStatus.NORMAL.getValue()); item.setRecordId(""); - BaseEntityUtils.preInsert(item); dfRecordItemMapper.insert(item); }); } @@ -157,7 +154,6 @@ public class DfRecordService extends BaseService { item.setParts(String.join(PART_SEPARATOR, o.getParts())); item.setStatus(o.getStatus()); item.setProblem(o.getProblem()); - BaseEntityUtils.preUpdate(item); dfRecordItemMapper.updateById(item); }); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java index b344f197..c20a04ff 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java @@ -37,34 +37,4 @@ public class SzChecking extends SyBaseEntity { @ApiModelProperty("巡查类型") private Long type; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java index f3c720cd..19eeccd8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java @@ -44,34 +44,4 @@ public class SzCheckingItem extends SyBaseEntity { @ApiModelProperty("检查内容") private String content; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java index 5c05906e..a8d02a37 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java @@ -73,34 +73,4 @@ public class SzPlan extends SyBaseEntity { @ApiModelProperty("附加配置") private String otherConfig; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java index 15f58e4e..d9da7b1b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java @@ -44,34 +44,5 @@ public class SzPlanOperator extends SyBaseEntity { @ApiModelProperty("执行人名称") private String operatorName; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java index 87f26829..cdc80515 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java @@ -51,34 +51,5 @@ public class SzPoint extends SyBaseEntity { @ApiModelProperty("海拔") private Long altitude; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java index cd32b5ac..90e66090 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java @@ -44,34 +44,5 @@ public class SzRecord extends SyBaseEntity { @ApiModelProperty("状态") private Long status; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java index 297ec145..68a4e810 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java @@ -1,12 +1,10 @@ package com.kms.yxgh.sz.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; @@ -58,34 +56,4 @@ public class SzRecordItem extends SyBaseEntity { @ApiModelProperty("存在问题") private String problem; - /** - * 创建人 - */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - private String updateUid; - - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - private Date updateTime; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java index 3106b0d0..a959efd9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.domain.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; @@ -52,18 +53,20 @@ public class SzTrace extends SyBaseEntity { private Long altitude; /** - * 创建人 + * 最近修改人 */ - @Excel(name = "创建人") - @ApiModelProperty("创建人") - private String createUid; + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + @TableField(exist = false) + private String updateUid; /** - * 创建时间 + * 最近修改时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("创建时间") - private Date createTime; + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + @TableField(exist = false) + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index 2664ce7d..671c453a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -3,7 +3,6 @@ package com.kms.yxgh.sz.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.common.utils.BaseEntityUtils; import com.kms.yxgh.base.SzException; import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto.SzCheckingItemDto; import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto; @@ -71,7 +70,6 @@ public class SzCheckingService extends BaseService SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class); if (checking != null) { if (checkNameDistinct(checking.getId(), checking.getName())) { - BaseEntityUtils.preInsert(checking); getBaseMapper().insert(checking); String id = checking.getId(); if (CollectionUtil.isNotEmpty(dto.getItems())) { @@ -80,7 +78,6 @@ public class SzCheckingService extends BaseService item.setXcId(id); item.setContent(o.getContent()); item.setParts(String.join(PART_SEPARATOR, o.getParts())); - BaseEntityUtils.preInsert(item); SzCheckingItemMapper.insert(item); }); } @@ -99,7 +96,6 @@ public class SzCheckingService extends BaseService SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class); if (checking != null) { if (checkNameDistinct(checking.getId(), checking.getName())) { - BaseEntityUtils.preUpdate(checking); getBaseMapper().updateById(checking); String id = checking.getId(); deleteItems(id); @@ -109,7 +105,6 @@ public class SzCheckingService extends BaseService item.setXcId(id); item.setContent(o.getContent()); item.setParts(String.join(PART_SEPARATOR, o.getParts())); - BaseEntityUtils.preInsert(item); SzCheckingItemMapper.insert(item); }); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index 020e0d48..1ae06561 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.common.utils.BaseEntityUtils; import com.kms.yxgh.base.SzException; import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto.OperatorDto; import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto; @@ -65,7 +64,6 @@ public class SzPlanService extends BaseService { if (SzPlan != null) { if (checkNameDistinct(SzPlan.getId(), SzPlan.getName())) { SzPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); - BaseEntityUtils.preInsert(SzPlan); getBaseMapper().insert(SzPlan); String id = SzPlan.getId(); if (CollectionUtil.isNotEmpty(dto.getOperators())) { @@ -86,7 +84,6 @@ public class SzPlanService extends BaseService { item.setPlanId(id); item.setOperatorName(o.getName()); item.setOperatorUid(o.getUid()); - BaseEntityUtils.preInsert(item); SzPlanOperatorMapper.insert(item); }; } @@ -98,7 +95,6 @@ public class SzPlanService extends BaseService { if (SzPlan != null) { if (checkNameDistinct(SzPlan.getId(), SzPlan.getName())) { SzPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); - BaseEntityUtils.preUpdate(SzPlan); getBaseMapper().updateById(SzPlan); String id = SzPlan.getId(); deleteItems(id); @@ -135,7 +131,6 @@ public class SzPlanService extends BaseService { SzPoint point = BeanCopyUtils.copy(po, SzPoint.class); if (point != null) { point.setPlanId(id); - BaseEntityUtils.preInsert(point); SzPointMapper.insert(point); } }); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index aa04b41f..e29ab653 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysUserService; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; @@ -104,7 +103,6 @@ public class SzRecordService extends BaseService { record.setPlanId(startPlan.getPlanId()); record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); record.setStatus(RecordStatus.CHECKING.getValue()); - BaseEntityUtils.preInsert(record); String id = record.getId(); if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { checkingDetailDto.getItems().forEach(o -> { @@ -114,7 +112,6 @@ public class SzRecordService extends BaseService { item.setParts(String.join(PART_SEPARATOR, o.getParts())); item.setStatus(CheckingStatus.NORMAL.getValue()); item.setRecordId(""); - BaseEntityUtils.preInsert(item); szRecordItemMapper.insert(item); }); } @@ -158,7 +155,6 @@ public class SzRecordService extends BaseService { item.setParts(String.join(PART_SEPARATOR, o.getParts())); item.setStatus(o.getStatus()); item.setProblem(o.getProblem()); - BaseEntityUtils.preUpdate(item); szRecordItemMapper.updateById(item); }); } From 0d2a3e9926d3a086b760d34788a3fafddcc00b8b Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Thu, 16 Nov 2023 15:09:10 +0800 Subject: [PATCH 18/35] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/web/controller/system/SysUserController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysUserController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysUserController.java index 5cf7a2b0..5ab77877 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysUserController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysUserController.java @@ -20,6 +20,8 @@ import com.kms.system.service.SysDeptService; import com.kms.system.service.SysPostService; import com.kms.system.service.SysRoleService; import com.kms.system.service.SysUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,6 +35,7 @@ import java.util.stream.Collectors; * @author kms */ @RestController +@Api(tags = "用户数据") @RequestMapping("/system/user") public class SysUserController extends BaseController { @@ -51,6 +54,7 @@ public class SysUserController extends BaseController /** * 获取用户列表 */ + @ApiOperation("用户数据列表") @PostMapping("/list") public IPage list(@RequestBody SearchParam sp) { @@ -146,6 +150,7 @@ public class SysUserController extends BaseController /** * 根据用户编号获取详细信息 */ + @ApiOperation("根据用户编号获取详细信息") @SaCheckLogin @SaCheckPermission(value = "system:user:query") @GetMapping(value = { "/", "/{userId}" }) From 97091a44e08d86037665ec707c61ecc0ceb20a73 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Thu, 16 Nov 2023 15:29:41 +0800 Subject: [PATCH 19/35] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/df/controller/DfCheckingController.java | 6 +++--- .../kms/yxgh/df/controller/DfPlanController.java | 6 +++--- .../yxgh/df/controller/DfRecordController.java | 8 ++++---- .../yxgh/df/controller/DfTraceController.java | 2 +- .../yxgh/df/domain/{entity => }/DfChecking.java | 2 +- .../df/domain/{entity => }/DfCheckingItem.java | 2 +- .../kms/yxgh/df/domain/{entity => }/DfPlan.java | 2 +- .../df/domain/{entity => }/DfPlanOperator.java | 2 +- .../kms/yxgh/df/domain/{entity => }/DfPoint.java | 2 +- .../yxgh/df/domain/{entity => }/DfRecord.java | 2 +- .../df/domain/{entity => }/DfRecordItem.java | 2 +- .../kms/yxgh/df/domain/{entity => }/DfTrace.java | 2 +- .../df/{domain => }/dto/DfCheckingDetailDto.java | 2 +- .../df/{domain => }/dto/DfPlanDetailDto.java | 2 +- .../kms/yxgh/df/{domain => }/dto/DfPointDto.java | 2 +- .../df/{domain => }/dto/DfRecordDetailDto.java | 2 +- .../df/{domain => }/dto/DfRecordSearchDto.java | 2 +- .../df/{domain => }/dto/SimpleDfCheckingDto.java | 2 +- .../kms/yxgh/df/{domain => }/dto/StartPlan.java | 2 +- .../kms/yxgh/df/mapper/DfCheckingItemMapper.java | 2 +- .../com/kms/yxgh/df/mapper/DfCheckingMapper.java | 2 +- .../com/kms/yxgh/df/mapper/DfPlanMapper.java | 2 +- .../kms/yxgh/df/mapper/DfPlanOperatorMapper.java | 2 +- .../com/kms/yxgh/df/mapper/DfPointMapper.java | 2 +- .../kms/yxgh/df/mapper/DfRecordItemMapper.java | 2 +- .../com/kms/yxgh/df/mapper/DfRecordMapper.java | 2 +- .../com/kms/yxgh/df/mapper/DfTraceMapper.java | 2 +- .../yxgh/df/service/DfCheckingItemService.java | 2 +- .../kms/yxgh/df/service/DfCheckingService.java | 8 ++++---- .../yxgh/df/service/DfPlanOperatorService.java | 2 +- .../com/kms/yxgh/df/service/DfPlanService.java | 12 ++++++------ .../com/kms/yxgh/df/service/DfPointService.java | 2 +- .../kms/yxgh/df/service/DfRecordItemService.java | 2 +- .../com/kms/yxgh/df/service/DfRecordService.java | 16 ++++++++-------- .../com/kms/yxgh/df/service/DfTraceService.java | 2 +- .../yxgh/sz/controller/SzCheckingController.java | 6 +++--- .../kms/yxgh/sz/controller/SzPlanController.java | 6 +++--- .../yxgh/sz/controller/SzRecordController.java | 8 ++++---- .../yxgh/sz/controller/SzTraceController.java | 2 +- .../yxgh/sz/domain/{entity => }/SzChecking.java | 2 +- .../sz/domain/{entity => }/SzCheckingItem.java | 2 +- .../kms/yxgh/sz/domain/{entity => }/SzPlan.java | 2 +- .../sz/domain/{entity => }/SzPlanOperator.java | 2 +- .../kms/yxgh/sz/domain/{entity => }/SzPoint.java | 2 +- .../yxgh/sz/domain/{entity => }/SzRecord.java | 2 +- .../sz/domain/{entity => }/SzRecordItem.java | 2 +- .../kms/yxgh/sz/domain/{entity => }/SzTrace.java | 2 +- .../sz/{domain => }/dto/SimpleSzCheckingDto.java | 2 +- .../kms/yxgh/sz/{domain => }/dto/StartPlan.java | 2 +- .../sz/{domain => }/dto/SzCheckingDetailDto.java | 2 +- .../sz/{domain => }/dto/SzPlanDetailDto.java | 2 +- .../kms/yxgh/sz/{domain => }/dto/SzPointDto.java | 2 +- .../sz/{domain => }/dto/SzRecordDetailDto.java | 2 +- .../sz/{domain => }/dto/SzRecordSearchDto.java | 2 +- .../kms/yxgh/sz/mapper/SzCheckingItemMapper.java | 2 +- .../com/kms/yxgh/sz/mapper/SzCheckingMapper.java | 2 +- .../com/kms/yxgh/sz/mapper/SzPlanMapper.java | 2 +- .../kms/yxgh/sz/mapper/SzPlanOperatorMapper.java | 2 +- .../com/kms/yxgh/sz/mapper/SzPointMapper.java | 2 +- .../kms/yxgh/sz/mapper/SzRecordItemMapper.java | 2 +- .../com/kms/yxgh/sz/mapper/SzRecordMapper.java | 2 +- .../com/kms/yxgh/sz/mapper/SzTraceMapper.java | 2 +- .../yxgh/sz/service/SzCheckingItemService.java | 2 +- .../kms/yxgh/sz/service/SzCheckingService.java | 8 ++++---- .../yxgh/sz/service/SzPlanOperatorService.java | 2 +- .../com/kms/yxgh/sz/service/SzPlanService.java | 12 ++++++------ .../com/kms/yxgh/sz/service/SzPointService.java | 2 +- .../kms/yxgh/sz/service/SzRecordItemService.java | 2 +- .../com/kms/yxgh/sz/service/SzRecordService.java | 16 ++++++++-------- .../com/kms/yxgh/sz/service/SzTraceService.java | 2 +- 70 files changed, 114 insertions(+), 114 deletions(-) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{entity => }/DfChecking.java (95%) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{entity => }/DfCheckingItem.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{entity => }/DfPlan.java (97%) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{entity => }/DfPlanOperator.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{entity => }/DfPoint.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{entity => }/DfRecord.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{entity => }/DfRecordItem.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{entity => }/DfTrace.java (97%) rename shuili-system/src/main/java/com/kms/yxgh/df/{domain => }/dto/DfCheckingDetailDto.java (95%) rename shuili-system/src/main/java/com/kms/yxgh/df/{domain => }/dto/DfPlanDetailDto.java (97%) rename shuili-system/src/main/java/com/kms/yxgh/df/{domain => }/dto/DfPointDto.java (93%) rename shuili-system/src/main/java/com/kms/yxgh/df/{domain => }/dto/DfRecordDetailDto.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/df/{domain => }/dto/DfRecordSearchDto.java (95%) rename shuili-system/src/main/java/com/kms/yxgh/df/{domain => }/dto/SimpleDfCheckingDto.java (91%) rename shuili-system/src/main/java/com/kms/yxgh/df/{domain => }/dto/StartPlan.java (91%) rename shuili-system/src/main/java/com/kms/yxgh/sz/domain/{entity => }/SzChecking.java (95%) rename shuili-system/src/main/java/com/kms/yxgh/sz/domain/{entity => }/SzCheckingItem.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/sz/domain/{entity => }/SzPlan.java (97%) rename shuili-system/src/main/java/com/kms/yxgh/sz/domain/{entity => }/SzPlanOperator.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/sz/domain/{entity => }/SzPoint.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/sz/domain/{entity => }/SzRecord.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/sz/domain/{entity => }/SzRecordItem.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/sz/domain/{entity => }/SzTrace.java (97%) rename shuili-system/src/main/java/com/kms/yxgh/sz/{domain => }/dto/SimpleSzCheckingDto.java (91%) rename shuili-system/src/main/java/com/kms/yxgh/sz/{domain => }/dto/StartPlan.java (91%) rename shuili-system/src/main/java/com/kms/yxgh/sz/{domain => }/dto/SzCheckingDetailDto.java (95%) rename shuili-system/src/main/java/com/kms/yxgh/sz/{domain => }/dto/SzPlanDetailDto.java (97%) rename shuili-system/src/main/java/com/kms/yxgh/sz/{domain => }/dto/SzPointDto.java (93%) rename shuili-system/src/main/java/com/kms/yxgh/sz/{domain => }/dto/SzRecordDetailDto.java (96%) rename shuili-system/src/main/java/com/kms/yxgh/sz/{domain => }/dto/SzRecordSearchDto.java (95%) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java index deefdcb6..21d6b80c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java @@ -2,9 +2,9 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; -import com.kms.yxgh.df.domain.dto.SimpleDfCheckingDto; -import com.kms.yxgh.df.domain.entity.DfChecking; +import com.kms.yxgh.df.dto.DfCheckingDetailDto; +import com.kms.yxgh.df.dto.SimpleDfCheckingDto; +import com.kms.yxgh.df.domain.DfChecking; import com.kms.yxgh.df.service.DfCheckingService; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.annotation.Log; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index 75012320..b2f97834 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -2,9 +2,9 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; -import com.kms.yxgh.df.domain.dto.DfPointDto; -import com.kms.yxgh.df.domain.entity.DfPlan; +import com.kms.yxgh.df.dto.DfPlanDetailDto; +import com.kms.yxgh.df.dto.DfPointDto; +import com.kms.yxgh.df.domain.DfPlan; import com.kms.yxgh.df.service.DfPlanService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java index 6058bfeb..1c9d42a4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java @@ -2,10 +2,10 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.df.domain.dto.DfRecordDetailDto; -import com.kms.yxgh.df.domain.dto.DfRecordSearchDto; -import com.kms.yxgh.df.domain.dto.StartPlan; -import com.kms.yxgh.df.domain.entity.DfRecord; +import com.kms.yxgh.df.dto.DfRecordDetailDto; +import com.kms.yxgh.df.dto.DfRecordSearchDto; +import com.kms.yxgh.df.dto.StartPlan; +import com.kms.yxgh.df.domain.DfRecord; import com.kms.yxgh.df.service.DfRecordService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java index 294145de..7e6f2bfb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java @@ -3,7 +3,7 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; import com.kms.yxgh.base.Response; -import com.kms.yxgh.df.domain.entity.DfTrace; +import com.kms.yxgh.df.domain.DfTrace; import com.kms.yxgh.df.service.DfTraceService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfChecking.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfChecking.java index 10be26e0..c7944675 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfChecking.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.entity; +package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingItem.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingItem.java index aa59033f..b878f8be 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingItem.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.entity; +package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java index 2f4caabc..ed6f0d6a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.entity; +package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java index 97494391..e3b4df21 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.entity; +package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java index f7914cd1..128db743 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.entity; +package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java index d2988818..50381318 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.entity; +package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecordItem.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecordItem.java index 2190b555..d37acc8d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecordItem.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.entity; +package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java index 5c9a661b..34e9beec 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.entity; +package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingDetailDto.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java rename to shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingDetailDto.java index f7f0e6da..b3a15415 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfCheckingDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingDetailDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.dto; +package com.kms.yxgh.df.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java rename to shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java index b9f5d2e0..5d64abda 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.dto; +package com.kms.yxgh.df.dto; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPointDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPointDto.java similarity index 93% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPointDto.java rename to shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPointDto.java index 77abe92c..5d84e85f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPointDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPointDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.dto; +package com.kms.yxgh.df.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java rename to shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java index a9874cbf..26b3c863 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.dto; +package com.kms.yxgh.df.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordSearchDto.java rename to shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java index 0f366def..727746a1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.dto; +package com.kms.yxgh.df.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/SimpleDfCheckingDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/SimpleDfCheckingDto.java similarity index 91% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/SimpleDfCheckingDto.java rename to shuili-system/src/main/java/com/kms/yxgh/df/dto/SimpleDfCheckingDto.java index e1d238bb..10582fa2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/SimpleDfCheckingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/SimpleDfCheckingDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.dto; +package com.kms.yxgh.df.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/StartPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/StartPlan.java similarity index 91% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/StartPlan.java rename to shuili-system/src/main/java/com/kms/yxgh/df/dto/StartPlan.java index fd65fda8..7a58591f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/StartPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/StartPlan.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.df.domain.dto; +package com.kms.yxgh.df.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java index 0b798ea2..f229acf2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.mapper; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.entity.DfCheckingItem; +import com.kms.yxgh.df.domain.DfCheckingItem; /** * 堤防巡视检查项Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java index 31535d31..60a9bc9f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.mapper; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.entity.DfChecking; +import com.kms.yxgh.df.domain.DfChecking; /** * 堤防巡视检查Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java index 2e5411a5..7ed52585 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.mapper; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.entity.DfPlan; +import com.kms.yxgh.df.domain.DfPlan; /** * 堤防巡视检查计划Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java index f344b91c..b2361fe5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.mapper; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.entity.DfPlanOperator; +import com.kms.yxgh.df.domain.DfPlanOperator; /** * 堤防巡视检查计划执行人Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java index 68e3257f..7934074a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.mapper; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.entity.DfPoint; +import com.kms.yxgh.df.domain.DfPoint; /** * 堤防巡视检查计划点位Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java index eec9fc39..8e3eb1d4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.mapper; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.entity.DfRecordItem; +import com.kms.yxgh.df.domain.DfRecordItem; /** * 堤防巡视检查检查记录子项Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java index 3325b2ee..f02ea7fb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.mapper; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.entity.DfRecord; +import com.kms.yxgh.df.domain.DfRecord; /** * 堤防巡视检查记录Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java index 26ad2a64..f0a74cd5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.mapper; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.entity.DfTrace; +import com.kms.yxgh.df.domain.DfTrace; /** * 堤防巡视检查检查记录轨迹Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java index e7ac1410..da1daee1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.service; import com.shuili.common.core.service.BaseService; import com.kms.yxgh.df.mapper.DfCheckingItemMapper; -import com.kms.yxgh.df.domain.entity.DfCheckingItem; +import com.kms.yxgh.df.domain.DfCheckingItem; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index 62dfaaa0..abbb6ce7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yxgh.base.DfException; -import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; -import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto.DfCheckingItemDto; -import com.kms.yxgh.df.domain.entity.DfChecking; -import com.kms.yxgh.df.domain.entity.DfCheckingItem; +import com.kms.yxgh.df.dto.DfCheckingDetailDto; +import com.kms.yxgh.df.dto.DfCheckingDetailDto.DfCheckingItemDto; +import com.kms.yxgh.df.domain.DfChecking; +import com.kms.yxgh.df.domain.DfCheckingItem; import com.kms.yxgh.df.mapper.DfCheckingItemMapper; import com.kms.yxgh.df.mapper.DfCheckingMapper; import com.kms.yxgh.util.BeanCopyUtils; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java index 7a6e036b..f3d5dcdc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.service; import com.shuili.common.core.service.BaseService; import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; -import com.kms.yxgh.df.domain.entity.DfPlanOperator; +import com.kms.yxgh.df.domain.DfPlanOperator; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 6c795e2a..a807a30b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yxgh.base.DfException; -import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; -import com.kms.yxgh.df.domain.dto.DfPlanDetailDto.OperatorDto; -import com.kms.yxgh.df.domain.dto.DfPointDto; -import com.kms.yxgh.df.domain.entity.DfPlan; -import com.kms.yxgh.df.domain.entity.DfPlanOperator; -import com.kms.yxgh.df.domain.entity.DfPoint; +import com.kms.yxgh.df.dto.DfPlanDetailDto; +import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto; +import com.kms.yxgh.df.dto.DfPointDto; +import com.kms.yxgh.df.domain.DfPlan; +import com.kms.yxgh.df.domain.DfPlanOperator; +import com.kms.yxgh.df.domain.DfPoint; import com.kms.yxgh.df.mapper.DfPlanMapper; import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; import com.kms.yxgh.df.mapper.DfPointMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java index 9164b9d4..79411bef 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.service; import com.shuili.common.core.service.BaseService; import com.kms.yxgh.df.mapper.DfPointMapper; -import com.kms.yxgh.df.domain.entity.DfPoint; +import com.kms.yxgh.df.domain.DfPoint; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java index ffca2632..f1dc1cca 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.service; import com.shuili.common.core.service.BaseService; import com.kms.yxgh.df.mapper.DfRecordItemMapper; -import com.kms.yxgh.df.domain.entity.DfRecordItem; +import com.kms.yxgh.df.domain.DfRecordItem; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 45fd54f2..964c98f2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -10,14 +10,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysUserService; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; -import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto; -import com.kms.yxgh.df.domain.dto.DfPlanDetailDto; -import com.kms.yxgh.df.domain.dto.DfRecordDetailDto; -import com.kms.yxgh.df.domain.dto.DfRecordDetailDto.DfRecordItemDto; -import com.kms.yxgh.df.domain.dto.DfRecordSearchDto; -import com.kms.yxgh.df.domain.dto.StartPlan; -import com.kms.yxgh.df.domain.entity.DfRecord; -import com.kms.yxgh.df.domain.entity.DfRecordItem; +import com.kms.yxgh.df.dto.DfCheckingDetailDto; +import com.kms.yxgh.df.dto.DfPlanDetailDto; +import com.kms.yxgh.df.dto.DfRecordDetailDto; +import com.kms.yxgh.df.dto.DfRecordDetailDto.DfRecordItemDto; +import com.kms.yxgh.df.dto.DfRecordSearchDto; +import com.kms.yxgh.df.dto.StartPlan; +import com.kms.yxgh.df.domain.DfRecord; +import com.kms.yxgh.df.domain.DfRecordItem; import com.kms.yxgh.df.mapper.DfRecordItemMapper; import com.kms.yxgh.df.mapper.DfRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java index 2e034256..2cdd87fe 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java @@ -2,7 +2,7 @@ package com.kms.yxgh.df.service; import com.shuili.common.core.service.BaseService; import com.kms.yxgh.df.mapper.DfTraceMapper; -import com.kms.yxgh.df.domain.entity.DfTrace; +import com.kms.yxgh.df.domain.DfTrace; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java index ade4769c..0932a1b0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java @@ -2,9 +2,9 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto; -import com.kms.yxgh.sz.domain.dto.SimpleSzCheckingDto; -import com.kms.yxgh.sz.domain.entity.SzChecking; +import com.kms.yxgh.sz.dto.SzCheckingDetailDto; +import com.kms.yxgh.sz.dto.SimpleSzCheckingDto; +import com.kms.yxgh.sz.domain.SzChecking; import com.kms.yxgh.sz.service.SzCheckingService; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.annotation.Log; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java index 93330d96..6ad21abe 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java @@ -2,9 +2,9 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto; -import com.kms.yxgh.sz.domain.dto.SzPointDto; -import com.kms.yxgh.sz.domain.entity.SzPlan; +import com.kms.yxgh.sz.dto.SzPlanDetailDto; +import com.kms.yxgh.sz.dto.SzPointDto; +import com.kms.yxgh.sz.domain.SzPlan; import com.kms.yxgh.sz.service.SzPlanService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java index 10704ad6..8a634e69 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java @@ -2,10 +2,10 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.sz.domain.dto.StartPlan; -import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto; -import com.kms.yxgh.sz.domain.entity.SzRecord; -import com.kms.yxgh.sz.domain.dto.SzRecordSearchDto; +import com.kms.yxgh.sz.dto.StartPlan; +import com.kms.yxgh.sz.dto.SzRecordDetailDto; +import com.kms.yxgh.sz.domain.SzRecord; +import com.kms.yxgh.sz.dto.SzRecordSearchDto; import com.kms.yxgh.sz.service.SzRecordService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java index 48e29699..0bb7eda9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java @@ -3,7 +3,7 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; import com.kms.yxgh.base.Response; -import com.kms.yxgh.sz.domain.entity.SzTrace; +import com.kms.yxgh.sz.domain.SzTrace; import com.kms.yxgh.sz.service.SzTraceService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java index c20a04ff..7b4362b2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.entity; +package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java index 19eeccd8..2b19e750 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.entity; +package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlan.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlan.java index a8d02a37..f2978122 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlan.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.entity; +package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlanOperator.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlanOperator.java index d9da7b1b..ec53e3df 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlanOperator.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.entity; +package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java index cdc80515..3eb32362 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.entity; +package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzRecord.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzRecord.java index 90e66090..7d99033c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzRecord.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.entity; +package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzRecordItem.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzRecordItem.java index 68a4e810..0e126d72 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzRecordItem.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.entity; +package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.kms.yxgh.base.SyBaseEntity; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java index a959efd9..200923c8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.entity; +package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SimpleSzCheckingDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SimpleSzCheckingDto.java similarity index 91% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SimpleSzCheckingDto.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/dto/SimpleSzCheckingDto.java index a54175af..680237f0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SimpleSzCheckingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SimpleSzCheckingDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.dto; +package com.kms.yxgh.sz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/StartPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java similarity index 91% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/StartPlan.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java index fa8fa34b..b58ac2c0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/StartPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.dto; +package com.kms.yxgh.sz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzCheckingDetailDto.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java index d9face1e..ae14daa3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzCheckingDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.dto; +package com.kms.yxgh.sz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPlanDetailDto.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java index 57941ec7..2af173e0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.dto; +package com.kms.yxgh.sz.dto; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPointDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPointDto.java similarity index 93% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPointDto.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPointDto.java index 65d272d7..7ff95139 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPointDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPointDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.dto; +package com.kms.yxgh.sz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordDetailDto.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordDetailDto.java index 578f6767..06ed143b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordDetailDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.dto; +package com.kms.yxgh.sz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordSearchDto.java rename to shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java index 368f9efb..5d37b157 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java @@ -1,4 +1,4 @@ -package com.kms.yxgh.sz.domain.dto; +package com.kms.yxgh.sz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java index 271fcaae..e8578d28 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.sz.domain.entity.SzCheckingItem; +import com.kms.yxgh.sz.domain.SzCheckingItem; import org.springframework.stereotype.Repository; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java index bd1099f9..bb3b4559 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.sz.domain.entity.SzChecking; +import com.kms.yxgh.sz.domain.SzChecking; import org.springframework.stereotype.Repository; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java index 74046917..53d40e22 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.sz.domain.entity.SzPlan; +import com.kms.yxgh.sz.domain.SzPlan; import org.springframework.stereotype.Repository; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java index e87296da..59c91451 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.sz.domain.entity.SzPlanOperator; +import com.kms.yxgh.sz.domain.SzPlanOperator; import org.springframework.stereotype.Repository; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java index 10da7f71..98384c1c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.sz.domain.entity.SzPoint; +import com.kms.yxgh.sz.domain.SzPoint; import org.springframework.stereotype.Repository; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java index f6908422..f0077871 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.sz.domain.entity.SzRecordItem; +import com.kms.yxgh.sz.domain.SzRecordItem; import org.springframework.stereotype.Repository; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java index 5bfdb8df..22c3ade9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.sz.domain.entity.SzRecord; +import com.kms.yxgh.sz.domain.SzRecord; import org.springframework.stereotype.Repository; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java index cfcf1b93..e3dafd1c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.sz.domain.entity.SzTrace; +import com.kms.yxgh.sz.domain.SzTrace; import org.springframework.stereotype.Repository; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java index 8d8786b0..cb3f67d2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingItemService.java @@ -1,6 +1,6 @@ package com.kms.yxgh.sz.service; -import com.kms.yxgh.sz.domain.entity.SzCheckingItem; +import com.kms.yxgh.sz.domain.SzCheckingItem; import com.kms.yxgh.sz.mapper.SzCheckingItemMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index 671c453a..73c80c8b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yxgh.base.SzException; -import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto.SzCheckingItemDto; -import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto; -import com.kms.yxgh.sz.domain.entity.SzChecking; -import com.kms.yxgh.sz.domain.entity.SzCheckingItem; +import com.kms.yxgh.sz.dto.SzCheckingDetailDto.SzCheckingItemDto; +import com.kms.yxgh.sz.dto.SzCheckingDetailDto; +import com.kms.yxgh.sz.domain.SzChecking; +import com.kms.yxgh.sz.domain.SzCheckingItem; import com.kms.yxgh.sz.mapper.SzCheckingItemMapper; import com.kms.yxgh.sz.mapper.SzCheckingMapper; import com.kms.yxgh.util.BeanCopyUtils; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java index 424c9c2d..ad1ff319 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanOperatorService.java @@ -1,6 +1,6 @@ package com.kms.yxgh.sz.service; -import com.kms.yxgh.sz.domain.entity.SzPlanOperator; +import com.kms.yxgh.sz.domain.SzPlanOperator; import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index 1ae06561..9b11c4b5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yxgh.base.SzException; -import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto.OperatorDto; -import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto; -import com.kms.yxgh.sz.domain.dto.SzPointDto; -import com.kms.yxgh.sz.domain.entity.SzPlan; -import com.kms.yxgh.sz.domain.entity.SzPlanOperator; -import com.kms.yxgh.sz.domain.entity.SzPoint; +import com.kms.yxgh.sz.dto.SzPlanDetailDto.OperatorDto; +import com.kms.yxgh.sz.dto.SzPlanDetailDto; +import com.kms.yxgh.sz.dto.SzPointDto; +import com.kms.yxgh.sz.domain.SzPlan; +import com.kms.yxgh.sz.domain.SzPlanOperator; +import com.kms.yxgh.sz.domain.SzPoint; import com.kms.yxgh.sz.mapper.SzPlanMapper; import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper; import com.kms.yxgh.sz.mapper.SzPointMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java index fc4e8ad9..cfc2734f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPointService.java @@ -1,6 +1,6 @@ package com.kms.yxgh.sz.service; -import com.kms.yxgh.sz.domain.entity.SzPoint; +import com.kms.yxgh.sz.domain.SzPoint; import com.kms.yxgh.sz.mapper.SzPointMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java index 0ecdfd6c..3637d367 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordItemService.java @@ -1,6 +1,6 @@ package com.kms.yxgh.sz.service; -import com.kms.yxgh.sz.domain.entity.SzRecordItem; +import com.kms.yxgh.sz.domain.SzRecordItem; import com.kms.yxgh.sz.mapper.SzRecordItemMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index e29ab653..1e87ad86 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -10,14 +10,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysUserService; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; -import com.kms.yxgh.sz.domain.dto.StartPlan; -import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto; -import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto; -import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto; -import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto.SzRecordItemDto; -import com.kms.yxgh.sz.domain.entity.SzRecord; -import com.kms.yxgh.sz.domain.entity.SzRecordItem; -import com.kms.yxgh.sz.domain.dto.SzRecordSearchDto; +import com.kms.yxgh.sz.dto.StartPlan; +import com.kms.yxgh.sz.dto.SzCheckingDetailDto; +import com.kms.yxgh.sz.dto.SzPlanDetailDto; +import com.kms.yxgh.sz.dto.SzRecordDetailDto; +import com.kms.yxgh.sz.dto.SzRecordDetailDto.SzRecordItemDto; +import com.kms.yxgh.sz.domain.SzRecord; +import com.kms.yxgh.sz.domain.SzRecordItem; +import com.kms.yxgh.sz.dto.SzRecordSearchDto; import com.kms.yxgh.sz.mapper.SzRecordItemMapper; import com.kms.yxgh.sz.mapper.SzRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java index 624239aa..be8a9fa5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java @@ -1,6 +1,6 @@ package com.kms.yxgh.sz.service; -import com.kms.yxgh.sz.domain.entity.SzTrace; +import com.kms.yxgh.sz.domain.SzTrace; import com.kms.yxgh.sz.mapper.SzTraceMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; From 3266caa5ac7e62e9ccab0c86c193fc42aae413eb Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Thu, 16 Nov 2023 15:39:04 +0800 Subject: [PATCH 20/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=E5=AD=97=E6=AE=B5=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/base/SyBaseEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java index 8b731aef..f933a4ad 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java @@ -1,6 +1,8 @@ package com.kms.yxgh.base; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.shuili.common.annotation.Excel; @@ -28,6 +30,7 @@ public abstract class SyBaseEntity extends BaseEntity { */ @Excel(name = "创建人") @ApiModelProperty("创建人") + @TableField(fill = FieldFill.INSERT) private String createUid; /** @@ -36,6 +39,7 @@ public abstract class SyBaseEntity extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) private Date createTime; /** @@ -43,6 +47,7 @@ public abstract class SyBaseEntity extends BaseEntity { */ @Excel(name = "最近修改人") @ApiModelProperty("最近修改人") + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUid; /** @@ -51,5 +56,6 @@ public abstract class SyBaseEntity extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最近修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; } From e71265c113f7c1a7bcf8c9fb9ded5a4e01b83ded Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Thu, 16 Nov 2023 15:45:37 +0800 Subject: [PATCH 21/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/base/SyBaseEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java index f933a4ad..c360774d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java @@ -37,7 +37,7 @@ public abstract class SyBaseEntity extends BaseEntity { * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("创建时间") @TableField(fill = FieldFill.INSERT) private Date createTime; @@ -54,7 +54,7 @@ public abstract class SyBaseEntity extends BaseEntity { * 最近修改时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("最近修改时间") @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; From 25a723bd0ebc4a43acb7faa225ae425ca380910a Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Thu, 16 Nov 2023 16:04:31 +0800 Subject: [PATCH 22/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/base/SyBaseEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java index c360774d..cb09111e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java @@ -36,7 +36,7 @@ public abstract class SyBaseEntity extends BaseEntity { /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("创建时间") @TableField(fill = FieldFill.INSERT) @@ -53,7 +53,7 @@ public abstract class SyBaseEntity extends BaseEntity { /** * 最近修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("最近修改时间") @TableField(fill = FieldFill.INSERT_UPDATE) From e786f858b58b050fc26fc582afaf60f8ee63697a Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Fri, 17 Nov 2023 20:53:38 +0800 Subject: [PATCH 23/35] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/domain/DfPoint.java | 6 +++--- .../src/main/java/com/kms/yxgh/df/domain/DfTrace.java | 6 +++--- .../src/main/java/com/kms/yxgh/sz/domain/SzPoint.java | 6 +++--- .../src/main/java/com/kms/yxgh/sz/domain/SzTrace.java | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java index 128db743..c6670819 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java @@ -35,20 +35,20 @@ public class DfPoint extends SyBaseEntity { */ @Excel(name = "经度") @ApiModelProperty("经度") - private Long longitude; + private Double longitude; /** * 纬度 */ @Excel(name = "纬度") @ApiModelProperty("纬度") - private Long latitude; + private Double latitude; /** * 海拔 */ @Excel(name = "海拔") @ApiModelProperty("海拔") - private Long altitude; + private Double altitude; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java index 34e9beec..f43c51cd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java @@ -36,21 +36,21 @@ public class DfTrace extends SyBaseEntity { */ @Excel(name = "经度") @ApiModelProperty("经度") - private Long longitude; + private Double longitude; /** * 纬度 */ @Excel(name = "纬度") @ApiModelProperty("纬度") - private Long latitude; + private Double latitude; /** * 海拔 */ @Excel(name = "海拔") @ApiModelProperty("海拔") - private Long altitude; + private Double altitude; /** * 最近修改人 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java index 3eb32362..8762b2ff 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java @@ -35,21 +35,21 @@ public class SzPoint extends SyBaseEntity { */ @Excel(name = "经度") @ApiModelProperty("经度") - private Long longitude; + private Double longitude; /** * 纬度 */ @Excel(name = "纬度") @ApiModelProperty("纬度") - private Long latitude; + private Double latitude; /** * 海拔 */ @Excel(name = "海拔") @ApiModelProperty("海拔") - private Long altitude; + private Double altitude; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java index 200923c8..1ef8877d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java @@ -36,21 +36,21 @@ public class SzTrace extends SyBaseEntity { */ @Excel(name = "经度") @ApiModelProperty("经度") - private Long longitude; + private Double longitude; /** * 纬度 */ @Excel(name = "纬度") @ApiModelProperty("纬度") - private Long latitude; + private Double latitude; /** * 海拔 */ @Excel(name = "海拔") @ApiModelProperty("海拔") - private Long altitude; + private Double altitude; /** * 最近修改人 From 5f42e58b84a051643ea8e42b5aa8818ea0036d61 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 20 Nov 2023 10:55:47 +0800 Subject: [PATCH 24/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=89=A7=E8=A1=8C=E8=80=85=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/service/DfPlanService.java | 9 +++++---- .../main/java/com/kms/yxgh/sz/service/SzPlanService.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index a807a30b..b472b592 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yxgh.base.DfException; -import com.kms.yxgh.df.dto.DfPlanDetailDto; -import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto; -import com.kms.yxgh.df.dto.DfPointDto; import com.kms.yxgh.df.domain.DfPlan; import com.kms.yxgh.df.domain.DfPlanOperator; import com.kms.yxgh.df.domain.DfPoint; +import com.kms.yxgh.df.dto.DfPlanDetailDto; +import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto; +import com.kms.yxgh.df.dto.DfPointDto; import com.kms.yxgh.df.mapper.DfPlanMapper; import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; import com.kms.yxgh.df.mapper.DfPointMapper; @@ -44,7 +44,8 @@ public class DfPlanService extends BaseService { if (dto != null) { dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig())); Wrapper wp = Wrappers.lambdaQuery() - .select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid) + .select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid, + DfPlanOperator::getOperatorName) .eq(DfPlanOperator::getPlanId, id); dto.setOperators(StreamUtils.toList(dfPlanOperatorMapper.selectList(wp), (o) -> { OperatorDto itemDto = new OperatorDto(); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index 9b11c4b5..09b376ca 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yxgh.base.SzException; -import com.kms.yxgh.sz.dto.SzPlanDetailDto.OperatorDto; -import com.kms.yxgh.sz.dto.SzPlanDetailDto; -import com.kms.yxgh.sz.dto.SzPointDto; import com.kms.yxgh.sz.domain.SzPlan; import com.kms.yxgh.sz.domain.SzPlanOperator; import com.kms.yxgh.sz.domain.SzPoint; +import com.kms.yxgh.sz.dto.SzPlanDetailDto; +import com.kms.yxgh.sz.dto.SzPlanDetailDto.OperatorDto; +import com.kms.yxgh.sz.dto.SzPointDto; import com.kms.yxgh.sz.mapper.SzPlanMapper; import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper; import com.kms.yxgh.sz.mapper.SzPointMapper; @@ -44,7 +44,8 @@ public class SzPlanService extends BaseService { if (dto != null) { dto.setOtherConfig(JSON.parseObject(SzPlan.getOtherConfig())); Wrapper wp = Wrappers.lambdaQuery() - .select(SzPlanOperator::getId, SzPlanOperator::getOperatorUid) + .select(SzPlanOperator::getId, SzPlanOperator::getOperatorUid, + SzPlanOperator::getOperatorName) .eq(SzPlanOperator::getPlanId, id); dto.setOperators(StreamUtils.toList(SzPlanOperatorMapper.selectList(wp), (o) -> { OperatorDto itemDto = new OperatorDto(); From 67e168f454afb2f9b3c4fe267b50dddedd08f107 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Tue, 21 Nov 2023 15:10:33 +0800 Subject: [PATCH 25/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=85=BB=E6=8A=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/base/enums/YhRecordStatus.java | 26 ++++ .../df/controller/DfYhPlanController.java | 89 ++++++++++++ .../df/controller/DfYhRecordController.java | 87 +++++++++++ .../com/kms/yxgh/df/domain/DfYhOperator.java | 46 ++++++ .../java/com/kms/yxgh/df/domain/DfYhPlan.java | 77 ++++++++++ .../com/kms/yxgh/df/domain/DfYhRecord.java | 80 +++++++++++ .../kms/yxgh/df/dto/DfYhPlanDetailDto.java | 67 +++++++++ .../kms/yxgh/df/dto/DfYhRecordDetailDto.java | 63 ++++++++ .../yxgh/df/mapper/DfYhOperatorMapper.java | 16 +++ .../kms/yxgh/df/mapper/DfYhPlanMapper.java | 16 +++ .../kms/yxgh/df/mapper/DfYhRecordMapper.java | 16 +++ .../yxgh/df/service/DfCheckingService.java | 4 +- .../kms/yxgh/df/service/DfPlanService.java | 4 +- .../yxgh/df/service/DfYhOperatorService.java | 17 +++ .../kms/yxgh/df/service/DfYhPlanService.java | 83 +++++++++++ .../yxgh/df/service/DfYhRecordService.java | 136 ++++++++++++++++++ .../yxgh/sz/service/SzCheckingService.java | 4 +- .../kms/yxgh/sz/service/SzPlanService.java | 4 +- 18 files changed, 827 insertions(+), 8 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/enums/YhRecordStatus.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhPlanController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhRecordController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhOperator.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhOperatorMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhOperatorService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/YhRecordStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/YhRecordStatus.java new file mode 100644 index 00000000..87e16bcd --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/YhRecordStatus.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.base.enums; + +import lombok.Getter; + +/** + * @ClassName: RecordStatus + * @Description: TODO + * @Date: 2023/11/15 上午11:56 * + * @author: hxh + * @version: 1.0 + */ + +@Getter +public enum YhRecordStatus { + + SAVED("已保存", 0L), + CONFIRMED("已确认", 1L); + + private final Long value; + private final String name; + + YhRecordStatus(String name, Long value) { + this.name = name; + this.value = value; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhPlanController.java new file mode 100644 index 00000000..f750fcf5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhPlanController.java @@ -0,0 +1,89 @@ +package com.kms.yxgh.df.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.domain.DfYhPlan; +import com.kms.yxgh.df.dto.DfYhPlanDetailDto; +import com.kms.yxgh.df.service.DfYhPlanService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.Arrays; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 堤防维修养护计划Controller + * + * @author sy + * @date 2023-11-20 + */ +@RestController +@RequestMapping("/run/df/yh/plan") +@Api(tags = "堤防维修养护计划") +public class DfYhPlanController extends BaseController { + + @Autowired + private DfYhPlanService dfYhPlanService; + + /** + * 查询堤防维修养护计划列表 + */ + @PostMapping("/list") + @ApiOperation("堤防维修养护计划列表") + public IPage list(@RequestBody SearchParam sp) { + return dfYhPlanService.selectPage(sp); + } + + /** + * 获取堤防维修养护计划详细信息 + */ + @ApiOperation(" 堤防维修养护计划详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") Long id) { + return Response.ok(dfYhPlanService.getById(id)); + } + + /** + * 新增堤防维修养护计划 + */ + @Log(title = "堤防维修养护计划新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防维修养护计划新增") + public Response add(@RequestBody DfYhPlanDetailDto dfYhPlan) { + return Response.ok(dfYhPlanService.add(dfYhPlan)); + } + + /** + * 修改堤防维修养护计划 + */ + @ApiOperation("堤防维修养护计划修改") + @Log(title = "堤防维修养护计划修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody DfYhPlanDetailDto dfYhPlan) { + return Response.ok(dfYhPlanService.update(dfYhPlan)); + } + + /** + * 删除堤防维修养护计划 + */ + @ApiOperation("堤防维修养护计划删除") + @Log(title = "堤防维修养护计划删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(dfYhPlanService.deleteById(id)); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhRecordController.java new file mode 100644 index 00000000..58972d11 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhRecordController.java @@ -0,0 +1,87 @@ +package com.kms.yxgh.df.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.domain.DfYhRecord; +import com.kms.yxgh.df.dto.DfYhRecordDetailDto; +import com.kms.yxgh.df.service.DfYhRecordService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 堤防维修养护记录Controller + * + * @author sy + * @date 2023-11-20 + */ +@RestController +@RequestMapping("/run/df/yh/record") +@Api(tags = "堤防维修养护记录") +public class DfYhRecordController extends BaseController { + + @Autowired + private DfYhRecordService dfYhRecordService; + + /** + * 查询堤防维修养护记录列表 + */ + @PostMapping("/list") + @ApiOperation("堤防维修养护记录列表") + public IPage list(@RequestBody SearchParam sp) { + return dfYhRecordService.selectPage(sp); + } + + + /** + * 获取堤防维修养护记录详细信息 + */ + @ApiOperation(" 堤防维修养护记录详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfYhRecordService.getDetailById(id)); + } + + /** + * 新增堤防维修养护记录 + */ + @Log(title = "堤防维修养护记录新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防维修养护记录新增") + public Response add(@RequestBody DfYhRecordDetailDto dfYhRecord) { + return Response.ok(dfYhRecordService.add(dfYhRecord)); + } + + /** + * 修改堤防维修养护记录 + */ + @ApiOperation("堤防维修养护记录修改") + @Log(title = "堤防维修养护记录修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody DfYhRecordDetailDto dfYhRecord) { + return Response.ok(dfYhRecordService.update(dfYhRecord)); + } + + /** + * 删除堤防维修养护记录 + */ + @ApiOperation("堤防维修养护记录删除") + @Log(title = "堤防维修养护记录删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(dfYhRecordService.deleteById(id)); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhOperator.java new file mode 100644 index 00000000..d72dc3b0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhOperator.java @@ -0,0 +1,46 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 堤防维修养护执行人对象 bs_sgc_df_yhjlzx + * + * @author sy + * @date 2023-11-20 + */ +@TableName("bs_sgc_df_yhjlzx") +@Data +@ApiModel("堤防维修养护执行人") +public class DfYhOperator extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 养护记录ID + */ + @Excel(name = "养护记录ID") + @ApiModelProperty("养护记录ID") + private String recordId; + + /** + * 执行人ID + */ + @Excel(name = "执行人ID") + @ApiModelProperty("执行人ID") + private String operatorUid; + + /** + * 执行人名称 + */ + @Excel(name = "执行人名称") + @ApiModelProperty("执行人名称") + private String operatorName; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java new file mode 100644 index 00000000..dd02e919 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java @@ -0,0 +1,77 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + + +/** + * 堤防维修养护计划对象 bs_sgc_df_yhjh + * + * @author sy + * @date 2023-11-20 + */ +@TableName("bs_sgc_df_yhjh") +@Data +@ApiModel("堤防维修养护计划") +public class DfYhPlan extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 堤防代码 + */ + @Excel(name = "堤防代码") + @ApiModelProperty("堤防代码") + private String dikeCode; + + /** + * 名称 + */ + @Excel(name = "名称") + @ApiModelProperty("名称") + private String name; + + /** + * 计划时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("计划时间") + private Date planTime; + + /** + * 国补资金 + */ + @Excel(name = "国补资金") + @ApiModelProperty("国补资金") + private Long nationalSupplement; + + /** + * 自筹资金 + */ + @Excel(name = "自筹资金") + @ApiModelProperty("自筹资金") + private Long selfSupplement; + + /** + * 具体地点 + */ + @Excel(name = "具体地点") + @ApiModelProperty("具体地点") + private String location; + + /** + * 维修养护内容 + */ + @Excel(name = "维修养护内容") + @ApiModelProperty("维修养护内容") + private String content; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java new file mode 100644 index 00000000..6294c1b6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java @@ -0,0 +1,80 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 堤防维修养护记录对象 bs_sgc_df_yhjl + * + * @author sy + * @date 2023-11-20 + */ +@TableName("bs_sgc_df_yhjl") +@Data +@ApiModel("堤防维修养护记录") +public class DfYhRecord extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 计划代码 + */ + @Excel(name = "计划代码") + @ApiModelProperty("计划代码") + private String planId; + + /** + * 名称 + */ + @Excel(name = "名称") + @ApiModelProperty("名称") + private String name; + + /** + * 维护前 + */ + @Excel(name = "维护前") + @ApiModelProperty("维护前") + private String before; + + /** + * 维护过程 + */ + @Excel(name = "维护过程") + @ApiModelProperty("维护过程") + private String middle; + + /** + * 维护结束 + */ + @Excel(name = "维护结束") + @ApiModelProperty("维护结束") + private String after; + + /** + * 养护费用 + */ + @Excel(name = "养护费用") + @ApiModelProperty("养护费用") + private Long maintenanceFunds; + + /** + * 落实情况 + */ + @Excel(name = "落实情况") + @ApiModelProperty("落实情况") + private String implement; + + + /** + * 状态 + */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Long status; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java new file mode 100644 index 00000000..47bf99da --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java @@ -0,0 +1,67 @@ +package com.kms.yxgh.df.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + + +/** + * 堤防维修养护计划详情 + * + * @author sy + * @date 2023-11-20 + */ +@Data +@ApiModel("堤防维修养护计划") +public class DfYhPlanDetailDto { + + @ApiModelProperty("养护计划id") + private String id; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + private String dikeCode; + + /** + * 名称 + */ + @ApiModelProperty("名称") + private String name; + + /** + * 计划时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("计划时间") + private Date planTime; + + /** + * 国补资金 + */ + @ApiModelProperty("国补资金") + private Long nationalSupplement; + + /** + * 自筹资金 + */ + @ApiModelProperty("自筹资金") + private Long selfSupplement; + + /** + * 具体地点 + */ + @ApiModelProperty("具体地点") + private String location; + + /** + * 维修养护内容 + */ + @ApiModelProperty("维修养护内容") + private String content; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java new file mode 100644 index 00000000..4a8bb64a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java @@ -0,0 +1,63 @@ +package com.kms.yxgh.df.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + + +/** + * 堤防维修养护记录 + * + * @author sy + * @date 2023-11-20 + */ +@Data +@ApiModel("堤防维修养护记录") +public class DfYhRecordDetailDto { + + @ApiModelProperty("养护记录id") + private String id; + + @ApiModelProperty("计划代码") + private String planId; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("维护前") + private String before; + + @ApiModelProperty("维护过程") + private String middle; + + @ApiModelProperty("维护结束") + private String after; + + @ApiModelProperty("养护费用") + private Long maintenanceFunds; + + @ApiModelProperty("落实情况") + private String implement; + + @ApiModelProperty("状态") + private Long status; + + @ApiModelProperty("养护人员") + private List operators; + + + @Data + public static class OperatorDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("用户id") + private String uid; + + @ApiModelProperty("用户名称") + private String name; + + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhOperatorMapper.java new file mode 100644 index 00000000..457e22e3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhOperatorMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import com.kms.yxgh.df.domain.DfYhOperator; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 堤防维修养护执行人Mapper接口 + * + * @author sy + * @date 2023-11-20 + */ +@Repository +public interface DfYhOperatorMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java new file mode 100644 index 00000000..bb427063 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import com.kms.yxgh.df.domain.DfYhPlan; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 堤防维修养护计划Mapper接口 + * + * @author sy + * @date 2023-11-20 + */ +@Repository +public interface DfYhPlanMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java new file mode 100644 index 00000000..6f38d662 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import com.kms.yxgh.df.domain.DfYhRecord; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 堤防维修养护记录Mapper接口 + * + * @author sy + * @date 2023-11-20 + */ +@Repository +public interface DfYhRecordMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index abbb6ce7..ae897aed 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -83,7 +83,7 @@ public class DfCheckingService extends BaseService } return this.getDetailById(id); } else { - throw new DfException("存在相同的名称"); + throw new DfException("该名称已存在"); } } @@ -110,7 +110,7 @@ public class DfCheckingService extends BaseService } return this.getDetailById(id); } else { - throw new DfException("存在相同的名称"); + throw new DfException("该名称已存在"); } } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index b472b592..2288f4e0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -72,7 +72,7 @@ public class DfPlanService extends BaseService { } return this.getDetailById(id); } else { - throw new DfException("存在相同的名称"); + throw new DfException("该名称已存在"); } } @@ -104,7 +104,7 @@ public class DfPlanService extends BaseService { } return this.getDetailById(id); } else { - throw new DfException("存在相同的名称"); + throw new DfException("该名称已存在"); } } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhOperatorService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhOperatorService.java new file mode 100644 index 00000000..6b224003 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhOperatorService.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.service; + +import com.kms.yxgh.df.domain.DfYhOperator; +import com.kms.yxgh.df.mapper.DfYhOperatorMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 堤防维修养护执行人Service接口 + * + * @author sy + * @date 2023-11-20 + */ +@Service +public class DfYhOperatorService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java new file mode 100644 index 00000000..303c09a4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java @@ -0,0 +1,83 @@ +package com.kms.yxgh.df.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.yxgh.base.DfException; +import com.kms.yxgh.df.domain.DfYhPlan; +import com.kms.yxgh.df.dto.DfYhPlanDetailDto; +import com.kms.yxgh.df.mapper.DfYhPlanMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import com.shuili.common.utils.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 堤防维修养护计划Service接口 + * + * @author sy + * @date 2023-11-20 + */ +@Service +public class DfYhPlanService extends BaseService { + + + public DfYhPlanDetailDto getDetailById(String id) { + DfYhPlan dfPlan = this.getById(id); + return BeanCopyUtils.copy(dfPlan, DfYhPlanDetailDto.class); + } + + + @Transactional(rollbackFor = Exception.class) + public DfYhPlanDetailDto add(DfYhPlanDetailDto dto) { + DfYhPlan dfPlan = BeanCopyUtils.copy(dto, DfYhPlan.class); + if (dfPlan != null) { + if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { + getBaseMapper().insert(dfPlan); + dto.setId(dfPlan.getId()); + return dto; + } else { + throw new DfException("该名称已存在"); + } + + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public DfYhPlanDetailDto update(DfYhPlanDetailDto dto) { + if (exist(dto.getId())) { + DfYhPlan dfPlan = BeanCopyUtils.copy(dto, DfYhPlan.class); + if (dfPlan != null) { + if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { + getBaseMapper().updateById(dfPlan); + return dto; + } else { + throw new DfException("该名称已存在"); + } + } + } + throw new BaseException("源数据不存在，请确认id值是否正确"); + + } + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + return removeById(id); + } + + private boolean checkNameDistinct(String id, String name) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhPlan::getName, name) + .ne(StringUtils.isNotEmpty(id), DfYhPlan::getId, id); + return this.getBaseMapper().selectCount(wp) <= 0; + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhPlan::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java new file mode 100644 index 00000000..f164206c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -0,0 +1,136 @@ +package com.kms.yxgh.df.service; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.yxgh.base.DfException; +import com.kms.yxgh.base.enums.YhRecordStatus; +import com.kms.yxgh.df.domain.DfYhOperator; +import com.kms.yxgh.df.domain.DfYhRecord; +import com.kms.yxgh.df.dto.DfYhRecordDetailDto; +import com.kms.yxgh.df.dto.DfYhRecordDetailDto.OperatorDto; +import com.kms.yxgh.df.mapper.DfYhOperatorMapper; +import com.kms.yxgh.df.mapper.DfYhRecordMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.kms.yxgh.util.StreamUtils; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import java.util.List; +import java.util.function.Consumer; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 堤防维修养护记录Service接口 + * + * @author sy + * @date 2023-11-20 + */ +@AllArgsConstructor +@Service +public class DfYhRecordService extends BaseService { + + private final DfYhOperatorMapper dfYhOperatorMapper; + + public DfYhRecordDetailDto getDetailById(String id) { + DfYhRecord record = this.getBaseMapper().selectById(id); + if (record != null) { + DfYhRecordDetailDto dto = BeanCopyUtils.copy(record, DfYhRecordDetailDto.class); + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhOperator::getRecordId, id); + List items = dfYhOperatorMapper.selectList(wp); + if (CollectionUtil.isNotEmpty(items) && dto != null) { + dto.setOperators(StreamUtils.toList(items, r -> BeanCopyUtils.copy(r, OperatorDto.class))); + return dto; + } + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public DfYhRecordDetailDto add(DfYhRecordDetailDto dto) { + DfYhRecord dfYhRecord = BeanCopyUtils.copy(dto, DfYhRecord.class); + if (dfYhRecord != null) { + if (existRecord(dto.getPlanId())) { + getBaseMapper().insert(dfYhRecord); + dto.setId(dfYhRecord.getId()); + if (CollectionUtil.isNotEmpty(dto.getOperators())) { + dto.getOperators().forEach(insertOperator(dto.getId())); + } + return dto; + } else { + throw new DfException("该维护计划已经存在维护记录"); + } + + } + return null; + } + + + @Transactional(rollbackFor = Exception.class) + public DfYhRecordDetailDto update(DfYhRecordDetailDto dfRecord) { + if (exist(dfRecord.getId())) { + if (checkStatus(dfRecord.getId())) { + DfYhRecord dfYhRecord = BeanCopyUtils.copy(dfRecord, DfYhRecord.class); + if (dfYhRecord != null) { + getBaseMapper().updateById(dfYhRecord); + String id = dfRecord.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(dfRecord.getOperators())) { + dfRecord.getOperators().forEach(insertOperator(id)); + } + return dfRecord; + } + } else { + throw new BaseException("已确认的记录不能修改"); + } + } + throw new BaseException("源数据不存在，请确认id值是否正确"); + } + + private Consumer insertOperator(String id) { + return (o) -> { + DfYhOperator item = new DfYhOperator(); + item.setRecordId(id); + item.setOperatorName(o.getName()); + item.setOperatorUid(o.getUid()); + dfYhOperatorMapper.insert(item); + }; + } + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; + } + + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhOperator::getRecordId, id); + dfYhOperatorMapper.delete(wp); + } + + private boolean checkStatus(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhRecord::getId, id) + .eq(DfYhRecord::getStatus, YhRecordStatus.CONFIRMED.getValue()); + return !(this.getBaseMapper().selectCount(wp) > 0); + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhRecord::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } + + private boolean existRecord(String planId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhRecord::getPlanId, planId); + return this.getBaseMapper().selectCount(wp) > 0; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index 73c80c8b..eea77964 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -83,7 +83,7 @@ public class SzCheckingService extends BaseService } return this.getDetailById(id); } else { - throw new SzException("存在相同的名称"); + throw new SzException("该名称已存在"); } } @@ -110,7 +110,7 @@ public class SzCheckingService extends BaseService } return this.getDetailById(id); } else { - throw new SzException("存在相同的名称"); + throw new SzException("该名称已存在"); } } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index 09b376ca..7bac6138 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -72,7 +72,7 @@ public class SzPlanService extends BaseService { } return this.getDetailById(id); } else { - throw new SzException("存在相同的名称"); + throw new SzException("该名称已存在"); } } @@ -104,7 +104,7 @@ public class SzPlanService extends BaseService { } return this.getDetailById(id); } else { - throw new SzException("存在相同的名称"); + throw new SzException("该名称已存在"); } } } From c49333e5f28c2adb07461cf1d4f9be603d43a1c8 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 22 Nov 2023 10:19:08 +0800 Subject: [PATCH 26/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B0=B4?= =?UTF-8?q?=E9=97=B8=E7=BB=B4=E4=BF=AE=E5=85=BB=E6=8A=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sz/controller/SzYhPlanController.java | 86 +++++++++++ .../sz/controller/SzYhRecordController.java | 87 +++++++++++ .../com/kms/yxgh/sz/domain/SzYhOperator.java | 46 ++++++ .../java/com/kms/yxgh/sz/domain/SzYhPlan.java | 77 ++++++++++ .../com/kms/yxgh/sz/domain/SzYhRecord.java | 80 +++++++++++ .../kms/yxgh/sz/dto/SzRecordSearchDto.java | 4 +- .../kms/yxgh/sz/dto/SzYhPlanDetailDto.java | 67 +++++++++ .../kms/yxgh/sz/dto/SzYhRecordDetailDto.java | 63 ++++++++ .../yxgh/sz/mapper/SzYhOperatorMapper.java | 16 +++ .../kms/yxgh/sz/mapper/SzYhPlanMapper.java | 16 +++ .../kms/yxgh/sz/mapper/SzYhRecordMapper.java | 16 +++ .../kms/yxgh/sz/service/SzYhPlanService.java | 83 +++++++++++ .../yxgh/sz/service/SzYhRecordService.java | 136 ++++++++++++++++++ 13 files changed, 775 insertions(+), 2 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhPlanController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhRecordController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhOperator.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhOperatorMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhPlanController.java new file mode 100644 index 00000000..e8ac58a3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhPlanController.java @@ -0,0 +1,86 @@ +package com.kms.yxgh.sz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.sz.domain.SzYhPlan; +import com.kms.yxgh.sz.dto.SzYhPlanDetailDto; +import com.kms.yxgh.sz.service.SzYhPlanService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 水闸维修养护计划Controller + * + * @author sy + * @date 2023-11-20 + */ +@RestController +@RequestMapping("/run/sz/yh/plan") +@Api(tags = "水闸维修养护计划") +public class SzYhPlanController extends BaseController { + + @Autowired + private SzYhPlanService szYhPlanService; + + /** + * 查询水闸维修养护计划列表 + */ + @PostMapping("/list") + @ApiOperation("水闸维修养护计划列表") + public IPage list(@RequestBody SearchParam sp) { + return szYhPlanService.selectPage(sp); + } + + /** + * 获取水闸维修养护计划详细信息 + */ + @ApiOperation(" 水闸维修养护计划详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") Long id) { + return Response.ok(szYhPlanService.getById(id)); + } + + /** + * 新增水闸维修养护计划 + */ + @Log(title = "水闸维修养护计划新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸维修养护计划新增") + public Response add(@RequestBody SzYhPlanDetailDto szYhPlan) { + return Response.ok(szYhPlanService.add(szYhPlan)); + } + + /** + * 修改水闸维修养护计划 + */ + @ApiOperation("水闸维修养护计划修改") + @Log(title = "水闸维修养护计划修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody SzYhPlanDetailDto szYhPlan) { + return Response.ok(szYhPlanService.update(szYhPlan)); + } + + /** + * 删除水闸维修养护计划 + */ + @ApiOperation("水闸维修养护计划删除") + @Log(title = "水闸维修养护计划删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(szYhPlanService.deleteById(id)); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhRecordController.java new file mode 100644 index 00000000..03580bea --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhRecordController.java @@ -0,0 +1,87 @@ +package com.kms.yxgh.sz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.sz.domain.SzYhRecord; +import com.kms.yxgh.sz.dto.SzYhRecordDetailDto; +import com.kms.yxgh.sz.service.SzYhRecordService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 水闸维修养护记录Controller + * + * @author sy + * @date 2023-11-20 + */ +@RestController +@RequestMapping("/run/sz/yh/record") +@Api(tags = "水闸维修养护记录") +public class SzYhRecordController extends BaseController { + + @Autowired + private SzYhRecordService szYhRecordService; + + /** + * 查询水闸维修养护记录列表 + */ + @PostMapping("/list") + @ApiOperation("水闸维修养护记录列表") + public IPage list(@RequestBody SearchParam sp) { + return szYhRecordService.selectPage(sp); + } + + + /** + * 获取水闸维修养护记录详细信息 + */ + @ApiOperation(" 水闸维修养护记录详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(szYhRecordService.getDetailById(id)); + } + + /** + * 新增水闸维修养护记录 + */ + @Log(title = "水闸维修养护记录新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸维修养护记录新增") + public Response add(@RequestBody SzYhRecordDetailDto szYhRecord) { + return Response.ok(szYhRecordService.add(szYhRecord)); + } + + /** + * 修改水闸维修养护记录 + */ + @ApiOperation("水闸维修养护记录修改") + @Log(title = "水闸维修养护记录修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody SzYhRecordDetailDto szYhRecord) { + return Response.ok(szYhRecordService.update(szYhRecord)); + } + + /** + * 删除水闸维修养护记录 + */ + @ApiOperation("水闸维修养护记录删除") + @Log(title = "水闸维修养护记录删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(szYhRecordService.deleteById(id)); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhOperator.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhOperator.java new file mode 100644 index 00000000..11c92dfa --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhOperator.java @@ -0,0 +1,46 @@ +package com.kms.yxgh.sz.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 水闸维修养护执行人对象 bs_sgc_sz_yhjlzx + * + * @author sy + * @date 2023-11-20 + */ +@TableName("bs_sgc_sz_yhjlzx") +@Data +@ApiModel("水闸维修养护执行人") +public class SzYhOperator extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 养护记录ID + */ + @Excel(name = "养护记录ID") + @ApiModelProperty("养护记录ID") + private String recordId; + + /** + * 执行人ID + */ + @Excel(name = "执行人ID") + @ApiModelProperty("执行人ID") + private String operatorUid; + + /** + * 执行人名称 + */ + @Excel(name = "执行人名称") + @ApiModelProperty("执行人名称") + private String operatorName; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java new file mode 100644 index 00000000..6509cf3e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java @@ -0,0 +1,77 @@ +package com.kms.yxgh.sz.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + + +/** + * 水闸维修养护计划对象 bs_sgc_sz_yhjh + * + * @author sy + * @date 2023-11-20 + */ +@TableName("bs_sgc_sz_yhjh") +@Data +@ApiModel("水闸维修养护计划") +public class SzYhPlan extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水闸代码 + */ + @Excel(name = "水闸代码") + @ApiModelProperty("水闸代码") + private String wagaCode; + + /** + * 名称 + */ + @Excel(name = "名称") + @ApiModelProperty("名称") + private String name; + + /** + * 计划时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("计划时间") + private Date planTime; + + /** + * 国补资金 + */ + @Excel(name = "国补资金") + @ApiModelProperty("国补资金") + private Long nationalSupplement; + + /** + * 自筹资金 + */ + @Excel(name = "自筹资金") + @ApiModelProperty("自筹资金") + private Long selfSupplement; + + /** + * 具体地点 + */ + @Excel(name = "具体地点") + @ApiModelProperty("具体地点") + private String location; + + /** + * 维修养护内容 + */ + @Excel(name = "维修养护内容") + @ApiModelProperty("维修养护内容") + private String content; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java new file mode 100644 index 00000000..6380b7bf --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java @@ -0,0 +1,80 @@ +package com.kms.yxgh.sz.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 水闸维修养护记录对象 bs_sgc_sz_yhjl + * + * @author sy + * @date 2023-11-20 + */ +@TableName("bs_sgc_sz_yhjl") +@Data +@ApiModel("水闸维修养护记录") +public class SzYhRecord extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 计划代码 + */ + @Excel(name = "计划代码") + @ApiModelProperty("计划代码") + private String planId; + + /** + * 名称 + */ + @Excel(name = "名称") + @ApiModelProperty("名称") + private String name; + + /** + * 维护前 + */ + @Excel(name = "维护前") + @ApiModelProperty("维护前") + private String before; + + /** + * 维护过程 + */ + @Excel(name = "维护过程") + @ApiModelProperty("维护过程") + private String middle; + + /** + * 维护结束 + */ + @Excel(name = "维护结束") + @ApiModelProperty("维护结束") + private String after; + + /** + * 养护费用 + */ + @Excel(name = "养护费用") + @ApiModelProperty("养护费用") + private Long maintenanceFunds; + + /** + * 落实情况 + */ + @Excel(name = "落实情况") + @ApiModelProperty("落实情况") + private String implement; + + + /** + * 状态 + */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Long status; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java index 5d37b157..689590f1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java @@ -6,9 +6,9 @@ import java.util.List; import lombok.Data; /** - * @ClassName: DfRecordSearchDto + * @ClassName: SzRecordSearchDto * @Description: TODO - * @Date: 2023/11/15 下午4:02 * + * {@code @Date:} 2023/11/15 下午4:02 * * @author: hxh * @version: 1.0 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java new file mode 100644 index 00000000..d29ab0cc --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java @@ -0,0 +1,67 @@ +package com.kms.yxgh.sz.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + + +/** + * 水闸维修养护计划详情 + * + * @author sy + * @date 2023-11-20 + */ +@Data +@ApiModel("水闸维修养护计划") +public class SzYhPlanDetailDto { + + @ApiModelProperty("养护计划id") + private String id; + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + private String dikeCode; + + /** + * 名称 + */ + @ApiModelProperty("名称") + private String name; + + /** + * 计划时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("计划时间") + private Date planTime; + + /** + * 国补资金 + */ + @ApiModelProperty("国补资金") + private Long nationalSupplement; + + /** + * 自筹资金 + */ + @ApiModelProperty("自筹资金") + private Long selfSupplement; + + /** + * 具体地点 + */ + @ApiModelProperty("具体地点") + private String location; + + /** + * 维修养护内容 + */ + @ApiModelProperty("维修养护内容") + private String content; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java new file mode 100644 index 00000000..33b5207b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java @@ -0,0 +1,63 @@ +package com.kms.yxgh.sz.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + + +/** + * 水闸维修养护记录 + * + * @author sy + * @date 2023-11-20 + */ +@Data +@ApiModel("水闸维修养护记录") +public class SzYhRecordDetailDto { + + @ApiModelProperty("养护记录id") + private String id; + + @ApiModelProperty("计划代码") + private String planId; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("维护前") + private String before; + + @ApiModelProperty("维护过程") + private String middle; + + @ApiModelProperty("维护结束") + private String after; + + @ApiModelProperty("养护费用") + private Long maintenanceFunds; + + @ApiModelProperty("落实情况") + private String implement; + + @ApiModelProperty("状态") + private Long status; + + @ApiModelProperty("养护人员") + private List operators; + + + @Data + public static class OperatorDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("用户id") + private String uid; + + @ApiModelProperty("用户名称") + private String name; + + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhOperatorMapper.java new file mode 100644 index 00000000..0ca595a0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhOperatorMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.sz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.sz.domain.SzYhOperator; +import org.springframework.stereotype.Repository; + +/** + * 水闸维修养护执行人Mapper接口 + * + * @author sy + * @date 2023-11-20 + */ +@Repository +public interface SzYhOperatorMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java new file mode 100644 index 00000000..965380e3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.sz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.sz.domain.SzYhPlan; +import org.springframework.stereotype.Repository; + +/** + * 水闸维修养护计划Mapper接口 + * + * @author sy + * @date 2023-11-20 + */ +@Repository +public interface SzYhPlanMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java new file mode 100644 index 00000000..b548aa30 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.sz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.sz.domain.SzYhRecord; +import org.springframework.stereotype.Repository; + +/** + * 水闸维修养护记录Mapper接口 + * + * @author sy + * @date 2023-11-20 + */ +@Repository +public interface SzYhRecordMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java new file mode 100644 index 00000000..5c88c12d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java @@ -0,0 +1,83 @@ +package com.kms.yxgh.sz.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.yxgh.base.SzException; +import com.kms.yxgh.sz.domain.SzYhPlan; +import com.kms.yxgh.sz.dto.SzYhPlanDetailDto; +import com.kms.yxgh.sz.mapper.SzYhPlanMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import com.shuili.common.utils.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 水闸维修养护计划Service接口 + * + * @author sy + * @date 2023-11-20 + */ +@Service +public class SzYhPlanService extends BaseService { + + + public SzYhPlanDetailDto getDetailById(String id) { + SzYhPlan szPlan = this.getById(id); + return BeanCopyUtils.copy(szPlan, SzYhPlanDetailDto.class); + } + + + @Transactional(rollbackFor = Exception.class) + public SzYhPlanDetailDto add(SzYhPlanDetailDto dto) { + SzYhPlan szPlan = BeanCopyUtils.copy(dto, SzYhPlan.class); + if (szPlan != null) { + if (checkNameDistinct(szPlan.getId(), szPlan.getName())) { + getBaseMapper().insert(szPlan); + dto.setId(szPlan.getId()); + return dto; + } else { + throw new SzException("该名称已存在"); + } + + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public SzYhPlanDetailDto update(SzYhPlanDetailDto dto) { + if (exist(dto.getId())) { + SzYhPlan szPlan = BeanCopyUtils.copy(dto, SzYhPlan.class); + if (szPlan != null) { + if (checkNameDistinct(szPlan.getId(), szPlan.getName())) { + getBaseMapper().updateById(szPlan); + return dto; + } else { + throw new SzException("该名称已存在"); + } + } + } + throw new BaseException("源数据不存在，请确认id值是否正确"); + + } + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + return removeById(id); + } + + private boolean checkNameDistinct(String id, String name) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhPlan::getName, name) + .ne(StringUtils.isNotEmpty(id), SzYhPlan::getId, id); + return this.getBaseMapper().selectCount(wp) <= 0; + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhPlan::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java new file mode 100644 index 00000000..f61ed428 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java @@ -0,0 +1,136 @@ +package com.kms.yxgh.sz.service; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.yxgh.base.SzException; +import com.kms.yxgh.base.enums.YhRecordStatus; +import com.kms.yxgh.sz.domain.SzYhOperator; +import com.kms.yxgh.sz.domain.SzYhRecord; +import com.kms.yxgh.sz.dto.SzYhRecordDetailDto; +import com.kms.yxgh.sz.dto.SzYhRecordDetailDto.OperatorDto; +import com.kms.yxgh.sz.mapper.SzYhOperatorMapper; +import com.kms.yxgh.sz.mapper.SzYhRecordMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.kms.yxgh.util.StreamUtils; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.exception.BaseException; +import java.util.List; +import java.util.function.Consumer; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 水闸维修养护记录Service接口 + * + * @author sy + * @date 2023-11-20 + */ +@AllArgsConstructor +@Service +public class SzYhRecordService extends BaseService { + + private final SzYhOperatorMapper szYhOperatorMapper; + + public SzYhRecordDetailDto getDetailById(String id) { + SzYhRecord record = this.getBaseMapper().selectById(id); + if (record != null) { + SzYhRecordDetailDto dto = BeanCopyUtils.copy(record, SzYhRecordDetailDto.class); + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhOperator::getRecordId, id); + List items = szYhOperatorMapper.selectList(wp); + if (CollectionUtil.isNotEmpty(items) && dto != null) { + dto.setOperators(StreamUtils.toList(items, r -> BeanCopyUtils.copy(r, OperatorDto.class))); + return dto; + } + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public SzYhRecordDetailDto add(SzYhRecordDetailDto dto) { + SzYhRecord szYhRecord = BeanCopyUtils.copy(dto, SzYhRecord.class); + if (szYhRecord != null) { + if (existRecord(dto.getPlanId())) { + getBaseMapper().insert(szYhRecord); + dto.setId(szYhRecord.getId()); + if (CollectionUtil.isNotEmpty(dto.getOperators())) { + dto.getOperators().forEach(insertOperator(dto.getId())); + } + return dto; + } else { + throw new SzException("该维护计划已经存在维护记录"); + } + + } + return null; + } + + + @Transactional(rollbackFor = Exception.class) + public SzYhRecordDetailDto update(SzYhRecordDetailDto szRecord) { + if (exist(szRecord.getId())) { + if (checkStatus(szRecord.getId())) { + SzYhRecord szYhRecord = BeanCopyUtils.copy(szRecord, SzYhRecord.class); + if (szYhRecord != null) { + getBaseMapper().updateById(szYhRecord); + String id = szRecord.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(szRecord.getOperators())) { + szRecord.getOperators().forEach(insertOperator(id)); + } + return szRecord; + } + } else { + throw new BaseException("已确认的记录不能修改"); + } + } + throw new BaseException("源数据不存在，请确认id值是否正确"); + } + + private Consumer insertOperator(String id) { + return (o) -> { + SzYhOperator item = new SzYhOperator(); + item.setRecordId(id); + item.setOperatorName(o.getName()); + item.setOperatorUid(o.getUid()); + szYhOperatorMapper.insert(item); + }; + } + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; + } + + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhOperator::getRecordId, id); + szYhOperatorMapper.delete(wp); + } + + private boolean checkStatus(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhRecord::getId, id) + .eq(SzYhRecord::getStatus, YhRecordStatus.CONFIRMED.getValue()); + return !(this.getBaseMapper().selectCount(wp) > 0); + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhRecord::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } + + private boolean existRecord(String planId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhRecord::getPlanId, planId); + return this.getBaseMapper().selectCount(wp) > 0; + } + +} From c007045e42f0db03950f61c128c7304487663d6f Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 22 Nov 2023 11:51:36 +0800 Subject: [PATCH 27/35] =?UTF-8?q?feat:=20=E9=9A=90=E8=97=8F=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E4=B8=ADremark=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/domain/DfTrace.java | 3 +++ .../src/main/java/com/kms/yxgh/sz/domain/SzTrace.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java index f43c51cd..71968035 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java @@ -69,4 +69,7 @@ public class DfTrace extends SyBaseEntity { @TableField(exist = false) private Date updateTime; + @TableField(exist = false) + private String remark; + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java index 1ef8877d..768125a4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java @@ -69,4 +69,7 @@ public class SzTrace extends SyBaseEntity { @TableField(exist = false) private Date updateTime; + @TableField(exist = false) + private String remark; + } From 0cfc32db90bc1d11c113540a23b1975f840cc8b4 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 22 Nov 2023 15:37:32 +0800 Subject: [PATCH 28/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-admin/src/main/resources/application-druid-sy.yml | 2 +- shuili-admin/src/main/resources/application-sy.yml | 2 +- .../main/java/com/kms/yxgh/df/service/DfRecordService.java | 3 ++- .../main/java/com/kms/yxgh/sz/service/SzRecordService.java | 7 ++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/shuili-admin/src/main/resources/application-druid-sy.yml b/shuili-admin/src/main/resources/application-druid-sy.yml index b95f44dd..53b91c73 100644 --- a/shuili-admin/src/main/resources/application-druid-sy.yml +++ b/shuili-admin/src/main/resources/application-druid-sy.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://mysql:3306/?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://mysql:3306/sy-shuili?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root password: mysql123456 # 从库数据源 diff --git a/shuili-admin/src/main/resources/application-sy.yml b/shuili-admin/src/main/resources/application-sy.yml index cf2b2cd8..ba29dfde 100644 --- a/shuili-admin/src/main/resources/application-sy.yml +++ b/shuili-admin/src/main/resources/application-sy.yml @@ -56,7 +56,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid-dev + active: druid-sy session: store-type: redis redis: diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 964c98f2..f83b653a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -102,6 +102,7 @@ public class DfRecordService extends BaseService { record.setPlanId(startPlan.getPlanId()); record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); record.setStatus(RecordStatus.CHECKING.getValue()); + getBaseMapper().insert(record); String id = record.getId(); if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { checkingDetailDto.getItems().forEach(o -> { @@ -138,8 +139,8 @@ public class DfRecordService extends BaseService { } return itemDto; })); - return dto; } + return dto; } return null; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index 1e87ad86..adb69483 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysUserService; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; +import com.kms.yxgh.sz.domain.SzRecord; +import com.kms.yxgh.sz.domain.SzRecordItem; import com.kms.yxgh.sz.dto.StartPlan; import com.kms.yxgh.sz.dto.SzCheckingDetailDto; import com.kms.yxgh.sz.dto.SzPlanDetailDto; import com.kms.yxgh.sz.dto.SzRecordDetailDto; import com.kms.yxgh.sz.dto.SzRecordDetailDto.SzRecordItemDto; -import com.kms.yxgh.sz.domain.SzRecord; -import com.kms.yxgh.sz.domain.SzRecordItem; import com.kms.yxgh.sz.dto.SzRecordSearchDto; import com.kms.yxgh.sz.mapper.SzRecordItemMapper; import com.kms.yxgh.sz.mapper.SzRecordMapper; @@ -103,6 +103,7 @@ public class SzRecordService extends BaseService { record.setPlanId(startPlan.getPlanId()); record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); record.setStatus(RecordStatus.CHECKING.getValue()); + getBaseMapper().insert(record); String id = record.getId(); if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { checkingDetailDto.getItems().forEach(o -> { @@ -139,8 +140,8 @@ public class SzRecordService extends BaseService { } return itemDto; })); - return dto; } + return dto; } return null; } From 6c80199fd6a1a83d7861cfc04375faf0f7516e9f Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 22 Nov 2023 17:07:53 +0800 Subject: [PATCH 29/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E8=AE=B0=E5=BD=95=E5=85=A5=E5=BA=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/service/DfRecordService.java | 2 +- .../src/main/java/com/kms/yxgh/sz/service/SzRecordService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index f83b653a..dd8cc81c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -111,7 +111,7 @@ public class DfRecordService extends BaseService { item.setContent(o.getContent()); item.setParts(String.join(PART_SEPARATOR, o.getParts())); item.setStatus(CheckingStatus.NORMAL.getValue()); - item.setRecordId(""); + item.setProblem(""); dfRecordItemMapper.insert(item); }); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index adb69483..a7850080 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -112,7 +112,7 @@ public class SzRecordService extends BaseService { item.setContent(o.getContent()); item.setParts(String.join(PART_SEPARATOR, o.getParts())); item.setStatus(CheckingStatus.NORMAL.getValue()); - item.setRecordId(""); + item.setProblem(""); szRecordItemMapper.insert(item); }); } From 501c74bd5e1535383158cd8feb959f3828536b37 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 22 Nov 2023 18:16:05 +0800 Subject: [PATCH 30/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E8=AE=B0=E5=BD=95=E6=A3=80=E7=B4=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/service/DfRecordService.java | 6 +++--- .../main/java/com/kms/yxgh/sz/service/SzRecordService.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index dd8cc81c..d485d783 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -10,14 +10,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysUserService; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; +import com.kms.yxgh.df.domain.DfRecord; +import com.kms.yxgh.df.domain.DfRecordItem; import com.kms.yxgh.df.dto.DfCheckingDetailDto; import com.kms.yxgh.df.dto.DfPlanDetailDto; import com.kms.yxgh.df.dto.DfRecordDetailDto; import com.kms.yxgh.df.dto.DfRecordDetailDto.DfRecordItemDto; import com.kms.yxgh.df.dto.DfRecordSearchDto; import com.kms.yxgh.df.dto.StartPlan; -import com.kms.yxgh.df.domain.DfRecord; -import com.kms.yxgh.df.domain.DfRecordItem; import com.kms.yxgh.df.mapper.DfRecordItemMapper; import com.kms.yxgh.df.mapper.DfRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; @@ -71,7 +71,7 @@ public class DfRecordService extends BaseService { DfRecordSearchDto dto = BeanCopyUtils.copy(r, DfRecordSearchDto .class); if (dto != null) { - dto.setParts(items.getOrDefault(r.getPlanId(), Collections.emptyList()) + dto.setParts(items.getOrDefault(r.getId(), Collections.emptyList()) .stream().map(item -> { List parts = Arrays.stream(item.getParts().split(PART_SEPARATOR)) .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index a7850080..e2e68e26 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -71,7 +71,7 @@ public class SzRecordService extends BaseService { SzRecordSearchDto dto = BeanCopyUtils.copy(r, SzRecordSearchDto .class); if (dto != null) { - dto.setParts(items.getOrDefault(r.getPlanId(), Collections.emptyList()) + dto.setParts(items.getOrDefault(r.getId(), Collections.emptyList()) .stream().map(item -> { List parts = Arrays.stream(item.getParts().split( SzCheckingService.PART_SEPARATOR)) From 636b20ba40529244f22e589d9ca07c5476a0dca5 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 27 Nov 2023 15:23:07 +0800 Subject: [PATCH 31/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/base/DfException.java | 2 +- .../com/kms/yxgh/base/SyBaseException.java | 21 ++ .../java/com/kms/yxgh/base/SzException.java | 2 +- .../com/kms/yxgh/df/domain/DfYhRecord.java | 4 + .../yxgh/df/service/DfCheckingService.java | 3 +- .../kms/yxgh/df/service/DfPlanService.java | 3 +- .../kms/yxgh/df/service/DfRecordService.java | 6 +- .../kms/yxgh/df/service/DfYhPlanService.java | 3 +- .../yxgh/df/service/DfYhRecordService.java | 191 +++++++++--------- .../com/kms/yxgh/sz/domain/SzYhRecord.java | 4 + .../yxgh/sz/service/SzCheckingService.java | 3 +- .../kms/yxgh/sz/service/SzPlanService.java | 3 +- .../kms/yxgh/sz/service/SzRecordService.java | 6 +- .../kms/yxgh/sz/service/SzYhPlanService.java | 3 +- .../yxgh/sz/service/SzYhRecordService.java | 190 ++++++++--------- 15 files changed, 234 insertions(+), 210 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/SyBaseException.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java b/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java index 5719b899..4116871f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java @@ -7,7 +7,7 @@ import com.shuili.common.exception.BaseException; * * @author shuili */ -public class DfException extends BaseException { +public class DfException extends SyBaseException { private static final long serialVersionUID = 1L; diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseException.java b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseException.java new file mode 100644 index 00000000..8a56421a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseException.java @@ -0,0 +1,21 @@ +package com.kms.yxgh.base; + +import com.shuili.common.exception.BaseException; + +/** + * 基础异常 + * + * @author shuili + */ +public abstract class SyBaseException extends BaseException { + + public SyBaseException(String module, String code, Object[] args, String defaultMessage) { + super(module, code, args, defaultMessage); + } + + @Override + public String getMessage() { + return getDefaultMessage(); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java b/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java index a27e5e9a..1823a500 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java @@ -7,7 +7,7 @@ import com.shuili.common.exception.BaseException; * * @author shuili */ -public class SzException extends BaseException { +public class SzException extends SyBaseException { private static final long serialVersionUID = 1L; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java index 6294c1b6..af24e480 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java @@ -1,5 +1,6 @@ package com.kms.yxgh.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; @@ -40,6 +41,7 @@ public class DfYhRecord extends SyBaseEntity { */ @Excel(name = "维护前") @ApiModelProperty("维护前") + @TableField(value = "`before`") private String before; /** @@ -47,6 +49,7 @@ public class DfYhRecord extends SyBaseEntity { */ @Excel(name = "维护过程") @ApiModelProperty("维护过程") + @TableField(value = "`middle`") private String middle; /** @@ -54,6 +57,7 @@ public class DfYhRecord extends SyBaseEntity { */ @Excel(name = "维护结束") @ApiModelProperty("维护结束") + @TableField(value = "`after`") private String after; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index ae897aed..e34c1a4a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -14,7 +14,6 @@ import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; import com.shuili.common.utils.StringUtils; import java.util.Arrays; import java.util.Comparator; @@ -114,7 +113,7 @@ public class DfCheckingService extends BaseService } } } - throw new BaseException("源数据不存在，请确认id值是否正确"); + throw new DfException("源数据不存在，请确认id值是否正确"); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 2288f4e0..b92af7eb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -17,7 +17,6 @@ import com.kms.yxgh.df.mapper.DfPointMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; import com.shuili.common.utils.StringUtils; import java.util.List; import java.util.function.Consumer; @@ -108,7 +107,7 @@ public class DfPlanService extends BaseService { } } } - throw new BaseException("源数据不存在，请确认id值是否正确"); + throw new DfException("源数据不存在，请确认id值是否正确"); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index d485d783..78162192 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysUserService; +import com.kms.yxgh.base.DfException; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; import com.kms.yxgh.df.domain.DfRecord; @@ -25,7 +26,6 @@ import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; import com.shuili.common.utils.DateUtils; import com.shuili.common.utils.StringUtils; import java.util.Arrays; @@ -117,10 +117,10 @@ public class DfRecordService extends BaseService { } return this.getDetailById(id); } else { - throw new BaseException("查询巡查检查项数据异常"); + throw new DfException("查询巡查检查项数据异常"); } } - throw new BaseException("查询巡查计划"); + throw new DfException("查询巡查计划"); } public DfRecordDetailDto getDetailById(String id) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java index 303c09a4..afed0d1e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java @@ -8,7 +8,6 @@ import com.kms.yxgh.df.dto.DfYhPlanDetailDto; import com.kms.yxgh.df.mapper.DfYhPlanMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; import com.shuili.common.utils.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -58,7 +57,7 @@ public class DfYhPlanService extends BaseService { } } } - throw new BaseException("源数据不存在，请确认id值是否正确"); + throw new DfException("源数据不存在，请确认id值是否正确"); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index f164206c..6a6bb931 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -14,13 +14,13 @@ import com.kms.yxgh.df.mapper.DfYhRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; -import java.util.List; -import java.util.function.Consumer; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.function.Consumer; + /** * 堤防维修养护记录Service接口 * @@ -31,106 +31,107 @@ import org.springframework.transaction.annotation.Transactional; @Service public class DfYhRecordService extends BaseService { - private final DfYhOperatorMapper dfYhOperatorMapper; - - public DfYhRecordDetailDto getDetailById(String id) { - DfYhRecord record = this.getBaseMapper().selectById(id); - if (record != null) { - DfYhRecordDetailDto dto = BeanCopyUtils.copy(record, DfYhRecordDetailDto.class); - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfYhOperator::getRecordId, id); - List items = dfYhOperatorMapper.selectList(wp); - if (CollectionUtil.isNotEmpty(items) && dto != null) { - dto.setOperators(StreamUtils.toList(items, r -> BeanCopyUtils.copy(r, OperatorDto.class))); - return dto; - } + private final DfYhOperatorMapper dfYhOperatorMapper; + + public DfYhRecordDetailDto getDetailById(String id) { + DfYhRecord record = this.getBaseMapper().selectById(id); + if (record != null) { + DfYhRecordDetailDto dto = BeanCopyUtils.copy(record, DfYhRecordDetailDto.class); + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhOperator::getRecordId, id); + List items = dfYhOperatorMapper.selectList(wp); + if (CollectionUtil.isNotEmpty(items) && dto != null) { + dto.setOperators(StreamUtils.toList(items, r -> BeanCopyUtils.copy(r, OperatorDto.class))); + return dto; + } + } + return null; } - return null; - } - - @Transactional(rollbackFor = Exception.class) - public DfYhRecordDetailDto add(DfYhRecordDetailDto dto) { - DfYhRecord dfYhRecord = BeanCopyUtils.copy(dto, DfYhRecord.class); - if (dfYhRecord != null) { - if (existRecord(dto.getPlanId())) { - getBaseMapper().insert(dfYhRecord); - dto.setId(dfYhRecord.getId()); - if (CollectionUtil.isNotEmpty(dto.getOperators())) { - dto.getOperators().forEach(insertOperator(dto.getId())); + + @Transactional(rollbackFor = Exception.class) + public DfYhRecordDetailDto add(DfYhRecordDetailDto dto) { + DfYhRecord dfYhRecord = BeanCopyUtils.copy(dto, DfYhRecord.class); + if (dfYhRecord != null) { + if (!existRecord(dto.getPlanId())) { + getBaseMapper().insert(dfYhRecord); + dto.setId(dfYhRecord.getId()); + if (CollectionUtil.isNotEmpty(dto.getOperators())) { + dto.getOperators().forEach(insertOperator(dto.getId())); + } + return dto; + } else { + throw new DfException("该维护计划已经存在维护记录"); + } + } - return dto; - } else { - throw new DfException("该维护计划已经存在维护记录"); - } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public DfYhRecordDetailDto update(DfYhRecordDetailDto dfRecord) { + if (exist(dfRecord.getId())) { + if (checkStatus(dfRecord.getId())) { + DfYhRecord dfYhRecord = BeanCopyUtils.copy(dfRecord, DfYhRecord.class); + if (dfYhRecord != null) { + getBaseMapper().updateById(dfYhRecord); + String id = dfRecord.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(dfRecord.getOperators())) { + dfRecord.getOperators().forEach(insertOperator(id)); + } + return dfRecord; + } + } else { + throw new DfException("已确认的记录不能修改"); + } + } + throw new DfException("源数据不存在，请确认id值是否正确"); } - return null; - } + private Consumer insertOperator(String id) { + return (o) -> { + DfYhOperator item = new DfYhOperator(); + item.setRecordId(id); + item.setOperatorName(o.getName()); + item.setOperatorUid(o.getUid()); + dfYhOperatorMapper.insert(item); + }; + } - @Transactional(rollbackFor = Exception.class) - public DfYhRecordDetailDto update(DfYhRecordDetailDto dfRecord) { - if (exist(dfRecord.getId())) { - if (checkStatus(dfRecord.getId())) { - DfYhRecord dfYhRecord = BeanCopyUtils.copy(dfRecord, DfYhRecord.class); - if (dfYhRecord != null) { - getBaseMapper().updateById(dfYhRecord); - String id = dfRecord.getId(); - deleteItems(id); - if (CollectionUtil.isNotEmpty(dfRecord.getOperators())) { - dfRecord.getOperators().forEach(insertOperator(id)); - } - return dfRecord; + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); } - } else { - throw new BaseException("已确认的记录不能修改"); - } + return rt; + } + + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhOperator::getRecordId, id); + dfYhOperatorMapper.delete(wp); } - throw new BaseException("源数据不存在，请确认id值是否正确"); - } - - private Consumer insertOperator(String id) { - return (o) -> { - DfYhOperator item = new DfYhOperator(); - item.setRecordId(id); - item.setOperatorName(o.getName()); - item.setOperatorUid(o.getUid()); - dfYhOperatorMapper.insert(item); - }; - } - - @Transactional(rollbackFor = Exception.class) - public Boolean deleteById(String id) { - boolean rt = removeById(id); - if (rt) { - deleteItems(id); + + private boolean checkStatus(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhRecord::getId, id) + .eq(DfYhRecord::getStatus, YhRecordStatus.CONFIRMED.getValue()); + return !(this.getBaseMapper().selectCount(wp) > 0); + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhRecord::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } + + private boolean existRecord(String planId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhRecord::getPlanId, planId); + Integer count = this.getBaseMapper().selectCount(wp); + return count>0; } - return rt; - } - - private void deleteItems(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfYhOperator::getRecordId, id); - dfYhOperatorMapper.delete(wp); - } - - private boolean checkStatus(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfYhRecord::getId, id) - .eq(DfYhRecord::getStatus, YhRecordStatus.CONFIRMED.getValue()); - return !(this.getBaseMapper().selectCount(wp) > 0); - } - - private boolean exist(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfYhRecord::getId, id); - return this.getBaseMapper().selectCount(wp) > 0; - } - - private boolean existRecord(String planId) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfYhRecord::getPlanId, planId); - return this.getBaseMapper().selectCount(wp) > 0; - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java index 6380b7bf..b8b6d8ea 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java @@ -1,5 +1,6 @@ package com.kms.yxgh.sz.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; @@ -40,6 +41,7 @@ public class SzYhRecord extends SyBaseEntity { */ @Excel(name = "维护前") @ApiModelProperty("维护前") + @TableField(value = "`before`") private String before; /** @@ -47,6 +49,7 @@ public class SzYhRecord extends SyBaseEntity { */ @Excel(name = "维护过程") @ApiModelProperty("维护过程") + @TableField(value = "`middle`") private String middle; /** @@ -54,6 +57,7 @@ public class SzYhRecord extends SyBaseEntity { */ @Excel(name = "维护结束") @ApiModelProperty("维护结束") + @TableField(value = "`after`") private String after; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index eea77964..c977eff2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -14,7 +14,6 @@ import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; import com.shuili.common.utils.StringUtils; import java.util.Arrays; import java.util.Comparator; @@ -114,7 +113,7 @@ public class SzCheckingService extends BaseService } } } - throw new BaseException("源数据不存在，请确认id值是否正确"); + throw new SzException("源数据不存在，请确认id值是否正确"); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index 7bac6138..6301c556 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -17,7 +17,6 @@ import com.kms.yxgh.sz.mapper.SzPointMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; import com.shuili.common.utils.StringUtils; import java.util.List; import java.util.function.Consumer; @@ -108,7 +107,7 @@ public class SzPlanService extends BaseService { } } } - throw new BaseException("源数据不存在，请确认id值是否正确"); + throw new SzException("源数据不存在，请确认id值是否正确"); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index e2e68e26..eef175d9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysUserService; +import com.kms.yxgh.base.SzException; import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.RecordStatus; import com.kms.yxgh.sz.domain.SzRecord; @@ -25,7 +26,6 @@ import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; import com.shuili.common.utils.DateUtils; import com.shuili.common.utils.StringUtils; import java.util.Arrays; @@ -118,10 +118,10 @@ public class SzRecordService extends BaseService { } return this.getDetailById(id); } else { - throw new BaseException("查询巡查检查项数据异常"); + throw new SzException("查询巡查检查项数据异常"); } } - throw new BaseException("查询巡查计划"); + throw new SzException("查询巡查计划"); } public SzRecordDetailDto getDetailById(String id) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java index 5c88c12d..9dd65164 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java @@ -8,7 +8,6 @@ import com.kms.yxgh.sz.dto.SzYhPlanDetailDto; import com.kms.yxgh.sz.mapper.SzYhPlanMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; import com.shuili.common.utils.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -58,7 +57,7 @@ public class SzYhPlanService extends BaseService { } } } - throw new BaseException("源数据不存在，请确认id值是否正确"); + throw new SzException("源数据不存在，请确认id值是否正确"); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java index f61ed428..42870282 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java @@ -14,13 +14,13 @@ import com.kms.yxgh.sz.mapper.SzYhRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.service.BaseService; -import com.shuili.common.exception.BaseException; -import java.util.List; -import java.util.function.Consumer; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.function.Consumer; + /** * 水闸维修养护记录Service接口 * @@ -31,106 +31,106 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SzYhRecordService extends BaseService { - private final SzYhOperatorMapper szYhOperatorMapper; - - public SzYhRecordDetailDto getDetailById(String id) { - SzYhRecord record = this.getBaseMapper().selectById(id); - if (record != null) { - SzYhRecordDetailDto dto = BeanCopyUtils.copy(record, SzYhRecordDetailDto.class); - Wrapper wp = Wrappers.lambdaQuery() - .eq(SzYhOperator::getRecordId, id); - List items = szYhOperatorMapper.selectList(wp); - if (CollectionUtil.isNotEmpty(items) && dto != null) { - dto.setOperators(StreamUtils.toList(items, r -> BeanCopyUtils.copy(r, OperatorDto.class))); - return dto; - } + private final SzYhOperatorMapper szYhOperatorMapper; + + public SzYhRecordDetailDto getDetailById(String id) { + SzYhRecord record = this.getBaseMapper().selectById(id); + if (record != null) { + SzYhRecordDetailDto dto = BeanCopyUtils.copy(record, SzYhRecordDetailDto.class); + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhOperator::getRecordId, id); + List items = szYhOperatorMapper.selectList(wp); + if (CollectionUtil.isNotEmpty(items) && dto != null) { + dto.setOperators(StreamUtils.toList(items, r -> BeanCopyUtils.copy(r, OperatorDto.class))); + return dto; + } + } + return null; } - return null; - } - - @Transactional(rollbackFor = Exception.class) - public SzYhRecordDetailDto add(SzYhRecordDetailDto dto) { - SzYhRecord szYhRecord = BeanCopyUtils.copy(dto, SzYhRecord.class); - if (szYhRecord != null) { - if (existRecord(dto.getPlanId())) { - getBaseMapper().insert(szYhRecord); - dto.setId(szYhRecord.getId()); - if (CollectionUtil.isNotEmpty(dto.getOperators())) { - dto.getOperators().forEach(insertOperator(dto.getId())); + + @Transactional(rollbackFor = Exception.class) + public SzYhRecordDetailDto add(SzYhRecordDetailDto dto) { + SzYhRecord szYhRecord = BeanCopyUtils.copy(dto, SzYhRecord.class); + if (szYhRecord != null) { + if (!existRecord(dto.getPlanId())) { + getBaseMapper().insert(szYhRecord); + dto.setId(szYhRecord.getId()); + if (CollectionUtil.isNotEmpty(dto.getOperators())) { + dto.getOperators().forEach(insertOperator(dto.getId())); + } + return dto; + } else { + throw new SzException("该维护计划已经存在维护记录"); + } + } - return dto; - } else { - throw new SzException("该维护计划已经存在维护记录"); - } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public SzYhRecordDetailDto update(SzYhRecordDetailDto szRecord) { + if (exist(szRecord.getId())) { + if (checkStatus(szRecord.getId())) { + SzYhRecord szYhRecord = BeanCopyUtils.copy(szRecord, SzYhRecord.class); + if (szYhRecord != null) { + getBaseMapper().updateById(szYhRecord); + String id = szRecord.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(szRecord.getOperators())) { + szRecord.getOperators().forEach(insertOperator(id)); + } + return szRecord; + } + } else { + throw new SzException("已确认的记录不能修改"); + } + } + throw new SzException("源数据不存在，请确认id值是否正确"); } - return null; - } + private Consumer insertOperator(String id) { + return (o) -> { + SzYhOperator item = new SzYhOperator(); + item.setRecordId(id); + item.setOperatorName(o.getName()); + item.setOperatorUid(o.getUid()); + szYhOperatorMapper.insert(item); + }; + } - @Transactional(rollbackFor = Exception.class) - public SzYhRecordDetailDto update(SzYhRecordDetailDto szRecord) { - if (exist(szRecord.getId())) { - if (checkStatus(szRecord.getId())) { - SzYhRecord szYhRecord = BeanCopyUtils.copy(szRecord, SzYhRecord.class); - if (szYhRecord != null) { - getBaseMapper().updateById(szYhRecord); - String id = szRecord.getId(); - deleteItems(id); - if (CollectionUtil.isNotEmpty(szRecord.getOperators())) { - szRecord.getOperators().forEach(insertOperator(id)); - } - return szRecord; + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + boolean rt = removeById(id); + if (rt) { + deleteItems(id); } - } else { - throw new BaseException("已确认的记录不能修改"); - } + return rt; + } + + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhOperator::getRecordId, id); + szYhOperatorMapper.delete(wp); } - throw new BaseException("源数据不存在，请确认id值是否正确"); - } - - private Consumer insertOperator(String id) { - return (o) -> { - SzYhOperator item = new SzYhOperator(); - item.setRecordId(id); - item.setOperatorName(o.getName()); - item.setOperatorUid(o.getUid()); - szYhOperatorMapper.insert(item); - }; - } - - @Transactional(rollbackFor = Exception.class) - public Boolean deleteById(String id) { - boolean rt = removeById(id); - if (rt) { - deleteItems(id); + + private boolean checkStatus(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhRecord::getId, id) + .eq(SzYhRecord::getStatus, YhRecordStatus.CONFIRMED.getValue()); + return !(this.getBaseMapper().selectCount(wp) > 0); + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhRecord::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } + + private boolean existRecord(String planId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzYhRecord::getPlanId, planId); + return this.getBaseMapper().selectCount(wp) > 0; } - return rt; - } - - private void deleteItems(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(SzYhOperator::getRecordId, id); - szYhOperatorMapper.delete(wp); - } - - private boolean checkStatus(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(SzYhRecord::getId, id) - .eq(SzYhRecord::getStatus, YhRecordStatus.CONFIRMED.getValue()); - return !(this.getBaseMapper().selectCount(wp) > 0); - } - - private boolean exist(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(SzYhRecord::getId, id); - return this.getBaseMapper().selectCount(wp) > 0; - } - - private boolean existRecord(String planId) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(SzYhRecord::getPlanId, planId); - return this.getBaseMapper().selectCount(wp) > 0; - } } From ab64d8b1addb78267a17016a7b7022d41d93374f Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Tue, 28 Nov 2023 09:19:54 +0800 Subject: [PATCH 32/35] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=BF=94=E5=9B=9E=E6=93=8D=E4=BD=9C=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/service/DfYhRecordService.java | 12 +++++++++--- .../com/kms/yxgh/sz/service/SzYhRecordService.java | 10 ++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index 6a6bb931..c560ec4f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -41,9 +41,15 @@ public class DfYhRecordService extends BaseService .eq(DfYhOperator::getRecordId, id); List items = dfYhOperatorMapper.selectList(wp); if (CollectionUtil.isNotEmpty(items) && dto != null) { - dto.setOperators(StreamUtils.toList(items, r -> BeanCopyUtils.copy(r, OperatorDto.class))); - return dto; + dto.setOperators(StreamUtils.toList(items, r -> { + OperatorDto operatorDto = new OperatorDto(); + operatorDto.setId(r.getId()); + operatorDto.setUid(r.getOperatorUid()); + operatorDto.setName(r.getOperatorName()); + return operatorDto; + })); } + return dto; } return null; } @@ -131,7 +137,7 @@ public class DfYhRecordService extends BaseService Wrapper wp = Wrappers.lambdaQuery() .eq(DfYhRecord::getPlanId, planId); Integer count = this.getBaseMapper().selectCount(wp); - return count>0; + return count > 0; } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java index 42870282..10727978 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java @@ -41,9 +41,15 @@ public class SzYhRecordService extends BaseService .eq(SzYhOperator::getRecordId, id); List items = szYhOperatorMapper.selectList(wp); if (CollectionUtil.isNotEmpty(items) && dto != null) { - dto.setOperators(StreamUtils.toList(items, r -> BeanCopyUtils.copy(r, OperatorDto.class))); - return dto; + dto.setOperators(StreamUtils.toList(items, r -> { + OperatorDto operatorDto = new OperatorDto(); + operatorDto.setId(r.getId()); + operatorDto.setUid(r.getOperatorUid()); + operatorDto.setName(r.getOperatorName()); + return operatorDto; + })); } + return dto; } return null; } From f6ac6f563b903cce69600583330ab61c9fb3fa41 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Tue, 28 Nov 2023 16:45:13 +0800 Subject: [PATCH 33/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B0=B4?= =?UTF-8?q?=E9=97=B8=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java index d29ab0cc..3a67ff23 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java @@ -24,7 +24,7 @@ public class SzYhPlanDetailDto { * 水闸代码 */ @ApiModelProperty("水闸代码") - private String dikeCode; + private String wagaCode; /** * 名称 From 9c70b03da8c1aa87b1a4bda1327bad44415c8d12 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 29 Nov 2023 17:52:51 +0800 Subject: [PATCH 34/35] =?UTF-8?q?doc:=20=E6=B7=BB=E5=8A=A0sql=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/sy/v1.0.0.sql | 319 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 sql/sy/v1.0.0.sql diff --git a/sql/sy/v1.0.0.sql b/sql/sy/v1.0.0.sql new file mode 100644 index 00000000..3d9f0163 --- /dev/null +++ b/sql/sy/v1.0.0.sql @@ -0,0 +1,319 @@ +--------------------- 堤防 ---------------------------------------------------------------------------- +CREATE TABLE `bs_sgc_df_xs` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查编号', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查名称', + `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查表'; + + +CREATE TABLE `bs_sgc_df_xsx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡查内容编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `PARTS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查部位', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查项表'; + +CREATE TABLE `bs_sgc_df_xsjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划名称', + `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `FREQUENCY` int COLLATE utf8mb4_general_ci COMMENT '检查次数', + `CYCLE_TYPE` int COLLATE utf8mb4_general_ci COMMENT '周期', + `REMINDER_TIME` datetime DEFAULT NULL COMMENT '提醒时间', + `OTHER_CONFIG` text COLLATE utf8mb4_general_ci COMMENT '附加配置', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划表'; + +CREATE TABLE `bs_sgc_df_xsjhzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划执行者编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人ID', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划执行人表'; + +CREATE TABLE `bs_sgc_df_xsjhdw` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划点位编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', + `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', + `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划点位表'; + + +CREATE TABLE `bs_sgc_df_xsjhjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查记录名称', + `STATUS` int NOT NULL COMMENT '状态', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查记录表'; + +CREATE TABLE `bs_sgc_df_xsjhjlz` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录子项编号', + `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', + `PARTS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查部位', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容', + `STATUS` int NOT NULL COMMENT '状态', + `PROBLEM` varchar(500) COLLATE utf8mb4_general_ci COMMENT '存在问题', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查检查记录子项表'; + +CREATE TABLE `bs_sgc_df_xsjhjgj` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录轨迹编号', + `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', + `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', + `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', + `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查检查记录轨迹表'; + + +CREATE TABLE `bs_sgc_df_yhjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防维修养护计划编号', + `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', + `PLAN_TIME` datetime DEFAULT NULL COMMENT '计划时间', + `NATIONAL_SUPPLEMENT` float DEFAULT NULL COMMENT '国补资金', + `SELF_SUPPLEMENT` float DEFAULT NULL COMMENT '自筹资金', + `LOCATION` varchar(500) COLLATE utf8mb4_general_ci COMMENT '具体地点', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '维修养护内容', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防维修养护计划表'; + +CREATE TABLE `bs_sgc_df_yhjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防维修养护记录编号', + `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码', + `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', + `BEFORE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护前', + `MIDDLE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护过程', + `AFTER` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护结束', + `MAINTENANCE_FUNDS` float DEFAULT NULL COMMENT '养护费用', + `IMPLEMENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '落实情况', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `STATUS` int NOT NULL COMMENT '状态', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防维修养护记录表'; + +CREATE TABLE `bs_sgc_df_yhjlzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防维修养护执行者编号', + `RECORD_ID` int NOT NULL COMMENT '养护记录ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人ID', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防维修养护执行人表'; + +--------------------- 水闸 ---------------------------------------------------------------------------- + +CREATE TABLE `bs_sgc_sz_xs` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查编号', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查名称', + `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查表'; + + +CREATE TABLE `bs_sgc_sz_xsx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡查内容编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `PARTS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查部位', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查项表'; + +CREATE TABLE `bs_sgc_sz_xsjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查计划编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划名称', + `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `FREQUENCY` int COLLATE utf8mb4_general_ci COMMENT '检查次数', + `CYCLE_TYPE` int COLLATE utf8mb4_general_ci COMMENT '周期', + `REMINDER_TIME` datetime DEFAULT NULL COMMENT '提醒时间', + `OTHER_CONFIG` text COLLATE utf8mb4_general_ci COMMENT '附加配置', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查计划表'; + +CREATE TABLE `bs_sgc_sz_xsjhzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查计划执行者编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查计划执行人表'; + +CREATE TABLE `bs_sgc_sz_xsjhdw` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查计划点位编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', + `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', + `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查计划点位表'; + + +CREATE TABLE `bs_sgc_sz_xsjhjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查检查记录编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查记录名称', + `STATUS` int NOT NULL COMMENT '状态', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查记录表'; + +CREATE TABLE `bs_sgc_sz_xsjhjlz` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查检查记录子项编号', + `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', + `PARTS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查部位', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容', + `STATUS` int NOT NULL COMMENT '状态', + `PROBLEM` varchar(500) COLLATE utf8mb4_general_ci COMMENT '存在问题', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查检查记录子项表'; + +CREATE TABLE `bs_sgc_sz_xsjhjgj` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查检查记录轨迹编号', + `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', + `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', + `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', + `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查检查记录轨迹表'; + +CREATE TABLE `bs_sgc_sz_yhjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸维修养护计划编号', + `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码', + `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', + `PLAN_TIME` datetime DEFAULT NULL COMMENT '计划时间', + `NATIONAL_SUPPLEMENT` float DEFAULT NULL COMMENT '国补资金', + `SELF_SUPPLEMENT` float DEFAULT NULL COMMENT '自筹资金', + `LOCATION` varchar(500) COLLATE utf8mb4_general_ci COMMENT '具体地点', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '维修养护内容', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护计划表'; + +CREATE TABLE `bs_sgc_sz_yhjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸维修养护记录编号', + `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码', + `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', + `BEFORE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护前', + `MIDDLE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护过程', + `AFTER` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护结束', + `MAINTENANCE_FUNDS` float DEFAULT NULL COMMENT '养护费用', + `IMPLEMENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '落实情况', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `STATUS` int NOT NULL COMMENT '状态', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护记录表'; + +CREATE TABLE `bs_sgc_sz_yhjlzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸维修养护执行者编号', + `RECORD_ID` int NOT NULL COMMENT '养护记录ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人ID', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护执行人表'; From 212996a79167f899b34b155192cd253d9d77f134 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 4 Dec 2023 13:47:53 +0800 Subject: [PATCH 35/35] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/df/service/DfCheckingService.java | 226 +++++++++--------- .../kms/yxgh/df/service/DfRecordService.java | 2 +- .../yxgh/sz/service/SzCheckingService.java | 226 +++++++++--------- .../kms/yxgh/sz/service/SzRecordService.java | 2 +- 4 files changed, 240 insertions(+), 216 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index e34c1a4a..40b74931 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -4,24 +4,27 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yxgh.base.DfException; -import com.kms.yxgh.df.dto.DfCheckingDetailDto; -import com.kms.yxgh.df.dto.DfCheckingDetailDto.DfCheckingItemDto; import com.kms.yxgh.df.domain.DfChecking; import com.kms.yxgh.df.domain.DfCheckingItem; +import com.kms.yxgh.df.domain.DfPlan; +import com.kms.yxgh.df.dto.DfCheckingDetailDto; +import com.kms.yxgh.df.dto.DfCheckingDetailDto.DfCheckingItemDto; import com.kms.yxgh.df.mapper.DfCheckingItemMapper; import com.kms.yxgh.df.mapper.DfCheckingMapper; +import com.kms.yxgh.df.mapper.DfPlanMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.StringUtils; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; /** * 堤防巡视检查Service接口 @@ -33,117 +36,126 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class DfCheckingService extends BaseService { - private final DfCheckingItemMapper dfCheckingItemMapper; - public final static String PART_SEPARATOR = ":"; - - public List selectSimple(SearchParam sp) { - Wrapper wp = Wrappers.lambdaQuery() - .select(DfChecking::getId, DfChecking::getName) - .eq(DfChecking::getType, sp.getData().getType()); - return getBaseMapper().selectList(wp); - } - - - public DfCheckingDetailDto getDetailById(String id) { - DfChecking checking = this.getById(id); - DfCheckingDetailDto dto = BeanCopyUtils.copy(checking, DfCheckingDetailDto.class); - if (dto != null) { - Wrapper wp = Wrappers.lambdaQuery() - .select(DfCheckingItem::getId, DfCheckingItem::getParts, DfCheckingItem::getContent) - .eq(DfCheckingItem::getXcId, id); - dto.setItems(StreamUtils.toList(dfCheckingItemMapper.selectList(wp), (o) -> { - DfCheckingItemDto itemDto = new DfCheckingItemDto(); - itemDto.setContent(o.getContent()); - itemDto.setId(o.getId()); - itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), PART_SEPARATOR)) - .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); - return itemDto; - })); + private final DfCheckingItemMapper dfCheckingItemMapper; + private final DfPlanMapper dfPlanMapper; + public final static String PART_SEPARATOR = ":"; + + public List selectSimple(SearchParam sp) { + Wrapper wp = Wrappers.lambdaQuery() + .select(DfChecking::getId, DfChecking::getName) + .eq(DfChecking::getType, sp.getData().getType()); + return getBaseMapper().selectList(wp); } - return dto; - } - - - @Transactional(rollbackFor = Exception.class) - public DfCheckingDetailDto add(DfCheckingDetailDto dto) { - DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class); - if (checking != null) { - if (checkNameDistinct(checking.getId(), checking.getName())) { - getBaseMapper().insert(checking); - String id = checking.getId(); - if (CollectionUtil.isNotEmpty(dto.getItems())) { - dto.getItems().forEach((o) -> { - DfCheckingItem item = new DfCheckingItem(); - item.setXcId(id); - item.setContent(o.getContent()); - item.setParts(String.join(PART_SEPARATOR, o.getParts())); - dfCheckingItemMapper.insert(item); - }); + + + public DfCheckingDetailDto getDetailById(String id) { + DfChecking checking = this.getById(id); + DfCheckingDetailDto dto = BeanCopyUtils.copy(checking, DfCheckingDetailDto.class); + if (dto != null) { + Wrapper wp = Wrappers.lambdaQuery() + .select(DfCheckingItem::getId, DfCheckingItem::getParts, DfCheckingItem::getContent) + .eq(DfCheckingItem::getXcId, id); + dto.setItems(StreamUtils.toList(dfCheckingItemMapper.selectList(wp), (o) -> { + DfCheckingItemDto itemDto = new DfCheckingItemDto(); + itemDto.setContent(o.getContent()); + itemDto.setId(o.getId()); + itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), PART_SEPARATOR)) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); + return itemDto; + })); } - return this.getDetailById(id); - } else { - throw new DfException("该名称已存在"); - } + return dto; + } + + + @Transactional(rollbackFor = Exception.class) + public DfCheckingDetailDto add(DfCheckingDetailDto dto) { + DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class); + if (checking != null) { + if (checkNameDistinct(checking.getId(), checking.getName())) { + getBaseMapper().insert(checking); + String id = checking.getId(); + if (CollectionUtil.isNotEmpty(dto.getItems())) { + dto.getItems().forEach((o) -> { + DfCheckingItem item = new DfCheckingItem(); + item.setXcId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + dfCheckingItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new DfException("该名称已存在"); + } + + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public DfCheckingDetailDto update(DfCheckingDetailDto dto) { + if (exist(dto.getId())) { + DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class); + if (checking != null) { + if (checkNameDistinct(checking.getId(), checking.getName())) { + getBaseMapper().updateById(checking); + String id = checking.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(dto.getItems())) { + dto.getItems().forEach((o) -> { + DfCheckingItem item = new DfCheckingItem(); + item.setXcId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + dfCheckingItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new DfException("该名称已存在"); + } + } + } + throw new DfException("源数据不存在，请确认id值是否正确"); } - return null; - } - - @Transactional(rollbackFor = Exception.class) - public DfCheckingDetailDto update(DfCheckingDetailDto dto) { - if (exist(dto.getId())) { - DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class); - if (checking != null) { - if (checkNameDistinct(checking.getId(), checking.getName())) { - getBaseMapper().updateById(checking); - String id = checking.getId(); - deleteItems(id); - if (CollectionUtil.isNotEmpty(dto.getItems())) { - dto.getItems().forEach((o) -> { - DfCheckingItem item = new DfCheckingItem(); - item.setXcId(id); - item.setContent(o.getContent()); - item.setParts(String.join(PART_SEPARATOR, o.getParts())); - dfCheckingItemMapper.insert(item); - }); - } - return this.getDetailById(id); - } else { - throw new DfException("该名称已存在"); + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + if (isUsed(id)) { + throw new DfException("已被巡查计划，不能删除！"); } - } + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; } - throw new DfException("源数据不存在，请确认id值是否正确"); - } + private boolean isUsed(String id) { + return dfPlanMapper.selectCount(Wrappers.lambdaQuery() + .eq(DfPlan::getXcId, id)) > 0; + } + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfCheckingItem::getXcId, id); + dfCheckingItemMapper.delete(wp); + } + + private boolean checkNameDistinct(String id, String name) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfChecking::getName, name) + .ne(StringUtils.isNotEmpty(id), DfChecking::getId, id); + return this.getBaseMapper().selectCount(wp) <= 0; + } - @Transactional(rollbackFor = Exception.class) - public Boolean deleteById(String id) { - boolean rt = removeById(id); - if (rt) { - deleteItems(id); + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfChecking::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; } - return rt; - } - - private void deleteItems(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfCheckingItem::getXcId, id); - dfCheckingItemMapper.delete(wp); - } - - private boolean checkNameDistinct(String id, String name) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfChecking::getName, name) - .ne(StringUtils.isNotEmpty(id), DfChecking::getId, id); - return this.getBaseMapper().selectCount(wp) <= 0; - } - - private boolean exist(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfChecking::getId, id); - return this.getBaseMapper().selectCount(wp) > 0; - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 78162192..f5824534 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -100,7 +100,7 @@ public class DfRecordService extends BaseService { if (checkingDetailDto != null) { DfRecord record = new DfRecord(); record.setPlanId(startPlan.getPlanId()); - record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); + record.setName(planDetailDto.getName() + DateUtils.getTime()); record.setStatus(RecordStatus.CHECKING.getValue()); getBaseMapper().insert(record); String id = record.getId(); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index c977eff2..94ac5903 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -4,24 +4,27 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yxgh.base.SzException; -import com.kms.yxgh.sz.dto.SzCheckingDetailDto.SzCheckingItemDto; -import com.kms.yxgh.sz.dto.SzCheckingDetailDto; import com.kms.yxgh.sz.domain.SzChecking; import com.kms.yxgh.sz.domain.SzCheckingItem; +import com.kms.yxgh.sz.domain.SzPlan; +import com.kms.yxgh.sz.dto.SzCheckingDetailDto; +import com.kms.yxgh.sz.dto.SzCheckingDetailDto.SzCheckingItemDto; import com.kms.yxgh.sz.mapper.SzCheckingItemMapper; import com.kms.yxgh.sz.mapper.SzCheckingMapper; +import com.kms.yxgh.sz.mapper.SzPlanMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.StringUtils; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; /** * 水闸巡视检查Service接口 @@ -33,117 +36,126 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class SzCheckingService extends BaseService { - private final SzCheckingItemMapper SzCheckingItemMapper; - public final static String PART_SEPARATOR = ":"; - - public List selectSimple(SearchParam sp) { - Wrapper wp = Wrappers.lambdaQuery() - .select(SzChecking::getId, SzChecking::getName) - .eq(SzChecking::getType, sp.getData().getType()); - return getBaseMapper().selectList(wp); - } - - - public SzCheckingDetailDto getDetailById(String id) { - SzChecking checking = this.getById(id); - SzCheckingDetailDto dto = BeanCopyUtils.copy(checking, SzCheckingDetailDto.class); - if (dto != null) { - Wrapper wp = Wrappers.lambdaQuery() - .select(SzCheckingItem::getId, SzCheckingItem::getParts, SzCheckingItem::getContent) - .eq(SzCheckingItem::getXcId, id); - dto.setItems(StreamUtils.toList(SzCheckingItemMapper.selectList(wp), (o) -> { - SzCheckingItemDto itemDto = new SzCheckingItemDto(); - itemDto.setContent(o.getContent()); - itemDto.setId(o.getId()); - itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), PART_SEPARATOR)) - .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); - return itemDto; - })); + private final SzCheckingItemMapper SzCheckingItemMapper; + private final SzPlanMapper szPlanMapper; + public final static String PART_SEPARATOR = ":"; + + public List selectSimple(SearchParam sp) { + Wrapper wp = Wrappers.lambdaQuery() + .select(SzChecking::getId, SzChecking::getName) + .eq(SzChecking::getType, sp.getData().getType()); + return getBaseMapper().selectList(wp); } - return dto; - } - - - @Transactional(rollbackFor = Exception.class) - public SzCheckingDetailDto add(SzCheckingDetailDto dto) { - SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class); - if (checking != null) { - if (checkNameDistinct(checking.getId(), checking.getName())) { - getBaseMapper().insert(checking); - String id = checking.getId(); - if (CollectionUtil.isNotEmpty(dto.getItems())) { - dto.getItems().forEach((o) -> { - SzCheckingItem item = new SzCheckingItem(); - item.setXcId(id); - item.setContent(o.getContent()); - item.setParts(String.join(PART_SEPARATOR, o.getParts())); - SzCheckingItemMapper.insert(item); - }); + + + public SzCheckingDetailDto getDetailById(String id) { + SzChecking checking = this.getById(id); + SzCheckingDetailDto dto = BeanCopyUtils.copy(checking, SzCheckingDetailDto.class); + if (dto != null) { + Wrapper wp = Wrappers.lambdaQuery() + .select(SzCheckingItem::getId, SzCheckingItem::getParts, SzCheckingItem::getContent) + .eq(SzCheckingItem::getXcId, id); + dto.setItems(StreamUtils.toList(SzCheckingItemMapper.selectList(wp), (o) -> { + SzCheckingItemDto itemDto = new SzCheckingItemDto(); + itemDto.setContent(o.getContent()); + itemDto.setId(o.getId()); + itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), PART_SEPARATOR)) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); + return itemDto; + })); } - return this.getDetailById(id); - } else { - throw new SzException("该名称已存在"); - } + return dto; + } + + + @Transactional(rollbackFor = Exception.class) + public SzCheckingDetailDto add(SzCheckingDetailDto dto) { + SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class); + if (checking != null) { + if (checkNameDistinct(checking.getId(), checking.getName())) { + getBaseMapper().insert(checking); + String id = checking.getId(); + if (CollectionUtil.isNotEmpty(dto.getItems())) { + dto.getItems().forEach((o) -> { + SzCheckingItem item = new SzCheckingItem(); + item.setXcId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + SzCheckingItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new SzException("该名称已存在"); + } + + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public SzCheckingDetailDto update(SzCheckingDetailDto dto) { + if (exist(dto.getId())) { + SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class); + if (checking != null) { + if (checkNameDistinct(checking.getId(), checking.getName())) { + getBaseMapper().updateById(checking); + String id = checking.getId(); + deleteItems(id); + if (CollectionUtil.isNotEmpty(dto.getItems())) { + dto.getItems().forEach((o) -> { + SzCheckingItem item = new SzCheckingItem(); + item.setXcId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + SzCheckingItemMapper.insert(item); + }); + } + return this.getDetailById(id); + } else { + throw new SzException("该名称已存在"); + } + } + } + throw new SzException("源数据不存在，请确认id值是否正确"); } - return null; - } - - @Transactional(rollbackFor = Exception.class) - public SzCheckingDetailDto update(SzCheckingDetailDto dto) { - if (exist(dto.getId())) { - SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class); - if (checking != null) { - if (checkNameDistinct(checking.getId(), checking.getName())) { - getBaseMapper().updateById(checking); - String id = checking.getId(); - deleteItems(id); - if (CollectionUtil.isNotEmpty(dto.getItems())) { - dto.getItems().forEach((o) -> { - SzCheckingItem item = new SzCheckingItem(); - item.setXcId(id); - item.setContent(o.getContent()); - item.setParts(String.join(PART_SEPARATOR, o.getParts())); - SzCheckingItemMapper.insert(item); - }); - } - return this.getDetailById(id); - } else { - throw new SzException("该名称已存在"); + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + if (isUsed(id)) { + throw new SzException("已被巡查计划，不能删除！"); } - } + boolean rt = removeById(id); + if (rt) { + deleteItems(id); + } + return rt; } - throw new SzException("源数据不存在，请确认id值是否正确"); - } + private boolean isUsed(String id) { + return szPlanMapper.selectCount(Wrappers.lambdaQuery() + .eq(SzPlan::getXcId, id)) > 0; + } + private void deleteItems(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzCheckingItem::getXcId, id); + SzCheckingItemMapper.delete(wp); + } + + private boolean checkNameDistinct(String id, String name) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzChecking::getName, name) + .ne(StringUtils.isNotEmpty(id), SzChecking::getId, id); + return this.getBaseMapper().selectCount(wp) <= 0; + } - @Transactional(rollbackFor = Exception.class) - public Boolean deleteById(String id) { - boolean rt = removeById(id); - if (rt) { - deleteItems(id); + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzChecking::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; } - return rt; - } - - private void deleteItems(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(SzCheckingItem::getXcId, id); - SzCheckingItemMapper.delete(wp); - } - - private boolean checkNameDistinct(String id, String name) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(SzChecking::getName, name) - .ne(StringUtils.isNotEmpty(id), SzChecking::getId, id); - return this.getBaseMapper().selectCount(wp) <= 0; - } - - private boolean exist(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(SzChecking::getId, id); - return this.getBaseMapper().selectCount(wp) > 0; - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index eef175d9..1b449b49 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -101,7 +101,7 @@ public class SzRecordService extends BaseService { if (checkingDetailDto != null) { SzRecord record = new SzRecord(); record.setPlanId(startPlan.getPlanId()); - record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); + record.setName(planDetailDto.getName() + DateUtils.getTime()); record.setStatus(RecordStatus.CHECKING.getValue()); getBaseMapper().insert(record); String id = record.getId();