From 00062ed2e07d3d705abd1baa10ee483617f10dfb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 09 六月 2023 18:44:57 +0800
Subject: [PATCH] 提交get请求中文编码问题，表名常量类，表别名枚举类
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 83 +++++++++--------------------------------
1 files changed, 19 insertions(+), 64 deletions(-)
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 a89d482..56490a2 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
@@ -19,7 +19,9 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.wrapper.CodeClassifyTemplateAttrWrapper;
import com.vci.ubcs.omd.feign.IAttributeClient;
+import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
@@ -28,14 +30,17 @@
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
+import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
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 org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.context.annotation.Lazy;
@@ -89,7 +94,7 @@
* 灞炴�ф湇鍔″璞�
*/
@Resource
- private IAttributeClient attributeClient;
+ private IBtmTypeClient btmTypeClient;
/**
* 鏌ヨ鎵�鏈夌殑涓婚搴撳垎绫荤殑妯℃澘灞炴��
@@ -297,34 +302,17 @@
pageHelper = new PageHelper(-1);
}
pageHelper.addDefaultAsc("ordernum");
-// IPage iPage = new IPage();
Query query = new Query();
query.setAscs("ordernum");
-// query.setSize(100);
if(pageHelper.getLimit() != -1){
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
}
-// Condition.getPage(query)
- CodeClassifyTemplateAttr codeClstempattrVO = new CodeClassifyTemplateAttr();
-// BeanUtil.toBean(map,codeClstempattrVO);
-// BeanUtil
- BeanMap beanMap = BeanMap.create(codeClstempattrVO);
-
- beanMap.putAll(conditionMap);
-// Condition.getQueryWrapper(
IPage<CodeClassifyTemplateAttr> doList = baseMapper.
- selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClstempattrVO));
-
-
+ selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class));
if (!CollectionUtils.isEmpty(doList.getRecords())) {
-// CodeClstempattrEntity codeClstempattrEntity = new CodeClstempattrEntity();
-// BeanUtils.copyProperties(conditionMap, codeClstempattrEntity);
-// List<CodeClstempattrEntity> codeClstempattrEntities = new ArrayList<>();
-// BeanUtils.copyProperties(doList,codeClstempattrEntities);
-// codeClstempattrEntities.addAll(doList);
dataGrid.setData(codeClassifyTemplateAttrDO2VOs(doList.getRecords()));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(Condition.getQueryWrapper(codeClstempattrVO)))));
+ dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class)))));
}
return dataGrid;
}
@@ -649,6 +637,7 @@
public CodeClassifyTemplateAttrVO getObjectByOid(String oid) throws VciBaseException{
return codeClassifyTemplateAttrDO2VO(selectByOid(oid));
}
+
/**
* 涓婚敭鏌ヨ鏁版嵁瀵硅薄
* @param oid 涓婚敭
@@ -697,21 +686,6 @@
}
/**
- * 鍙傜収涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- // @Override
- // public DataGrid<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- // if(conditionMap == null){
- // conditionMap = new HashMap<String, String>();
- // }
- // return gridCodeClassifyTemplateAttr(conditionMap,pageHelper);
- // }
-
- /**
* 鏌ヨ杩欎釜妯℃澘锛屼笟鍔＄被鍨嬩笅鐨勬墍鏈夋湭閫夋嫨鐨勫睘鎬�
* @param baseQueryObject
* @return
@@ -736,35 +710,16 @@
//鏌ヨ妯℃澘瀵硅薄
CodeClassifyTemplate codeClassifyTemplateDO = codeClassifyTemplateMapper.selectById(templateAttrOid);
-
- //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
- // 寰呭畬鍠�
- List<BtmTypeAttributeVO> boAttrs = null; //(List<BtmTypeAttributeVO>)attributeClient.selectById(codeClassifyTemplateDO.getBtmTypeId());// this.btmService.listAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
- // codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId());
- // BeanUtils.copyProperties(codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId()),boAttrs);
- //鎶婇粯璁ょ殑灞炴�т篃娣诲姞鍒癰oAttrs
- if(boAttrs == null){
- boAttrs = new ArrayList<>();
+ // 娌℃湁妯℃澘瀵硅薄涓嶆墽琛岄�昏緫
+ if(Objects.isNull(codeClassifyTemplateDO)){
+ dataGrid.setData(new ArrayList<>());
+ dataGrid.setTotal(0);
+ return dataGrid;
}
- if(!false){
-// List<CodeOsbtmtypeattributeVO> finalBoAttrs = boAttrs;
-// attributeService.getDefaultAttributeVOs().stream().forEach(attr-> {
-// CodeOsbtmtypeattributeVO attributeVO = new CodeOsbtmtypeattributeVO();
-// BeanUtil.convert(attr, attributeVO);
-// if ("id".equalsIgnoreCase(attributeVO.getId())) {
-// attributeVO.setName("浼佷笟缂栫爜");
-// }
-// if ("name".equalsIgnoreCase(attributeVO.getId())) {
-// attributeVO.setName("闆嗗洟鐮�");
-// }
-// attributeVO.setAttrDataType(attr.getAttributeDataType());
-// attributeVO.setAttributeLength(attr.getAttrLength());
-// attributeVO.setReferBtmTypeId(attr.getBtmTypeId());
-// attributeVO.setReferBtmTypeName(attr.getBtmTypeName());
-// finalBoAttrs.add(attributeVO);
-// });
-// boAttrs = finalBoAttrs;
- Object o = null;
+ //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
+ R<BtmTypeVO> btmTypeVOR = btmTypeClient.getAllAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
+ if(btmTypeVOR.getCode() != 200){
+ throw new ServiceException("涓氬姟绫诲瀷feign璋冪敤澶辫触锛�");
}
//杩欎釜妯℃澘涓嬪凡缁忔湁鐨勫睘鎬�
@@ -782,7 +737,7 @@
//杩囨护鎺夊凡缁忓瓨鍦ㄧ殑灞炴��
List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>();
- for (BtmTypeAttributeVO osBtmTypeAttributeVO:boAttrs){
+ for (BtmTypeAttributeVO osBtmTypeAttributeVO:btmTypeVOR.getData().getAttributes()){
if(!btmOids.contains(osBtmTypeAttributeVO.getId())){
//鐪嬬湅鏄笉鏄湁妯＄硦鏌ヨ
boolean inSearch = true;
--
Gitblit v1.9.3