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-24 14:46:20 +08:00
parent 956cc743f7
commit 62d07c581b
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormExecutionServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.seer.teach.mp.app.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.seer.teach.common.utils.OrderIdGenerator; import com.seer.teach.common.utils.OrderIdGenerator;
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.resp.AppActivityFormFieldResp;
import com.seer.teach.mp.app.controller.resp.AppFormFieldWithValueResp; import com.seer.teach.mp.app.controller.resp.AppFormFieldWithValueResp;
import com.seer.teach.mp.app.convert.AppActivityFormConvert; import com.seer.teach.mp.app.convert.AppActivityFormConvert;
import com.seer.teach.mp.app.service.IAppActivityFormExecutionService; import com.seer.teach.mp.app.service.IAppActivityFormExecutionService;
@ -14,10 +15,12 @@ import com.seer.teach.mp.service.IMpActivityFormFieldService;
import com.seer.teach.mp.service.IMpActivityFormVariableService; import com.seer.teach.mp.service.IMpActivityFormVariableService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -135,14 +138,21 @@ public class AppActivityFormExecutionServiceImpl implements IAppActivityFormExec
public AppFormFieldWithValueResp getExecutionWithFormData(Integer activityId, Integer agentId, Integer userId) { public AppFormFieldWithValueResp getExecutionWithFormData(Integer activityId, Integer agentId, Integer userId) {
MpActivityFormExecutionEntity execution = activityFormExecutionService.getOneByActivityIdAndAgentIdAndSubmitterId(activityId, agentId, userId); MpActivityFormExecutionEntity execution = activityFormExecutionService.getOneByActivityIdAndAgentIdAndSubmitterId(activityId, agentId, userId);
if (Objects.isNull(execution)) { if (Objects.isNull(execution)) {
log.warn("未找到该用户的执行记录，活动ID：{}，代理ID：{}，用户ID：{}", activityId, agentId, userId);
return null; return null;
} }
// 获取表单字段定义 // 获取表单字段定义
List<MpActivityFormFieldEntity> fieldDefinitions = activityFormFieldService.getFieldListByFormId(execution.getFormId()); List<MpActivityFormFieldEntity> fieldDefinitions = activityFormFieldService.getFieldListByFormId(execution.getFormId());
if(CollectionUtil.isEmpty(fieldDefinitions)){
log.warn("表单字段定义为空，表单ID：{}", execution.getFormId());
return null;
}
// 获取表单提交的数据 // 获取表单提交的数据
List<MpActivityFormVariableEntity> variables = activityFormVariableService.getListByExecutionId(execution.getId()); List<MpActivityFormVariableEntity> variables = activityFormVariableService.getListByExecutionId(execution.getId());
if(CollectionUtil.isEmpty(variables)){
log.warn("表单提交数据为空，执行ID：{}", execution.getId());
return null;
}
Map<String, Object> formData = new HashMap<>(); Map<String, Object> formData = new HashMap<>();
for (MpActivityFormVariableEntity variable : variables) { for (MpActivityFormVariableEntity variable : variables) {
Object value = convertValueByType(variable.getVariableValue(), variable.getDataType()); Object value = convertValueByType(variable.getVariableValue(), variable.getDataType());
@ -157,16 +167,19 @@ public class AppActivityFormExecutionServiceImpl implements IAppActivityFormExec
response.setFormId(execution.getFormId()); response.setFormId(execution.getFormId());
response.setSubmitterId(execution.getSubmitterId()); response.setSubmitterId(execution.getSubmitterId());
// 组合字段定义和对应的值 // 组合字段定义和对应的值
List<AppFormFieldWithValueResp.FieldWithValueItemResp> fields = fieldDefinitions.stream() List<AppFormFieldWithValueResp.FieldWithValueItemResp> fields = new ArrayList<>(fieldDefinitions.size());
.map(field -> { for(MpActivityFormFieldEntity field : fieldDefinitions){
AppFormFieldWithValueResp.FieldWithValueItemResp item = new AppFormFieldWithValueResp.FieldWithValueItemResp(); AppFormFieldWithValueResp.FieldWithValueItemResp item = new AppFormFieldWithValueResp.FieldWithValueItemResp();
item.setFieldDefinition(AppActivityFormConvert.INSTANCE.convertToAppFieldResp(field)); AppActivityFormFieldResp appActivityFormFieldResp = AppActivityFormConvert.INSTANCE.convertToAppFieldResp(field);
// 如果有对应的值则设置，否则为null item.setFieldDefinition(appActivityFormFieldResp);
item.setFieldValue(formData.get(field.getFieldCode())); String filedCode = field.getFieldCode();
return item; if(StringUtils.isNotEmpty(filedCode)){
}) Object object = formData.get(filedCode.trim());
.collect(Collectors.toList()); item.setFieldValue(object);
log.info("字段code：{}, 字段value:{}", appActivityFormFieldResp.getFieldCode(), object);
}
fields.add(item);
}
response.setFields(fields); response.setFields(fields);
return response; return response;