From d88379444c5790417b1b7495e0e3ad5e041b799e Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 04 七月 2023 18:06:21 +0800
Subject: [PATCH] 1、对redis取值方式进行修改。 2、对模板属性批量保存的DTO进行了大写的改动。
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java | 96 ++++++++++++++++---------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 8 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 12 ++--
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java | 8 +-
4 files changed, 64 insertions(+), 60 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
index be49c9c..da4b3a1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
@@ -38,110 +38,110 @@
/**
* 鎵�灞炴ā鏉�
*/
- private String classifytemplateoid;
+ private String classifyTemplateOid;
/**
* 鎵�灞炴ā鏉挎樉绀烘枃鏈�
*/
- private String classifytemplateoidName;
+ private String classifyTemplateOidName;
/**
* 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿�
*/
- private String classifyattributeoid;
+ private String classifyAttributeOid;
/**
* 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿樉绀烘枃鏈�
*/
- private String classifyattributeoidName;
+ private String classifyAttributeOidName;
/**
* 灞炴�х殑绫诲瀷
*/
- private String attributedatatype;
+ private String attributeDataType;
/**
* 鏄惁鍏抽敭灞炴��
*/
- private String keyattrflag;
+ private String keyAttrFlag;
/**
* 鏄惁蹇�熸煡璇㈠睘鎬�
*/
- private String queryattrflag;
+ private String queryAttrFlag;
/**
* 鏄惁楂樼骇鏌ヨ灞炴��
*/
- private String seniorqueryattrflag;
+ private String seniorQueryAttrFlag;
/**
* 鐩镐技鏌ラ噸灞炴��
*/
- private String samerepeatattrflag;
+ private String sameRepeatAttrFlag;
/**
* 鏄惁鎺掑簭
*/
- private String sortattrflag;
+ private String sortAttrFlag;
/**
* 鏄惁鐢熸垚浜岀淮鐮�
*/
- private String qrcodeflag;
+ private String qrcodeFlag;
/**
* 鏄惁鐢熸垚涓�缁寸爜
*/
- private String barcodeflag;
+ private String barcodeFlag;
/**
* 缁勫悎瑙勫垯
*/
- private String componentrule;
+ private String componentRule;
/**
* 楠岃瘉瑙勫垯
*/
- private String verifyrule;
+ private String verifyRule;
/**
* 鍒嗙被娉ㄥ叆灞傜骇
*/
- private String classifyinvokelevel;
+ private String classifyInvokeLevel;
/**
* 鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�
*/
- private String classifyinvokeattr;
+ private String classifyInvokeAttr;
/**
* 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
*/
- private String classifyinvokeattrname;
+ private String classifyInvokeAttrName;
/**
* 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
*/
- private String classifyinvokeeditflag;
+ private String classifyInvokeEditFlag;
/**
* 鐮佸�煎簭鍙�
*/
- private Integer ordernum;
+ private Integer orderNum;
/**
* 琛ㄥ崟閲屾槸鍚︽樉绀�
*/
- private String formdisplayflag;
+ private String formDisplayFlag;
/**
* 鍒楄〃閲屾槸鍚︽樉绀�
*/
- private String tabledisplayflag;
+ private String tableDisplayFlag;
/**
* 鎵�灞炲睘鎬у垎缁�
*/
- private String attributegroup;
+ private String attributeGroup;
/**
* 浣跨敤鏋氫妇娉ㄥ叆鐨勫瓧绗︿覆鏍煎紡
@@ -151,27 +151,27 @@
/**
* 浣跨敤鏋氫妇鑻辨枃缂栧彿
*/
- private String enumid;
+ private String enumId;
/**
* 浣跨敤鏋氫妇涓枃鍚嶇О
*/
- private String enumname;
+ private String enumName;
/**
* 鏋氫妇鏄惁鍙互缂栬緫
*/
- private String enumeditflag;
+ private String enumEditFlag;
/**
* 鍙傜収鐨勪笟鍔＄被鍨嬭嫳鏂囧悕绉�
*/
- private String referbtmid;
+ private String referBtmId;
/**
* 鍙傜収鐨勪笟鍔＄被鍨嬩腑鏂囧悕绉�
*/
- private String referbtmname;
+ private String referBtmName;
/**
* 鍙傜収绐楀彛閰嶇疆
@@ -181,97 +181,97 @@
/**
* 鏄惁蹇呰緭
*/
- private String requireflag;
+ private String requireFlag;
/**
* 鏄惁鍙
*/
- private String readonlyflag;
+ private String readOnlyFlag;
/**
* 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
*/
- private Integer controllength;
+ private Integer controlLength;
/**
* 琛ㄥ崟閲屾樉绀虹殑鏍峰紡
*/
- private String formdisplaystyle;
+ private String formDisplayStyle;
/**
* 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
*/
- private String tabledisplaystyle;
+ private String tableDisplayStyle;
/**
* 琛ㄥ崟涓秴閾炬帴鍐呭
*/
- private String formhref;
+ private String formHref;
/**
* 琛ㄦ牸涓秴閾炬帴鍐呭
*/
- private String tablehref;
+ private String tableHref;
/**
* 灏忔暟绮惧害
*/
- private Integer precisionlength;
+ private Integer precisionLength;
/**
* 灏忔暟鍒诲害
*/
- private Integer scalelength;
+ private Integer scaleLength;
/**
* 鍙栧�艰寖鍥�
*/
- private String valuearea;
+ private String valueArea;
/**
* 鏃堕棿鏍煎紡
*/
- private String codedateformat;
+ private String codeDateFormat;
/**
* 琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js
*/
- private String tabledisplayjs;
+ private String tableDisplayJs;
/**
* 鏄惁鏄剧ず澶氳鏂囨湰
*/
- private String textareaflag;
+ private String textAreaFlag;
/**
* 棰勮鍥�
*/
- private String imageflag;
+ private String imageFlag;
/**
* 榛樿鍊�
*/
- private String defaultvalue;
+ private String defaultValue;
/**
* 鍓嶇紑
*/
- private String prefixvalue;
+ private String prefixValue;
/**
* 鍚庣紑
*/
- private String suffixvalue;
+ private String suffixValue;
/**
* 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
*/
- private String filtersourceattr;
+ private String filterSourceAttr;
/**
* 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
*/
- private String filtersourceattrname;
+ private String filterSourceAttrName;
/**
* 灞炴�у垪琛ㄤ腑鐨勫搴�
@@ -306,5 +306,9 @@
*/
//@Column(columnDefinition = "绾ц仈鏌ヨ灞炴��")
private String parentQueryAttr;
+ /**
+ * 杈撳叆鎻愮ず
+ */
+ private String inputTip;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java
index ac03baf..cc5b2f9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java
@@ -5,7 +5,7 @@
public class CodeImprotParmaDatVO {
private List<CodeImprotSaveDatVO> codeImprotSaveDatVOList;
private String classifyAttr;
- private Boolean isImprot;
+ private Boolean improt;
public List<CodeImprotSaveDatVO> getCodeImprotSaveDatVOList() {
return codeImprotSaveDatVOList;
@@ -24,18 +24,18 @@
}
public Boolean getImprot() {
- return isImprot;
+ return this.improt;
}
public void setImprot(Boolean improt) {
- isImprot = improt;
+ this.improt = improt;
}
@Override
public String toString() {
return "CodeImprotParmaDatVO{" +
"codeImprotSaveDatVOList=" + codeImprotSaveDatVOList +
- ", isImprot=" + isImprot +
+ ", isImprot=" + improt +
'}';
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index 68256fb..10740cd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -36,7 +36,7 @@
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
-import org.springblade.core.log.exception.ServiceException;
+import com.vci.ubcs.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -398,7 +398,7 @@
throw new VciBaseException("{0}{1}灞炴�х殑鏃堕棿鏍煎紡涓嶇鍚堣姹�",new String[]{codeClassifyTemplateAttrDO.getId(),codeClassifyTemplateAttrDO.getName()});
}
//濡傛灉鏄粍鍚堣鍒欙紝閲岄潰浣跨敤鐨勫睘鎬т笉鑳界己澶憋紝涔熼兘寰楁樉绀�
- String componentrule = codeClassifyTemplateAttrDTO.getComponentrule();
+ String componentrule = codeClassifyTemplateAttrDTO.getComponentRule();
boolean isContainsDynamicParameter = PatternUtil.isContainsDynamicParameter(componentrule);
if(isContainsDynamicParameter){
List<String> userdAttrList = PatternUtil.getKeyListByContent(componentrule);//鍖呭惈鐨勬墍鏈�${xxx}涓殑xxx
@@ -409,7 +409,7 @@
}
//瑕佺湅鐪嬭〃鍗曟槸鍚︽樉绀�
String unFormDisplayAttr = userdAttrList.stream().filter(s -> !VciBaseUtil.getBoolean(attrDTOMap.getOrDefault(s.toLowerCase(Locale.ROOT),
- new CodeClassifyTemplateAttrDTO()).getFormdisplayflag())).collect(Collectors.joining(","));
+ new CodeClassifyTemplateAttrDTO()).getFormDisplayFlag())).collect(Collectors.joining(","));
if(StringUtils.isNotBlank(unFormDisplayAttr)){
throw new VciBaseException("{0}灞炴�ф槸缁勫悎瑙勫垯锛屼絾鏄鍒欓噷鍖呭惈鐨勫睘鎬{1}]鍦ㄥ綋鍓嶆ā鏉夸腑娌℃湁璁剧疆 琛ㄥ崟鏄剧ず ",new String[]{codeClassifyTemplateAttrDO.getName(),unFormDisplayAttr});
}
@@ -417,7 +417,7 @@
}
if(CLASSIFYTEMPLATEOID==null){
- CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifytemplateoid();
+ CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifyTemplateOid();
}
}
@@ -439,7 +439,7 @@
}
// BatchCBO batchCBOTemplateDelete = new BatchCBO();
if(!CollectionUtils.isEmpty(oids)){
- baseMapper.deleteBatchIds(oids);
+ this.removeBatchByIds(oids);
}
//鍐嶆柊澧�
@@ -542,7 +542,7 @@
}
//鍒ゆ柇浼犺繃鏉ョ殑鍙傜収閰嶇疆鏄惁鏄痡son鏍煎紡
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferbtmid())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferbtmid())){
+ if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferBtmId())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferBtmId())){
throw new VciBaseException("鏋氫妇娉ㄥ叆鏁版嵁鏍煎紡閿欒!");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 90a9ab3..931fe88 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -54,6 +54,7 @@
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.ss.usermodel.Workbook;
+import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
import org.springframework.beans.BeanUtils;
@@ -1379,8 +1380,7 @@
public List<CodeImportTemplateVO> gridclassifys(String redisOid) {
List<CodeImportTemplateVO> codeImportTemplateVOs=new ArrayList<>();
VciBaseUtil.alertNotNull(redisOid,"鍒嗙被",redisOid,"鍒嗙被缂撳瓨涓婚敭");
-
- List<CodeImportTemplateVO> redisServiceCacheObjects=bladeRedis.lRange(redisOid,0,-1);
+ List<CodeImportTemplateVO> redisServiceCacheObjects=bladeRedis.get(redisOid);
if(redisServiceCacheObjects!=null){
codeImportTemplateVOs= redisServiceCacheObjects;
}
@@ -1396,7 +1396,7 @@
@Override
public DataGrid<Map<String, String>> gridDatas(String codeClssifyOid, String redisOid) {
VciBaseUtil.alertNotNull(redisOid,"瀵煎叆鐩镐技鏁版嵁",redisOid,"鏁版嵁缂撳瓨涓婚敭");
- List<CodeImprotDataVO> codeImprotDataVOs = bladeRedis.lRange(redisOid+"-"+codeClssifyOid,0,-1);
+ List<CodeImprotDataVO> codeImprotDataVOs = bladeRedis.get(redisOid+"-"+codeClssifyOid);
// redisService.getCacheList(redisOid+"-"+codeClssifyOid);
CodeImprotDataVO codeImprotDataVO=new CodeImprotDataVO();
if(!CollectionUtils.isEmpty(codeImprotDataVOs)){
@@ -1430,7 +1430,7 @@
@Override
public DataGrid<Map<String,String>> gridRowResemble(String oid,String redisOid){
VciBaseUtil.alertNotNull(redisOid,"瀵煎叆鐩镐技鏁版嵁",redisOid,"鏁版嵁缂撳瓨涓婚敭");
- List<DataResembleVO> codeImprotDataVOs = bladeRedis.lRange(redisOid,0,-1);;
+ List<DataResembleVO> codeImprotDataVOs = bladeRedis.get(redisOid);;
DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
List<Map<String, String>> dataList = new ArrayList<>();
--
Gitblit v1.10.0