diff --git a/src/main/java/com/spring/modules/cdc/mapper/CollectRecordMapper.java b/src/main/java/com/spring/modules/cdc/mapper/CollectRecordMapper.java index 504707a7..262eea0d 100644 --- a/src/main/java/com/spring/modules/cdc/mapper/CollectRecordMapper.java +++ b/src/main/java/com/spring/modules/cdc/mapper/CollectRecordMapper.java @@ -14,4 +14,6 @@ public interface CollectRecordMapper extends BaseMapper { List selectCollectRecordListByItemNo(CollectRecord collectRecord); void updateCollectCurrentValue(CollectRecord collectRecord); + + Long selectMaxItemNo(CollectRecord collectRecord); } diff --git a/src/main/java/com/spring/modules/cdc/service/impl/CollectRecordServiceImpl.java b/src/main/java/com/spring/modules/cdc/service/impl/CollectRecordServiceImpl.java index 70dd3632..a48f25e0 100644 --- a/src/main/java/com/spring/modules/cdc/service/impl/CollectRecordServiceImpl.java +++ b/src/main/java/com/spring/modules/cdc/service/impl/CollectRecordServiceImpl.java @@ -74,14 +74,15 @@ public class CollectRecordServiceImpl extends ServiceImpl 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 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; } } diff --git a/src/main/resources/mapper/cdc/collectRecordMapper.xml b/src/main/resources/mapper/cdc/collectRecordMapper.xml index b560a3ac..5fc825a1 100644 --- a/src/main/resources/mapper/cdc/collectRecordMapper.xml +++ b/src/main/resources/mapper/cdc/collectRecordMapper.xml @@ -88,4 +88,8 @@ update cdc_collect_current_value set item_value = #{itemValue}, create_time = #{createTime} where device_no = #{deviceNo} and collect_id = #{collectId} and site = #{site} + + \ No newline at end of file