Java/seer-teach-cloud-21
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改mp模块下@SaCheckLogin，将其修改为@SaCheckPermission

Browse Source
This commit is contained in:
Wang 2026-01-23 18:10:05 +08:00
parent efca204371
commit a0106420e0
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java
View File

@ -172,7 +172,7 @@ public class AdminActivityFormServiceImpl implements IAdminActivityFormService {
fieldEntity.setFieldCode(fieldCode); fieldEntity.setFieldCode(fieldCode);
// 设置字段类型 // 设置字段类型
String fieldType = (String) fieldMap.get("tag"); String fieldType = (String) config.get("tagIcon");
if (fieldType == null) { if (fieldType == null) {
fieldType = (String) config.get("tag"); fieldType = (String) config.get("tag");
} }

28
seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java
View File

@ -1,9 +1,10 @@
package com.seer.teach.mp.app.service.impl; package com.seer.teach.mp.app.service.impl;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.seer.teach.common.PageListBean; import com.seer.teach.common.PageListBean;
import com.seer.teach.common.utils.OrderIdGenerator;
import com.seer.teach.common.utils.PageConverterUtils; import com.seer.teach.common.utils.PageConverterUtils;
import com.seer.teach.mp.app.controller.req.ActivityFormSubmitReq; import com.seer.teach.mp.app.controller.req.ActivityFormSubmitReq;
import com.seer.teach.mp.app.controller.req.AppActivityFormExecutionQueryReq; import com.seer.teach.mp.app.controller.req.AppActivityFormExecutionQueryReq;
@ -108,7 +109,7 @@ public class AppActivityFormServiceImpl implements IAppActivityFormService {
@Transactional @Transactional
public String submitForm(ActivityFormSubmitReq req, Integer userId) { public String submitForm(ActivityFormSubmitReq req, Integer userId) {
// 生成执行编号 // 生成执行编号
String executionNo = "AFE-" + System.currentTimeMillis() + "-" + IdUtil.getSnowflakeNextId(); String executionNo = OrderIdGenerator.generateOrderId("EX");
// 创建表单执行实例 // 创建表单执行实例
MpActivityFormExecutionEntity execution = new MpActivityFormExecutionEntity(); MpActivityFormExecutionEntity execution = new MpActivityFormExecutionEntity();
@ -124,17 +125,18 @@ public class AppActivityFormServiceImpl implements IAppActivityFormService {
activityFormExecutionService.save(execution); activityFormExecutionService.save(execution);
// 处理表单数据，将其存储到变量表中 // 处理表单数据，将其存储到变量表中
if (req.getFormData() != null && !req.getFormData().isEmpty()) { if (CollectionUtil.isNotEmpty(req.getFormData())) {
for (Map.Entry<String, Object> entry : req.getFormData().entrySet()) { List<MpActivityFormVariableEntity> variables = req.getFormData().entrySet().stream()
MpActivityFormVariableEntity variable = new MpActivityFormVariableEntity(); .map(entry -> {
variable.setExecutionId(execution.getId()); MpActivityFormVariableEntity variable = new MpActivityFormVariableEntity();
variable.setVariableName(entry.getKey()); variable.setExecutionId(execution.getId());
variable.setVariableCode(entry.getKey()); variable.setVariableName(entry.getKey());
variable.setVariableValue(String.valueOf(entry.getValue())); variable.setVariableCode(entry.getKey());
variable.setDataType(getDataType(entry.getValue())); variable.setVariableValue(String.valueOf(entry.getValue()));
variable.setDataType(getDataType(entry.getValue()));
activityFormVariableService.save(variable); return variable;
} }).collect(Collectors.toList());
activityFormVariableService.saveBatch(variables);
} }
log.info("表单提交成功，执行编号：{}", executionNo); log.info("表单提交成功，执行编号：{}", executionNo);