终端统计及appbug修改

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml

@@ -29,7 +29,7 @@
         FROM cs_ed_data a
                      LEFT JOIN sys_dict_data b ON a.dev_type = b.id
                 WHERE
-                1 = 1 And a.`status`='1'
+                1 = 1
         <if test="csEdDataQueryParm.versionStartDate != null and csEdDataQueryParm.versionStartDate != ''">
             AND a.version_date &gt;= #{csEdDataQueryParm.versionStartDate }
         </if>

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java

@@ -6,13 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.google.common.base.Objects;
+import com.njcn.algorithm.mapper.AppProjectMapper;
 import com.njcn.algorithm.mapper.AppTopologyDiagramMapper;
 import com.njcn.algorithm.pojo.param.AppTopologyDiagramAddParm;
 import com.njcn.algorithm.pojo.param.AppTopologyDiagramAuditParm;
 import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryPageParm;
 import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryParm;
+import com.njcn.algorithm.pojo.po.AppProjectPO;
 import com.njcn.algorithm.pojo.po.AppTopologyDiagramPO;
 import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO;
+import com.njcn.algorithm.service.AppProjectService;
 import com.njcn.algorithm.service.AppTopologyDiagramService;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
@@ -41,6 +44,7 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
 
 
     private final FileStorageUtil fileStorageUtil;
+    private final AppProjectMapper appServiceMapper;
 
     private final AppTopologyDiagramMapper appTopologyDiagramMapper;
     @Override
@@ -91,9 +95,13 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
                 eq (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getProjectId ()),"project_id",appTopologyDiagramAuditParm.getProjectId ()).
                 like (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getName ()),"name", appTopologyDiagramAuditParm.getName ());
         List<AppTopologyDiagramPO> list = this.list (queryWrapper);
+
         List<AppTopologyDiagramVO> collect = list.stream ( ).map (temp -> {
             AppTopologyDiagramVO vo = new AppTopologyDiagramVO ( );
             BeanUtils.copyProperties (temp, vo);
+
+            AppProjectPO appProjectPO = appServiceMapper.selectById(vo.getProjectId());
+            vo.setProjectName(appProjectPO.getName());
             vo.setFilePath (fileStorageUtil.getFileUrl (vo.getFilePath ()));
             return vo;
         }).collect (Collectors.toList ( ));
@@ -114,6 +122,9 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
         List<AppTopologyDiagramVO> collect = tempPage.getRecords ( ).stream ( ).map (temp -> {
             AppTopologyDiagramVO vo = new AppTopologyDiagramVO ( );
             BeanUtils.copyProperties (temp, vo);
+
+            AppProjectPO appProjectPO = appServiceMapper.selectById(vo.getProjectId());
+            vo.setProjectName(appProjectPO.getName());
             vo.setFilePath (fileStorageUtil.getFileUrl (temp.getFilePath ( )));
             return vo;
         }).collect (Collectors.toList ( ));

pqs-algorithm/algorithm-boot/src/main/resources/bootstrap.yml

@@ -31,7 +31,7 @@ spring:
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-Id: algorithm-config.yaml
             refresh: true
   main:
     allow-bean-definition-overriding: true