bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【修改】代码位置修改

This commit is contained in:
nmy 2023-12-04 18:14:32 +08:00
parent a6ad9f8c7e
commit a2d3b29f0a
10 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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
View File

@ -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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class DevInfoVo extends DevInfo { public class MaDevInfoVo extends DevInfo {
//企业名称 //企业名称

15
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
View File

@ -1,7 +1,6 @@
package com.bonus.zlpt.equip.controller; package com.bonus.zlpt.equip.controller;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
import com.bonus.zlpt.common.core.web.controller.BaseController; 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.annotation.Log;
import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.log.enums.BusinessType;
import com.bonus.zlpt.common.security.annotation.RequiresPermissions; 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.common.core.domain.equip.dto.UpOffDto;
import com.bonus.zlpt.equip.domain.TypeInfo; import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo;
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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -69,7 +62,7 @@ public class UpOffController extends BaseController
public TableDataInfo selectList(@RequestBody UpOffDto upOffDto){ public TableDataInfo selectList(@RequestBody UpOffDto upOffDto){
startPage(); startPage();
List<DevInfoVo> devInfoVos = upOffService.selectList(upOffDto); List<MaDevInfoVo> devInfoVos = upOffService.selectList(upOffDto);
return getDataTable(devInfoVos); return getDataTable(devInfoVos);
} }

10
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
View File

@ -1,9 +1,9 @@
package com.bonus.zlpt.equip.mapper; package com.bonus.zlpt.equip.mapper;
import java.util.List; import java.util.List;
import com.bonus.zlpt.equip.domain.DevInfo;
import com.bonus.zlpt.equip.dto.UpOffDto; import com.bonus.zlpt.common.core.domain.equip.DevInfo;
import com.bonus.zlpt.equip.vo.DevInfoVo; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
/** /**
* 设备信息Mapper接口 * 设备信息Mapper接口
@ -19,7 +19,7 @@ public interface DevInfoMapper
* @param maId 设备信息主键 * @param maId 设备信息主键
* @return 设备信息 * @return 设备信息
*/ */
public DevInfo selectDevInfoByMaId(Long maId); public DevInfoVo selectDevInfoByMaId(Long maId);
/** /**
* 查询设备信息列表 * 查询设备信息列表
@ -27,7 +27,7 @@ public interface DevInfoMapper
* @param devInfo 设备信息 * @param devInfo 设备信息
* @return 设备信息集合 * @return 设备信息集合
*/ */
public List<DevInfo> selectDevInfoList(DevInfo devInfo); public List<DevInfoVo> selectDevInfoList(DevInfo devInfo);
/** /**
* 新增设备信息 * 新增设备信息

9
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java
View File

@ -1,9 +1,10 @@
package com.bonus.zlpt.equip.mapper; package com.bonus.zlpt.equip.mapper;
import java.util.List; import java.util.List;
import com.bonus.zlpt.equip.domain.UpOff;
import com.bonus.zlpt.equip.dto.UpOffDto; import com.bonus.zlpt.common.core.domain.equip.UpOff;
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;
/** /**
* 设备上下架管理 * 设备上下架管理
@ -80,5 +81,5 @@ public interface UpOffMapper
* @param upOffDto * @param upOffDto
* @return * @return
*/ */
List<DevInfoVo> selectList(UpOffDto upOffDto); List<MaDevInfoVo> selectList(UpOffDto upOffDto);
} }

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/ITypeInfoService.java
View File

@ -6,7 +6,7 @@ import java.util.stream.Collectors;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNode; import cn.hutool.core.lang.tree.TreeNode;
import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.TreeUtil;
import com.bonus.zlpt.equip.domain.TypeInfo; import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
/** /**
* 设备类型Service接口 * 设备类型Service接口

12
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java
View File

@ -2,10 +2,10 @@ package com.bonus.zlpt.equip.service;
import java.util.List; import java.util.List;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.equip.domain.UpOff; import com.bonus.zlpt.common.core.domain.equip.UpOff;
import com.bonus.zlpt.equip.dto.UpOffDto; import com.bonus.zlpt.common.core.domain.equip.dto.UpOffDto;
import com.bonus.zlpt.equip.vo.DevInfoVo; import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo;
/** /**
* 设备上下架管理 * 设备上下架管理
@ -83,7 +83,7 @@ public interface IUpOffService
* @param upOffDto * @param upOffDto
* @return * @return
*/ */
List<DevInfoVo> selectList(UpOffDto upOffDto); List<MaDevInfoVo> selectList(UpOffDto upOffDto);
List<DevInfoVo> selectInfo(List<Long> ids); List<MaDevInfoVo> selectInfo(List<Long> ids);
} }

4
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
View File

@ -2,7 +2,9 @@ package com.bonus.zlpt.equip.service.impl;
import java.util.List; import java.util.List;
import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
import com.bonus.zlpt.common.core.utils.DateUtils; import com.bonus.zlpt.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -34,6 +36,8 @@ public class DevInfoServiceImpl implements IDevInfoService
return devInfoMapper.selectDevInfoByMaId(maId); return devInfoMapper.selectDevInfoByMaId(maId);
} }
/** /**
* 查询设备信息列表 * 查询设备信息列表
* *

24
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
View File

@ -3,13 +3,13 @@ package com.bonus.zlpt.equip.service.impl;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.bonus.zlpt.equip.domain.FileInfo;
import com.bonus.zlpt.equip.domain.TypeInfo; import com.bonus.zlpt.common.core.domain.equip.FileInfo;
import com.bonus.zlpt.equip.dto.UpOffDto; 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.FileInfoMapper;
import com.bonus.zlpt.equip.mapper.TypeInfoMapper; import com.bonus.zlpt.equip.mapper.TypeInfoMapper;
import com.bonus.zlpt.equip.service.ITypeInfoService; import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo;
import com.bonus.zlpt.equip.vo.DevInfoVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.bonus.zlpt.equip.mapper.UpOffMapper; import com.bonus.zlpt.equip.mapper.UpOffMapper;
@ -128,10 +128,10 @@ public class UpOffServiceImpl implements IUpOffService
* @return * @return
*/ */
@Override @Override
public List<DevInfoVo> selectList(UpOffDto upOffDto) { public List<MaDevInfoVo> selectList(UpOffDto upOffDto) {
List<DevInfoVo> devInfoVos = upOffMapper.selectList(upOffDto); List<MaDevInfoVo> devInfoVos = upOffMapper.selectList(upOffDto);
for (DevInfoVo devInfoVo : devInfoVos) { for (MaDevInfoVo devInfoVo : devInfoVos) {
//组装装备名称 当前数据装备类型名称 + 设备型号 //组装装备名称 当前数据装备类型名称 + 设备型号
devInfoVo.buildDevName(); devInfoVo.buildDevName();
TypeInfo typeInfo = typeInfoMapper.selectTypeInfoByTypeId(devInfoVo.getTypeId()); TypeInfo typeInfo = typeInfoMapper.selectTypeInfoByTypeId(devInfoVo.getTypeId());
@ -142,15 +142,15 @@ public class UpOffServiceImpl implements IUpOffService
} }
@Override @Override
public List<DevInfoVo> selectInfo(List<Long> ids) { public List<MaDevInfoVo> selectInfo(List<Long> ids) {
List<DevInfoVo> devInfoVos = selectList(new UpOffDto()); List<MaDevInfoVo> devInfoVos = selectList(new UpOffDto());
//去重 //去重
devInfoVos = devInfoVos.stream() devInfoVos = devInfoVos.stream()
.filter(devInfoVo -> ids.contains(devInfoVo.getMaId())) .filter(devInfoVo -> ids.contains(devInfoVo.getMaId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
for (DevInfoVo devInfoVo : devInfoVos) { for (MaDevInfoVo devInfoVo : devInfoVos) {
//组装装备名称 当前数据装备类型名称 + 设备型号 //组装装备名称 当前数据装备类型名称 + 设备型号
devInfoVo.buildDevName(); devInfoVo.buildDevName();
TypeInfo typeInfo = typeInfoMapper.selectTypeInfoByTypeId(devInfoVo.getTypeId()); TypeInfo typeInfo = typeInfoMapper.selectTypeInfoByTypeId(devInfoVo.getTypeId());
@ -158,7 +158,7 @@ public class UpOffServiceImpl implements IUpOffService
devInfoVo.setParentDevType(typeInfo1.getTypeName()); devInfoVo.setParentDevType(typeInfo1.getTypeName());
} }
for (DevInfoVo devInfoVo : devInfoVos) { for (MaDevInfoVo devInfoVo : devInfoVos) {
//组装url //组装url
List<FileInfo> fileInfos = fileInfoMapper.selectByMaId(devInfoVo.getMaId()); List<FileInfo> fileInfos = fileInfoMapper.selectByMaId(devInfoVo.getMaId());
for (FileInfo fileInfo : fileInfos) { for (FileInfo fileInfo : fileInfos) {

10
zlpt-modules/zlpt-equip/src/main/resources/mapper/FileInfoMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.zlpt.equip.mapper.FileInfoMapper"> <mapper namespace="com.bonus.zlpt.equip.mapper.FileInfoMapper">
<resultMap type="FileInfo" id="FileInfoResult"> <resultMap type="com.bonus.zlpt.common.core.domain.equip.FileInfo" id="FileInfoResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="maId" column="ma_id" /> <result property="maId" column="ma_id" />
<result property="fileName" column="file_name" /> <result property="fileName" column="file_name" />
@ -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 select id, ma_id, file_name, file_url, type from ma_file_info
</sql> </sql>
<select id="selectFileInfoList" parameterType="FileInfo" resultMap="FileInfoResult"> <select id="selectFileInfoList" parameterType="com.bonus.zlpt.common.core.domain.equip.FileInfo" resultMap="FileInfoResult">
<include refid="selectFileInfoVo"/> <include refid="selectFileInfoVo"/>
<where> <where>
<if test="maId != null "> and ma_id = #{maId}</if> <if test="maId != null "> and ma_id = #{maId}</if>
@ -31,11 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<select id="selectByMaId" resultType="com.bonus.zlpt.equip.domain.FileInfo"> <select id="selectByMaId" resultType="com.bonus.zlpt.common.core.domain.equip.FileInfo">
select f.* from ma_dev_info d,ma_file_info f where d.ma_id=f.ma_id select f.* from ma_dev_info d,ma_file_info f where d.ma_id=f.ma_id
</select> </select>
<insert id="insertFileInfo" parameterType="FileInfo"> <insert id="insertFileInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.FileInfo">
insert into ma_file_info insert into ma_file_info
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">id,</if>
@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="updateFileInfo" parameterType="FileInfo"> <update id="updateFileInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.FileInfo">
update ma_file_info update ma_file_info
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="maId != null">ma_id = #{maId},</if> <if test="maId != null">ma_id = #{maId},</if>

10
zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.zlpt.equip.mapper.UpOffMapper"> <mapper namespace="com.bonus.zlpt.equip.mapper.UpOffMapper">
<resultMap type="UpOff" id="UpOffResult"> <resultMap type="com.bonus.zlpt.common.core.domain.equip.UpOff" id="UpOffResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="maId" column="ma_id" /> <result property="maId" column="ma_id" />
<result property="applyTime" column="apply_time" /> <result property="applyTime" column="apply_time" />
@ -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 select id, ma_id, apply_time, apply_user, apply_company, type, audit_user, audit_time, status from ma_up_off
</sql> </sql>
<select id="selectUpOffList" parameterType="UpOff" resultMap="UpOffResult"> <select id="selectUpOffList" parameterType="com.bonus.zlpt.common.core.domain.equip.UpOff" resultMap="UpOffResult">
<include refid="selectUpOffVo"/> <include refid="selectUpOffVo"/>
<where> <where>
<if test="maId != null "> and ma_id = #{maId}</if> <if test="maId != null "> and ma_id = #{maId}</if>
@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectList" resultType="com.bonus.zlpt.equip.vo.DevInfoVo"> <select id="selectList" resultType="com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo">
select select
d.*,c.company_name companyName,t.type_name devTypeName d.*,c.company_name companyName,t.type_name devTypeName
from from
@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<insert id="insertUpOff" parameterType="UpOff"> <insert id="insertUpOff" parameterType="com.bonus.zlpt.common.core.domain.equip.UpOff">
insert into ma_up_off insert into ma_up_off
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">id,</if>
@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="updateUpOff" parameterType="UpOff"> <update id="updateUpOff" parameterType="com.bonus.zlpt.common.core.domain.equip.UpOff">
update ma_up_off update ma_up_off
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="maId != null">ma_id = #{maId},</if> <if test="maId != null">ma_id = #{maId},</if>