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/OsCodeGenSchemaServiceImpl.java | 50 ++++++++++++++++++--------------------------------
1 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
index edd1a2a..bdfe2df 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
@@ -1,7 +1,15 @@
package com.vci.web.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.vci.bo.OsCodeGenAttributeBO;
+import com.vci.bo.OsCodeGenButtonBO;
import com.vci.corba.common.PLException;
+import com.vci.dto.OsCodeGenSchemaDTO;
+import com.vci.enumpck.OsCodeGenJsPanelTypeEnum;
+import com.vci.model.OsCodeGenSchemaDO;
+import com.vci.pagemodel.OsBtmTypeAttributeVO;
+import com.vci.pagemodel.OsBtmTypeVO;
+import com.vci.pagemodel.OsCodeGenSchemaVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
@@ -10,24 +18,14 @@
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.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.bo.OsCodeGenAttributeBO;
-import com.vci.bo.OsCodeGenButtonBO;
import com.vci.web.dao.OsCodeGenSchemaDaoI;
-import com.vci.dto.OsCodeGenSchemaDTO;
-import com.vci.web.enumpck.OsCodeGenJsPanelTypeEnum;
-import com.vci.model.OsCodeGenSchemaDO;
-import com.vci.pagemodel.OsBtmTypeAttributeVO;
-import com.vci.pagemodel.OsBtmTypeVO;
-import com.vci.pagemodel.OsCodeGenSchemaVO;
-import com.vci.web.service.OsAttributeServiceI;
-import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.OsCodeGenSchemaServiceI;
-import com.vci.web.service.WebBtmIOServiceI;
+import com.vci.web.service.WebBtmServiceI;
import com.vci.web.util.WebUtil;
import com.vci.web.util.file.VciZipUtil;
import org.apache.commons.io.IOUtils;
@@ -74,22 +72,10 @@
private OsCodeGenSchemaDaoI codeGenSchemaDOMapper;
/**
- * 涓氬姟绫诲瀷
- */
- @Autowired
- private WebBtmIOServiceI btmIOService;
-
- /**
* 涓氬姟绫诲瀷鐩稿叧鐨勬搷浣�
*/
- @Autowired
- private OsBtmServiceI btmService;
-
- /**
- * 灞炴�х殑鏈嶅姟
- */
- @Autowired
- private OsAttributeServiceI attrServiceI;
+ @Resource
+ private WebBtmServiceI btmService;
/**
* 浠ｇ爜鐢熸垚鐨勬枃浠跺す
@@ -158,7 +144,7 @@
public OsCodeGenSchemaVO codeGenSchemaDO2VO(OsCodeGenSchemaDO schemaDO) {
OsCodeGenSchemaVO schemaVO = new OsCodeGenSchemaVO();
if(schemaDO!=null){
- BeanUtil.convert(schemaDO,schemaVO);
+ BeanUtilForVCI.convert(schemaDO,schemaVO);
schemaVO.setWestLayoutPanelTypeText(OsCodeGenJsPanelTypeEnum.getTextByValue(schemaVO.getWestLayoutPanelType()));
schemaVO.setCenterLayoutPanelTypeText(OsCodeGenJsPanelTypeEnum.getTextByValue(schemaVO.getCenterLayoutPanelType()));
schemaVO.setSouthLayoutPanelTypeText(OsCodeGenJsPanelTypeEnum.getTextByValue(schemaVO.getSouthLayoutPanelType()));
@@ -177,7 +163,7 @@
public OsCodeGenSchemaVO addSchema(OsCodeGenSchemaDTO codeGenSchemaDTO) throws VciBaseException {
VciBaseUtil.alertNotNull(codeGenSchemaDTO,"瑕佹坊鍔犵殑鏂规");
OsCodeGenSchemaDO codeGenSchemaDO = new OsCodeGenSchemaDO();
- BeanUtil.convert(codeGenSchemaDTO,codeGenSchemaDO);
+ BeanUtilForVCI.convert(codeGenSchemaDTO,codeGenSchemaDO);
checkJsonFormate(codeGenSchemaDO);
//瀹炵幇绫绘槸鍓嶇鐩存帴濉啓
codeGenSchemaDOMapper.insert(codeGenSchemaDO);
@@ -408,7 +394,7 @@
}
OsBtmTypeAttributeVO idAttr = new OsBtmTypeAttributeVO();
if(defaultAttrMap.containsKey("id")){
- BeanUtil.convert(defaultAttrMap.get("id"),idAttr);
+ BeanUtilForVCI.convert(defaultAttrMap.get("id"),idAttr);
idAttr.setId("id");
if(StringUtils.isBlank(idAttr.getName())){
idAttr.setName("缂栧彿");
@@ -422,7 +408,7 @@
OsBtmTypeAttributeVO nameAttr = new OsBtmTypeAttributeVO();
if(defaultAttrMap.containsKey("name")){
- BeanUtil.convert(defaultAttrMap.get("name"),nameAttr);
+ BeanUtilForVCI.convert(defaultAttrMap.get("name"),nameAttr);
nameAttr.setId("name");
if(StringUtils.isBlank(nameAttr.getName())){
nameAttr.setName("鍚嶇О");
@@ -436,7 +422,7 @@
OsBtmTypeAttributeVO descAttr = new OsBtmTypeAttributeVO();
if(defaultAttrMap.containsKey("desc")){
- BeanUtil.convert(defaultAttrMap.get("desc"),descAttr);
+ BeanUtilForVCI.convert(defaultAttrMap.get("desc"),descAttr);
descAttr.setId("description");
if(StringUtils.isBlank(descAttr.getName())){
descAttr.setName("鎻忚堪");
@@ -451,7 +437,7 @@
if(!CollectionUtils.isEmpty(attributeVOS)){
attributeVOS.stream().forEach(attr->{
OsCodeGenAttributeBO attributeBO = new OsCodeGenAttributeBO();
- BeanUtil.convert(attr, attributeBO);
+ BeanUtilForVCI.convert(attr, attributeBO);
attributeBO.setIdUpper(attr.getId().toUpperCase());
if(VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(attributeBO.getId())){
attributeBO.setName("鐘舵��");
--
Gitblit v1.9.3