模板调整适配

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataSetMapper.xml

@@ -12,7 +12,9 @@
         from
             cs_data_set
         where
-            pid = #{modelId} and cl_dev = #{clDev}
+            pid = #{modelId}
+          and cl_dev = #{clDev}
+          and data_type in ('Stat',NULL)
         order by type,cl_dev
     </select>
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java

@@ -8,7 +8,6 @@ import com.njcn.csdevice.service.ICsDataSetService;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -24,12 +23,22 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
 
     @Override
     public List<CsDataSet> findDataSetByModelId(String modelId, Integer clDev) {
-        return this.lambdaQuery().eq(CsDataSet::getPid,modelId).eq(CsDataSet::getClDev,clDev).list();
+        return this.lambdaQuery()
+                .eq(CsDataSet::getPid,modelId)
+                .eq(CsDataSet::getClDev,clDev)
+                .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
+                .list();
     }
 
     @Override
     public List<CsDataSet> findDataSetByModelId(String modelId) {
-        return this.lambdaQuery().eq(CsDataSet::getPid,modelId).in(CsDataSet::getType, Arrays.asList(0,2)).orderByAsc(CsDataSet::getType,CsDataSet::getClDev).list();
+        return this.lambdaQuery()
+                .eq(CsDataSet::getPid,modelId)
+                .in(CsDataSet::getType, Arrays.asList(0,2))
+                .eq(CsDataSet::getStoreFlag,1)
+                .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
+                .orderByAsc(CsDataSet::getType,CsDataSet::getClDev)
+                .list();
     }
 
     @Override