Source/UBCS-WEB/src/api/omd/status.js
@@ -72,4 +72,14 @@ pageSize } }) } } export const getApplyRange = (id) => { return request({ url: '/api/ubcs-omd/status/get-apply-range', method: 'get', params: { id } }) } Source/UBCS-WEB/src/views/modeling/status.vue
@@ -11,36 +11,41 @@ @row-del="rowDel" @refresh-change="refreshChange" @search-reset="searchChange" @search-change="searchChange"> @search-change="searchChange" @row-click="rowClick"> <template slot="menuLeft"> <el-tooltip class="item" effect="dark" content="æ¥æ¾ç¶ææ± 使ç¨èå´" placement="top"> <el-tooltip class="item" effect="dark" content="æ¥æ¾ç¶æä½¿ç¨èå´" placement="top"> <el-button size="small" plain type="primary" icon="el-icon-zoom-in" @click="handleSearch">æ¥ç使ç¨èå´ @click="applyRangeSearch">æ¥ç使ç¨èå´ </el-button> </el-tooltip> </template>> </template> <template slot="radio" slot-scope="{row}"> <el-radio v-model="selectRow" :label="row.$index"> </el-radio> </template> </avue-crud> <el-dialog title="æ¥ç使ç¨èå´" append-to-body :visible.sync="packageSearchBox" width="1200px"> <versionpackage></versionpackage> </el-dialog> <versionpackage :rangeData="applyRangeData" ref="applyRange"></versionpackage> </basic-container> </template> <script> import { getPage,add,update,remove } from '../../api/omd/status'; import { getPage,add,update,remove,getApplyRange } from '../../api/omd/status'; export default { name: "status", data(){ return { //æ¥ç使ç¨èå´ packageSearchBox:false, // ç¹å»æ°æ® selectRow: '', selectRowData: {}, //åé¡µæ°æ® page: { pageSize: 10, @@ -56,7 +61,14 @@ border: true, index: true, searchMenuSpan:5, highlightCurrentRow: true, stripe:true, column:[ { label: '', prop: 'radio', width: 120 }, { label:'è±æåç§°', prop: 'id', @@ -73,12 +85,28 @@ type:'textarea' } ] } }, applyRangeData: [] } }, methods:{ handleSearch(){ // this.packageSearchBox=true rowClick(row){ this.selectRow = row.$index; this.selectRowData = row; }, applyRangeSearch(){ if (!this.selectRow && this.selectRow != 0){ console.log(this.selectRow); this.$message({ type:"warning", message: "请å 鿩屿§" }) } getApplyRange(this.selectRowData.id).then(res => { this.applyRangeData = res.data.data; this.$refs.applyRange.rangeData = this.applyRangeData; this.$refs.applyRange.showDialog = true; }) }, getList() { this.loading = true; @@ -134,8 +162,7 @@ } } </script> <style scoped> </style> Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java
@@ -50,11 +50,11 @@ */ String GET_BY_OIDS = API_PREFIX + "/btm-type/get-by-oids"; String GET_DEFAULT_ATTR_BY_BTM_ID = API_PREFIX + "/btm-attribute/get-default-attr-by-btm-id"; String GET_DEFAULT_ATTR_BY_BTM_ID = API_PREFIX + "/btm-type/get-default-attr-by-btm-id"; String GET_ALL_ATTR_BY_BTM_ID = API_PREFIX + "/btm-attribute/get-all-attr-by-btm-id"; String GET_ALL_ATTR_BY_BTM_ID = API_PREFIX + "/btm-type/get-all-attr-by-btm-id"; String GET_ALL_ATTR_BY_BTM_OID = API_PREFIX + "/btm-attribute/get-all-attr-by-btm-oid"; String GET_ALL_ATTR_BY_BTM_OID = API_PREFIX + "/btm-type/get-all-attr-by-btm-oid"; /** * è·åä¸å¡ç±»å详æ ä¿¡æ¯ Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/ILinkTypeClient.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,136 @@ package com.vci.ubcs.omd.feign; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vci.ubcs.omd.vo.LinkTypeVO; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; /** * Description: 龿¥ç±»åFeignæ¥å£ * * @author LiHang * @date 2023/6/13 */ @FeignClient( value = AppConstant.APPLICATION_NAME_OMD, fallback = ILinkTypeFallback.class ) public interface ILinkTypeClient { /** * åç¼ */ String API_PREFIX = "/client"; /** * å页åç §æ¥è¯¢ */ String GET_REF_PAGE =API_PREFIX + "/link-type/get-ref-page"; /** * åç §å表æ¥è¯¢æ å页 */ String GET_REF = API_PREFIX + "/link-type/get-ref"; /** * åç §æç» */ String GET_DETAIL = API_PREFIX + "/link-type/get-detail"; /** * è±æåç§°æ¹éæ¥è¯¢ */ String GET_BY_IDS = API_PREFIX + "/link-type/get-by-ids"; /** * 䏻鮿¹éæ¥è¯¢ */ String GET_BY_OIDS = API_PREFIX + "/link-type/get-by-oids"; /** * æé¾æ¥ç±»åè±æåç§°è·åé»è®¤å段 */ String GET_DEFAULT_ATTR_BY_LINK_ID = API_PREFIX + "/link-type/get-default-attr-by-link-id"; /** * æé¾æ¥ç±»åè±æåç§°è·åå ¨é¨å段 */ String GET_ALL_ATTR_BY_LINK_ID = API_PREFIX + "/link-type/get-all-attr-by-link-id"; /** * æé¾æ¥ç±»å主é®è·åå ¨é¨å段 */ String GET_ALL_ATTR_BY_LINK_OID = API_PREFIX + "/link-type/get-all-attr-by-link-oid"; /** * è·åä¸å¡ç±»å详æ ä¿¡æ¯ * * @param oid ä¸»é® * @return ä¸å¡ç±»å详æ ä¿¡æ¯ */ @GetMapping(GET_DETAIL) R<LinkTypeVO> getDetail(@RequestParam("oid") String oid); /** * åç §å表æ¥è¯¢ * * @param baseQueryObject æ¥è¯¢æ¡ä»¶å¯¹è±¡ * @return æ¥è¯¢ç»æ */ @PostMapping(GET_REF_PAGE) R<Page<LinkTypeVO>> getRefPage(@RequestBody BaseQueryObject baseQueryObject); /** * åç §å表æ¥è¯¢ * @param baseQueryObject æ¥è¯¢æ¡ä»¶å¯¹è±¡ * @return æ¥è¯¢ç»æ */ @PostMapping(GET_REF) R<List<LinkTypeVO>> getRef(@RequestBody BaseQueryObject baseQueryObject); /** * æ ¹æ®è±æåç§°æ¹éæ¥è¯¢å¯¹è±¡ * @param ids å¯¹è±¡è±æåç§° 使¯ä¸è½è¶ è¿1000 * @return ä¸å¡å¯¹è±¡ */ @PostMapping(GET_BY_IDS) R<List<LinkTypeVO>> selectByIdCollection(@RequestBody List<String> ids); /** * æ¹éæ ¹æ®ä¸»é®è·åä¸å¡ç±»å * @param pkLinkTypeCollection ä¸å¡ç±»å主é®éå * @return ä¸å¡ç±»åå表ï¼å¦ææä¸åå¨çä¸ä¼è¿åï¼å ¨é¨ä¸åå¨çåè¿å空å表 */ @PostMapping(GET_BY_OIDS) R<List<LinkTypeVO>> listLinkTypeByOidCollection(@RequestBody List<String> pkLinkTypeCollection); /** * è·åä¸å¡ç±»åï¼åªæé»è®¤å段 * * @param linkTypeId ä¸å¡ç±»åid * @return é»è®¤åæ®µå±æ§ */ @GetMapping(GET_DEFAULT_ATTR_BY_LINK_ID) R<LinkTypeVO> getDefaultAttrByLinkId(@RequestParam("linkTypeId") String linkTypeId); /** * è·åä¸å¡ç±»åï¼æææçåæ®µ * * @param linkTypeId ä¸å¡ç±»åid * @return ææå段 */ @GetMapping(GET_ALL_ATTR_BY_LINK_ID) R<LinkTypeVO> getAllAttributeByLinkId(@RequestParam("linkTypeId") String linkTypeId); /** * è·åä¸å¡ç±»åï¼æææçåæ®µ * * @param linkTypeOid ä¸å¡ç±»åä¸»é® * @return ææå段 */ @GetMapping(GET_ALL_ATTR_BY_LINK_OID) R<LinkTypeVO> getAllAttributeByLinkOid(@RequestParam("linkTypeOid") String linkTypeOid); } Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/ILinkTypeFallback.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,104 @@ package com.vci.ubcs.omd.feign; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vci.ubcs.omd.vo.LinkTypeVO; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import org.springblade.core.tool.api.R; import java.util.List; /** * Description: 龿¥ç±»åfeign失败çé 置类 * * @author LiHang * @date 2023/6/13 */ public class ILinkTypeFallback implements ILinkTypeClient{ /** * è·åä¸å¡ç±»å详æ ä¿¡æ¯ * * @param oid ä¸»é® * @return ä¸å¡ç±»å详æ ä¿¡æ¯ */ @Override public R<LinkTypeVO> getDetail(String oid) { return R.fail("è·åæ°æ®å¤±è´¥"); } /** * åç §å表æ¥è¯¢ * * @param baseQueryObject æ¥è¯¢æ¡ä»¶å¯¹è±¡ * @return æ¥è¯¢ç»æ */ @Override public R<Page<LinkTypeVO>> getRefPage(BaseQueryObject baseQueryObject) { return R.fail("è·åæ°æ®å¤±è´¥"); } /** * åç §å表æ¥è¯¢ * * @param baseQueryObject æ¥è¯¢æ¡ä»¶å¯¹è±¡ * @return æ¥è¯¢ç»æ */ @Override public R<List<LinkTypeVO>> getRef(BaseQueryObject baseQueryObject) { return R.fail("è·åæ°æ®å¤±è´¥"); } /** * æ ¹æ®è±æåç§°æ¹éæ¥è¯¢å¯¹è±¡ * * @param ids å¯¹è±¡è±æåç§° 使¯ä¸è½è¶ è¿1000 * @return ä¸å¡å¯¹è±¡ */ @Override public R<List<LinkTypeVO>> selectByIdCollection(List<String> ids) { return R.fail("è·åæ°æ®å¤±è´¥"); } /** * æ¹éæ ¹æ®ä¸»é®è·åä¸å¡ç±»å * * @param pkLinkTypeCollection ä¸å¡ç±»å主é®éå * @return ä¸å¡ç±»åå表ï¼å¦ææä¸åå¨çä¸ä¼è¿åï¼å ¨é¨ä¸åå¨çåè¿å空å表 */ @Override public R<List<LinkTypeVO>> listLinkTypeByOidCollection(List<String> pkLinkTypeCollection) { return R.fail("è·åæ°æ®å¤±è´¥"); } /** * è·åä¸å¡ç±»åï¼åªæé»è®¤å段 * * @param linkTypeId ä¸å¡ç±»åid * @return é»è®¤åæ®µå±æ§ */ @Override public R<LinkTypeVO> getDefaultAttrByLinkId(String linkTypeId) { return R.fail("è·åæ°æ®å¤±è´¥"); } /** * è·åä¸å¡ç±»åï¼æææçåæ®µ * * @param linkTypeId ä¸å¡ç±»åid * @return ææå段 */ @Override public R<LinkTypeVO> getAllAttributeByLinkId(String linkTypeId) { return R.fail("è·åæ°æ®å¤±è´¥"); } /** * è·åä¸å¡ç±»åï¼æææçåæ®µ * * @param linkTypeOid ä¸å¡ç±»åä¸»é® * @return ææå段 */ @Override public R<LinkTypeVO> getAllAttributeByLinkOid(String linkTypeOid) { return R.fail("è·åæ°æ®å¤±è´¥"); } } Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,183 @@ package com.vci.ubcs.omd.feign; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vci.ubcs.omd.entity.LinkType; import com.vci.ubcs.omd.service.ILinkTypeService; import com.vci.ubcs.omd.vo.LinkTypeVO; import com.vci.ubcs.omd.wrapper.LinkTypeWrapper; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import com.vci.ubcs.starter.web.util.VciBaseUtil; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springframework.cglib.beans.BeanMap; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.*; /** * Description: 龿¥ç±»åFeignå®ç°ç±» * * @author LiHang * @date 2023/6/13 */ @ApiIgnore() @RestController @AllArgsConstructor public class LinkTypeClient implements ILinkTypeClient{ private final ILinkTypeService linkTypeService; private final String DOMAIN = "domain"; /** * è·å龿¥ç±»å详æ ä¿¡æ¯ * * @param oid ä¸»é® * @return 龿¥ç±»å详æ ä¿¡æ¯ */ @Override public R<LinkTypeVO> getDetail(String oid) { LinkTypeVO vo = linkTypeService.getLinkTypeByOid(oid); return R.data(vo); } /** * åç §å表æ¥è¯¢ * * @param baseQueryObject æ¥è¯¢æ¡ä»¶å¯¹è±¡ * @return æ¥è¯¢ç»æ */ @Override public R<Page<LinkTypeVO>> getRefPage(BaseQueryObject baseQueryObject) { Map<String, String> conditionMap = baseQueryObject.getConditionMap(); if (conditionMap == null){ conditionMap = new HashMap<>(16); } if (!conditionMap.containsKey(DOMAIN)){ return R.fail("é¢åå¼ä¸è½ä¸ºç©º"); } PageHelper pageHelper = baseQueryObject.getPageHelper(); if (pageHelper == null){ pageHelper = new PageHelper(-1); } String domainValue = conditionMap.get(DOMAIN); VciBaseUtil.alertNotNull(domainValue,"é¢åå¼"); conditionMap.remove(DOMAIN); LinkType queryObj = new LinkType(); BeanMap.create(queryObj).putAll(conditionMap); Query query = new Query(); query.setSize(pageHelper.getLimit()); query.setCurrent(pageHelper.getPage()); IPage<LinkType> page = linkTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getDomain, domainValue).orderByAsc(LinkType::getId)); Page<LinkTypeVO> pageVO = new Page<>(); BeanUtil.copy(page,pageVO); pageVO.setRecords(LinkTypeWrapper.build().listEntityVO(page.getRecords(),null)); R<Page<LinkTypeVO>> r = R.data(pageVO); r.setSuccess(true); return r; } /** * åç §å表æ¥è¯¢ * * @param baseQueryObject æ¥è¯¢æ¡ä»¶å¯¹è±¡ * @return æ¥è¯¢ç»æ */ @Override public R<List<LinkTypeVO>> getRef(BaseQueryObject baseQueryObject) { Map<String, String> conditionMap = baseQueryObject.getConditionMap(); if (conditionMap == null){ conditionMap = new HashMap<>(16); } if (!conditionMap.containsKey(DOMAIN)){ return R.fail("é¢åå¼ä¸è½ä¸ºç©º"); } PageHelper pageHelper = baseQueryObject.getPageHelper(); if (pageHelper == null){ pageHelper = new PageHelper(-1); } String domainValue = conditionMap.get(DOMAIN); VciBaseUtil.alertNotNull(domainValue,"é¢åå¼"); conditionMap.remove(DOMAIN); LinkType queryObj = new LinkType(); BeanMap.create(queryObj).putAll(conditionMap); List<LinkType> doList = linkTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getDomain, domainValue).orderByAsc(LinkType::getId)); return R.data(LinkTypeWrapper.build().listEntityVO(doList,null)); } /** * æ ¹æ®è±æåç§°æ¹éæ¥è¯¢å¯¹è±¡ * * @param ids å¯¹è±¡è±æåç§° 使¯ä¸è½è¶ è¿1000 * @return ä¸å¡å¯¹è±¡ */ @Override public R<List<LinkTypeVO>> selectByIdCollection(List<String> ids) { Func.requireNotNull(ids,"龿¥ç±»åè±æåç§°"); List<LinkTypeVO> voList = LinkTypeWrapper.build().listEntityVO( Optional.ofNullable(linkTypeService.list( Wrappers.<LinkType>query().lambda().in(LinkType::getId, ids) ) ).orElseGet(ArrayList::new),null ); return R.data(voList); } /** * æ¹éæ ¹æ®ä¸»é®è·å龿¥ç±»å * * @param pkLinkTypeCollection 龿¥ç±»å主é®éå * @return 龿¥ç±»åå表ï¼å¦ææä¸åå¨çä¸ä¼è¿åï¼å ¨é¨ä¸åå¨çåè¿å空å表 */ @Override public R<List<LinkTypeVO>> listLinkTypeByOidCollection(List<String> pkLinkTypeCollection) { Func.requireNotNull(pkLinkTypeCollection,"龿¥ç±»å主é®"); List<LinkTypeVO> voList = LinkTypeWrapper.build().listEntityVO( Optional.ofNullable(linkTypeService.list( Wrappers.<LinkType>query().lambda().in(LinkType::getOid, pkLinkTypeCollection) ) ).orElseGet(ArrayList::new),null ); return R.data(voList); } /** * è·å龿¥ç±»åï¼åªæé»è®¤å段 * * @param linkTypeId 龿¥ç±»åID * @return é»è®¤åæ®µå±æ§ */ @Override public R<LinkTypeVO> getDefaultAttrByLinkId(String linkTypeId) { return R.data(linkTypeService.getLinkTypeDefaultAttrById(linkTypeId)); } /** * è·å龿¥ç±»åï¼æææçåæ®µ * * @param linkTypeId 龿¥ç±»åid * @return ææå段 */ @Override public R<LinkTypeVO> getAllAttributeByLinkId(String linkTypeId) { return R.data(linkTypeService.getLinkTypeAllAttrById(linkTypeId)); } /** * è·å龿¥ç±»åï¼æææçåæ®µ * * @param linkTypeOid 龿¥ç±»åä¸»é® * @return ææå段 */ @Override public R<LinkTypeVO> getAllAttributeByLinkOid(String linkTypeOid) { return R.data(linkTypeService.getLinkTypeAllAttrByOid(linkTypeOid)); } } Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILinkTypeService.java
@@ -8,6 +8,7 @@ import com.vci.ubcs.omd.vo.LinkTypeVO; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import org.springblade.core.mp.base.BaseService; import java.util.Collection; import java.util.List; @@ -20,7 +21,7 @@ * @author LiHang * @date 2023/5/24 */ public interface ILinkTypeService extends IService<LinkType> { public interface ILinkTypeService extends BaseService<LinkType> { /** * è·å龿¥ç±»åå表 @@ -209,4 +210,28 @@ * @return æ¥è¯¢ç»æ */ List<BtmTreeVO> treeDomain(); /** * è·å龿¥ç±»åï¼åªæé»è®¤å段 * * @param linkTypeId 龿¥ç±»åid * @return é»è®¤åæ®µå±æ§ */ LinkTypeVO getLinkTypeDefaultAttrById(String linkTypeId); /** * è·å龿¥ç±»åï¼æææçåæ®µ * * @param linkTypeId 龿¥ç±»åid * @return ææå段 */ LinkTypeVO getLinkTypeAllAttrById(String linkTypeId); /** * è·å龿¥ç±»åï¼æææçåæ®µ * * @param linkTypeOid 龿¥ç±»åä¸»é® * @return ææå段 */ LinkTypeVO getLinkTypeAllAttrByOid(String linkTypeOid); } Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
@@ -45,6 +45,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.util.CollectionUtils; import javax.validation.constraints.NotEmpty; import java.util.*; import java.util.stream.Collectors; @@ -901,4 +902,56 @@ throw new RuntimeException(e); } } @Override public boolean deleteLogic(@NotEmpty List<Long> ids) { return false; } @Override public boolean changeStatus(@NotEmpty List<Long> ids, Integer status) { return false; } /** * è·å龿¥ç±»åï¼åªæé»è®¤å段 * * @param linkTypeId 龿¥ç±»åid * @return é»è®¤åæ®µå±æ§ */ @Override public LinkTypeVO getLinkTypeDefaultAttrById(String linkTypeId) { LinkTypeVO vo = getLinkTypeById(linkTypeId); List<LinkTypeAttributeVO> attributes = linkTypeAttributeService.getDefaultAttributes(vo); vo.setAttributes(attributes); return vo; } /** * è·å龿¥ç±»åï¼æææçåæ®µ * * @param linkTypeId 龿¥ç±»åid * @return ææå段 */ @Override public LinkTypeVO getLinkTypeAllAttrById(String linkTypeId) { LinkTypeVO vo = getLinkTypeById(linkTypeId); List<LinkTypeAttributeVO> attributes = linkTypeAttributeService.getAllAttributes(vo); vo.setAttributes(attributes); return vo; } /** * è·å龿¥ç±»åï¼æææçåæ®µ * * @param linkTypeOid 龿¥ç±»åä¸»é® * @return ææå段 */ @Override public LinkTypeVO getLinkTypeAllAttrByOid(String linkTypeOid) { LinkTypeVO vo = getLinkTypeByOid(linkTypeOid); List<LinkTypeAttributeVO> attributes = linkTypeAttributeService.getAllAttributes(vo); vo.setAttributes(attributes); return vo; } }