From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +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/WebBoServiceImpl.java | 103 ++++++++++++++++++++++-----------------------------
1 files changed, 45 insertions(+), 58 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index f9aff20..b21f501 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -12,7 +12,6 @@
import com.vci.corba.query.ObjectQueryServicePrx;
import com.vci.corba.query.data.BtmRefQueryOption;
import com.vci.corba.query.data.KV;
-import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.omd.utils.ObjectTool;
import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.Column;
@@ -21,12 +20,12 @@
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.util.BeanUtil;
+import com.vci.starter.web.util.BeanUtilForVCI;
+import com.vci.starter.web.util.Lcm.Func;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
-import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -35,10 +34,10 @@
import org.dom4j.DocumentHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,76 +48,64 @@
* @author weidy
*/
@Service
-public class WebBoServiceImpl implements WebBoServiceI{
-
- /**
- * 鏋氫妇鏈嶅姟
- */
- @Autowired
- private OsEnumServiceI enumService;//鏋氫妇鏈嶅姟
-
- /**
- * 灞炴�ф湇鍔�
- */
- @Autowired
- private OsAttributeServiceI attrService;//灞炴�ф湇鍔�
+public class WebBoServiceImpl implements WebBoServiceI {
- /**
- * 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
- */
- @Autowired
- private OsLifeCycleServiceI lifeService;//鐢熷懡鍛ㄦ湡鏈嶅姟
-
- /**
- * 鐘舵�佺殑鏈嶅姟
- */
- @Autowired
- private OsStatusServiceI statusService;
-
- /**
- * 鐢ㄦ埛鏌ヨ鏈嶅姟
- */
- @Autowired
- private SmUserQueryServiceI userQueryService;
-
- /**
- * 閾炬帴绫诲瀷鏈嶅姟
- */
- @Autowired
- private WebLoServiceI loService;
-
- /**
- * 閰嶇疆淇℃伅
- */
- @Autowired
- private WebProperties webProperties;
-
- /**
- * 澶氳瑷�鍓嶇紑
- */
- private final String msgCodePrefix = "com.vci.web.boService.";
-
/**
* 鏃ュ織瀵硅薄
*/
private Logger logger = LoggerFactory.getLogger(getClass());
/**
+ * 澶氳瑷�鍓嶇紑
+ */
+ private final String msgCodePrefix = "com.vci.web.boService.";
+
+ /**
+ * 鏋氫妇鏈嶅姟
+ */
+ @Resource
+ private WebEnumServiceI enumService;//鏋氫妇鏈嶅姟
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
+ */
+ @Resource
+ private WebLifeCycleServiceI lifeService;//鐢熷懡鍛ㄦ湡鏈嶅姟
+
+ /**
+ * 鐘舵�佺殑鏈嶅姟
+ */
+ @Resource
+ private WebStatusServiceI statusService;
+
+ /**
+ * 鐢ㄦ埛鏌ヨ鏈嶅姟
+ */
+ @Resource
+ private SmUserQueryServiceI userQueryService;
+
+ /**
+ * 閰嶇疆淇℃伅
+ */
+ @Resource
+ private WebProperties webProperties;
+
+ /**
* 涓氬姟绫诲瀷鐨勬湇鍔�
*/
- @Autowired
- private OsBtmServiceI btmService;
+ @Resource
+ private WebBtmServiceI btmService;
/**
* 鐗堟湰瑙勫垯鐨勬湇鍔�
*/
- @Autowired
- private OsRevisionRuleServiceI revisionRuleService;
+ @Resource
+ private WebRevisionRuleServiceI revisionRuleService;
/**
* 骞冲彴璋冪敤瀹㈡埛绔�
*/
- @Autowired
+ @Resource
private PlatformClientUtil platformClientUtil;
/**
@@ -2531,7 +2518,7 @@
@Override
public <T> int countByQueryWrapper(VciQueryWrapperForDO queryWrapper, Class<T> doClass) throws VciBaseException {
VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(null,doClass);
- BeanUtil.convert(queryWrapper,queryWrapperForDO);
+ BeanUtilForVCI.convert(queryWrapper,queryWrapperForDO);
queryWrapperForDO.clearPage();
queryWrapperForDO.wrapperSql();
String sql= queryWrapperForDO.getSelectFieldSql() + " from " + queryWrapperForDO.getTableName() + " " + queryWrapperForDO.getTableNick() + queryWrapperForDO.getLinkTableSql() ;
--
Gitblit v1.9.3