From b0dc3b48be862f09da13a212d8a731d546b7dfc2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 31 三月 2023 16:31:16 +0800
Subject: [PATCH] 修改部署相关代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index 0b47f4a..ce05b52 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -2,19 +2,7 @@
import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.dao.CodeBasicSecDaoI;
-import com.vci.ubcs.code.dao.CodeClassifyValueDaoI;
-import com.vci.ubcs.code.dao.CodeFixedValueDaoI;
-import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
-import com.vci.ubcs.code.lifecycle.CodeRuleLC;
-import com.vci.ubcs.code.model.CodeBasicSecDO;
-import com.vci.ubcs.code.model.CodeClassifyValueDO;
-import com.vci.ubcs.code.model.CodeFixedValueDO;
-import com.vci.ubcs.code.service.CodeBasicSecServiceI;
-import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
-import com.vci.ubcs.code.service.CodeFixedValueServiceI;
-import com.vci.ubcs.code.service.CodeRuleServiceI;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.revision.service.RevisionModelUtil;
@@ -25,6 +13,24 @@
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciParentQueryOption;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
+import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
+import com.vci.ubcs.code.dto.CodeBasicSecDTO;
+import com.vci.ubcs.code.entity.CodeBasicSecDO;
+import com.vci.ubcs.code.entity.CodeClassifyValueDO;
+import com.vci.ubcs.code.entity.CodeFixedValueDO;
+import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
+import com.vci.ubcs.code.lifecycle.CodeRuleLC;
+import com.vci.ubcs.code.mapper.CodeBasicSecMapper;
+import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
+import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
+import com.vci.ubcs.code.service.CodeBasicSecServiceI;
+import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
+import com.vci.ubcs.code.service.CodeFixedValueServiceI;
+import com.vci.ubcs.code.service.CodeRuleServiceI;
+import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.web.enumpck.OsCodeFillTypeEnum;
import com.vci.web.pageModel.BatchCBO;
import com.vci.web.pageModel.UIFormReferVO;
@@ -34,11 +40,7 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeBasicSecDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -70,14 +72,14 @@
* 鏁版嵁鎿嶄綔灞�
*/
@Resource
- private CodeBasicSecDaoI codeBasicSecMapper;
+ private CodeBasicSecMapper codeBasicSecMapper;
/**
* 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
*/
@Autowired
@Lazy
-private WebBoServiceI boService;
+ private WebBoServiceI boService;
/**
* 瀵硅薄鐨勬搷浣�
@@ -89,6 +91,7 @@
* 涓绘暟鎹紪鐮佽鍒欐湇鍔�
*/
@Autowired
+ @Lazy
private CodeRuleServiceI codeRuleService;
/**
@@ -100,8 +103,8 @@
/**
* 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰
*/
- @Autowired
- private CodeClassifyValueDaoI codeClassifyValueMapper;
+ @Resource
+ private CodeClassifyValueMapper codeClassifyValueMapper;
/**
* 鍥哄畾鐮佹鐨勭爜鍊肩殑鏈嶅姟
@@ -112,12 +115,13 @@
/**
* 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰
*/
- @Autowired
- private CodeFixedValueDaoI fixedValueMapper;
+ @Resource
+ private CodeFixedValueMapper fixedValueMapper;
+
/**
* 涓婂眰鍒嗙被鐮佹鐨勫睘鎬у悕绉�
*/
- private static final String PARENT_FIELD_NAME = "parentclassifysecoid";
+ private static final String PARENT_FIELD_NAME = "parentclassifysecoid";
/**
* 涓婄骇鍒嗙被鐮佸�肩殑灞炴�у悕绉�
@@ -147,7 +151,7 @@
if(!conditionMap.containsKey("pkCodeRule") || StringUtils.isBlank(conditionMap.get("pkCodeRule"))){
return new DataGrid<>();
}
- List<CodeBasicSecDO> doList = codeBasicSecMapper.selectByCondition(conditionMap, pageHelper);
+ List<CodeBasicSecDO> doList = codeBasicSecMapper.(conditionMap, pageHelper);
DataGrid<CodeBasicSecVO> dataGrid = new DataGrid<CodeBasicSecVO>();
if (!CollectionUtils.isEmpty(doList)) {
dataGrid.setData(codeBasicSecDO2VOs(doList));
--
Gitblit v1.9.3