风场图update

于紫祥_1901

2020-08-12 19b06c5deda2a18d0c77b71ac5189d34c532b25e

风场图update

 src/main/java/com/moral/controller/ScreenController.java

@@ -17,7 +17,6 @@
import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
import com.moral.common.bean.Constants;

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -801,7 +801,6 @@
            map.put("V",V);

            mapList.add(map);

        }

        System.out.println(mapList);

        for (int i = 0; i <mapList.size() ; i++) {

            Double lo= (Double) mapList.get(i).get("lo");

            Double la= (Double) mapList.get(i).get("la");

@@ -820,11 +819,7 @@
                if (i==0){

                    if ((y>=2 && j==(y)*nx+x)){

                        int k;

                        System.out.println(nx*ny);

                        for (k = j-2*nx; k <=j+2*nx ;k=k+nx) {

                            System.out.println(k);

                            System.out.println("----------------");

                            System.out.println(uList.size());

                            uList.set(k,U);

                            uList.set(k-1,U);

                            uList.set(k-2,U);


 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java

@@ -61,10 +61,6 @@
    }



    @Override

    public Organization getOrganizationByMac(Map<String, Object> parameters) {

        return organizationMapper.getOrganizationByMac(parameters);

    }

    @Override

    public List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters) {

        ValidateUtil.notNull(parameters.get("areaName"), "param.is.null");

        List<Organization> organizations = organizationMapper.getOrganizationsByAreaName(parameters);