Source/UBCS-WEB/src/option/system/dict.js
@@ -2,6 +2,7 @@ height: 'auto', calcHeight: 20, tip: false, columnBtn:false, searchShow: true, searchMenuSpan: 10, border: true, Source/UBCS-WEB/src/option/system/dictbiz.js
@@ -1,6 +1,7 @@ export const optionParent = { height: 'auto', calcHeight: 30, columnBtn:false, tip: false, searchShow: true, searchMenuSpan: 10, Source/UBCS-WEB/src/views/authority/apiscope.vue
@@ -114,6 +114,7 @@ menu: true, option: { lazy: true, columnBtn:false, tip: false, //simplePage: true, searchShow: true, Source/UBCS-WEB/src/views/authority/datascope.vue
@@ -118,6 +118,7 @@ watchMode: true, option: { lazy: true, columnBtn:false, tip: false, // simplePage: true, searchShow: true, Source/UBCS-WEB/src/views/authority/role.vue
@@ -38,7 +38,7 @@ <el-dialog title="è§è²æéé ç½®" append-to-body :visible.sync="box" width="350px" width="350px" style="height: 115vh; margin-top: -13vh; overflow: hidden"> <el-tabs type="border-card" style="overflow-y: auto; height: 72vh"> <el-tab-pane label="èåæé"> @@ -113,6 +113,7 @@ option: { height: "auto", tip: false, columnBtn:false, // simplePage: true, searchShow: true, searchMenuSpan: 6, Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -128,6 +128,7 @@ option: { headerAlign: 'center', align: 'center', columnBtn:false, border: true, index: true, rowKey:'id', Source/UBCS-WEB/src/views/system/client.vue
@@ -50,6 +50,7 @@ selectionList: [], option: { height: 'auto', columnBtn:false, calcHeight: 30, tip: false, searchShow: true, Source/UBCS-WEB/src/views/system/dept.vue
@@ -78,6 +78,7 @@ tip: false, height:'auto', maxHeight:600, columnBtn:false, // simplePage: true, searchShow: true, searchMenuSpan: 6, Source/UBCS-WEB/src/views/system/menu.vue
@@ -107,6 +107,7 @@ option: { height: "auto", lazy: true, columnBtn:false, tip: false, simplePage: true, searchShow: true, Source/UBCS-WEB/src/views/system/post.vue
@@ -55,6 +55,7 @@ selectionList: [], option: { height: 'auto', columnBtn:false, calcHeight: 30, tip: false, searchShow: true, Source/UBCS-WEB/src/views/system/tenant.vue
@@ -227,6 +227,7 @@ option(){ return{ height: 'auto', columnBtn:false, calcHeight: 30, tip: false, searchShow: true, Source/UBCS-WEB/src/views/system/topmenu.vue
@@ -93,6 +93,7 @@ option: { height: 'auto', calcHeight: 30, columnBtn:false, tip: false, searchShow: true, searchMenuSpan: 6, Source/UBCS-WEB/src/views/system/user.vue
@@ -278,6 +278,7 @@ tip: false, searchShow: true, searchMenuSpan: 6, columnBtn:false, border: true, index: true, selection: true, @@ -548,12 +549,7 @@ props: { label: "postName", value: "id" }, rules: [{ required: true, message: "è¯·éæ©æå±å²ä½", trigger: "click" }], } }, ] }, Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,114 @@ package com.vci.ubcs.code.controller; import com.vci.ubcs.code.dto.CodeResembleRuleDTO; import com.vci.ubcs.code.service.ICodeResembleRuleService; import com.vci.ubcs.code.vo.pagemodel.CodeResembleRuleVO; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import com.vci.ubcs.starter.web.pagemodel.DataGrid; import com.vci.ubcs.starter.web.util.VciBaseUtil; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Collection; /** * ç¸ä¼¼æ¥è¯¢è§åæ§å¶å¨ * * @author weidy * @date 2022-04-10 */ @RestController @RequestMapping("/resembleRuleController") public class CodeResembleRuleController { /** * ç¸ä¼¼æ¥è¯¢è§å æå¡ */ @Resource private ICodeResembleRuleService codeResembleRuleService; /** * ç¸ä¼¼æ¥è¯¢è§åå表 * @param baseQueryObject åºç¡æ¥è¯¢å¯¹è±¡ï¼å 嫿¥è¯¢æ¡ä»¶ï¼åé¡µï¼æåºç * @return ç¸ä¼¼æ¥è¯¢è§åæ¾ç¤ºå¯¹è±¡å表 */ @GetMapping("/gridCodeResembleRule") public DataGrid<CodeResembleRuleVO> gridCodeResembleRule(BaseQueryObject baseQueryObject){ if(baseQueryObject == null){ baseQueryObject = new BaseQueryObject(); } return codeResembleRuleService.gridCodeResembleRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); } /** * å¢å ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æï¼success为true表示æåï¼msgæ¯å¤±è´¥çæç¤ºä¿¡æ¯ï¼objæ¯æ·»å 宿åçæ¾ç¤ºå¯¹è±¡ */ @PostMapping( "/addSave") public R<CodeResembleRuleVO> addSave(@RequestBody CodeResembleRuleDTO codeResembleRuleDTO){ CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.addSave(codeResembleRuleDTO); return R.data(codeResembleRuleVO); } /** * ä¿®æ¹ ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æï¼success为true表示æåï¼msgæ¯å¤±è´¥çæç¤ºä¿¡æ¯ï¼objæ¯æ·»å 宿åçæ¾ç¤ºå¯¹è±¡ */ @PutMapping("/editSave") public R<CodeResembleRuleVO> editSave(@RequestBody CodeResembleRuleDTO codeResembleRuleDTO){ CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.editSave(codeResembleRuleDTO); return R.data(codeResembleRuleVO); } /** * å é¤ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ï¼oidåtséè¦ä¼ è¾ * @return å é¤ç»æåé¦ï¼ï¼successï¼æåï¼failï¼å¤±è´¥ */ @DeleteMapping( "/deleteData") public R delCodeResembleRule( CodeResembleRuleDTO codeResembleRuleDTO) { return codeResembleRuleService.deleteCodeResembleRule(codeResembleRuleDTO); } /** * 主é®è·åç¸ä¼¼æ¥è¯¢è§å * @param oid ä¸»é® * @return ç¸ä¼¼æ¥è¯¢è§åæ¾ç¤ºå¯¹è±¡ */ @GetMapping("/getObjectByOid") public R<CodeResembleRuleVO> getObjectByOid(String oid){ CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.getObjectByOid(oid); return R.data(codeResembleRuleVO); } /** * 䏻鮿¹éè·åç¸ä¼¼æ¥è¯¢è§å * @param oids 主é®ï¼å¤ä¸ªä»¥éå·åéï¼ä½æ¯åæ§è½å½±åï¼å»ºè®®ä¸æ¬¡æ¥è¯¢ä¸è¶ è¿10000个 * @return ç¸ä¼¼æ¥è¯¢è§åæ¾ç¤ºå¯¹è±¡ */ @GetMapping("/listDataByOids") public R<CodeResembleRuleVO> listCodeResembleRuleByOids(String oids){ Collection<CodeResembleRuleVO> voCollection = codeResembleRuleService.listCodeResembleRuleByOids(VciBaseUtil.str2List(oids)); R baseResult = R.success("æ¥è¯¢æå!"); baseResult.setData(voCollection); return baseResult; } /** * åç §ç¸ä¼¼æ¥è¯¢è§åå表 * @param baseQueryObject åºç¡æ¥è¯¢å¯¹è±¡ï¼å 嫿¥è¯¢æ¡ä»¶ï¼åé¡µï¼æåºç * @return ç¸ä¼¼æ¥è¯¢è§åæ¾ç¤ºå¯¹è±¡å表ï¼çæçå 容 */ @GetMapping("/refDataGrid") public DataGrid<CodeResembleRuleVO> refDataGridCodeResembleRule(BaseQueryObject baseQueryObject){ if(baseQueryObject == null){ baseQueryObject = new BaseQueryObject(); } return codeResembleRuleService.refDataGridCodeResembleRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeResembleRuleService.java
@@ -1,10 +1,18 @@ package com.vci.ubcs.code.service; import com.github.yulichang.base.MPJBaseService; import com.vci.ubcs.code.dto.CodeResembleRuleDTO; import com.vci.ubcs.code.entity.CodeReferConfig; import com.vci.ubcs.code.entity.CodeResembleRule; import com.vci.ubcs.code.vo.pagemodel.CodeResembleRuleVO; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.web.pagemodel.DataGrid; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import org.springblade.core.tool.api.R; import java.util.Collection; import java.util.List; import java.util.Map; public interface ICodeResembleRuleService extends MPJBaseService<CodeResembleRule> { CodeResembleRuleVO getObjectByOid(String codeResembleRuleOid); @@ -17,4 +25,67 @@ */ CodeResembleRuleVO codeResembleRuleDO2VO(CodeResembleRule codeResembleRuleDO) throws VciBaseException; } /** * æ¥è¯¢ææçç¸ä¼¼æ¥è¯¢è§å * @param conditionMap æ¥è¯¢æ¡ä»¶ * @param pageHelper å页åæåº * @return æ§è¡ç»æ * @throws VciBaseException æ¥è¯¢æ¡ä»¶åå页åºéçæ¶å伿åºå¼å¸¸ */ DataGrid<CodeResembleRuleVO> gridCodeResembleRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; /** * æ¹éæ°æ®å¯¹è±¡è½¬æ¢ä¸ºæ¾ç¤ºå¯¹è±¡ * @param codeResembleRuleDOs æ°æ®å¯¹è±¡å表 * @return æ¾ç¤ºå¯¹è±¡ * @throws VciBaseException åæ°ä¸ºç©ºæè ä¸åå¨çæ¶å伿åºå¼å¸¸ */ List<CodeResembleRuleVO> codeResembleRuleDO2VOs(Collection<CodeResembleRule> codeResembleRuleDOs) throws VciBaseException; /** * å¢å ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æ * @throws VciBaseException åæ°ä¸ºç©ºï¼å¯ä¸é¡¹ï¼å¿ è¾é¡¹ä¸éè¿æ¶ä¼æåºå¼å¸¸ */ CodeResembleRuleVO addSave(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException; /** * ä¿®æ¹ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æ * @throws VciBaseException åæ°ä¸ºç©ºï¼å¯ä¸é¡¹ï¼å¿ è¾é¡¹ä¸éè¿æ¶ä¼æåºå¼å¸¸ */ CodeResembleRuleVO editSave(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException; /** * å é¤ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ï¼oidåtséè¦ä¼ è¾ * @return å é¤ç»æåé¦ï¼ï¼successï¼æåï¼failï¼å¤±è´¥ * @throws VciBaseException åæ°ä¸ºç©ºï¼è¢«å¼ç¨æ¶æåºå¼å¸¸ */ R deleteCodeResembleRule(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException; /** * 䏻鮿¹éè·åç¸ä¼¼æ¥è¯¢è§å * @param oidCollections 主é®éåï¼ä½æ¯åæ§è½å½±åï¼å»ºè®®ä¸æ¬¡æ¥è¯¢ä¸è¶ è¿10000个 * @return ç¸ä¼¼æ¥è¯¢è§åæ¾ç¤ºå¯¹è±¡ * @throws VciBaseException æ¥è¯¢åºç°å¼å¸¸æ¶ä¼æåº */ Collection<CodeResembleRuleVO> listCodeResembleRuleByOids(Collection<String> oidCollections) throws VciBaseException; /** * åç §ç¸ä¼¼æ¥è¯¢è§åå表 * @param conditionMap æ¥è¯¢æ¡ä»¶ * @param pageHelper å页åæåº * @return ç¸ä¼¼æ¥è¯¢è§åæ¾ç¤ºå¯¹è±¡å表ï¼çæçå 容 * @throws VciBaseException æ¥è¯¢æ¡ä»¶åå页åºéçæ¶å伿åºå¼å¸¸ */ DataGrid<CodeResembleRuleVO> refDataGridCodeResembleRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java
@@ -1,6 +1,10 @@ package com.vci.ubcs.code.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.yulichang.base.MPJBaseServiceImpl; import com.vci.ubcs.code.dto.CodeResembleRuleDTO; import com.vci.ubcs.code.entity.CodeReferConfig; import com.vci.ubcs.code.entity.CodeResembleRule; import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus; @@ -8,13 +12,27 @@ import com.vci.ubcs.code.mapper.CodeResembleRuleMapper; import com.vci.ubcs.code.service.ICodeResembleRuleService; import com.vci.ubcs.code.vo.pagemodel.CodeResembleRuleVO; import com.vci.ubcs.omd.entity.BtmType; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.service.RevisionModelUtil; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; import com.vci.ubcs.starter.util.MdmBtmTypeConstant; import com.vci.ubcs.starter.web.pagemodel.DataGrid; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import com.vci.ubcs.starter.web.util.BeanUtilForVCI; import com.vci.ubcs.starter.web.util.VciBaseUtil; import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_OID_NOT_EXIST; import java.util.*; import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.*; /** * ç¸ä¼¼æ¥è¯¢è§åæå¡ @@ -23,6 +41,14 @@ */ @Service public class CodeResembleRuleServiceImpl extends MPJBaseServiceImpl<CodeResembleRuleMapper, CodeResembleRule> implements ICodeResembleRuleService { /** * 对象çæä½ */ @Autowired private RevisionModelUtil revisionModelUtil; @Override public CodeResembleRuleVO getObjectByOid(String oid) { return codeResembleRuleDO2VO(selectByOid(oid)); @@ -62,4 +88,226 @@ } return vo; } /** * æ¥è¯¢ææçç¸ä¼¼æ¥è¯¢è§å * @param conditionMap æ¥è¯¢æ¡ä»¶ * @param pageHelper å页åæåº * @return æ§è¡ç»æ * @throws VciBaseException æ¥è¯¢æ¡ä»¶åå页åºéçæ¶å伿åºå¼å¸¸ */ @Override public DataGrid<CodeResembleRuleVO> gridCodeResembleRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{ if (pageHelper == null) { pageHelper = new PageHelper(-1); } Query query = new Query(); query.setSize(pageHelper.getLimit()); query.setCurrent(pageHelper.getPage()); query.setDescs("createTime"); Map<String, Object> condition = new HashMap<>(conditionMap); List<CodeResembleRule> doList = baseMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(condition, CodeResembleRule.class)).getRecords(); DataGrid<CodeResembleRuleVO> dataGrid=new DataGrid<CodeResembleRuleVO>(); if (!CollectionUtils.isEmpty(doList)) { dataGrid.setData(codeResembleRuleDO2VOs(doList)); dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(Condition.getQueryWrapper(condition, CodeResembleRule.class))))); } return dataGrid; } /** * æ¹éæ°æ®å¯¹è±¡è½¬æ¢ä¸ºæ¾ç¤ºå¯¹è±¡ * @param codeResembleRuleDOs æ°æ®å¯¹è±¡å表 * @return æ¾ç¤ºå¯¹è±¡ * @throws VciBaseException åæ°ä¸ºç©ºæè ä¸åå¨çæ¶å伿åºå¼å¸¸ */ @Override public List<CodeResembleRuleVO> codeResembleRuleDO2VOs(Collection<CodeResembleRule> codeResembleRuleDOs) throws VciBaseException{ List<CodeResembleRuleVO> voList = new ArrayList<CodeResembleRuleVO>(); if(!CollectionUtils.isEmpty(codeResembleRuleDOs)){ for(CodeResembleRule s: codeResembleRuleDOs){ CodeResembleRuleVO vo = codeResembleRuleDO2VO(s); if(vo != null){ voList.add(vo); } } } return voList; } // /** // * æ°æ®å¯¹è±¡è½¬æ¢ä¸ºæ¾ç¤ºå¯¹è±¡ // * @param codeResembleRuleDO æ°æ®å¯¹è±¡ // * @return æ¾ç¤ºå¯¹è±¡ // * @throws VciBaseException æ·è´å±æ§åºéçæ¶å伿åºå¼å¸¸ // */ // @Override // public CodeResembleRuleVO codeResembleRuleDO2VO(CodeResembleRule codeResembleRuleDO) throws VciBaseException{ // CodeResembleRuleVO vo = new CodeResembleRuleVO(); // if(codeResembleRuleDO != null){ // BeanUtilForVCI.copyPropertiesIgnoreCase(codeResembleRuleDO,vo); // //妿ælcstatusçç±»çè¯ // vo.setLcStatusText(FrameworkDataLCStatus.getTextByValue(vo.getLcStatus())); // // } // return vo; // } /** * å¢å ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æ * @throws VciBaseException åæ°ä¸ºç©ºï¼å¯ä¸é¡¹ï¼å¿ è¾é¡¹ä¸éè¿æ¶ä¼æåºå¼å¸¸ */ @Override public CodeResembleRuleVO addSave(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException{ VciBaseUtil.alertNotNull(codeResembleRuleDTO,"éè¦æ·»å çæ°æ®å¯¹è±¡"); //å°DTO转æ¢ä¸ºDO CodeResembleRule codeResembleRuleDO = new CodeResembleRule(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeResembleRuleDTO,codeResembleRuleDO); DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeResembleRuleDO, MdmBtmTypeConstant.CODE_RESEMBLE_RULE); codeResembleRuleDO.setTenantId(AuthUtil.getTenantId()); codeResembleRuleDO.setLctid("frameworkDataLc"); codeResembleRuleDO.setLcStatus("Enabled"); codeResembleRuleDO.setOwner(AuthUtil.getUser().getUserName()); codeResembleRuleDO.setLastModifier(AuthUtil.getUser().getUserName()); baseMapper.insert(codeResembleRuleDO); return codeResembleRuleDO2VO(codeResembleRuleDO); } /** * ä¿®æ¹ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æ * @throws VciBaseException åæ°ä¸ºç©ºï¼å¯ä¸é¡¹ï¼å¿ è¾é¡¹ä¸éè¿æ¶ä¼æåºå¼å¸¸ */ @Override public CodeResembleRuleVO editSave(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException{ VciBaseUtil.alertNotNull(codeResembleRuleDTO,"æ°æ®å¯¹è±¡",codeResembleRuleDTO.getOid(),"ç¸ä¼¼æ¥è¯¢è§å主é®"); //å°DTO转æ¢ä¸ºDO CodeResembleRule codeResembleRuleDO = selectByOid(codeResembleRuleDTO.getOid()); revisionModelUtil.copyFromDTOIgnore(codeResembleRuleDTO,codeResembleRuleDO); codeResembleRuleDO.setLastModifier(AuthUtil.getUser().getUserName()); codeResembleRuleDO.setLastModifyTime(new Date()); codeResembleRuleDO.setTs(new Date()); baseMapper.updateById(codeResembleRuleDO); return codeResembleRuleDO2VO(codeResembleRuleDO); } /** * æ ¡éªæ¯å¦å¯ä»¥å é¤ï¼å¦æåå¨ä¸çº§ï¼å¹¶ä¸ä¸çº§ææ°æ®å¼ç¨åä¸è½å é¤ * @param codeResembleRuleDTO æ°æ®ä¼ è¾å¯¹è±¡ * @param codeResembleRuleDO æ°æ®åºä¸çæ°æ®å¯¹è±¡ * @return success为true为å¯ä»¥å é¤ï¼falseè¡¨ç¤ºææ°æ®å¼ç¨ï¼obj为true表示æä¸çº§ */ private R checkIsCanDeleteForDO(CodeResembleRuleDTO codeResembleRuleDTO, CodeResembleRule codeResembleRuleDO) { CodeResembleRule tsDO = new CodeResembleRule(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeResembleRuleDTO,tsDO); // boService.checkTs(tsDO); // QueryWrapper<CodeResembleRule> wrapper = new QueryWrapper<>(); // wrapper.eq("oid",tsDO.getOid()); // wrapper.eq("ts",tsDO.getTs()); if(!checkIsLinked(codeResembleRuleDO.getOid())) { return R.success("å¯ä»¥å é¤ï¼"); }else{ return R.fail(DATA_LINKED_NOT_DELETE); } } /** * æ ¡éªæ¯å¦è¢«å¼ç¨ * @param oid ä¸»é® * @throws VciBaseException 被å¼ç¨çæ¶å伿åºå¼å¸¸ */ private boolean checkIsLinked(String oid) throws VciBaseException{ //TODO æ·»å éè¦æ ¡éªå¼ç¨çå°æ¹ return false; } /** * å é¤ç¸ä¼¼æ¥è¯¢è§å * @param codeResembleRuleDTO ç¸ä¼¼æ¥è¯¢è§åæ°æ®ä¼ è¾å¯¹è±¡ï¼oidåtséè¦ä¼ è¾ * @return å é¤ç»æåé¦ï¼ï¼successï¼æåï¼failï¼å¤±è´¥ * @throws VciBaseException åæ°ä¸ºç©ºï¼è¢«å¼ç¨æ¶æåºå¼å¸¸ */ @Override public R deleteCodeResembleRule(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException{ VciBaseUtil.alertNotNull(codeResembleRuleDTO,"ç¸ä¼¼æ¥è¯¢è§åæ°æ®å¯¹è±¡",codeResembleRuleDTO.getOid(),"ç¸ä¼¼æ¥è¯¢è§åç主é®"); CodeResembleRule codeResembleRuleDO = selectByOid(codeResembleRuleDTO.getOid()); R baseResult = checkIsCanDeleteForDO(codeResembleRuleDTO,codeResembleRuleDO); if(baseResult.isSuccess()) { }else{ return baseResult; } //æ§è¡å é¤æä½ // BatchCBO batchCBO = codeResembleRuleMapper.deleteByPrimaryKey(codeResembleRuleDO.getOid()); int i = baseMapper.deleteById(codeResembleRuleDO.getOid()); return (i > 0)?R.success(DELETE_SUCCESS):R.fail(DELETE_FAIL); } // /** // * 䏻鮿¥è¯¢æ°æ®å¯¹è±¡ // * @param oid ä¸»é® // * @return æ°æ®å¯¹è±¡ // * @throws VciBaseException åæ°ä¸ºç©ºï¼å¹¶ä¸æ°æ®ä¸åå¨çæ¶å伿åºå¼å¸¸ // */ // private CodeResembleRule selectByOid(String oid) throws VciBaseException{ // VciBaseUtil.alertNotNull(oid,"主é®"); // CodeResembleRule codeResembleRuleDO = codeResembleRuleMapper.selectByPrimaryKey(oid.trim()); // if(codeResembleRuleDO == null || StringUtils.isBlank(codeResembleRuleDO.getOid())){ // throw new VciBaseException(DATA_OID_NOT_EXIST); // } // return codeResembleRuleDO; // } /** * 䏻鮿¹éè·åç¸ä¼¼æ¥è¯¢è§å * @param oidCollections 主é®éåï¼ä½æ¯åæ§è½å½±åï¼å»ºè®®ä¸æ¬¡æ¥è¯¢ä¸è¶ è¿10000个 * @return ç¸ä¼¼æ¥è¯¢è§åæ¾ç¤ºå¯¹è±¡ * @throws VciBaseException æ¥è¯¢åºç°å¼å¸¸æ¶ä¼æåº */ @Override public Collection<CodeResembleRuleVO> listCodeResembleRuleByOids(Collection<String> oidCollections) throws VciBaseException{ VciBaseUtil.alertNotNull(oidCollections,"æ°æ®å¯¹è±¡ä¸»é®éå"); List<CodeResembleRule> codeResembleRuleDOList = listCodeResembleRuleDOByOidCollections(oidCollections); return codeResembleRuleDO2VOs(codeResembleRuleDOList); } /** * 使ç¨ä¸»é®éåæ¥è¯¢æ°æ®å¯¹è±¡ * @param oidCollections 主é®çéå * @return æ°æ®å¯¹è±¡å表 */ private List<CodeResembleRule> listCodeResembleRuleDOByOidCollections(Collection<String> oidCollections){ List<CodeResembleRule> codeResembleRuleDOList = new ArrayList<CodeResembleRule>(); if(!CollectionUtils.isEmpty(oidCollections)){ Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections); for(Collection<String> oids: oidCollectionsList){ List<CodeResembleRule> tempDOList = baseMapper.selectBatchIds(oids); if(!CollectionUtils.isEmpty(tempDOList)){ codeResembleRuleDOList.addAll(tempDOList); } } } return codeResembleRuleDOList; } /** * åç §ç¸ä¼¼æ¥è¯¢è§åå表 * @param conditionMap æ¥è¯¢æ¡ä»¶ * @param pageHelper å页åæåº * @return ç¸ä¼¼æ¥è¯¢è§åæ¾ç¤ºå¯¹è±¡å表ï¼çæçå 容 * @throws VciBaseException æ¥è¯¢æ¡ä»¶åå页åºéçæ¶å伿åºå¼å¸¸ */ @Override public DataGrid<CodeResembleRuleVO> refDataGridCodeResembleRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{ if(conditionMap == null){ conditionMap = new HashMap<String, String>(); } return gridCodeResembleRule(conditionMap,pageHelper); } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -29,6 +29,7 @@ import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum; import com.vci.ubcs.starter.web.util.VciBaseUtil; import com.vci.ubcs.starter.web.util.VciDateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -42,6 +43,7 @@ import static com.vci.ubcs.code.constant.MdmEngineConstant.*; @Service @Slf4j public class MdmProductCodeServiceImpl implements MdmProductCodeService { /** @@ -97,9 +99,11 @@ Map<String/**æµæ°´ä¾æ®**/, Map<String/**ç æ®µç主é®**/,Double/**æå¤§æµæ°´å·**/>> maxSerialMap = new HashMap<>(); // TODO å¤çº¿ç¨æµå¼åçé®é¢å·²ä¿®æ¹ dataCBOList.parallelStream().forEach(cbo->{ log.info("code:----->"+cbo.getId()); // VciBaseUtil.setCurrentUserSessionInfo(sessionInfo); String code = cbo.getId(); List<String> serialUnitList = new ArrayList<>(); String seclenghStr=cbo.getData().get(CODE_SEC_LENGTH_FIELD); String[] secLengths = cbo.getData().get(CODE_SEC_LENGTH_FIELD).split("#"); cbo.getData().remove(CODE_SEC_LENGTH_FIELD);//å°æ¤keyé¤å» cbo.getData().remove(IMPORT_ROW_INDEX);//å°æ¤keyé¤å» @@ -110,18 +114,18 @@ for (int i = 0; i < secLengths.length; i++) { CodeBasicSecVO secVO = secVOList.get(i); String thisSecValue = ""; if(i == 0){ thisSecValue = code.contains("#")?code.substring(0,code.indexOf("#")):code; /*if(i == 0){ thisSecValue = seclenghStr.contains("#")?code.substring(0,VciBaseUtil.getInt(secLengths[i])):code; } else if(i == secLengths.length-1){ //æå thisSecValue = code.contains("#")?code.substring(code.lastIndexOf("#")):code; }else { thisSecValue = seclenghStr.contains("#")?code.substring(VciBaseUtil.getInt(secLengths[i-1]),code.length()):code; }else {*/ int start = 0; for (int j = 0; j < i; j++) { start += VciBaseUtil.getInt(secLengths[j]) + 1; start += VciBaseUtil.getInt(secLengths[j]); } thisSecValue = code.substring(start,start+VciBaseUtil.getInt(secLengths[1])); } thisSecValue = code.substring(start,start+VciBaseUtil.getInt(secLengths[i])); // } if(VciBaseUtil.getBoolean(secVO.getSerialDependFlag())){ serialUnitList.add(thisSecValue); } @@ -146,6 +150,12 @@ OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType())))); } Map<String, Double> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>()); if(thisUnitMaxMap.containsKey(secOid)){ Double maxValue= thisUnitMaxMap.getOrDefault(secOid,new Double(-1)); if(maxValue>serialDb){ serialDb=maxValue; } } thisUnitMaxMap.put(secOid,serialDb); maxSerialMap.put(serialUnitString,thisUnitMaxMap); serialUnFileStringList.add(String.valueOf(serialDb)); @@ -167,6 +177,7 @@ //å¤çæå¤§çæµæ°´å· List<CodeSerialValue> addSerialValueList = new ArrayList<>(); List<CodeSerialValue> editSerialValueList = new ArrayList<>(); log.info("maxSerialMap:----->"+maxSerialMap.size()); maxSerialMap.forEach((serialUnit,secOidMaxMap)->{ secOidMaxMap.forEach((secOid,maxSerial)->{ QueryWrapper<CodeSerialValue> queryWrapper = new QueryWrapper<>(); @@ -176,8 +187,10 @@ queryWrapper.eq("codeSecOid", secOid); List<CodeSerialValue> serialValueDOS = serialValueMapper.selectList(queryWrapper); log.info("serialValueDOS--->"+serialValueDOS.size()); if (!CollectionUtils.isEmpty(serialValueDOS)) { CodeSerialValue serialValueDO = serialValueDOS.get(0); log.info("oldmaxSerial--->"+serialValueDO.getMaxSerial()+"---- newmaxSerial---->"+maxSerial); if(VciBaseUtil.getDouble(serialValueDO.getMaxSerial())<maxSerial){ serialValueDO.setMaxSerial(String.valueOf(maxSerial)); DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO); @@ -318,6 +331,7 @@ //è¦å卿åçå ¨é¨allcode wrapperAllCode(classifyFullInfoBO, ruleVO, cbo, templateVO, allCodeDOList, serialUnitString, sb.toString()); } //å¤çæå¤§æµæ°´ saveSerialValue( ruleVO, lastMaxSerialValueMap, maxSerialValueMap); allCodeDOList.stream().forEach(