From a2d3b29f0a617d931a0cb170c4ce7f9c32363531 Mon Sep 17 00:00:00 2001 From: nmy <849173236@qq.com> Date: Mon, 4 Dec 2023 18:14:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/equip/vo/MaDevInfoVo.java | 7 +++--- .../equip/controller/UpOffController.java | 15 ++++-------- .../zlpt/equip/mapper/DevInfoMapper.java | 10 ++++---- .../bonus/zlpt/equip/mapper/UpOffMapper.java | 9 +++---- .../zlpt/equip/service/ITypeInfoService.java | 2 +- .../zlpt/equip/service/IUpOffService.java | 12 +++++----- .../service/impl/DevInfoServiceImpl.java | 4 ++++ .../equip/service/impl/UpOffServiceImpl.java | 24 +++++++++---------- .../main/resources/mapper/FileInfoMapper.xml | 10 ++++---- .../src/main/resources/mapper/UpOffMapper.xml | 10 ++++---- 10 files changed, 51 insertions(+), 52 deletions(-) rename zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/vo/DevInfoVo.java => zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/MaDevInfoVo.java (80%) diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/vo/DevInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/MaDevInfoVo.java similarity index 80% rename from zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/vo/DevInfoVo.java rename to zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/MaDevInfoVo.java index 8ed0d61..f486f1d 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/vo/DevInfoVo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/MaDevInfoVo.java @@ -1,12 +1,13 @@ -package com.bonus.zlpt.equip.vo; +package com.bonus.zlpt.common.core.domain.equip.vo; -import com.bonus.zlpt.equip.domain.DevInfo; + +import com.bonus.zlpt.common.core.domain.equip.DevInfo; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -public class DevInfoVo extends DevInfo { +public class MaDevInfoVo extends DevInfo { //企业名称 diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java index 67e3e6f..bc10571 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java @@ -1,7 +1,6 @@ package com.bonus.zlpt.equip.controller; import java.util.List; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; import com.bonus.zlpt.common.core.web.controller.BaseController; @@ -10,15 +9,9 @@ import com.bonus.zlpt.common.core.web.page.TableDataInfo; import com.bonus.zlpt.common.log.annotation.Log; import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.security.annotation.RequiresPermissions; -import com.bonus.zlpt.equip.domain.DevInfo; -import com.bonus.zlpt.equip.domain.FileInfo; -import com.bonus.zlpt.equip.domain.TypeInfo; -import com.bonus.zlpt.equip.dto.UpOffDto; -import com.bonus.zlpt.equip.mapper.FileInfoMapper; -import com.bonus.zlpt.equip.service.IDevInfoService; -import com.bonus.zlpt.equip.service.IFileInfoService; -import com.bonus.zlpt.equip.service.ITypeInfoService; -import com.bonus.zlpt.equip.vo.DevInfoVo; + +import com.bonus.zlpt.common.core.domain.equip.dto.UpOffDto; +import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -69,7 +62,7 @@ public class UpOffController extends BaseController public TableDataInfo selectList(@RequestBody UpOffDto upOffDto){ startPage(); - List devInfoVos = upOffService.selectList(upOffDto); + List devInfoVos = upOffService.selectList(upOffDto); return getDataTable(devInfoVos); } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java index fd3a4f3..9987bd4 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java @@ -1,9 +1,9 @@ package com.bonus.zlpt.equip.mapper; import java.util.List; -import com.bonus.zlpt.equip.domain.DevInfo; -import com.bonus.zlpt.equip.dto.UpOffDto; -import com.bonus.zlpt.equip.vo.DevInfoVo; + +import com.bonus.zlpt.common.core.domain.equip.DevInfo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; /** * 设备信息Mapper接口 @@ -19,7 +19,7 @@ public interface DevInfoMapper * @param maId 设备信息主键 * @return 设备信息 */ - public DevInfo selectDevInfoByMaId(Long maId); + public DevInfoVo selectDevInfoByMaId(Long maId); /** * 查询设备信息列表 @@ -27,7 +27,7 @@ public interface DevInfoMapper * @param devInfo 设备信息 * @return 设备信息集合 */ - public List selectDevInfoList(DevInfo devInfo); + public List selectDevInfoList(DevInfo devInfo); /** * 新增设备信息 diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java index 8f2b356..bba784b 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java @@ -1,9 +1,10 @@ package com.bonus.zlpt.equip.mapper; import java.util.List; -import com.bonus.zlpt.equip.domain.UpOff; -import com.bonus.zlpt.equip.dto.UpOffDto; -import com.bonus.zlpt.equip.vo.DevInfoVo; + +import com.bonus.zlpt.common.core.domain.equip.UpOff; +import com.bonus.zlpt.common.core.domain.equip.dto.UpOffDto; +import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo; /** * 设备上下架管理 @@ -80,5 +81,5 @@ public interface UpOffMapper * @param upOffDto * @return */ - List selectList(UpOffDto upOffDto); + List selectList(UpOffDto upOffDto); } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/ITypeInfoService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/ITypeInfoService.java index f4383ee..1335128 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/ITypeInfoService.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/ITypeInfoService.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNode; import cn.hutool.core.lang.tree.TreeUtil; -import com.bonus.zlpt.equip.domain.TypeInfo; +import com.bonus.zlpt.common.core.domain.equip.TypeInfo; /** * 设备类型Service接口 diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java index d38a7c3..b0cfb94 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java @@ -2,10 +2,10 @@ package com.bonus.zlpt.equip.service; import java.util.List; -import com.bonus.zlpt.common.core.web.domain.AjaxResult; -import com.bonus.zlpt.equip.domain.UpOff; -import com.bonus.zlpt.equip.dto.UpOffDto; -import com.bonus.zlpt.equip.vo.DevInfoVo; + +import com.bonus.zlpt.common.core.domain.equip.UpOff; +import com.bonus.zlpt.common.core.domain.equip.dto.UpOffDto; +import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo; /** * 设备上下架管理 @@ -83,7 +83,7 @@ public interface IUpOffService * @param upOffDto * @return */ - List selectList(UpOffDto upOffDto); + List selectList(UpOffDto upOffDto); - List selectInfo(List ids); + List selectInfo(List ids); } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java index bed762b..fe7a4c2 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java @@ -2,7 +2,9 @@ package com.bonus.zlpt.equip.service.impl; import java.util.List; + import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; + import com.bonus.zlpt.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +36,8 @@ public class DevInfoServiceImpl implements IDevInfoService return devInfoMapper.selectDevInfoByMaId(maId); } + + /** * 查询设备信息列表 * diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java index 5744f2a..30ad18b 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java @@ -3,13 +3,13 @@ package com.bonus.zlpt.equip.service.impl; import java.util.List; import java.util.stream.Collectors; -import com.bonus.zlpt.equip.domain.FileInfo; -import com.bonus.zlpt.equip.domain.TypeInfo; -import com.bonus.zlpt.equip.dto.UpOffDto; + +import com.bonus.zlpt.common.core.domain.equip.FileInfo; +import com.bonus.zlpt.common.core.domain.equip.TypeInfo; +import com.bonus.zlpt.common.core.domain.equip.dto.UpOffDto; import com.bonus.zlpt.equip.mapper.FileInfoMapper; import com.bonus.zlpt.equip.mapper.TypeInfoMapper; -import com.bonus.zlpt.equip.service.ITypeInfoService; -import com.bonus.zlpt.equip.vo.DevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.zlpt.equip.mapper.UpOffMapper; @@ -128,10 +128,10 @@ public class UpOffServiceImpl implements IUpOffService * @return */ @Override - public List selectList(UpOffDto upOffDto) { + public List selectList(UpOffDto upOffDto) { - List devInfoVos = upOffMapper.selectList(upOffDto); - for (DevInfoVo devInfoVo : devInfoVos) { + List devInfoVos = upOffMapper.selectList(upOffDto); + for (MaDevInfoVo devInfoVo : devInfoVos) { //组装装备名称 当前数据装备类型名称 + 设备型号 devInfoVo.buildDevName(); TypeInfo typeInfo = typeInfoMapper.selectTypeInfoByTypeId(devInfoVo.getTypeId()); @@ -142,15 +142,15 @@ public class UpOffServiceImpl implements IUpOffService } @Override - public List selectInfo(List ids) { + public List selectInfo(List ids) { - List devInfoVos = selectList(new UpOffDto()); + List devInfoVos = selectList(new UpOffDto()); //去重 devInfoVos = devInfoVos.stream() .filter(devInfoVo -> ids.contains(devInfoVo.getMaId())) .collect(Collectors.toList()); - for (DevInfoVo devInfoVo : devInfoVos) { + for (MaDevInfoVo devInfoVo : devInfoVos) { //组装装备名称 当前数据装备类型名称 + 设备型号 devInfoVo.buildDevName(); TypeInfo typeInfo = typeInfoMapper.selectTypeInfoByTypeId(devInfoVo.getTypeId()); @@ -158,7 +158,7 @@ public class UpOffServiceImpl implements IUpOffService devInfoVo.setParentDevType(typeInfo1.getTypeName()); } - for (DevInfoVo devInfoVo : devInfoVos) { + for (MaDevInfoVo devInfoVo : devInfoVos) { //组装url List fileInfos = fileInfoMapper.selectByMaId(devInfoVo.getMaId()); for (FileInfo fileInfo : fileInfos) { diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/FileInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/FileInfoMapper.xml index dda9b82..3f2bbb6 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/FileInfoMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/FileInfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, ma_id, file_name, file_url, type from ma_file_info - and ma_id = #{maId} @@ -31,11 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - select f.* from ma_dev_info d,ma_file_info f where d.ma_id=f.ma_id - + insert into ma_file_info id, @@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ma_file_info ma_id = #{maId}, diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml index bce621d..18e7127 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, ma_id, apply_time, apply_user, apply_company, type, audit_user, audit_time, status from ma_up_off - and ma_id = #{maId} @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select d.*,c.company_name companyName,t.type_name devTypeName from @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into ma_up_off id, @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ma_up_off ma_id = #{maId},