From d9f77c5f5d08e558bc8250e491bcaf65c3364a8a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 25 Jan 2024 13:56:28 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=80=83=E6=A0=B8=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/supervise/api/ClassifyApi.java | 17 ++++++- .../mapper/IndicatorsAnnexMapper.java | 6 +++ .../mapper/IndicatorsAnnexMapper.xml | 3 ++ .../supervise/mapper/IndicatorsMapper.java | 2 +- .../supervise/mapper/IndicatorsMapper.xml | 14 +++--- .../supervise/service/IClassifyService.java | 7 +++ .../service/impl/ClassifyServiceImpl.java | 49 ++++++++++++++++--- 7 files changed, 80 insertions(+), 18 deletions(-) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java index 923f924f6..ac8765a79 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java @@ -62,12 +62,25 @@ public class ClassifyApi { @GetMapping("/myApiIndicatorsDetail") @ApiOperationSupport(order = 1) @ApiOperation(value = "我的考核列表") - public R myApiIndicatorsDetail(@RequestParam Long Id) { - R r = classifyService.myApiIndicatorsDetail(Id); + public R myApiIndicatorsDetail(@RequestParam Long id) { + R r = classifyService.myApiIndicatorsDetail(id); return r; } + @PostMapping("/updateApiIndicators") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "小程序保存考核内容", notes = "传入classify") + public R updateApiIndicators(@RequestBody IndicatorsDTO instanceofDTO) { + R r = classifyService.updateApiIndicators(instanceofDTO); + return r; + } + + + + + + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java index 91c5096d6..5eea3b1a5 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java @@ -12,4 +12,10 @@ public interface IndicatorsAnnexMapper extends BaseMapper List findListByIndicatorsIdAndType(@Param("id") Long id, @Param("type") int type); + + /** + * \进行考核的资源文件删除 + * @param id + */ + void deleteResourceByInstanceoId(@Param("indicatorsId") Long indicatorsId); } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml index 28c3ee5da..8a2aa471d 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml @@ -1,6 +1,9 @@ + + DELETE FROM sup_indicators_annex WHERE indicators_id = #{indicatorsId} + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java index aec0c6dec..558c3d38c 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java @@ -79,4 +79,11 @@ public interface IClassifyService extends BaseService { * @return */ R myApiIndicatorsDetail(Long id); + + /** + * 修改考核详情 + * @param instanceofDTO + * @return + */ + R updateApiIndicators(IndicatorsDTO instanceofDTO); } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index a3da9857c..1df3e59c1 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -27,6 +27,7 @@ import com.logpm.supervise.entity.IndicatorsAnnexEntity; import com.logpm.supervise.entity.IndicatorsEntity; import com.logpm.supervise.entity.PointsEntity; import com.logpm.supervise.mapper.ClassifyMapper; +import com.logpm.supervise.mapper.IndicatorsAnnexMapper; import com.logpm.supervise.mapper.IndicatorsMapper; import com.logpm.supervise.service.IClassifyService; import com.logpm.supervise.service.IIndicatorsAnnexService; @@ -66,6 +67,8 @@ public class ClassifyServiceImpl extends BaseServiceImpl> resourceList = instanceofDTO.getResourceList(); - for (Map map : resourceList) { - IndicatorsAnnexEntity indicatorsAnnexEntity = Func.copy(map, IndicatorsAnnexEntity.class); - indicatorsAnnexService.save(indicatorsAnnexEntity); - } + handleResource(resourceList,indicatorsEntity.getId()); + } + return R.status(true); + } + + @Transactional + private void handleResource(List> resourceList, Long id) { + for (Map map : resourceList) { + IndicatorsAnnexEntity indicatorsAnnexEntity = Func.copy(map, IndicatorsAnnexEntity.class); + indicatorsAnnexEntity.setIndicatorsId(id); + indicatorsAnnexService.save(indicatorsAnnexEntity); } - //保存考核内容 - IndicatorsEntity indicatorsEntity = Func.copy(instanceofDTO, IndicatorsEntity.class); - return R.status(iIndicatorsService.save(indicatorsEntity)); } @Override public R selectMyApiIndicators(Map params, IPage page) { Long userId = AuthUtil.getUserId(); + if (Func.isEmpty(userId)){ + return null; + } + params.put("userId",userId); Page indicatorsVOPage = indicatorsMapper.selectMyApiIndicators(page,params); return R.data(indicatorsVOPage); } @@ -223,12 +240,28 @@ public class ClassifyServiceImpl extends BaseServiceImpl annexEntityList = indicatorsAnnexService.list(Wrappers.query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, instanceofDTO.getId())); + if (Func.isNotEmpty(annexEntityList)){ + //进行附件文件信息删除 + indicatorsAnnexMapper.deleteResourceByInstanceoId(instanceofDTO.getId()); + } + if (Func.isNotEmpty(instanceofDTO.getResourceList())){ + handleResource(instanceofDTO.getResourceList(), instanceofDTO.getId()); + } + IndicatorsEntity indicatorsEntity = Func.copy(instanceofDTO, IndicatorsEntity.class); + return R.status(iIndicatorsService.updateById(indicatorsEntity)); + } + private List getClassifyList(Long pid) { return baseMapper.selectAllClassifyList(pid); } From 29c9ab0fb0f3d5dd55005c21929ea574de22d91f Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 26 Jan 2024 18:01:04 +0800 Subject: [PATCH 2/9] =?UTF-8?q?1.=E4=B8=8A=E6=9E=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BA=93=E4=BD=8D=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/WarehouseUpdownTypeApiController.java | 41 +++++++++++++++++++ .../mapper/WarehouseUpdownGoodsMapper.java | 2 + .../mapper/WarehouseUpdownGoodsMapper.xml | 12 ++++++ .../service/IWarehouseUpdownGoodsService.java | 1 + .../service/IWarehouseUpdownTypeService.java | 2 + .../impl/WarehouseUpdownGoodsServiceImpl.java | 5 +++ .../impl/WarehouseUpdownTypeServiceImpl.java | 8 ++++ 7 files changed, 71 insertions(+) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index 40929d03f..e4c831265 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java @@ -143,6 +143,47 @@ public class WarehouseUpdownTypeApiController { } + @ResponseBody + @PostMapping("/orderUpshelfDetailByAllocationId") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "已上架订单详情", notes = "传入trayTypeDTO") + public R orderUpshelfDetailByAllocationId(@RequestBody UpdownTypeDTO updownTypeDTO ) { + String method = "###########orderUpshelfDetailByAllocationId: "; + log.info(method + "已上架订单详情 updownTypeDTO={}", updownTypeDTO); + String orderCode = updownTypeDTO.getOrderCode(); + Long allocationId = updownTypeDTO.getAllocationId(); + try{ + + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息不能为空"); + return R.fail(403,"仓库信息不能为空"); + } + + if(Objects.isNull(allocationId)){ + log.warn(method+"库位id为空 allocationId={}",allocationId); + return R.fail(403,"库位id为空"); + } + + if(StringUtil.isBlank(orderCode)){ + log.warn(method+"订单编码不能为空 orderCode={}",orderCode); + return R.fail(403,"订单编码不能为空"); + } + + //查询该库位的货物信息 + List orderPackageCodes = warehouseUpdownTypeService.orderUpshelfDetailByAllocationId(orderCode,allocationId,myCurrentWarehouse.getId()); + return R.data(orderPackageCodes); + }catch (CustomerException e){ + log.warn(e.message); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常，联系管理员",e); + return R.fail(500,"系统异常，联系管理员"); + } + + } + + @ResponseBody @PostMapping("/upShelfOrder") @ApiOperationSupport(order = 1) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java index 0faab8128..d1f96bf6c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java @@ -124,6 +124,8 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper findStockOrderDetailList(@Param("allocationId") Long allocationId, @Param("warehouseId") Long warehouseId); + List orderUpshelfDetailByAllocationId(@Param("orderCode") String orderCode, @Param("allocationId") Long allocationId, @Param("warehouseId") Long warehouseId); + // /** // * 根据货位查询货物 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml index 69caccb9a..2cf8257b8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml @@ -468,4 +468,16 @@ and lwug.association_type = '4' + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java index 1e129ce68..cbf908562 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java @@ -149,4 +149,5 @@ public interface IWarehouseUpdownGoodsService extends BaseService findStockOrderDetailList(Long allocationId, Long warehouseId); + List orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java index 6bfb140ac..213e9934c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java @@ -86,4 +86,6 @@ public interface IWarehouseUpdownTypeService extends BaseService upShelfPackageList, Long warehouseId); R findAllocationData(Long allocationId, Long warehouseId); + + List orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index e94a3b4e2..157783fbd 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -253,4 +253,9 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId) { + return baseMapper.orderUpshelfDetailByAllocationId(orderCode,allocationId,warehouseId); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 52d668835..c338a7f16 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -148,6 +148,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId) { + + List ls = warehouseUpdownGoodsService.orderUpshelfDetailByAllocationId(orderCode,allocationId,warehouseId); + + return ls; + } + private void packageChangeStockByAllocaton(WarehouseUpdownGoodsEntity one) { //当前登录人选择的仓库 From 14fb462213f50e7f836d39ddaa2c9ab1a2d53cc1 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 26 Jan 2024 18:06:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E7=BD=91=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/launch/LauncherServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index 2749bc113..7d5c44bb6 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -41,10 +41,10 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); From f68f7c477521eaa6dc4824cf0498c40440112965 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jan 2024 22:35:27 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=80=83=E6=A0=B8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/supervise/api/ClassifyApi.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java index de3730577..d0022cc10 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java @@ -76,23 +76,4 @@ public class ClassifyApi { return r; } - @PostMapping("/updateApiIndicators") - @ApiOperationSupport(order = 1) - @ApiOperation(value = "小程序保存考核内容", notes = "传入classify") - public R updateApiIndicators(@RequestBody IndicatorsDTO instanceofDTO) { - R r = classifyService.updateApiIndicators(instanceofDTO); - return r; - } - - - - - - - - - - - - } From 8074c738140bb287a9571466d188cbbee46aa1f9 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jan 2024 22:45:35 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=80=83=E6=A0=B8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/supervise/vo/api/ClassifyApiVO.java | 3 ++ .../service/impl/ClassifyServiceImpl.java | 15 ++++-- .../supervise/wrapper/PointsWrapper.java | 47 +++++++++++++++++++ 3 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/PointsWrapper.java diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java index f07fff9da..d5d47ee65 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java @@ -2,6 +2,7 @@ package com.logpm.supervise.vo.api; import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.vo.PointsVO; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,4 +13,6 @@ import java.util.List; public class ClassifyApiVO extends ClassifyEntity { private List children; + + private List pointsVOS; } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index 22634dbd9..f9cb19af6 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -37,6 +37,7 @@ import com.logpm.supervise.vo.ClassifyVO; import com.logpm.supervise.vo.IndicatorsVO; import com.logpm.supervise.vo.api.ClassifyApiVO; import com.logpm.supervise.wrapper.IndicatorsWrapper; +import com.logpm.supervise.wrapper.PointsWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; @@ -195,9 +196,17 @@ public class ClassifyServiceImpl extends BaseServiceImpl classifyEntities = getClassifyList(pid); for (ClassifyApiVO classifyEntity : classifyEntities) { - List classifyList = getClassifyList(classifyEntity.getId()); - if (!Objects.isNull(classifyList)){ - classifyEntity.setChildren(classifyList); + if (!classifyEntity.getPId().equals(0L)){ + List classifyList = getClassifyList(classifyEntity.getId()); + List list = pointsService.list(Wrappers.query().lambda() + .eq(PointsEntity::getClassifyId, classifyEntity.getId()) + ); + if (!Objects.isNull(classifyList)){ + classifyEntity.setChildren(classifyList); + if(Func.isNotEmpty(list)){ + classifyEntity.setPointsVOS(PointsWrapper.build().listVO(list)); + } + } } } return classifyEntities; diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/PointsWrapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/PointsWrapper.java new file mode 100644 index 000000000..1995aa499 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/PointsWrapper.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.wrapper; + +import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.entity.PointsEntity; +import com.logpm.supervise.vo.IndicatorsVO; +import com.logpm.supervise.vo.PointsVO; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; + +import java.util.Objects; + +/** + * 分类指标表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2024-01-23 + */ +public class PointsWrapper extends BaseEntityWrapper { + + public static PointsWrapper build() { + return new PointsWrapper(); + } + + @Override + public PointsVO entityVO(PointsEntity pointsEntity) { + PointsVO pointsVO = Objects.requireNonNull(BeanUtil.copy(pointsEntity, PointsVO.class)); + return pointsVO; + } + + +} From ca86bdc00b5b0f9006c375196e2091de2987f5da Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jan 2024 23:03:03 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=80=83=E6=A0=B8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/supervise/service/impl/ClassifyServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index f9cb19af6..c33cf4f86 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -200,6 +200,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl classifyList = getClassifyList(classifyEntity.getId()); List list = pointsService.list(Wrappers.query().lambda() .eq(PointsEntity::getClassifyId, classifyEntity.getId()) + .ne(PointsEntity::getPoint, pid) ); if (!Objects.isNull(classifyList)){ classifyEntity.setChildren(classifyList); From 04fb9379ca72abbd34004376710f87a2914db73a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jan 2024 23:09:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=80=83=E6=A0=B8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/supervise/mapper/ClassifyMapper.xml | 2 +- .../com/logpm/supervise/service/impl/ClassifyServiceImpl.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml index 4f36e4257..09ba02a81 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml @@ -56,7 +56,7 @@