From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java
similarity index 93%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java
index 31ff447..802b49f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java
@@ -1,15 +1,15 @@
package com.vci.web.service.impl;
+import com.vci.dto.WebHomeTaskActionDTO;
+import com.vci.model.WebHomeTaskActionDO;
+import com.vci.pagemodel.WebHomeTaskActionVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.dto.WebHomeTaskActionDTO;
-import com.vci.model.WebHomeTaskActionDO;
-import com.vci.pagemodel.WebHomeTaskActionVO;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.service.WebHomeTaskServiceI;
import com.vci.web.util.WebUtil;
@@ -19,7 +19,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -60,7 +62,7 @@
if(!CollectionUtils.isEmpty(allActions)){
allActions.stream().forEach(action->{
WebHomeTaskActionVO taskActionVO = new WebHomeTaskActionVO();
- BeanUtil.convert(action,taskActionVO);
+ BeanUtilForVCI.convert(action,taskActionVO);
actionVOS.add(taskActionVO);
});
}
@@ -84,7 +86,7 @@
public void addAction(WebHomeTaskActionDTO action){
WebUtil.alertNotNull(action,"瑕佹坊鍔犵殑淇℃伅涓虹┖",action.getId(),"鑿滃崟鐨勪富閿�",action.getName(),"鑿滃崟鐨勫悕绉�",action.getCountUrl(),"璋冪敤鐨勫湴鍧�");
WebHomeTaskActionDO actionDO = new WebHomeTaskActionDO();
- BeanUtil.convert(action,actionDO);
+ BeanUtilForVCI.convert(action,actionDO);
actionDO.setOid(VciBaseUtil.getPk());
boService.addSave(actionDO);
}
@@ -98,7 +100,7 @@
public void editAction(WebHomeTaskActionDTO action) {
WebUtil.alertNotNull(action,"瑕佷慨鏀圭殑淇℃伅涓虹┖",action.getOid(),"涓婚敭",action.getTs(),"鏃堕棿鎴�");
WebHomeTaskActionDO actionDO = boService.selectByOid(action.getOid(),WebHomeTaskActionDO.class);
- BeanUtil.convert(action,actionDO);
+ BeanUtilForVCI.convert(action,actionDO);
boService.editSave(actionDO);
}
@@ -134,7 +136,7 @@
List<WebHomeTaskActionVO> taskActionVOS = new ArrayList<>();
dataGrid.getData().forEach(action->{
WebHomeTaskActionVO taskActionVO = new WebHomeTaskActionVO();
- BeanUtil.convert((WebHomeTaskActionDO)action,taskActionVO);
+ BeanUtilForVCI.convert(action,taskActionVO);
taskActionVOS.add(taskActionVO);
});
dataGrid.setData(taskActionVOS);
--
Gitblit v1.9.3