测厚仪数据获取

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<IotThickness> 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<IotThickness> qcHardnessIotList = service.list(wrapper);
+        List<IotThickness> qcHardnessIotList = service.getDataByTime(deviceCode, startTime, endTime, allData ? 0 : 1);
 
         List<JSONObject> resultList = new ArrayList<>();
 

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<IotThickness> {
 	 * @return IotThickness
 	 */
 	IotThickness getByEquipmentAndFiletime(@Param("equipmentCode") String equipmentCode, @Param("filetime") String filetime);
+
+    List<IotThickness> getDataByTime(String deviceCode, Date startTime, Date endTime, int allData);
 }

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
     </select>
+    <select id="getDataByTime" resultType="org.springblade.desk.quality.pojo.entity.IotThickness">
+        select * from QA_IOT_THICKNESS where id in (
+        select id from (select row_number()over(partition by a.EQUIPMENT_CODE,a.CREATE_TIME order by a.CREATE_TIME) as no,a.id
+        from QA_IOT_THICKNESS a where a.EQUIPMENT_CODE = #{deviceCode} and a.FLAG_READ = #{allData}
+        and a.CREATE_TIME between #{startTime} and #{endTime} ) where no = 1) order by CREATE_TIME
+    </select>
 </mapper>

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<IotThickness> {
 	 * @param data 推送数据
 	 */
 	void pushThickness(JSONObject data);
+
+    List<IotThickness> getDataByTime(String deviceCode, Date startTime, Date endTime, int allData);
 }

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<IotThicknessMapper,
 
 		log.info("iot系统推送测厚数据: equipmentCode={}, fileTime={}, data={}", deviceCode, fileTime, data.toJSONString());
 	}
+
+	@Override
+	public List<IotThickness> getDataByTime(String deviceCode, Date startTime, Date endTime, int allData) {
+		return baseMapper.getDataByTime(deviceCode, startTime, endTime, allData);
+	}
 }