From 1a9c7582d02b6b6e761d3f17410b692d193ced02 Mon Sep 17 00:00:00 2001 From: 15195 Date: Fri, 13 Feb 2026 10:58:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AE=9C=E5=AE=89?= =?UTF-8?q?=E9=A1=B9=E7=9B=AEtask=E9=85=8D=E7=BD=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=9B=E7=94=A8=E6=88=B7=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=BC=80=E5=85=B3=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SimulationSystemConfigServiceImpl.java | 9 ++ .../src/main/resources/application-yian.yml | 11 +- task/src/main/resources/application-yian.yml | 135 ++++++++++++++++++ 3 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 task/src/main/resources/application-yian.yml diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java index b4f57421..9c00ac45 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java @@ -49,6 +49,10 @@ import java.util.stream.Collectors; @Service public class SimulationSystemConfigServiceImpl extends BaseService implements ISimulationSystemConfigService { + // 是否开启用户自定义配置表单权限开关 true 开 false:关（宜安） + @Value("${formconfigure.selfSysUserConfigButton:true}") + private Boolean selfSysUserConfigButton; + @Value("#{'${formconfigure.admin.role:ROLE_ADMIN}'.split(',')}") private List adminRoleList; @@ -379,6 +383,11 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS } private boolean isNormalRole(){ + log.info("isNormalRole selfSysUserConfigButton:{}",selfSysUserConfigButton); + // 自定义表单关闭，直接就都是超管 + if(!selfSysUserConfigButton){ + return false; + } // 查询是否是可以自定义表格的角色，ROLE_ADMIN 是管理员角色 SdmResponse> roleResponse = sysUserService.queryUserRole(ThreadLocalContext.getUserId()); if(!roleResponse.isSuccess()){ diff --git a/system/src/main/resources/application-yian.yml b/system/src/main/resources/application-yian.yml index f699e967..a55832fe 100644 --- a/system/src/main/resources/application-yian.yml +++ b/system/src/main/resources/application-yian.yml @@ -145,7 +145,8 @@ cid: user: listUser: /spdm-user/listUser queryUserDetail: /spdm-user/queryUserDetail - listUserByIds: /dataManager/tree/node/listUserByIds + listUserByIds: /spdm-user/listUserByIds + listUserDetailByIds: /spdm-user/listUserDetailByIds queryUserRole: /spdm-user/queryUserRole queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail @@ -164,6 +165,8 @@ cid: launchApprove: /spdm-flow/startFlow queryFlowTemplate: /spdm-flow/listProcessByGroup queryApproveDetail: /spdm-flow/queryFlowNodeDetail + queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail + getTaskIdByNodeId: /spdm-flow/getTaskIdByNodeId stopApproveFlow: /spdm-flow/stopFlow group: SPDM # 单次批量查询cid审批流详情的条数 @@ -189,4 +192,8 @@ security: - /systemLog/saveLog - /tenant/list - /tenant/initNewTenant - - /user/getUserByRoleCode \ No newline at end of file + - /user/getUserByRoleCode + +# 表单配置开关 +formconfigure: + selfSysUserConfigButton: false \ No newline at end of file diff --git a/task/src/main/resources/application-yian.yml b/task/src/main/resources/application-yian.yml new file mode 100644 index 00000000..af2ec426 --- /dev/null +++ b/task/src/main/resources/application-yian.yml @@ -0,0 +1,135 @@ +# 前后端联调使用该配置文件，本地调试使用local +server: + port: 7102 + +spring: + application: + name: task + datasource: + username: root + password: mysql + jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 + maximum-pool-size: 20 + # 连接池在空闲时保持的最小连接数。 + minimum-idle: 5 + # 一个连接在被标记为空闲之前可以保持空闲状态的最长时间（毫秒）。当连接的空闲时间超过此值后，它可能会被连接池 evict（驱逐）。 + idle-timeout: 60000 # 1 min + # 一个连接从被创建开始，其生命周期的最大时长（毫秒）。HikariCP的默认值就是30分钟，这是一个非常合理的设置。 + max-lifetime: 1800000 # 30 min（Hikari 默认） + # 应用程序尝试从连接池获取一个连接时，等待的最长时间（毫秒）。建议值：30-60秒。 + connection-timeout: 30000 # 30s + master: + username: root + password: mysql + jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + slave: + username: root + password: mysql + jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + enable: true + cloud: + nacos: + discovery: + server-addr: 192.168.0.88:8848 + group: DEV_GROUP + # server-addr: 127.0.0.1:8848 + enabled: true + # username: nacos + # password: ENC(+QKYnI6gAYu1SbLaZQTkZA==) + data: + redis: + # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 + database: 0 + # redis服务器地址（填写自己的服务器地址） + host: 192.168.0.88 + # redis端口（默认6379） + port: 6379 + #redis连接超时等待,10秒 + timeout: PT10S + # redis访问密码（默认为空） + password: + lettuce: + pool: + # 连接池最大连接数（使用负值表示没有限制） 默认 8 + max-active: 50 + # 连接池中的最大空闲连接 默认 8 + max-idle: 20 + # 连接池中的最小空闲连接 默认 0 + min-idle: 1 + # 连接池最大阻塞等待时间(使用负值表示没有限制) 默认 -1，这里配置10s + max-wait: PT10S + # password: + # sentinel: + # master: mymaster + # nodes: 10.18.109.50:26379,10.18.109.51:26379,10.18.109.52:26379 + servlet: + multipart: + # 单个文件的最大值 + max-file-size: 500MB + # 上传文件总的最大值 + max-request-size: 10240MB + +management: + endpoints: + web: + exposure: + include: health,info + endpoint: + health: + show-details: always + group: + readiness: + include: discoveryComposite,ping,refreshScope + health: + redis: + enabled: false + db: + enabled: false + +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + auto-mapping-behavior: full + # cache-enabled: true + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mapper-locations: classpath*:mapper/**/*.xml + global-config: + # 逻辑删除配置 + db-config: + # 删除前 + logic-not-delete-value: 1 + # 删除后 + logic-delete-value: 0 + +#showSql +#logging: +# level: +# com.sdm.dao: debug + +lombok: + anyConstructor: + addConstructorProperties: true + +file: + rootPath: /data/home/sdm + scriptPath : /opt/script +approve: + replyUrl: http:192.168.0.88:7102/simulation/task/taskpool/approveHandleNotice +#logging: +# config: ./config/logback.xml + +security: + whitelist: + paths: + - /taskpool/approveHandleNotice + - /taskPerformance/getRunPerformance + +simulationPool: + baseline: baseline + lyric: lyric + chose: lyric \ No newline at end of file