fix(REQ-2774): 页面元素上报增加秘钥和上报人
This commit is contained in:
parent
d333091bbc
commit
8b5c575206
@ -26,6 +26,18 @@ public class PageElementReportReq {
|
|||||||
@NotBlank(message = "端信息不能为空")
|
@NotBlank(message = "端信息不能为空")
|
||||||
private String terminal;
|
private String terminal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 上报秘钥
|
||||||
|
*/
|
||||||
|
@NotBlank(message = "上报秘钥不能为空")
|
||||||
|
private String secretKey;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建人名
|
||||||
|
*/
|
||||||
|
@NotBlank(message = "创建人名不能为空")
|
||||||
|
private String createName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 页面元素列表
|
* 页面元素列表
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -55,4 +55,10 @@ public class SaasPageElement extends BaseEntity<SaasPageElement> {
|
|||||||
*/
|
*/
|
||||||
@TableField("terminal")
|
@TableField("terminal")
|
||||||
private String terminal;
|
private String terminal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建人名
|
||||||
|
*/
|
||||||
|
@TableField("create_name")
|
||||||
|
private String createName;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,12 +74,15 @@ public class SaasPageElementServiceImpl implements SaasPageElementService {
|
|||||||
private ExecutorService asyncExecutor;
|
private ExecutorService asyncExecutor;
|
||||||
@Value("${not.auth.featureCodes:}")
|
@Value("${not.auth.featureCodes:}")
|
||||||
private Set<String> notAuthFeatureCodes;
|
private Set<String> notAuthFeatureCodes;
|
||||||
|
@Value("#{'${pageElement.report.secretKeys:1qaz@WSX}'.split(',')}")
|
||||||
|
private List<String> reportSecretKeys;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public void report(PageElementReportReq request) {
|
public void report(PageElementReportReq request) {
|
||||||
StopWatchUtil watch = StopWatchUtil.createStarted("saasPageElement-report");
|
StopWatchUtil watch = StopWatchUtil.createStarted("saasPageElement-report");
|
||||||
watch.start("report");
|
watch.start("report");
|
||||||
|
AssertUtil.isTrue(reportSecretKeys.contains(request.getSecretKey()), "上报秘钥有误。");
|
||||||
// 根据端删除所有的元素
|
// 根据端删除所有的元素
|
||||||
saasPageElementDao.deleteAllByTerminal(request.getTerminal());
|
saasPageElementDao.deleteAllByTerminal(request.getTerminal());
|
||||||
|
|
||||||
@ -273,6 +276,7 @@ public class SaasPageElementServiceImpl implements SaasPageElementService {
|
|||||||
.type(pageElement.getType())
|
.type(pageElement.getType())
|
||||||
.name(pageElement.getName())
|
.name(pageElement.getName())
|
||||||
.linkUrl(pageElement.getLinkUrl())
|
.linkUrl(pageElement.getLinkUrl())
|
||||||
|
.createName(request.getCreateName())
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
if (CollectionUtils.isNotEmpty(pageElement.getChildren())) {
|
if (CollectionUtils.isNotEmpty(pageElement.getChildren())) {
|
||||||
@ -282,6 +286,7 @@ public class SaasPageElementServiceImpl implements SaasPageElementService {
|
|||||||
.code(e.getCode())
|
.code(e.getCode())
|
||||||
.type(e.getType())
|
.type(e.getType())
|
||||||
.name(e.getName())
|
.name(e.getName())
|
||||||
|
.createName(request.getCreateName())
|
||||||
.build()).collect(Collectors.toList()));
|
.build()).collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user