ubcs.git - Gitblit

			@@ -17,8 +17,10 @@
			package com.vci.ubcs.code.service.impl;

			import com.alibaba.nacos.api.utils.StringUtils;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
			import com.vci.ubcs.code.dto.CodeClstemplateDTO;
			import com.vci.ubcs.code.entity.*;
			import com.vci.ubcs.code.enumpack.CodeClassifyTemplateLC;
			@@ -87,11 +89,13 @@
			@Autowired(required = false)
			private CodeClsflowtempMapper codeClsflowtempMapper;
			@Autowired(required = false)
			private CodeTemplatePhaseMapper codeTempphaseMapper;
			private CodeTempphaseMapper codeTempphaseMapper;
			@Autowired(required = false)
			private CodeClassifyTemplateButtonMapper codeTempbuttonMapper;
			private CodeTempbuttonMapper codeTempbuttonMapper;
			@Autowired(required = false)
			private CodePhaseAttrMapper codePhaseattrMapper;
			private CodePhaseattrMapper codePhaseattrMapper;
			@Autowired(required = false)
			private CodeClassifyMapper codeClassifyMapper;
			@Autowired(required = false)
			private ICodeClassifyService codeClassifyService;
			@Autowired(required = false)
			@@ -484,34 +488,34 @@
			// ClientBusinessObject clientBusinessObject_template_insert = null;
			// try {
			// clientBusinessObject_template_insert = clientBusinessObjectOperation.reviseBusinessObject(clientBusinessObject_template, "");
			codeCls_template_insert.setOid(VciBaseUtil.getPk());
			codeCls_template_insert.setRevisionOid(VciBaseUtil.getPk());
			codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
			codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
			codeCls_template_insert.setLastR(String.valueOf(1));
			codeCls_template_insert.setFirstR(String.valueOf(0));
			codeCls_template_insert.setFirstV(String.valueOf(1));
			codeCls_template_insert.setLastV(String.valueOf(1));
			codeCls_template_insert.setCreator(AuthUtil.getUser().getUserName());
			codeCls_template_insert.setCreateTime(new Date());
			codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
			codeCls_template_insert.setLastModifyTime(new Date());
			codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
			codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
			Map rvObj = baseMapper.getNextRevision(codeCls_template.getNameOid());
			codeCls_template_insert.setRevisionSeq(Integer.parseInt(rvObj.get("REVISIONSEQ").toString()));
			codeCls_template_insert.setRevisionValue(rvObj.get("REVISIONVAL").toString());
			codeCls_template_insert.setOid(VciBaseUtil.getPk());
			codeCls_template_insert.setRevisionOid(VciBaseUtil.getPk());
			codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
			codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
			codeCls_template_insert.setLastR(String.valueOf(1));
			codeCls_template_insert.setFirstR(String.valueOf(0));
			codeCls_template_insert.setFirstV(String.valueOf(1));
			codeCls_template_insert.setLastV(String.valueOf(1));
			codeCls_template_insert.setCreator(AuthUtil.getUser().getUserName());
			codeCls_template_insert.setCreateTime(new Date());
			codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
			codeCls_template_insert.setLastModifyTime(new Date());
			codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
			codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
			Map rvObj = baseMapper.getNextRevision(codeCls_template.getNameOid());
			codeCls_template_insert.setRevisionSeq(Integer.parseInt(rvObj.get("REVISIONSEQ").toString()));
			codeCls_template_insert.setRevisionValue(rvObj.get("REVISIONVAL").toString());
			// VersionValueObject versionObj = this.getVersionValue(item.verRuleName);
			codeCls_template_insert.setVersionSeq(Integer.parseInt(rvObj.get("VERSIONSEQ").toString()));
			codeCls_template_insert.setVersionValue(rvObj.get("VERSIONVAL").toString());
			codeCls_template_insert.setLctid(codeCls_template.getLctid());
			codeCls_template_insert.setLcStatus("Editing");
			codeCls_template_insert.setId(codeCls_template.getId());
			codeCls_template_insert.setName(codeCls_template.getName());
			codeCls_template_insert.setDescription(codeCls_template.getDescription());
			codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
			codeCls_template_insert.setVersionSeq(Integer.parseInt(rvObj.get("VERSIONSEQ").toString()));
			codeCls_template_insert.setVersionValue(rvObj.get("VERSIONVAL").toString());
			codeCls_template_insert.setLctid(codeCls_template.getLctid());
			codeCls_template_insert.setLcStatus("Editing");
			codeCls_template_insert.setId(codeCls_template.getId());
			codeCls_template_insert.setName(codeCls_template.getName());
			codeCls_template_insert.setDescription(codeCls_template.getDescription());
			codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
			// codeCls_template_insert.setCheckinBy(userName);
			codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
			codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
			// }catch (VCIError e){
			// e.printStackTrace();
			// logger.error("===============>分类模板-升版复制出错oid： "+templateOldOid+",mes"+e.error_message);
			@@ -548,11 +552,11 @@
			//复制模板阶段，阶段属性
			Map phase_attrMap = copyTemplatePhase_attr(templateOldOid,templateNewOid);

			List<CodeTemplatePhase> codeClassifyPhaseDOList = (ArrayList<CodeTemplatePhase>)phase_attrMap.get("phase");//模板阶段
			List<CodePhaseAttr> codePhaseAttrDOList = (ArrayList<CodePhaseAttr>)phase_attrMap.get("phaseAttr");//阶段属性
			List<CodeTempphaseEntity> codeClassifyPhaseDOList = (ArrayList<CodeTempphaseEntity>)phase_attrMap.get("phase");//模板阶段
			List<CodePhaseattrEntity> codePhaseAttrDOList = (ArrayList<CodePhaseattrEntity>)phase_attrMap.get("phaseAttr");//阶段属性

			//复制模板按钮
			List<CodeClassifyTemplateButton> codeClassifyTemplateButtonDOList = copyTemplateButton(templateOldOid,templateNewOid);
			List<CodeTempbuttonEntity> codeClassifyTemplateButtonDOList = copyTemplateButton(templateOldOid,templateNewOid);

			//一起保存数据
			// WebUtil.setPersistence(false);//不执行保存
			@@ -651,11 +655,11 @@
			//复制模板阶段，阶段属性
			Map phase_attrMap = copyTemplatePhase_attr(oldOid,newOid);

			List<CodeTemplatePhase> codeClassifyPhaseDOList = (ArrayList<CodeTemplatePhase>)phase_attrMap.get("phase");//模板阶段
			List<CodePhaseAttr> codePhaseAttrDOList = (ArrayList<CodePhaseAttr>)phase_attrMap.get("phaseAttr");//阶段属性
			List<CodeTempphaseEntity> codeClassifyPhaseDOList = (ArrayList<CodeTempphaseEntity>)phase_attrMap.get("phase");//模板阶段
			List<CodePhaseattrEntity> codePhaseAttrDOList = (ArrayList<CodePhaseattrEntity>)phase_attrMap.get("phaseAttr");//阶段属性

			//复制模板按钮
			List<CodeClassifyTemplateButton> codeClassifyTemplateButtonDOList = copyTemplateButton(oldOid,newOid);
			List<CodeTempbuttonEntity> codeClassifyTemplateButtonDOList = copyTemplateButton(oldOid,newOid);

			// baseMapper.insert(codeClassifyTemplateDOList);
			this.saveBatch(codeClassifyTemplateDOList);
			@@ -754,21 +758,21 @@
			// phaseWrapper.addQueryMap("codeClassifyTemplateOid",templateOldOid);
			Map<String,Object> condition = new HashMap<>(1);
			condition.put("codeclassifyTemplateOid",templateOldOid);
			List<CodeTemplatePhase> codeTempphaseEntities = codeTempphaseMapper.selectByMap(condition);
			List<CodeTempphaseEntity> codeTempphaseEntities = codeTempphaseMapper.selectByMap(condition);
			// List<CodeTemplatePhaseDO> codeClassifyPhaseDOList = codeTemplatePhaseDaoI.selectByWrapper(phaseWrapper);//要保存的新的模板流程
			Map<String,String> phaseKeyMap = new HashMap<String,String>();//需要复制的模板阶段属性,key:value,模板阶段老oid:模板属性新oid
			List<String> phaseOidList = new ArrayList<String>();
			for (CodeTemplatePhase codeTemplatePhaseDO:codeTempphaseEntities){
			for (CodeTempphaseEntity codeTemplatePhaseDO:codeTempphaseEntities){
			String oldoid = codeTemplatePhaseDO.getOid();
			String newOid = VciBaseUtil.getPk();
			codeTemplatePhaseDO.setOid(newOid);
			codeTemplatePhaseDO.setCodeClassifyTemplateOid(templateNewOid);
			codeTemplatePhaseDO.setCodeclassifytemplateoid(templateNewOid);
			phaseKeyMap.put(oldoid,newOid);
			phaseOidList.add(oldoid);
			}

			//模板阶段的属性
			List<CodePhaseAttr> codePhaseAttrDOList = new ArrayList<CodePhaseAttr>();
			List<CodePhaseattrEntity> codePhaseAttrDOList = new ArrayList<CodePhaseattrEntity>();

			if(!CollectionUtils.isEmpty(phaseOidList)){//size()==0下边方法会报错
			// Map<String,String> conditionMap = new HashMap<>();
			@@ -776,11 +780,11 @@
			// codePhaseAttrDOList = codePhaseAttrDaoI.selectByCondition(conditionMap,new PageHelper(-1));
			codePhaseAttrDOList = codePhaseattrMapper.selectByPhaseaIds(VciBaseUtil.toInSql(phaseOidList.toArray(new String[0])));
			}
			for (CodePhaseAttr codePhaseAttrDO:codePhaseAttrDOList){
			String oldPhaseoid = codePhaseAttrDO.getCodePhaseOid();
			for (CodePhaseattrEntity codePhaseAttrDO:codePhaseAttrDOList){
			String oldPhaseoid = codePhaseAttrDO.getCodephaseoid();
			// String newOid = VciBaseUtil.getPk();
			codePhaseAttrDO.setOid(null);
			codePhaseAttrDO.setCodePhaseOid(phaseKeyMap.get(oldPhaseoid));
			codePhaseAttrDO.setCodephaseoid(phaseKeyMap.get(oldPhaseoid));
			// codePhaseattrMapper.insert(codePhaseAttrDO);
			}
			Map phaseMap = new HashMap();
			@@ -792,15 +796,15 @@
			/**
			* 复制模板按钮
			*/
			public List<CodeClassifyTemplateButton> copyTemplateButton(String templateOldOid,String templateNewOid){
			public List<CodeTempbuttonEntity> copyTemplateButton(String templateOldOid,String templateNewOid){

			Map<String,Object> condition = new HashMap<>(1);
			condition.put("classifyTemplateOid",templateOldOid);
			// VciQueryWrapperForDO buttonWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateButtonDO.class);
			// buttonWrapper.addQueryMap("classifyTemplateOid",templateOldOid);
			List<CodeClassifyTemplateButton> codeTempbuttonEntities = codeTempbuttonMapper.selectByMap(condition);
			List<CodeTempbuttonEntity> codeTempbuttonEntities = codeTempbuttonMapper.selectByMap(condition);
			// List<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOList = codeClassifyTemplateButtonDaoI.selectByWrapper(buttonWrapper);
			for (CodeClassifyTemplateButton codeClassifyTemplateButtonDO:codeTempbuttonEntities){
			for (CodeTempbuttonEntity codeClassifyTemplateButtonDO:codeTempbuttonEntities){
			// String newOid = VciBaseUtil.getPk();
			codeClassifyTemplateButtonDO.setOid(null);
			codeClassifyTemplateButtonDO.setClassifytemplateoid(templateNewOid);
			@@ -817,11 +821,13 @@
			// VciQueryWrapperForDO codeClassifyTemplateAttrQuery = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
			// codeClassifyTemplateAttrQuery.addQueryMap("classifyTemplateOid",templateOldOid);

			Map<String,Object> condition = new HashMap<>(1);
			condition.put("classifyTemplateOid",templateOldOid);
			// Map<String,Object> condition = new HashMap<>(1);
			// condition.put("classifyTemplateOid",templateOldOid);
			QueryWrapper<CodeClstempattrEntity> wrapper=new QueryWrapper<>();
			wrapper.eq("classifyTemplateOid",templateOldOid);

			// List<CodeClstempattrEntity> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrDaoI.selectByWrapper(codeClassifyTemplateAttrQuery);
			List<CodeClstempattrEntity> codeClstempattrEntities = codeClstempattrMapper.selectByMap(condition);
			List<CodeClstempattrEntity> codeClstempattrEntities = codeClstempattrMapper.selectList(wrapper);

			for (CodeClstempattrEntity codeClassifyTemplateAttrDO :codeClstempattrEntities){
			// String attrOid = VciBaseUtil.getPk();
			@@ -1003,7 +1009,7 @@
			// condition.put("ts",codeClassifyTemplateDOCopyFromDTO.getTs());
			CodeClstemplateEntity detail = baseMapper
			.selectById(codeClassifyTemplateDOCopyFromDTO.getOid());
			// boolean tsBoolean = boService.checkTs(codeClassifyTemplateAttrDOListemplateDOCopyFromDTO);
			// boolean tsBoolean = boService.checkTs(codeClassifyTemplateAttrDOListemplateDOCopyFromDTO);
			if(detail.getTs().compareTo(codeClassifyTemplateDOCopyFromDTO.getTs()) != 0){//不是最新的不让改
			return R.fail("当前数据不是最新，请刷新后再修改！");
			}
			@@ -1029,4 +1035,120 @@
			return R.data(codeClassifyTemplateDO2VO(codeClassifyTemplateDO));
			}

			/**
			*根据父分类id去查找叶子节点的模板，如果没查到则认为模板在上层建立，则根据分类去查当前模板
			* @param codeClassifyOid 父分类的主键
			* @return
			*/
			@Override
			public List<CodeClstemplateVO> childTemplates(String codeClassifyOid){
			List<CodeClstemplateVO> codeClassifyTemplateVOList=new ArrayList<>();
			// Map<String/模板的主键/,String/分类的主键/> childHasTemplateMap =baseMapper
			// .selectChildHasReleaseTemplate(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED,
			// codeClassifyOid,CodeClassifyTemplateLC.RELEASED.getValue());
			List<Map<String,String>> childHasTemplateList =baseMapper
			.selectChildHasReleaseTemplate(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED,
			codeClassifyOid,CodeClassifyTemplateLC.RELEASED.getValue());
			Map<String/模板的主键/,String/分类的主键/> childHasTemplateMap = new HashMap<>();
			if(!CollectionUtils.isEmpty(childHasTemplateList)){
			childHasTemplateList.stream().forEach(cbo->{
			childHasTemplateMap.put(cbo.get("OID"),cbo.get("CLSOID"));
			});
			}

			Set<String> templateOid = childHasTemplateMap.keySet();
			List<CodeClstemplateEntity> classifyTemplateDOS=new ArrayList<>();
			if(!CollectionUtils.isEmpty(templateOid)) {
			classifyTemplateDOS= this.listCodeClassifyTemplateDOByOidCollections(templateOid);
			}else{
			classifyTemplateDOS=selectOnlyTemplateByClassifyOid(codeClassifyOid);
			}
			List<CodeClstemplateVO> templateVOList = codeClassifyTemplateDO2VOs(classifyTemplateDOS, true);
			if(!CollectionUtils.isEmpty(templateVOList)){
			codeClassifyTemplateVOList.addAll(templateVOList);
			}
			return codeClassifyTemplateVOList;
			}


			/**
			* 使用分类主键递归查询
			* @param codeClassifyOid 分类的主键
			* @return 模板的数据对象
			*/
			private List<CodeClstemplateEntity> selectOnlyTemplateByClassifyOid(String codeClassifyOid){
			//1.直接查询，看看这个分类下面有没有发布状态的模板
			//2.如果没有，则往上找分类的内容，这个分类层级不会太多，所以直接递归即可
			//3.如果分类下面添加了模板，但是没有发布，则说明模板可能还在编辑的状态，依然使用上级分类

			// Map<String,String> conditionMap = new HashMap<>();
			// conditionMap.put("codeClassifyOid",codeClassifyOid);
			// conditionMap.put("lcstatus",CodeClassifyTemplateLC.RELEASED.getValue());
			QueryWrapper<CodeClstemplateEntity> wrapper=new QueryWrapper<>();
			wrapper.eq("codeClassifyOid",codeClassifyOid)
			.eq("lcstatus",CodeClassifyTemplateLC.RELEASED.getValue());

			List<CodeClstemplateEntity> templateDOS = baseMapper.selectList(wrapper);
			if(CollectionUtils.isEmpty(templateDOS)){
			//递归找上级的模板
			CodeClassify classifyDO = codeClassifyMapper.selectById(codeClassifyOid);
			// codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
			if(StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
			//说明已经是顶了，也没找到的话，那就返回了
			return null;
			}
			return selectOnlyTemplateByClassifyOid(classifyDO.getParentCodeClassifyOid());
			}else{
			return templateDOS;
			}
			}

			/**
			* 使用主题库的分类主键，获取生效的模板
			*
			* @param codeClassifyOid 主题库分类主键
			* @param hasAttribute 是否包含属性
			* @return 模板的信息
			*/
			@Override
			public List<CodeClstemplateVO> listReleaseTemplateByClassifyOid(String codeClassifyOid, boolean hasAttribute) {
			VciBaseUtil.alertNotNull(codeClassifyOid,"主题库分类主键");
			List<CodeClstemplateEntity> templateDOS = selectOnlyTemplateByClassifyOid(codeClassifyOid);
			if(CollectionUtils.isEmpty(templateDOS)){
			throw new VciBaseException("当前分类，以及其上级分类都没有设置模板");
			}
			List<CodeClstemplateVO> templateVOList = codeClassifyTemplateDO2VOs(templateDOS, true);
			return sortTemplateByRevision(templateVOList);
			}

			/**
			* 用模板的版本来排序
			* @param templateVOList 模板的显示对象
			* @return 排序后的列表
			*/
			@Override
			public List<CodeClstemplateVO> sortTemplateByRevision(List<CodeClstemplateVO> templateVOList){
			if(!CollectionUtils.isEmpty(templateVOList) && templateVOList.size() >1){
			//获取版本号最大的那个
			templateVOList = templateVOList.stream().sorted((o1,o2)->
			Integer.valueOf(o1.getRevisionSeq()).compareTo(Integer.valueOf(o2.getRevisionValue()))
			).collect(Collectors.toList());
			}
			return templateVOList;
			}

			/**
			* 主键获取分类模板对象(包含属性）
			*
			* @param oid 主键
			* @return 分类模板对象显示对象
			* @throws VciBaseException 参数为空，数据不存在时会抛出异常
			*/
			@Override
			public CodeClstemplateVO getObjectHasAttrByOid(String oid) throws VciBaseException {
			List<CodeClstemplateEntity> doList = new ArrayList<>();
			doList.add(selectByOid(oid));
			List<CodeClstemplateVO> templateVOS = codeClassifyTemplateDO2VOs(doList, true);
			return CollectionUtils.isEmpty(templateVOS)?null:templateVOS.get(0);
			}
			}