修改健康管理监视界面BUG

web/monitor-web-sxjn/src/main/java/com/gyee/SpringbootStart.java

@@ -1,5 +1,7 @@
 package com.gyee;
 
+import com.gyee.frame.common.spring.SpringUtils;
+import com.gyee.frame.service.initialpoint.InitialPointGoldenService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -23,7 +25,7 @@ public class SpringbootStart {
 
 
 
-//              InitialPointGoldenService initialPointGoldenService= SpringUtils.getBean("initialPointGoldenService");
+              InitialPointGoldenService initialPointGoldenService= SpringUtils.getBean("initialPointGoldenService");
 ////
 //        System.out.println("开始导出风机测点。。。。。。");
 //        initialPointGoldenService.initalFj();
@@ -42,12 +44,12 @@ public class SpringbootStart {
 ////        initialPointEdosHfService.initalDd();
 ////        System.out.println("结束导出地调测点。。。。。。");
 
-
+//
 //        System.out.println("开始导出逆变器测点。。。。。。");
 //        initialPointGoldenService.initalNbq();
 //        System.out.println("结束导出逆变器测点。。。。。。");
 //        System.out.println("初始化结束！");
-
+//
 
 
     }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -508,18 +508,20 @@ public class InitialRunner implements CommandLineRunner {
         }
 
         WindturbinetestingpointnewExample windTurbineTestingPointAiExample=new WindturbinetestingpointnewExample();
-        windTurbineTestingPointAiExample.createCriteria().getAllCriteria();
+
         List<Windturbinetestingpointnew> wtAilist= windTurbineTestingPointAiService.selectByExample(windTurbineTestingPointAiExample);
 
-        Map<String, Windturbinetestingpointnew> map = null;
+
 
         if(wtAilist != null && !wtAilist.isEmpty()){
             for(Windturbinetestingpointnew mp : wtAilist){
+
                 if(wtPointmap.containsKey(mp.getWindturbineid())){
-                    map = wtPointmap.get(mp.getWindturbineid());
+                    Map<String, Windturbinetestingpointnew> map = wtPointmap.get(mp.getWindturbineid());
                     map.put(mp.getUniformcode(), mp);
+                    wtPointmap.put(mp.getWindturbineid(), map);
                 }else{
-                    map = new HashMap<String, Windturbinetestingpointnew>();
+                    Map<String, Windturbinetestingpointnew> map = new HashMap<String, Windturbinetestingpointnew>();
                     map.put(mp.getUniformcode(), mp);
                     wtPointmap.put(mp.getWindturbineid(), map);
                 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/PhotovoltaicStandardPointService.java

@@ -0,0 +1,107 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.PhotovoltaicStandardPointMapper;
+import com.gyee.frame.model.auto.PhotovoltaicStandardPoint;
+import com.gyee.frame.model.auto.PhotovoltaicStandardPointExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class PhotovoltaicStandardPointService implements BaseService<PhotovoltaicStandardPoint, PhotovoltaicStandardPointExample> {
+    @Resource
+    private PhotovoltaicStandardPointMapper photovoltaicStandardPointMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        List<String> lista = Convert.toListStrArray(ids);
+        PhotovoltaicStandardPointExample example = new PhotovoltaicStandardPointExample();
+        example.createCriteria().andIdIn(lista);
+        return photovoltaicStandardPointMapper.deleteByExample(example);
+
+
+    }
+
+
+    @Override
+    public PhotovoltaicStandardPoint selectByPrimaryKey(String id) {
+
+        return null;
+
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(PhotovoltaicStandardPoint record) {
+        return -1;
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(PhotovoltaicStandardPoint record) {
+
+        //添加雪花主键id
+        record.setId(SnowflakeIdWorker.getUUID());
+
+
+        return photovoltaicStandardPointMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(PhotovoltaicStandardPoint record, PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(PhotovoltaicStandardPoint record, PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<PhotovoltaicStandardPoint> selectByExample(PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.deleteByExample(example);
+    }
+
+
+    public  List<PhotovoltaicStandardPoint> findAllList() {
+
+        PhotovoltaicStandardPointExample example = new PhotovoltaicStandardPointExample();
+        example.setOrderByClause("id ASC");
+        List<PhotovoltaicStandardPoint> vos = photovoltaicStandardPointMapper.selectByExample(example);
+
+
+        return vos;
+
+    }
+
+
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/initialpoint/InitialPointGoldenService.java

@@ -1023,7 +1023,7 @@ public class InitialPointGoldenService implements  IinitialPoint{
             List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wp.getId());
 
 
-            if(!stpointls.isEmpty() && wp.getId().endsWith("GDC"))
+            if(!stpointls.isEmpty() && wp.getId().endsWith("GDC") && wp.getId().equals("SY_GDC"))
             {
                 for(Windturbine wt:wtls)
                 {

web/monitor-web-sxjn/src/main/resources/application-jn.yml

@@ -40,7 +40,7 @@ gyee:
   initialcode: INITIAL
 #tomcat config
 server :
-  port : 8171
+  port : 8179
   session:
     timeout: 7200
   ##项目名字配置
@@ -57,16 +57,16 @@ server :
 #dev环境  mysql7.0
 spring :
   application:
-    name: monitor-hb-provider
-    cloud:
-      nacos:
-        discovery:
-          server-addr: 10.81.3.155:8848
-          #指定yaml格式的配置
-          file-extension: yaml
-          cluster-name: master
-        username: nacos
-        password: nacos
+#    name: monitor-hb-provider
+#    cloud:
+#      nacos:
+#        discovery:
+#          server-addr: 10.81.3.155:8848
+#          #指定yaml格式的配置
+#          file-extension: yaml
+#          cluster-name: master
+#        username: nacos
+#        password: nacos
     #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
     #include: ftpHX,ftpCloud
   servlet: