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/OsCodeRuleServiceImpl.java | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java
index 2184b86..86b8ad1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java
@@ -1,31 +1,30 @@
package com.vci.web.service.impl;
-import com.vci.constant.FrameWorkDefaultValueConstant;
-import com.vci.constant.FrameWorkDefaultValueConstant;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.model.*;
-import com.vci.starter.web.enumpck.BooleanEnum;
-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.LangBaseUtil;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
import com.vci.bo.OsCodeSerialBuildBO;
-import com.vci.web.dao.*;
+import com.vci.constant.FrameWorkDefaultValueConstant;
import com.vci.dto.OsCodeEnumDTO;
import com.vci.dto.OsCodeRuleDTO;
import com.vci.dto.OsCodeRuleElementDTO;
import com.vci.dto.OsCodeRuleProduceDTO;
-import com.vci.web.enumpck.OsCodeDateValueTypeEnum;
-import com.vci.web.enumpck.OsCodeElementTypeEnum;
-import com.vci.web.enumpck.OsCodeFillTypeEnum;
-import com.vci.web.enumpck.OsCodeProductTypeEnum;
+import com.vci.enumpck.OsCodeDateValueTypeEnum;
+import com.vci.enumpck.OsCodeElementTypeEnum;
+import com.vci.enumpck.OsCodeFillTypeEnum;
+import com.vci.enumpck.OsCodeProductTypeEnum;
+import com.vci.lcstatuspck.FrameworkDataLCStatus;
+import com.vci.model.*;
import com.vci.pagemodel.OsCodeEnumVO;
import com.vci.pagemodel.OsCodeResultVO;
import com.vci.pagemodel.OsCodeRuleElementVO;
import com.vci.pagemodel.OsCodeRuleVO;
+import com.vci.starter.web.enumpck.BooleanEnum;
+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.BeanUtilForVCI;
+import com.vci.starter.web.util.LangBaseUtil;
+import com.vci.starter.web.util.VciBaseUtil;
+import com.vci.starter.web.util.VciDateUtil;
+import com.vci.web.dao.*;
import com.vci.web.service.OsCodeRuleServiceI;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -561,7 +560,7 @@
Map<String,List<OsCodeEnumVO>> enumVOMap = new HashMap<String, List<OsCodeEnumVO>>();
for(OsCodeEnumDO enumDO : existEnumDOs){
OsCodeEnumVO enumVO = new OsCodeEnumVO();
- BeanUtil.convert(enumDO,enumVO);
+ BeanUtilForVCI.convert(enumDO,enumVO);
String pkCodeRuleElement = enumVO.getPkCodeRuleElement();
List<OsCodeEnumVO> enumVOS = enumVOMap.containsKey(pkCodeRuleElement) ? enumVOMap.get(pkCodeRuleElement) : new ArrayList<OsCodeEnumVO>();
enumVOS.add(enumVO);
@@ -584,7 +583,7 @@
public OsCodeRuleVO codeRuleDO2VO(OsCodeRuleDO ruleDO) {
OsCodeRuleVO ruleVO = new OsCodeRuleVO();
if (ruleDO != null) {
- BeanUtil.convert(ruleDO, ruleVO);
+ BeanUtilForVCI.convert(ruleDO, ruleVO);
ruleVO.setLcStatusText(FrameworkDataLCStatus.getTextByValue(ruleVO.getLcStatus()));
ruleVO.setCodeProductTypeText(OsCodeProductTypeEnum.getTextByValue(ruleVO.getCodeProductType()));
}
@@ -602,7 +601,7 @@
public OsCodeRuleElementVO codeRuleElementDO2VO(OsCodeRuleElementDO elementDO) {
OsCodeRuleElementVO elementVO = new OsCodeRuleElementVO();
if (elementDO != null) {
- BeanUtil.convert(elementDO, elementVO);
+ BeanUtilForVCI.convert(elementDO, elementVO);
elementVO.setCodeElementTypeText(OsCodeElementTypeEnum.getTextByValue(elementVO.getCodeElementType()));
elementVO.setCodeFillTypeText(OsCodeFillTypeEnum.getTextByValue(elementVO.getCodeFillType()));
elementVO.setCodeDateValueTypeText(OsCodeDateValueTypeEnum.getTextByValue(elementVO.getCodeDateValueType()));
@@ -650,7 +649,7 @@
public OsCodeRuleVO addRule(OsCodeRuleDTO ruleDTO) {
VciBaseUtil.alertNotNull(ruleDTO, "鏁版嵁浼犺緭瀵硅薄", ruleDTO.getElements(), "瑙勫垯鐨勫厓绱�");
OsCodeRuleDO ruleDO = new OsCodeRuleDO();
- BeanUtil.convert(ruleDTO, ruleDO);
+ BeanUtilForVCI.convert(ruleDTO, ruleDO);
ruleDO.setOid(VciBaseUtil.getPk());
List<OsCodeRuleElementDO> elementDOS = new ArrayList<OsCodeRuleElementDO>();
List<OsCodeEnumDO> enumMapDOs = new ArrayList<OsCodeEnumDO>();
@@ -676,7 +675,7 @@
if (elementDTOS != null) {
for (OsCodeRuleElementDTO elementDTO : elementDTOS) {
OsCodeRuleElementDO elementDO = new OsCodeRuleElementDO();
- BeanUtil.convert(elementDTO, elementDO);
+ BeanUtilForVCI.convert(elementDTO, elementDO);
elementDO.setPkCodeRule(pkRule);
elementDO.setOid(VciBaseUtil.getPk());
//闇�瑕佹瘡涓被鍨嬪仛澶勭悊
@@ -710,7 +709,7 @@
for(OsCodeEnumDTO enumDTO : enumMaps){
VciBaseUtil.alertNotNull(enumDTO.getEnumItemKey(),"鏋氫妇鏄犲皠涓灇涓剧殑鍊�",enumDTO.getCodeMapValue(),"鏋氫妇鏄犲皠鐨勬灇涓惧搴旂殑鏄犲皠鍊�");
OsCodeEnumDO enumDO = new OsCodeEnumDO();
- BeanUtil.convert(enumDTO,enumDO);
+ BeanUtilForVCI.convert(enumDTO,enumDO);
enumDO.setPkCodeRuleElement(elementDO.getOid());
enumMapDOs.add(enumDO);
}
@@ -738,7 +737,7 @@
public OsCodeRuleVO editRule(OsCodeRuleDTO ruleDTO) {
VciBaseUtil.alertNotNull(ruleDTO, "鏁版嵁浼犺緭瀵硅薄", ruleDTO.getElements(), "瑙勫垯鐨勫厓绱�", ruleDTO.getOid(), "瑙勫垯鐨勪富閿�");
OsCodeRuleDO ruleDO = selectByOid(ruleDTO.getOid());
- BeanUtil.convert(ruleDTO,ruleDO);
+ BeanUtilForVCI.convert(ruleDTO,ruleDO);
List<OsCodeRuleElementDO> existElementDOs = codeRuleElementDao.selectByRuleOid(ruleDO.getOid());
//鎵緀num鐨勬槑缁嗗唴瀹癸紝涔熸槸瑕佸垹闄ょ殑
List<OsCodeEnumDO> existEnumDOs = codeEnumDao.selectByRuleOid(ruleDO.getOid());
--
Gitblit v1.9.3