From 7fb91ac2b1b131801d62464020637557129673b8 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Wed, 14 Jun 2023 17:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8D=87=E9=99=8D=E6=9C=BA?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LifterController.java | 5 ++-- .../xmgl/modules/bigdevice/entity/Lifter.java | 16 ------------ .../bigdevice/entity/dto/LifterDto.java | 25 +++++++++++++++++++ .../bigdevice/mapper/LifterMapper.java | 3 ++- .../bigdevice/mapper/xml/LifterMapper.xml | 2 +- .../bigdevice/service/ILifterService.java | 3 ++- .../service/impl/LifterServiceImpl.java | 7 +++--- 7 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/dto/LifterDto.java diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/LifterController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/LifterController.java index c633fb77d..b5a89c46e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/LifterController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/LifterController.java @@ -4,6 +4,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.bigdevice.entity.Lifter; +import com.zhgd.xmgl.modules.bigdevice.entity.dto.LifterDto; import com.zhgd.xmgl.modules.bigdevice.entity.vo.LifterAlarmAndDevCountVo; import com.zhgd.xmgl.modules.bigdevice.entity.vo.LifterAndDataInfoVO; import com.zhgd.xmgl.modules.bigdevice.entity.vo.TodayOperatingStatusStatisticsVo; @@ -42,8 +43,8 @@ public class LifterController { @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), }) @PostMapping(value = "/list") - public Result> selectLifterList(@RequestBody Map map) { - List pageList = lifterService.selectLifterList(map); + public Result> selectLifterList(@RequestBody Map map) { + List pageList = lifterService.selectLifterList(map); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java index b6197480a..b5e41726f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java @@ -292,22 +292,6 @@ public class Lifter implements Serializable { @ApiModelProperty(value = "司机列表") private List driverList; - /** - * 使用devOnline字段 - */ - @Deprecated - @TableField(exist = false) - @ApiModelProperty(value = "设置是否在线，1在线，0离线", hidden = true) - private java.lang.String devonline; - - /** - * 使用enterpriseName字段 - */ - @Deprecated - @TableField(exist = false) - @ApiModelProperty(value = "总承包单位企业名称", hidden = true) - private java.lang.String generalContractorsName; - @TableField(exist = false) @ApiModelProperty(value = "企业名称") private java.lang.String enterpriseName; diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/dto/LifterDto.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/dto/LifterDto.java new file mode 100644 index 000000000..060441f55 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/dto/LifterDto.java @@ -0,0 +1,25 @@ +package com.zhgd.xmgl.modules.bigdevice.entity.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.zhgd.xmgl.modules.bigdevice.entity.Lifter; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LifterDto extends Lifter { + /** + * 使用devOnline字段 + */ + @Deprecated + @TableField(exist = false) + @ApiModelProperty(value = "设置是否在线，1在线，0离线", hidden = true) + private java.lang.String devonline; + + /** + * 使用enterpriseName字段 + */ + @Deprecated + @TableField(exist = false) + @ApiModelProperty(value = "总承包单位企业名称", hidden = true) + private java.lang.String generalContractorsName; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/LifterMapper.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/LifterMapper.java index 6fd011c2c..2ee07cb50 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/LifterMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/LifterMapper.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.bigdevice.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.bigdevice.entity.Lifter; +import com.zhgd.xmgl.modules.bigdevice.entity.dto.LifterDto; import com.zhgd.xmgl.modules.bigdevice.entity.vo.LifterAlarmAndDevCountVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,7 +22,7 @@ public interface LifterMapper extends BaseMapper { Integer selectLifterAlarmCurrentDayCount(Map map); - List selectLifterList(Map map); + List selectLifterList(Map map); List selectLifterDevList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterMapper.xml index 105997cc4..c22626e78 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterMapper.xml @@ -25,7 +25,7 @@ and cp.company_sn = #{sn} - SELECT w1.*, en.enterprise_name general_contractors_name, IFNULL(((case diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ILifterService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ILifterService.java index 3374dad85..92b68d0cf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ILifterService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ILifterService.java @@ -5,6 +5,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.bigdevice.entity.Lifter; import com.zhgd.xmgl.modules.bigdevice.entity.LifterAlarm; import com.zhgd.xmgl.modules.bigdevice.entity.LifterViolation; +import com.zhgd.xmgl.modules.bigdevice.entity.dto.LifterDto; import com.zhgd.xmgl.modules.bigdevice.entity.vo.LifterAlarmAndDevCountVo; import com.zhgd.xmgl.modules.bigdevice.entity.vo.LifterAndDataInfoVO; import com.zhgd.xmgl.modules.bigdevice.entity.vo.TodayOperatingStatusStatisticsVo; @@ -34,7 +35,7 @@ public interface ILifterService extends IService { void deleteProjectLifterData(String projectSn); - List selectLifterList(Map map); + List selectLifterList(Map map); LifterAlarmAndDevCountVo selectLifterAlarmAndDevCount(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java index 6a5877760..034eab045 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java @@ -15,13 +15,14 @@ import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.bigdevice.entity.*; import com.zhgd.xmgl.modules.bigdevice.entity.dto.LifterDataInfoDTO; +import com.zhgd.xmgl.modules.bigdevice.entity.dto.LifterDto; import com.zhgd.xmgl.modules.bigdevice.entity.vo.*; import com.zhgd.xmgl.modules.bigdevice.mapper.*; import com.zhgd.xmgl.modules.bigdevice.service.ILifterService; -import com.zhgd.xmgl.modules.project.entity.SubdivisionProject; import com.zhgd.xmgl.util.MessageUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -217,8 +218,8 @@ public class LifterServiceImpl extends ServiceImpl impleme } @Override - public List selectLifterList(Map map) { - List lifters = lifterMapper.selectLifterList(map); + public List selectLifterList(Map map) { + List lifters = lifterMapper.selectLifterList(map); lifters.forEach(e -> { e.setEnterpriseName(e.getGeneralContractorsName()); e.setDevOnline(Integer.valueOf(e.getDevonline()));