2024-06-14

src/main/java/com/spring/modules/cdc/mapper/CollectRecordMapper.java

@@ -14,4 +14,6 @@ public interface CollectRecordMapper extends BaseMapper<CollectRecord> {
     List<CollectRecord> selectCollectRecordListByItemNo(CollectRecord collectRecord);
 
     void updateCollectCurrentValue(CollectRecord collectRecord);
+
+    Long selectMaxItemNo(CollectRecord collectRecord);
 }

src/main/java/com/spring/modules/cdc/service/impl/CollectRecordServiceImpl.java

@@ -74,14 +74,15 @@ public class CollectRecordServiceImpl extends ServiceImpl<CollectRecordMapper,Co
     }
 
     private long getItemNo(CollectRecord collectRecord){
-        List<CollectRecord> list = lambdaQuery()
-                .eq(CollectRecord::getDeviceNo, collectRecord.getDeviceNo())
-                .eq(CollectRecord::getSite, collectRecord.getSite())
-                .eq(CollectRecord::getCollectId, collectRecord.getCollectId())
-                .orderByDesc(CollectRecord::getItemNo).list();
-        if (list.isEmpty()){
-            return 0L;
-        }
-        return list.get(0).getItemNo() + 1;
+        //        List<CollectRecord> list = lambdaQuery()
+//                .eq(CollectRecord::getDeviceNo, collectRecord.getDeviceNo())
+//                .eq(CollectRecord::getSite, collectRecord.getSite())
+//                .eq(CollectRecord::getCollectId, collectRecord.getCollectId())
+//                .orderByDesc(CollectRecord::getItemNo).list();
+        //        if (list.isEmpty()){
+//            return 0L;
+//        }
+//        return list.get(0).getItemNo() + 1;
+        return baseMapper.selectMaxItemNo(collectRecord)+1;
     }
 }

src/main/resources/mapper/cdc/collectRecordMapper.xml

@@ -88,4 +88,8 @@
     <update id="updateCollectCurrentValue">
         update cdc_collect_current_value set item_value = #{itemValue}, create_time = #{createTime} where device_no = #{deviceNo} and collect_id = #{collectId} and site = #{site}
     </update>
+
+    <select id="selectMaxItemNo" resultType="java.lang.Long">
+        select ISNULL(max(item_no),0) from cdc_collect_record where device_no = #{deviceNo} and collect_id = #{collectId} and site = #{site}
+    </select>
 </mapper>