Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模板调整适配

Browse Source
This commit is contained in:
xy
2024-10-09 09:25:41 +08:00
parent 105a5314cb
commit c95c1271c2
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -8,7 +8,6 @@ import com.njcn.csdevice.service.ICsDataSetService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
@@ -24,12 +23,22 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
@Override @Override
public List<CsDataSet> findDataSetByModelId(String modelId, Integer clDev) { 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 @Override
public List<CsDataSet> findDataSetByModelId(String modelId) { 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 @Override

3
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java
View File

@@ -182,7 +182,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
if (Objects.equals("dir",fileType)) { if (Objects.equals("dir",fileType)) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
askProjectInfo(null,nDid, Integer.parseInt(TypeEnum.TYPE_8.getCode()),path,"DevFileCmd"); askProjectInfo(null,nDid, Integer.parseInt(TypeEnum.TYPE_8.getCode()),path,"DevFileCmd");
Thread.sleep(2000); Thread.sleep(5000);
String key = AppRedisKey.PROJECT_INFO + nDid; String key = AppRedisKey.PROJECT_INFO + nDid;
Object object = redisUtil.getObjectByKey(key); Object object = redisUtil.getObjectByKey(key);
if (!Objects.isNull(object)) { if (!Objects.isNull(object)) {
@@ -262,6 +262,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
} }
} }
if (CollectionUtil.isNotEmpty(map)) { if (CollectionUtil.isNotEmpty(map)) {
System.out.println("map==:" + map);
map.forEach((k,v)->{ map.forEach((k,v)->{
String proName = k.replace("/bd0/cmn/",OssPath.DEV_MAKE_UP_PATH + param.getNDid() + "/"); String proName = k.replace("/bd0/cmn/",OssPath.DEV_MAKE_UP_PATH + param.getNDid() + "/");
String key = AppRedisKey.PROJECT_INFO + param.getNDid(); String key = AppRedisKey.PROJECT_INFO + param.getNDid();