From 6f2c413ef44a18577bea42d503cca1698d5f67eb Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 16 Dec 2024 13:31:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/book/domain/BookCarInfoDto.java | 2 ++ .../main/resources/mapper/material/bookcar/BookCarMapper.xml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java index 2790baf..8d9d5ef 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java @@ -67,5 +67,7 @@ public class BookCarInfoDto { @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + private String address; + private List detailList; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml index bdfb3e0..179a374 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into book_car_detail(ma_id, order_status, order_company, order_user, creater, create_time) + insert into book_car_detail(ma_id, order_status, order_company, order_user, address creater, create_time) values(#{maId}, 0, #{orderCompany}, #{orderUser}, #{creater}, now()) @@ -37,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" c.company_id as companyId, c.operate_address as operateAddress, d.create_time as createTime, - bcd.order_user as orderUser + bcd.order_user as orderUser, + bcd.address as address FROM ma_dev_info d LEFT JOIN bm_company_info c ON d.own_co = c.company_id LEFT JOIN book_car_detail bcd ON d.ma_id = bcd.ma_id From c76fac5e5519b36a6c0f2b4629d2ad88289168d9 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 16 Dec 2024 16:52:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/domain/TreeNode.java | 3 +++ .../com/bonus/common/biz/domain/TypeInfo.java | 3 +++ .../bonus/material/device/domain/DevInfo.java | 3 +++ .../service/impl/DevInfoServiceImpl.java | 1 + .../home/mapper/MaTypeInfoMapper.java | 2 ++ .../service/impl/MaTypeInfoServiceImpl.java | 27 +++++++++++++++++++ .../mapper/material/bookcar/BookCarMapper.xml | 4 +-- .../mapper/material/home/MaTypeInfoMapper.xml | 6 +++++ 8 files changed, 47 insertions(+), 2 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java index 37e522d..e2d268b 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java @@ -46,6 +46,9 @@ public class TreeNode { @ApiModelProperty(value = "实时库存") private Long storageNum; + // 上架数 + private Integer maCount; + private String remark; private List maTypeProperties; diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TypeInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TypeInfo.java index dabd7a9..397c6d3 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TypeInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TypeInfo.java @@ -62,6 +62,9 @@ public class TypeInfo extends BaseEntity @ApiModelProperty(value = "父部门名称", required = true) private String parentName; + @ApiModelProperty(value = "上架数") + private Integer maCount; + /** 子部门 */ @ApiModelProperty(value = "子部门", required = true) private List children = new ArrayList(); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java index 31fbc28..e3a4b5d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java @@ -224,6 +224,9 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "检测证明、检验pdf") private List examinationPdf = new ArrayList<>(); + @ApiModelProperty(value = "唯一标识符列表") + private List identifyCodes = new ArrayList<>(); + @ApiModelProperty(value = "合格证、保险pdf") private List> insurancePdfs = new ArrayList<>(); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index 73ee4b9..ce60aa8 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -334,6 +334,7 @@ public class DevInfoServiceImpl implements DevInfoService { devInfo.setCode(code); devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); devInfo.setDeviceCount(1); + devInfo.setIdentifyCode(devInfo.getIdentifyCodes().get(i)); int saveSuccessNum = devInfoMapper.insertDevInfo(devInfo); code = ""; if (saveSuccessNum == 0) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/mapper/MaTypeInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/mapper/MaTypeInfoMapper.java index 687af6c..b2f2457 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/mapper/MaTypeInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/mapper/MaTypeInfoMapper.java @@ -21,6 +21,8 @@ public interface MaTypeInfoMapper { */ public List getMaTypeInfoList(TypeInfo typeInfo) ; + List getMaCountByTypeId(TypeInfo typeInfo) ; + /** * 热搜设备 * @param devInfoVo diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java index 683768e..83aa669 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java @@ -5,7 +5,9 @@ import com.bonus.common.biz.domain.TreeNode; import com.bonus.common.biz.domain.TypeInfo; import com.bonus.common.biz.domain.vo.AreaVo; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.book.domain.CompanyPersonPhoneKey; import com.bonus.material.device.domain.vo.DevInfoVo; +import com.bonus.material.device.mapper.DevInfoMapper; import com.bonus.material.home.mapper.MaTypeInfoMapper; import com.bonus.material.home.service.MaTypeInfoSevice; import com.bonus.material.ma.mapper.MaTypeMapper; @@ -31,6 +33,9 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice { @Resource private MaTypeMapper maTypeMapper; + @Resource + private DevInfoMapper devInfoMapper; + /** * 首页查询分类树 * @return @@ -41,6 +46,28 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice { List list = new ArrayList<>(); try { list = maTypeInfoMapper.getMaTypeInfoList(typeInfo); + List typeCountList = maTypeInfoMapper.getMaCountByTypeId(typeInfo); + // 计算4级菜单的上架数 + for (TreeNode treeNode : list) { + for (TypeInfo typeCount : typeCountList) { + treeNode.setMaCount(0); + if ("4".equals(treeNode.getLevel()) && treeNode.getId() == typeCount.getTypeId().longValue()) { + treeNode.setMaCount(typeCount.getMaCount()); + } + } + } + // 计算3级菜单的上架数 + Map> maTypeCountMap = list.stream().filter(o -> "4".equals(o.getLevel())).collect(Collectors.groupingBy(TreeNode::getParentId)); + for (TreeNode treeNode : list) { + List mapValues = maTypeCountMap.get(treeNode.getId()); + if (CollectionUtils.isNotEmpty(mapValues)) { + int sum = 0; + for (TreeNode node : mapValues) { + sum += node.getMaCount() == null ? 0 : node.getMaCount(); + } + treeNode.setMaCount(sum); + } + } //填充自定义属性 fillProperties(list); if (CollectionUtils.isNotEmpty(list)) { diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml index 179a374..cc2d815 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml @@ -5,8 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into book_car_detail(ma_id, order_status, order_company, order_user, address creater, create_time) - values(#{maId}, 0, #{orderCompany}, #{orderUser}, #{creater}, now()) + insert into book_car_detail(ma_id, order_status, order_company, order_user, address, creater, create_time) + values(#{maId}, 0, #{orderCompany}, #{orderUser}, #{address}, #{creater}, now()) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml index 120f4b0..befc01c 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml @@ -78,6 +78,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = '0' + +