diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java index 8b26cdd90..42e0504ce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java @@ -132,18 +132,7 @@ public class IotThicknessController extends BladeController { Date endTime = data.getDate("endTime"); Boolean allData = data.getBoolean("allData"); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IotThickness::getEquipmentCode, deviceCode); - if (allData) { - wrapper.eq(IotThickness::getFlagRead, 0); - }else { - wrapper.eq(IotThickness::getFlagRead, 1); - } - if(startTime != null && endTime != null){ - wrapper.between(IotThickness::getCreateTime, startTime, endTime); - } - wrapper.orderByDesc(IotThickness::getCreateTime); - List qcHardnessIotList = service.list(wrapper); + List qcHardnessIotList = service.getDataByTime(deviceCode, startTime, endTime, allData ? 0 : 1); List resultList = new ArrayList<>(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java index c505d66b4..ff013b6e9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java @@ -11,6 +11,7 @@ import org.springblade.desk.quality.excel.IotThicknessExcel; import org.springblade.desk.quality.pojo.entity.IotThickness; import org.springblade.desk.quality.pojo.vo.IotThicknessVO; +import java.util.Date; import java.util.List; /** @@ -46,4 +47,6 @@ public interface IotThicknessMapper extends BaseMapper { * @return IotThickness */ IotThickness getByEquipmentAndFiletime(@Param("equipmentCode") String equipmentCode, @Param("filetime") String filetime); + + List getDataByTime(String deviceCode, Date startTime, Date endTime, int allData); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml index c78789a4f..3dc05df6f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml @@ -36,4 +36,10 @@ WHERE EQUIPMENT_CODE = #{equipmentCode} AND REMARK = #{filetime} AND is_deleted = 0 AND ROWNUM <= 1 + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java index 65985653c..bbecd3459 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java @@ -11,6 +11,7 @@ import org.springblade.desk.quality.excel.IotThicknessExcel; import org.springblade.desk.quality.pojo.entity.IotThickness; import org.springblade.desk.quality.pojo.vo.IotThicknessVO; +import java.util.Date; import java.util.List; /** @@ -49,4 +50,6 @@ public interface IIotThicknessService extends BaseService { * @param data 推送数据 */ void pushThickness(JSONObject data); + + List getDataByTime(String deviceCode, Date startTime, Date endTime, int allData); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java index e6466107a..b97b5d54f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java @@ -21,6 +21,7 @@ import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -84,4 +85,9 @@ public class IotThicknessServiceImpl extends BaseServiceImpl getDataByTime(String deviceCode, Date startTime, Date endTime, int allData) { + return baseMapper.getDataByTime(deviceCode, startTime, endTime, allData); + } }