diff --git a/.gitignore b/.gitignore index 9f46aab..2276063 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,9 @@ target/** logs/** .DS_Store -**/.DS_Store \ No newline at end of file +**/.DS_Store + +get_univ2/** +get_univ/** + +.idea diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 49a285e..c79507f 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -138,6 +138,12 @@ mail: port: 465 # 是否需要用户名密码验证 auth: true + +--- # 艺术院校导入配置 +art: + import: + # 学校JSON数据目录（为空则默认使用 {user.dir}/get_univ） + schoolJsonDir: /Users/zhouwentao/Workspaces/Yitisheng/art-management-backend/get_univ # 发送方，遵循RFC-822标准 from: xxx@163.com # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml new file mode 100644 index 0000000..c79507f --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -0,0 +1,276 @@ +--- # 监控中心配置 +spring.boot.admin.client: + # 增加客户端开关 + enabled: ${SPRING_BOOT_ADMIN_CLIENT_ENABLED:false} + url: http://localhost:9090/admin + instance: + service-host-type: IP + metadata: + username: ${spring.boot.admin.client.username} + userpassword: ${spring.boot.admin.client.password} + username: @monitor.username@ + password: @monitor.password@ + +--- # snail-job 配置 +snail-job: + enabled: ${SNAIL_JOB_ENABLED:false} + # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 + group: "ruoyi_group" + # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表 + token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" + server: + host: 127.0.0.1 + port: 17888 + # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段 + namespace: ${spring.profiles.active} + # 随主应用端口漂移 + port: 2${server.port} + # 客户端ip指定 + host: + +--- # 数据源配置 +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content + dynamic: + # 性能分析插件(有性能损耗 不建议生产环境使用) + p6spy: true + # 设置默认的数据源或者数据源组,默认值即为 master + primary: postgres + # 严格模式 匹配不到数据源则报错 + strict: true + datasource: + # 主库数据源 +# master: +# type: ${spring.datasource.type} +# driverClassName: com.mysql.cj.jdbc.Driver +# # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 +# # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) +# url: jdbc:mysql://10.13.13.1:3306/yitisheng_ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: root +# password: Db$7Hn#4Jm9Pq2!Xz +# # 从库数据源 +# slave: +# lazy: true +# type: ${spring.datasource.type} +# driverClassName: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: +# password: +# oracle: +# type: ${spring.datasource.type} +# driverClassName: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@//localhost:1521/XE +# username: ROOT +# password: root + postgres: + type: ${spring.datasource.type} + driverClassName: org.postgresql.Driver + url: jdbc:postgresql://10.13.13.1:5432/art_sports_volunteer?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + username: art_sports_volunteer + password: t56kX86WMQ8eNjRz +# sqlserver: +# type: ${spring.datasource.type} +# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true +# username: SA +# password: root + hikari: + # 最大连接池数量 + maxPoolSize: 20 + # 最小空闲线程数量 + minIdle: 10 + # 配置获取连接等待超时的时间 + connectionTimeout: 30000 + # 校验超时时间 + validationTimeout: 5000 + # 空闲连接存活最大时间，默认10分钟 + idleTimeout: 600000 + # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟 + maxLifetime: 1800000 + # 多久检查一次连接的活性 + keepaliveTime: 30000 + +--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) +spring.data: + redis: + # 地址 + host: 10.13.13.1 + # 端口，默认为6379 + port: 56379 + # 数据库索引 + database: 2 + # redis 密码必须配置 + password: Rd@5Wk8#Nv3Yt6$Bm + # 连接超时时间 + timeout: 10s + # 是否开启ssl + ssl.enabled: false + +# redisson 配置 +redisson: + # redis key前缀 + keyPrefix: + # 线程池数量 + threads: 4 + # Netty线程池数量 + nettyThreads: 8 + # 单节点配置 + singleServerConfig: + # 客户端名称 不能用中文 + clientName: RuoYi-Vue-Plus + # 最小空闲连接数 + connectionMinimumIdleSize: 8 + # 连接池大小 + connectionPoolSize: 32 + # 连接空闲超时，单位：毫秒 + idleConnectionTimeout: 10000 + # 命令等待超时，单位：毫秒 + timeout: 3000 + # 发布和订阅连接池大小 + subscriptionConnectionPoolSize: 50 + +--- # mail 邮件发送 +mail: + enabled: false + host: smtp.163.com + port: 465 + # 是否需要用户名密码验证 + auth: true + +--- # 艺术院校导入配置 +art: + import: + # 学校JSON数据目录（为空则默认使用 {user.dir}/get_univ） + schoolJsonDir: /Users/zhouwentao/Workspaces/Yitisheng/art-management-backend/get_univ + # 发送方，遵循RFC-822标准 + from: xxx@163.com + # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） + user: xxx@163.com + # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） + pass: xxxxxxxxxx + # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 + starttlsEnable: true + # 使用SSL安全连接 + sslEnable: true + # SMTP超时时长，单位毫秒，缺省值不超时 + timeout: 0 + # Socket连接超时值，单位毫秒，缺省值不超时 + connectionTimeout: 0 + +--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 +# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用 +sms: + # 配置源类型用于标定配置来源(interface,yaml) + config-type: yaml + # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制 + restricted: true + # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效 + minute-max: 1 + # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效 + account-max: 30 + # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 + blends: + # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 + # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 + config1: + # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 + supplier: alibaba + # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。 + access-key-id: 您的accessKey + # 称为accessSecret有些称之为apiSecret + access-key-secret: 您的accessKeySecret + signature: 您的短信签名 + sdk-app-id: 您的sdkAppId + config2: + # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 + supplier: tencent + access-key-id: 您的accessKey + access-key-secret: 您的accessKeySecret + signature: 您的短信签名 + sdk-app-id: 您的sdkAppId + + +--- # 三方授权 +justauth: + # 前端外网访问地址 + address: http://localhost:80 + type: + maxkey: + # maxkey 服务器地址 + # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 + server-url: http://sso.maxkey.top + client-id: 876892492581044224 + client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 + redirect-uri: ${justauth.address}/social-callback?source=maxkey + topiam: + # topiam 服务器地址 + server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol + client-id: 449c4*********937************759 + client-secret: ac7***********1e0************28d + redirect-uri: ${justauth.address}/social-callback?source=topiam + scopes: [openid, email, phone, profile] + qq: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=qq + union-id: false + weibo: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=weibo + gitee: + client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 + client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac + redirect-uri: ${justauth.address}/social-callback?source=gitee + dingtalk: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=dingtalk + baidu: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=baidu + csdn: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=csdn + coding: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=coding + coding-group-name: xx + oschina: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=oschina + alipay_wallet: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet + alipay-public-key: MIIB**************DAQAB + wechat_open: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_open + wechat_mp: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_mp + wechat_enterprise: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise + agent-id: 1000002 + gitlab: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=gitlab + gitea: + # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204 + # gitea 服务器地址 + server-url: https://demo.gitea.com + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=gitea diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2a22d17..efdef5a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -33,7 +33,7 @@ captcha: # 日志配置 logging: level: - org.dromara: @logging.level@ + org.dromara: info org.springframework: warn org.mybatis.spring.mapper: error org.apache.fury: warn @@ -67,7 +67,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: @profiles.active@ + active: dev # 文件上传 servlet: multipart: diff --git a/ruoyi-modules/ruoyi-art/pom.xml b/ruoyi-modules/ruoyi-art/pom.xml index 55651d6..5e13458 100644 --- a/ruoyi-modules/ruoyi-art/pom.xml +++ b/ruoyi-modules/ruoyi-art/pom.xml @@ -103,6 +103,11 @@ ruoyi-common-websocket + + org.postgresql + postgresql + + diff --git a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtSchoolDetailController.java b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtSchoolDetailController.java index 9559eb7..98f3306 100644 --- a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtSchoolDetailController.java +++ b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtSchoolDetailController.java @@ -1,11 +1,13 @@ package org.dromara.art.controller; import java.util.List; +import java.util.Map; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.fasterxml.jackson.databind.JsonNode; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -19,8 +21,10 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.art.domain.vo.ArtSchoolDetailVo; import org.dromara.art.domain.bo.ArtSchoolDetailBo; +import org.dromara.art.domain.ArtSchoolDetail; import org.dromara.art.service.IArtSchoolDetailService; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.json.utils.JsonUtils; /** * 学校详细信息 @@ -100,6 +104,501 @@ public class ArtSchoolDetailController extends BaseController { @DeleteMapping("/{detailIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] detailIds) { - return toAjax(artSchoolDetailService.deleteWithValidByIds(List.of(detailIds), true)); + return toAjax(artSchoolDetailService.deleteWithValidByIds(List.of(detailIds), Boolean.TRUE)); + } + + // ------------------------ JSONB 独立接口 ------------------------ + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/satisfaction") + public R> getSatisfactionJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("satisfactionJson", parseJson(getDetailValue(schoolId, DetailField.SATISFACTION)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/satisfaction") + public R saveSatisfactionJson(@Validated @RequestBody SatisfactionJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.SATISFACTION, toJsonString(request.getSatisfactionJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/satisfaction") + public R deleteSatisfactionJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.SATISFACTION, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/scholarship") + public R> getScholarshipJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("scholarshipJson", parseJson(getDetailValue(schoolId, DetailField.SCHOLARSHIP)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/scholarship") + public R saveScholarshipJson(@Validated @RequestBody ScholarshipJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.SCHOLARSHIP, toJsonString(request.getScholarshipJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/scholarship") + public R deleteScholarshipJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.SCHOLARSHIP, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/specialMajor") + public R> getSpecialMajorJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("specialMajorJson", parseJson(getDetailValue(schoolId, DetailField.SPECIAL_MAJOR)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/specialMajor") + public R saveSpecialMajorJson(@Validated @RequestBody SpecialMajorJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.SPECIAL_MAJOR, toJsonString(request.getSpecialMajorJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/specialMajor") + public R deleteSpecialMajorJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.SPECIAL_MAJOR, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/employmentReport") + public R> getEmploymentReportJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("employmentReportJson", parseJson(getDetailValue(schoolId, DetailField.EMPLOYMENT_REPORT)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/employmentReport") + public R saveEmploymentReportJson(@Validated @RequestBody EmploymentReportJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.EMPLOYMENT_REPORT, toJsonString(request.getEmploymentReportJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/employmentReport") + public R deleteEmploymentReportJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.EMPLOYMENT_REPORT, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/photo") + public R> getPhotoJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("photoJson", parseJson(getDetailValue(schoolId, DetailField.PHOTO)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/photo") + public R savePhotoJson(@Validated @RequestBody PhotoJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.PHOTO, toJsonString(request.getPhotoJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/photo") + public R deletePhotoJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.PHOTO, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/accommodation") + public R> getAccommodationJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("accommodationJson", parseJson(getDetailValue(schoolId, DetailField.ACCOMMODATION)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/accommodation") + public R saveAccommodationJson(@Validated @RequestBody AccommodationJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.ACCOMMODATION, toJsonString(request.getAccommodationJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/accommodation") + public R deleteAccommodationJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.ACCOMMODATION, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/subjectReviews") + public R> getSubjectReviewsJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("subjectReviewsJson", parseJson(getDetailValue(schoolId, DetailField.SUBJECT_REVIEWS)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/subjectReviews") + public R saveSubjectReviewsJson(@Validated @RequestBody SubjectReviewsJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.SUBJECT_REVIEWS, toJsonString(request.getSubjectReviewsJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/subjectReviews") + public R deleteSubjectReviewsJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.SUBJECT_REVIEWS, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/research") + public R> getResearchJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("researchJson", parseJson(getDetailValue(schoolId, DetailField.RESEARCH)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/research") + public R saveResearchJson(@Validated @RequestBody ResearchJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.RESEARCH, toJsonString(request.getResearchJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/research") + public R deleteResearchJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.RESEARCH, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/univMajors") + public R> getUnivMajorsJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return R.ok(Map.of("univMajorsJson", parseJson(getDetailValue(schoolId, DetailField.UNIV_MAJORS)))); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/univMajors") + public R saveUnivMajorsJson(@Validated @RequestBody UnivMajorsJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.UNIV_MAJORS, toJsonString(request.getUnivMajorsJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/univMajors") + public R deleteUnivMajorsJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.UNIV_MAJORS, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/univPostgraduate") + public R> getUnivPostgraduateJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + Object o = parseJson(getDetailValue(schoolId, DetailField.UNIV_POSTGRADUATE)); + return R.ok(Map.of("univPostgraduateJson", o)); + } + + @SaCheckPermission("art:schoolDetail:edit") + @PutMapping("/json/univPostgraduate") + public R saveUnivPostgraduateJson(@Validated @RequestBody UnivPostgraduateJsonRequest request) { + return toAjax(saveDetailValue(request.getSchoolId(), DetailField.UNIV_POSTGRADUATE, toJsonString(request.getUnivPostgraduateJson()))); + } + + @SaCheckPermission("art:schoolDetail:remove") + @DeleteMapping("/json/univPostgraduate") + public R deleteUnivPostgraduateJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + return toAjax(saveDetailValue(schoolId, DetailField.UNIV_POSTGRADUATE, null)); + } + + @SaCheckPermission("art:schoolDetail:query") + @GetMapping("/json/all") + public R> getAllJson(@NotNull(message = "学校ID不能为空") @RequestParam Long schoolId) { + ArtSchoolDetail detail = artSchoolDetailService.queryEntityBySchoolId(schoolId); + if (detail == null) { + return R.ok(Map.of()); + } + return R.ok(Map.of( + "satisfactionJson", parseJson(detail.getSatisfactionJson()), + "scholarshipJson", parseJson(detail.getScholarshipJson()), + "specialMajorJson", parseJson(detail.getSpecialMajorJson()), + "employmentReportJson", parseJson(detail.getEmploymentReportJson()), + "photoJson", parseJson(detail.getPhotoJson()), + "accommodationJson", parseJson(detail.getAccommodationJson()), + "subjectReviewsJson", parseJson(detail.getSubjectReviewsJson()), + "researchJson", parseJson(detail.getResearchJson()), + "univMajorsJson", parseJson(detail.getUnivMajorsJson()), + "univPostgraduateJson", parseJson(detail.getUnivPostgraduateJson()) + )); + } + + private String getDetailValue(Long schoolId, DetailField field) { + ArtSchoolDetail detail = artSchoolDetailService.queryEntityBySchoolId(schoolId); + if (detail == null) { + return null; + } + return switch (field) { + case SATISFACTION -> detail.getSatisfactionJson(); + case SCHOLARSHIP -> detail.getScholarshipJson(); + case SPECIAL_MAJOR -> detail.getSpecialMajorJson(); + case EMPLOYMENT_REPORT -> detail.getEmploymentReportJson(); + case PHOTO -> detail.getPhotoJson(); + case ACCOMMODATION -> detail.getAccommodationJson(); + case SUBJECT_REVIEWS -> detail.getSubjectReviewsJson(); + case RESEARCH -> detail.getResearchJson(); + case UNIV_MAJORS -> detail.getUnivMajorsJson(); + case UNIV_POSTGRADUATE -> detail.getUnivPostgraduateJson(); + }; + } + + private boolean saveDetailValue(Long schoolId, DetailField field, String json) { + ArtSchoolDetail detail = artSchoolDetailService.queryEntityBySchoolId(schoolId); + if (detail == null) { + detail = new ArtSchoolDetail(); + detail.setSchoolId(schoolId); + } + switch (field) { + case SATISFACTION -> detail.setSatisfactionJson(json); + case SCHOLARSHIP -> detail.setScholarshipJson(json); + case SPECIAL_MAJOR -> detail.setSpecialMajorJson(json); + case EMPLOYMENT_REPORT -> detail.setEmploymentReportJson(json); + case PHOTO -> detail.setPhotoJson(json); + case ACCOMMODATION -> detail.setAccommodationJson(json); + case SUBJECT_REVIEWS -> detail.setSubjectReviewsJson(json); + case RESEARCH -> detail.setResearchJson(json); + case UNIV_MAJORS -> detail.setUnivMajorsJson(json); + case UNIV_POSTGRADUATE -> detail.setUnivPostgraduateJson(json); + } + return artSchoolDetailService.saveOrUpdateBySchoolId(detail); + } + + private Object parseJson(String json) { + if (json == null || json.isBlank()) { + return null; + } + try { + return JsonUtils.getObjectMapper().readTree(json); + } catch (Exception e) { + return json; + } + } + + private String toJsonString(JsonNode node) { + if (node == null || node.isNull()) { + return null; + } + return JsonUtils.toJsonString(node); + } + + private enum DetailField { + SATISFACTION, + SCHOLARSHIP, + SPECIAL_MAJOR, + EMPLOYMENT_REPORT, + PHOTO, + ACCOMMODATION, + SUBJECT_REVIEWS, + RESEARCH, + UNIV_MAJORS, + UNIV_POSTGRADUATE + } + + public static class SatisfactionJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode satisfactionJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getSatisfactionJson() { + return satisfactionJson; + } + + public void setSatisfactionJson(JsonNode satisfactionJson) { + this.satisfactionJson = satisfactionJson; + } + } + + public static class ScholarshipJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode scholarshipJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getScholarshipJson() { + return scholarshipJson; + } + + public void setScholarshipJson(JsonNode scholarshipJson) { + this.scholarshipJson = scholarshipJson; + } + } + + public static class SpecialMajorJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode specialMajorJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getSpecialMajorJson() { + return specialMajorJson; + } + + public void setSpecialMajorJson(JsonNode specialMajorJson) { + this.specialMajorJson = specialMajorJson; + } + } + + public static class EmploymentReportJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode employmentReportJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getEmploymentReportJson() { + return employmentReportJson; + } + + public void setEmploymentReportJson(JsonNode employmentReportJson) { + this.employmentReportJson = employmentReportJson; + } + } + + public static class PhotoJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode photoJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getPhotoJson() { + return photoJson; + } + + public void setPhotoJson(JsonNode photoJson) { + this.photoJson = photoJson; + } + } + + public static class AccommodationJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode accommodationJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getAccommodationJson() { + return accommodationJson; + } + + public void setAccommodationJson(JsonNode accommodationJson) { + this.accommodationJson = accommodationJson; + } + } + + public static class SubjectReviewsJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode subjectReviewsJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getSubjectReviewsJson() { + return subjectReviewsJson; + } + + public void setSubjectReviewsJson(JsonNode subjectReviewsJson) { + this.subjectReviewsJson = subjectReviewsJson; + } + } + + public static class ResearchJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode researchJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getResearchJson() { + return researchJson; + } + + public void setResearchJson(JsonNode researchJson) { + this.researchJson = researchJson; + } + } + + public static class UnivMajorsJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode univMajorsJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getUnivMajorsJson() { + return univMajorsJson; + } + + public void setUnivMajorsJson(JsonNode univMajorsJson) { + this.univMajorsJson = univMajorsJson; + } + } + + public static class UnivPostgraduateJsonRequest { + @NotNull(message = "学校ID不能为空") + private Long schoolId; + private JsonNode univPostgraduateJson; + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public JsonNode getUnivPostgraduateJson() { + return univPostgraduateJson; + } + + public void setUnivPostgraduateJson(JsonNode univPostgraduateJson) { + this.univPostgraduateJson = univPostgraduateJson; + } } } diff --git a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtTestController.java b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtTestController.java index da95e2f..c9bd5b0 100644 --- a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtTestController.java +++ b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtTestController.java @@ -13,6 +13,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.core.domain.R; import org.dromara.common.web.core.BaseController; +import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -37,11 +38,18 @@ public class ArtTestController extends BaseController { private final IArtSchoolService artSchoolService; private final IArtSchoolDetailService artSchoolDetailService; + @Value("${art.import.schoolJsonDir:}") + private String schoolJsonDir; @GetMapping("/importSchoolByJson") public R importSchoolByJson(@RequestParam(defaultValue = "20") Integer previewSize) { int safePreviewSize = previewSize == null ? 20 : Math.min(Math.max(previewSize, 1), 200); - Path sourceDir = Path.of(System.getProperty("user.dir"), "get_univ"); + Path sourceDir; + if (StringUtils.isNotBlank(schoolJsonDir)) { + sourceDir = Path.of(schoolJsonDir.trim()); + } else { + sourceDir = Path.of(System.getProperty("user.dir"), "get_univ"); + } if (!Files.exists(sourceDir) || !Files.isDirectory(sourceDir)) { return R.fail("目录不存在: " + sourceDir); } @@ -246,6 +254,33 @@ public class ArtTestController extends BaseController { detail.setKeyMajorCount(resolveKeyMajorCount(node)); detail.setEmploymentRate(resolveEmploymentRate(node)); detail.setSatisfactionRate(resolveSatisfactionRate(node)); + // 评分/满意度相关原始数据与明细保留，便于后续展示或二次计算 + detail.setCombinedScore(asDecimal(node.get("combinedScore"))); + detail.setOverallRank(asInteger(node.get("rank"))); + detail.setEnvSatisfaction(asDecimal(node.get("envSatisfaction"))); + detail.setEnvVote(asInteger(node.get("envVote"))); + detail.setLiveSatisfaction(asDecimal(node.get("liveSatisfaction"))); + detail.setLiveVote(asInteger(node.get("liveVote"))); + detail.setCombinedSatisfaction(asDecimal(node.get("combinedSatisfaction"))); + detail.setCombinedVote(asInteger(node.get("combinedVote"))); + detail.setSatisfactionJson(toJsonString(node.get("satisfactionJson"))); + detail.setTeachers(asText(node.get("teachers"))); + detail.setScholarship(asText(node.get("scholarship"))); + detail.setScholarshipJson(toJsonString(node.get("scholarshipArray"))); + detail.setGrantDesc(asText(node.get("grant"))); + detail.setCanteen(asText(node.get("canteen"))); + detail.setDormitory(asText(node.get("dormitory"))); + detail.setMasterExplain(asText(node.get("masterExplain"))); + detail.setDoctorExplain(asText(node.get("doctorExplain"))); + // 结构化内容以 JSON 文本落库，避免一次性拆表 + detail.setSpecialMajorJson(toJsonString(node.get("specialMajor"))); + detail.setEmploymentReportJson(toJsonString(node.get("employmentReport"))); + detail.setPhotoJson(toJsonString(node.get("photoJson"))); + detail.setAccommodationJson(toJsonString(node.get("accommodationArray"))); + detail.setSubjectReviewsJson(toJsonString(node.get("subjectReviews"))); + detail.setResearchJson(toJsonString(node.get("researchJson"))); + detail.setUnivMajorsJson(toJsonString(node.get("univMajors"))); + detail.setUnivPostgraduateJson(toJsonString(node.get("univPostgraduateList"))); detail.setUnivId(univId); //detail.setRemark("source=" + sourceTag); @@ -275,20 +310,9 @@ public class ArtTestController extends BaseController { schoolCollegeBoList.add(schoolCollegeBo); } - // 特色专业 - node.get("specialMajor"); - // 就业报告 - node.get("employmentReport"); - // 图片 - node.get("photoJson"); - - // 建筑 - node.get("accommodationArray"); - - // 学科评估 - node.get("subjectReviews"); + // 其余结构化内容已映射到详情 JSON 字段 ArtSchoolSubmitBo submitBo = new ArtSchoolSubmitBo(); submitBo.setSchool(school); @@ -497,6 +521,14 @@ public class ArtTestController extends BaseController { } } + private String toJsonString(JsonNode node) { + if (node == null || node.isNull()) { + return null; + } + // 统一走 ObjectMapper 序列化，保持 JSON 原始结构 + return JsonUtils.toJsonString(node); + } + private void appendDetail(List details, int maxSize, String mainCode, String mainName, String status, String message) { if (details.size() >= maxSize) { return; diff --git a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/ArtSchoolDetail.java b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/ArtSchoolDetail.java index 7a22161..75637f9 100644 --- a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/ArtSchoolDetail.java +++ b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/ArtSchoolDetail.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*; import org.apache.ibatis.type.ArrayTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.art.handler.JsonbTypeHandler; import java.io.Serial; import java.math.BigDecimal; @@ -245,4 +246,139 @@ public class ArtSchoolDetail extends TenantEntity { * QS排名 */ private Integer qsdaluRank; + + /** + * 综合评分 + */ + private BigDecimal combinedScore; + + /** + * 综合排名 + */ + private Integer overallRank; + + /** + * 环境满意度 + */ + private BigDecimal envSatisfaction; + + /** + * 环境满意度投票数 + */ + private Integer envVote; + + /** + * 生活满意度 + */ + private BigDecimal liveSatisfaction; + + /** + * 生活满意度投票数 + */ + private Integer liveVote; + + /** + * 综合满意度(原始分) + */ + private BigDecimal combinedSatisfaction; + + /** + * 综合满意度投票数 + */ + private Integer combinedVote; + + /** + * 满意度明细JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String satisfactionJson; + + /** + * 师资力量描述 + */ + private String teachers; + + /** + * 奖学金说明 + */ + private String scholarship; + + /** + * 奖学金数组JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String scholarshipJson; + + /** + * 助学金说明 + */ + private String grantDesc; + + /** + * 食堂说明 + */ + private String canteen; + + /** + * 宿舍说明 + */ + private String dormitory; + + /** + * 硕士点说明 + */ + private String masterExplain; + + /** + * 博士点说明 + */ + private String doctorExplain; + + /** + * 特色专业JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String specialMajorJson; + + /** + * 就业报告JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String employmentReportJson; + + /** + * 图片JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String photoJson; + + /** + * 建筑/配套JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String accommodationJson; + + /** + * 学科评估JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String subjectReviewsJson; + + /** + * 科研信息JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String researchJson; + + /** + * 专业标签JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String univMajorsJson; + + /** + * 保研信息JSON + */ + @TableField(typeHandler = JsonbTypeHandler.class) + private String univPostgraduateJson; } diff --git a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/bo/ArtSchoolDetailBo.java b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/bo/ArtSchoolDetailBo.java index 0a64962..006d0a9 100644 --- a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/bo/ArtSchoolDetailBo.java +++ b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/bo/ArtSchoolDetailBo.java @@ -233,4 +233,129 @@ public class ArtSchoolDetailBo extends BaseEntity { * QS排名 */ private Integer qsdaluRank; + + /** + * 综合评分 + */ + private BigDecimal combinedScore; + + /** + * 综合排名 + */ + private Integer overallRank; + + /** + * 环境满意度 + */ + private BigDecimal envSatisfaction; + + /** + * 环境满意度投票数 + */ + private Integer envVote; + + /** + * 生活满意度 + */ + private BigDecimal liveSatisfaction; + + /** + * 生活满意度投票数 + */ + private Integer liveVote; + + /** + * 综合满意度(原始分) + */ + private BigDecimal combinedSatisfaction; + + /** + * 综合满意度投票数 + */ + private Integer combinedVote; + + /** + * 满意度明细JSON + */ + private String satisfactionJson; + + /** + * 师资力量描述 + */ + private String teachers; + + /** + * 奖学金说明 + */ + private String scholarship; + + /** + * 奖学金数组JSON + */ + private String scholarshipJson; + + /** + * 助学金说明 + */ + private String grantDesc; + + /** + * 食堂说明 + */ + private String canteen; + + /** + * 宿舍说明 + */ + private String dormitory; + + /** + * 硕士点说明 + */ + private String masterExplain; + + /** + * 博士点说明 + */ + private String doctorExplain; + + /** + * 特色专业JSON + */ + private String specialMajorJson; + + /** + * 就业报告JSON + */ + private String employmentReportJson; + + /** + * 图片JSON + */ + private String photoJson; + + /** + * 建筑/配套JSON + */ + private String accommodationJson; + + /** + * 学科评估JSON + */ + private String subjectReviewsJson; + + /** + * 科研信息JSON + */ + private String researchJson; + + /** + * 专业标签JSON + */ + private String univMajorsJson; + + /** + * 保研信息JSON + */ + private String univPostgraduateJson; } diff --git a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/vo/ArtSchoolDetailVo.java b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/vo/ArtSchoolDetailVo.java index c5f0aee..a92c8e1 100644 --- a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/vo/ArtSchoolDetailVo.java +++ b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/domain/vo/ArtSchoolDetailVo.java @@ -194,5 +194,239 @@ public class ArtSchoolDetailVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 背景图 + */ + @ExcelProperty(value = "背景图") + private String backGround; + + /** + * 是否公办：0否1是 + */ + @ExcelProperty(value = "是否公办") + private Integer isPublic; + + /** + * 考研率 + */ + @ExcelProperty(value = "考研率") + private BigDecimal masterProportionRate; + + /** + * 出国率 + */ + @ExcelProperty(value = "出国率") + private BigDecimal abroadProportionRate; + + /** + * 是否有普通本科：0否1是 + */ + @ExcelProperty(value = "是否有普通本科") + private Integer hasRegular; + + /** + * 是否有专科：0否1是 + */ + @ExcelProperty(value = "是否有专科") + private Integer hasJunior; + + /** + * 是否有硕士点：0否1是 + */ + @ExcelProperty(value = "是否有硕士点") + private Integer hasMaster; + + /** + * 是否双高计划：0否1是 + */ + @ExcelProperty(value = "是否双高计划") + private Integer isDoubleHighPlan; + + /** + * 是否强基计划：0否1是 + */ + @ExcelProperty(value = "是否强基计划") + private Integer isStrongPlan; + + /** + * 泰晤士中国排名 + */ + @ExcelProperty(value = "泰晤士中国排名") + private Integer twsdlRank; + + /** + * 校友会排名 + */ + @ExcelProperty(value = "校友会排名") + private Integer xyhRank; + + /** + * 武书连排名 + */ + @ExcelProperty(value = "武书连排名") + private Integer wslRank; + + /** + * US中国排名 + */ + @ExcelProperty(value = "US中国排名") + private Integer usdaluRank; + + /** + * QS排名 + */ + @ExcelProperty(value = "QS排名") + private Integer qsdaluRank; + + /** + * 综合评分 + */ + @ExcelProperty(value = "综合评分") + private BigDecimal combinedScore; + + /** + * 综合排名 + */ + @ExcelProperty(value = "综合排名") + private Integer overallRank; + + /** + * 环境满意度 + */ + @ExcelProperty(value = "环境满意度") + private BigDecimal envSatisfaction; + + /** + * 环境满意度投票数 + */ + @ExcelProperty(value = "环境满意度投票数") + private Integer envVote; + + /** + * 生活满意度 + */ + @ExcelProperty(value = "生活满意度") + private BigDecimal liveSatisfaction; + + /** + * 生活满意度投票数 + */ + @ExcelProperty(value = "生活满意度投票数") + private Integer liveVote; + + /** + * 综合满意度(原始分) + */ + @ExcelProperty(value = "综合满意度(原始分)") + private BigDecimal combinedSatisfaction; + + /** + * 综合满意度投票数 + */ + @ExcelProperty(value = "综合满意度投票数") + private Integer combinedVote; + + /** + * 满意度明细JSON + */ + @ExcelProperty(value = "满意度明细JSON") + private String satisfactionJson; + + /** + * 师资力量描述 + */ + @ExcelProperty(value = "师资力量描述") + private String teachers; + + /** + * 奖学金说明 + */ + @ExcelProperty(value = "奖学金说明") + private String scholarship; + + /** + * 奖学金数组JSON + */ + @ExcelProperty(value = "奖学金数组JSON") + private String scholarshipJson; + + /** + * 助学金说明 + */ + @ExcelProperty(value = "助学金说明") + private String grantDesc; + + /** + * 食堂说明 + */ + @ExcelProperty(value = "食堂说明") + private String canteen; + + /** + * 宿舍说明 + */ + @ExcelProperty(value = "宿舍说明") + private String dormitory; + + /** + * 硕士点说明 + */ + @ExcelProperty(value = "硕士点说明") + private String masterExplain; + + /** + * 博士点说明 + */ + @ExcelProperty(value = "博士点说明") + private String doctorExplain; + + /** + * 特色专业JSON + */ + @ExcelProperty(value = "特色专业JSON") + private String specialMajorJson; + + /** + * 就业报告JSON + */ + @ExcelProperty(value = "就业报告JSON") + private String employmentReportJson; + + /** + * 图片JSON + */ + @ExcelProperty(value = "图片JSON") + private String photoJson; + + /** + * 建筑/配套JSON + */ + @ExcelProperty(value = "建筑/配套JSON") + private String accommodationJson; + + /** + * 学科评估JSON + */ + @ExcelProperty(value = "学科评估JSON") + private String subjectReviewsJson; + + /** + * 科研信息JSON + */ + @ExcelProperty(value = "科研信息JSON") + private String researchJson; + + /** + * 专业标签JSON + */ + @ExcelProperty(value = "专业标签JSON") + private String univMajorsJson; + + /** + * 保研信息JSON + */ + @ExcelProperty(value = "保研信息JSON") + private String univPostgraduateJson; + } diff --git a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/service/IArtSchoolDetailService.java b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/service/IArtSchoolDetailService.java index 50a08a2..f1e97f2 100644 --- a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/service/IArtSchoolDetailService.java +++ b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/service/IArtSchoolDetailService.java @@ -2,6 +2,7 @@ package org.dromara.art.service; import org.dromara.art.domain.vo.ArtSchoolDetailVo; import org.dromara.art.domain.bo.ArtSchoolDetailBo; +import org.dromara.art.domain.ArtSchoolDetail; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -57,6 +58,22 @@ public interface IArtSchoolDetailService { */ Boolean updateByBo(ArtSchoolDetailBo bo); + /** + * 按学校ID查询详情实体 + * + * @param schoolId 学校ID + * @return 详情实体 + */ + ArtSchoolDetail queryEntityBySchoolId(Long schoolId); + + /** + * 按学校ID保存或更新详情实体（仅更新非空字段） + * + * @param detail 详情实体 + * @return 是否成功 + */ + Boolean saveOrUpdateBySchoolId(ArtSchoolDetail detail); + /** * 校验并批量删除学校详细信息信息 * diff --git a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/service/impl/ArtSchoolDetailServiceImpl.java b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/service/impl/ArtSchoolDetailServiceImpl.java index 6a14635..3ce40cf 100644 --- a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/service/impl/ArtSchoolDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/service/impl/ArtSchoolDetailServiceImpl.java @@ -41,7 +41,7 @@ public class ArtSchoolDetailServiceImpl implements IArtSchoolDetailService { */ @Override public ArtSchoolDetailVo queryById(Long detailId){ - return baseMapper.selectVoById(detailId); + return stripJsonb(baseMapper.selectVoById(detailId)); } /** @@ -55,6 +55,9 @@ public class ArtSchoolDetailServiceImpl implements IArtSchoolDetailService { public TableDataInfo queryPageList(ArtSchoolDetailBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + if (result.getRecords() != null) { + result.getRecords().forEach(this::stripJsonb); + } return TableDataInfo.build(result); } @@ -67,7 +70,11 @@ public class ArtSchoolDetailServiceImpl implements IArtSchoolDetailService { @Override public List queryList(ArtSchoolDetailBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + List list = baseMapper.selectVoList(lqw); + if (list != null) { + list.forEach(this::stripJsonb); + } + return list; } private LambdaQueryWrapper buildQueryWrapper(ArtSchoolDetailBo bo) { @@ -132,6 +139,48 @@ public class ArtSchoolDetailServiceImpl implements IArtSchoolDetailService { return baseMapper.updateById(update) > 0; } + @Override + public ArtSchoolDetail queryEntityBySchoolId(Long schoolId) { + if (schoolId == null) { + return null; + } + return baseMapper.selectOne(Wrappers.lambdaQuery() + .eq(ArtSchoolDetail::getSchoolId, schoolId), false); + } + + @Override + public Boolean saveOrUpdateBySchoolId(ArtSchoolDetail detail) { + if (detail == null || detail.getSchoolId() == null) { + return false; + } + if (detail.getDetailId() != null) { + return baseMapper.updateById(detail) > 0; + } + ArtSchoolDetail exist = queryEntityBySchoolId(detail.getSchoolId()); + if (exist == null) { + return baseMapper.insert(detail) > 0; + } + detail.setDetailId(exist.getDetailId()); + return baseMapper.updateById(detail) > 0; + } + + private ArtSchoolDetailVo stripJsonb(ArtSchoolDetailVo vo) { + if (vo == null) { + return null; + } + vo.setSatisfactionJson(null); + vo.setScholarshipJson(null); + vo.setSpecialMajorJson(null); + vo.setEmploymentReportJson(null); + vo.setPhotoJson(null); + vo.setAccommodationJson(null); + vo.setSubjectReviewsJson(null); + vo.setResearchJson(null); + vo.setUnivMajorsJson(null); + vo.setUnivPostgraduateJson(null); + return vo; + } + /** * 保存前的数据校验 */