From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 22 一月 2025 11:20:41 +0800 Subject: [PATCH] 现场型号代号/人员/组织接口调试 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java index c7f69cf..43a3678 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java @@ -49,6 +49,7 @@ import com.vci.ubcs.starter.web.util.LangBaseUtil; import com.vci.ubcs.starter.web.util.VciBaseUtil; import com.vci.ubcs.system.cache.NacosConfigCache; +import com.vci.ubcs.system.dto.ClassifyAuthDTO; import com.vci.ubcs.system.feign.ISysClient; import org.apache.poi.hssf.util.HSSFColor; import org.slf4j.Logger; @@ -71,12 +72,9 @@ import java.awt.event.ItemEvent; import java.io.File; import java.util.*; -import java.util.concurrent.ForkJoinPool; import java.util.stream.Collectors; -import java.util.stream.Stream; import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.*; -import static com.vci.ubcs.starter.web.util.VciBaseUtil.getTableName; @Service public class CodeClassifyServiceImpl extends ServiceImpl<CodeClassifyMapper, CodeClassify> implements ICodeClassifyService { @@ -159,6 +157,7 @@ * @param */ @Override + @Transactional(rollbackFor = Exception.class) public R addSave(CodeClassify codeClassifyEntity) { try { VciBaseUtil.alertNotNull(codeClassifyEntity.getId(),"涓婚搴撶紪鍙蜂笉鑳戒负绌猴紒",codeClassifyEntity.getName(),"涓婚搴撳悕绉颁笉鑳戒负绌猴紒"); @@ -185,8 +184,19 @@ } DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY); codeClassifyEntity.setLcStatus(FRAMEWORK_DATA_ENABLED); - int insertNumber = codeClassifyMapper.insert(codeClassifyEntity); - return R.status(SqlHelper.retBool(insertNumber)); + boolean resBoolean = SqlHelper.retBool(codeClassifyMapper.insert(codeClassifyEntity)); + if (!resBoolean) { + return R.status(resBoolean); + } + // 鍒嗙被娣诲姞鎴愬姛锛岀粰绯荤粺绠$悊鍛樺拰褰撳墠瑙掕壊澧炲姞鍒嗙被鏉冮檺鍜屾暟鎹潈闄� + ClassifyAuthDTO classifyAuthDTO = new ClassifyAuthDTO(); + classifyAuthDTO.setClassifyId(codeClassifyEntity.getOid()); +// classifyAuthDTO.setClassId(codeClassifyEntity.getId()); + R r = sysClient.saveAddClassifyDefaultAuth(classifyAuthDTO); + if (!r.isSuccess()) { + throw new ServiceException("缁欒鑹叉巿浜堥粯璁ゆ潈闄愭椂鍑虹幇閿欒锛屽師鍥狅細"+r.getMsg()); + } + return R.status(resBoolean); } /** @@ -749,6 +759,24 @@ } /** + * 鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夊彾瀛愯妭鐐瑰垎绫籵id + * @param pid + * @return + */ + @Override + public String selectLeafByPid(String pid) { + List<CodeClassify> codeClassifies = codeClassifyMapper.selectLeafByPid(pid); + if(codeClassifies.isEmpty()){ + return ""; + } + String oids = codeClassifies.stream() + .map(CodeClassify::getOid) + .map(s ->s) + .collect(Collectors.joining(","));; + return oids; + } + + /** * 娴佹按渚濊禆鐢熸垚 */ @Override -- Gitblit v1.9.3