代码更新

web/backmanagerconfig/pom.xml

@@ -58,6 +58,11 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.2.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/WindpowerstationController.java

@@ -222,8 +222,8 @@ public class WindpowerstationController {
      * @param companyid
      * @return
      */
-    @GetMapping(value = "/List")
-    public R findList(
+    @GetMapping(value = "/getList")
+    public R getList(
                       @RequestParam(value = "regionid",required = false) String regionid,
                       @RequestParam(value = "companyid",required = false) String companyid){
         List<WindpowerstationAdmVo> list = windpowerstationService.getList(regionid,companyid);

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IIndicatorsService.java

@@ -20,7 +20,7 @@ public interface IIndicatorsService extends IService<Indicators> {
 
     Indicators getOne(String id);
 
-    boolean addOrUpdate(Indicators indicators);
+    boolean addOrUpdate(Indicators indicators) throws Exception;
 
     boolean removeByIds(String ids);
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/IndicatorsServiceImpl.java

@@ -6,17 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.Indicators;
 import com.gyee.backconfig.mapper.auto.IndicatorsMapper;
-import com.gyee.backconfig.model.auto.Project;
-import com.gyee.backconfig.model.auto.Standardpoint;
 import com.gyee.backconfig.model.auto.Windpowerstationpointnew;
 import com.gyee.backconfig.service.auto.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.util.realtimedate.EdosUtil;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
 import javax.xml.crypto.Data;
@@ -38,6 +35,9 @@ public class IndicatorsServiceImpl extends ServiceImpl<IndicatorsMapper, Indicat
     private static String baseURL = "http://10.81.3.152:8011/ts";
 
     @Autowired
+    private EdosUtil goldenUtil;
+
+    @Autowired
     private IStandardpointService standardpointService;
 
     @Autowired
@@ -80,7 +80,7 @@ public class IndicatorsServiceImpl extends ServiceImpl<IndicatorsMapper, Indicat
     }
 
     @Override
-    public boolean addOrUpdate(Indicators indicators) {
+    public boolean addOrUpdate(Indicators indicators) throws Exception{
 //        boolean b =  this.saveOrUpdate(indicators);
         boolean b = false;
         if(null==indicators.getId()){
@@ -96,12 +96,8 @@ public class IndicatorsServiceImpl extends ServiceImpl<IndicatorsMapper, Indicat
             point.setEdnaId(stationlist.get(0).getCode());
             point.setPointTime(indicators.getCreatetime().getTime());
             point.setPointValueInDouble(Double.valueOf(indicators.getValue()));
-            b = addSinglePoint(point);
+            goldenUtil.sendSinglePoint(point);
         }
-
-
-
-
         return b;
     }
 
@@ -113,34 +109,4 @@ public class IndicatorsServiceImpl extends ServiceImpl<IndicatorsMapper, Indicat
     }
 
 
-    public boolean addSinglePoint(PointData point) {
-        String url = baseURL + "/latest";
-        try {
-            String  result = restTemplate.postForObject(url, convertPointData(point), String.class);
-        } catch (HttpClientErrorException exception) {
-            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                return false;
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    private JSONObject convertPointData(PointData pd) {
-        JSONObject jo = new JSONObject();
-        jo.put("tagName", pd.getEdnaId());
-        JSONObject joo = new JSONObject();
-        joo.put("ts", pd.getPointTime()*1000);
-        joo.put("status", 0);
-        joo.put("doubleValue", pd.getPointValueInDouble());
-        jo.put("tsData", joo);
-        return jo;
-    }
-
-
-
-
-
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationServiceImpl.java

@@ -112,9 +112,14 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
         List<Windpowerstation> list = baseMapper.selectList(qw);
 
         list.stream().forEach(i->{
+//            RPJFS
+//            RFDL
             String wpString = redisService.get(i.getId());
             Map<String, Windpowerstationpointnew> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
+
             });
+            String rpjfs  = stringMapMap.get("RPJFS").getCode();
+            String rfdl = stringMapMap.get("RFDL").getCode();
         });
 
         return null;

web/backmanagerconfig/src/main/java/com/gyee/backconfig/util/realtimedate/EdosUtil.java

@@ -10,11 +10,13 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.*;
 
+@Service
 public class EdosUtil  implements IEdosUtil {
 
     private RestTemplate restTemplate =new RestTemplate();