修正健康管理状态数量统计

web/health-hb/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -422,8 +422,8 @@ public class InitialRunner implements CommandLineRunner {
             for (int i = 0; i < warnls.size(); i++) {
                 Warning2 warning = warnls.get(i);
 
-                if (warnmodelmap.containsKey(warning.getModelid())) {
-                    Map<String, List<Warning2>> map = warnmodelmap.get(warning.getModelid());
+                if (warnmodelmap.containsKey(warning.getModelId())) {
+                    Map<String, List<Warning2>> map = warnmodelmap.get(warning.getModelId());
                     if(map.containsKey(warning.getWarningclassifyid()))
                     {
                         List<Warning2> ls =map.get(warning.getWarningclassifyid());
@@ -435,23 +435,23 @@ public class InitialRunner implements CommandLineRunner {
                         ls.add(warning);
                         map.put(warning.getWarningclassifyid(), ls);
                     }
-                    warnmodelmap.put(warning.getModelid(),map);
+                    warnmodelmap.put(warning.getModelId(),map);
                 } else {
                     Map<String, List<Warning2>> map = new HashMap<>();
                     List<Warning2> ls = new ArrayList<>();
                     ls.add(warning);
                     map.put(warning.getWarningclassifyid(), ls);
-                    warnmodelmap.put(warning.getModelid(),map);
+                    warnmodelmap.put(warning.getModelId(),map);
                 }
 
-                if (warnmap.containsKey(warning.getModelid())) {
-                    List<Warning2> ls =warnmap.get(warning.getModelid());
+                if (warnmap.containsKey(warning.getModelId())) {
+                    List<Warning2> ls =warnmap.get(warning.getModelId());
                     ls.add(warning);
-                    warnmap.put(warning.getModelid(),ls);
+                    warnmap.put(warning.getModelId(),ls);
                 } else {
                     List<Warning2> ls =new ArrayList<>();
                     ls.add(warning);
-                    warnmap.put(warning.getModelid(),ls);
+                    warnmap.put(warning.getModelId(),ls);
                 }
 
                 warningmap.put(warning.getId(), warning);
@@ -571,13 +571,13 @@ public class InitialRunner implements CommandLineRunner {
 
             if (mpls != null && !mpls.isEmpty()) {
                 for (ModelPower mp : mpls) {
-                    if (modelPowermap.containsKey(mp.getModelid())) {
-                        mpmap = modelPowermap.get(mp.getModelid());
+                    if (modelPowermap.containsKey(mp.getModelId())) {
+                        mpmap = modelPowermap.get(mp.getModelId());
                         mpmap.put(String.valueOf(mp.getSpeed().doubleValue()), mp);
                     } else {
                         mpmap = new HashMap<String, ModelPower>();
                         mpmap.put(String.valueOf(mp.getSpeed().doubleValue()), mp);
-                        modelPowermap.put(mp.getModelid(), mpmap);
+                        modelPowermap.put(mp.getModelId(), mpmap);
                     }
                 }
             }

web/health-hb/src/main/java/com/gyee/frame/controller/health/ReliabilityAnalysisController.java

@@ -70,7 +70,7 @@ public class ReliabilityAnalysisController {
         if(StringUtils.notEmp(wtmid))
         {
 
-            List<String> codes = alertrule2ervice.getUniformCodeByNameAndStation(name, station, wtmid.getModelid());
+            List<String> codes = alertrule2ervice.getUniformCodeByNameAndStation(name, station, wtmid.getModelId());
             if (codes == null || codes.size() == 0)
                 return AjaxResult.successData(AjaxStatus.success.code, list);
 
@@ -124,7 +124,7 @@ public class ReliabilityAnalysisController {
     public AjaxResult get(){
         List<String> list = alertrule2ervice.getUniformCodeByNameAndStations();
 
-        List<String> modelID = alertrule2ervice.getModelID();
+        List<String> modelID = alertrule2ervice.getModelId();
 
 
 //        for (String model : modelID)

web/health-hb/src/main/java/com/gyee/frame/model/auto/ActivePowerData.java

@@ -182,7 +182,7 @@ public class ActivePowerData implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Alarmsnap.java

@@ -584,7 +584,7 @@ public class Alarmsnap implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Alertrule2.java

@@ -349,7 +349,7 @@ public class Alertrule2 implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Healthpoint.java

@@ -341,7 +341,7 @@ public class Healthpoint implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Healthsystem.java

@@ -226,7 +226,7 @@ public class Healthsystem implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/ModelPower.java

@@ -88,7 +88,7 @@ public class ModelPower implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/ModelpowerRd.java

@@ -88,7 +88,7 @@ public class ModelpowerRd implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/StopAnalysismain.java

@@ -136,7 +136,7 @@ public class StopAnalysismain implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/StopAnalysismainVo.java

@@ -103,7 +103,7 @@ public class StopAnalysismainVo implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Warning2.java

@@ -415,7 +415,7 @@ public class Warning2 implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/WarningInfoDay.java

@@ -209,7 +209,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/WindTurbineTestingPointaiyj.java

@@ -349,7 +349,7 @@ public class WindTurbineTestingPointaiyj implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Windpowerstationpointnew.java

@@ -341,7 +341,7 @@ public class Windpowerstationpointnew implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Windsubstationtestingpoint.java

@@ -308,7 +308,7 @@ public class Windsubstationtestingpoint implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Windsubstationtestingpointnew.java

@@ -341,7 +341,7 @@ public class Windsubstationtestingpointnew implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Windturbine.java

@@ -119,7 +119,7 @@ private String standardid;
     }
 	 
 			
-	public String getModelid() {
+	public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Windturbinegoodness.java

@@ -387,7 +387,7 @@ public class Windturbinegoodness implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Windturbinetestingpoint.java

@@ -350,7 +350,7 @@ public class Windturbinetestingpoint implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/Windturbinetestingpointnew.java

@@ -350,7 +350,7 @@ public class Windturbinetestingpointnew implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/custom/PointVo.java

@@ -27,7 +27,7 @@ public class PointVo {
 	public void setName(String name) {
 		this.name = name;
 	}
-	public String getModelid() {
+	public String getModelId() {
 		return modelid;
 	}
 	public void setModelid(String modelid) {

web/health-hb/src/main/java/com/gyee/frame/model/custom/analysistask/Analysisconclusion.java

@@ -58,7 +58,7 @@ public class Analysisconclusion implements java.io.Serializable {
     	this.windturbineid = windturbineid;
     }
 
-	public String getModelid() {
+	public String getModelId() {
     	return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/custom/analysistask/Analysisconclusiontemp.java

@@ -58,7 +58,7 @@ public class Analysisconclusiontemp implements java.io.Serializable {
     	this.windturbineid = windturbineid;
     }
 
-	public String getModelid() {
+	public String getModelId() {
     	return modelid;
     }
 

web/health-hb/src/main/java/com/gyee/frame/service/ActivePowerDataService.java

@@ -123,7 +123,7 @@ public class ActivePowerDataService implements BaseService<ActivePowerData, Acti
 				item.setWindPowerStationId(ap.getWindpowerstationid());
 				item.setWindTurbineId(ap.getWindturbineid());
 				item.setWindTurbineCode(ap.getWindturbinecode());
-				item.setModelId(ap.getModelid());
+				item.setModelId(ap.getModelId());
 				item.setModelName(ap.getModelname());
 				item.setSpeed(ap.getSpeed());
 				item.setAvgpower(ap.getPower());
@@ -203,8 +203,8 @@ public class ActivePowerDataService implements BaseService<ActivePowerData, Acti
 						sj.add(StringUtils.round(power, 2));
 					}
 				}
-				retValue.put(String.format("%s(%s)实际功率", wt.getCode(), wt.getModelid()), sj);
-				sers.add(String.format("%s(%s)实际功率", wt.getCode(), wt.getModelid()));
+				retValue.put(String.format("%s(%s)实际功率", wt.getCode(), wt.getModelId()), sj);
+				sers.add(String.format("%s(%s)实际功率", wt.getCode(), wt.getModelId()));
 			}
 
 

web/health-hb/src/main/java/com/gyee/frame/service/Alertrule2ervice.java

@@ -283,7 +283,7 @@ public class Alertrule2ervice implements BaseService<Alertrule2, Alertrule2Examp
         return list;
     }
 
-    public List<String> getModelID(){
+    public List<String> getModelId(){
         Alertrule2Example example = new Alertrule2Example();
 
         List<Alertrule2> rules = alertrule2Mapper.selectByExample(example);
@@ -292,7 +292,7 @@ public class Alertrule2ervice implements BaseService<Alertrule2, Alertrule2Examp
 
         List<String> list = new ArrayList<>();
         for (Alertrule2 rule : rules){
-            String modelis = rule.getModelid();
+            String modelis = rule.getModelId();
             if (!list.contains(modelis))
                 list.add(modelis);
 

web/health-hb/src/main/java/com/gyee/frame/service/FaultPlaybackService.java

@@ -256,7 +256,7 @@ public class FaultPlaybackService  {
                         PointVo vo = new PointVo();
                         vo.setId(ai.getCode());
                         vo.setCode(ai.getCode());
-                        vo.setModelid(ai.getModelid());
+                        vo.setModelid(ai.getModelId());
                         vo.setName(ai.getName());
                         vo.setUniformcode(ai.getUniformcode());
                         vo.setWindpowerstationid(ai.getWindpowerstationid());
@@ -273,7 +273,7 @@ public class FaultPlaybackService  {
                         PointVo vo = new PointVo();
                         vo.setId(di.getCode());
                         vo.setCode(di.getCode());
-                        vo.setModelid(di.getModelid());
+                        vo.setModelid(di.getModelId());
                         vo.setName(di.getName());
                         vo.setUniformcode(di.getUniformcode());
                         vo.setWindpowerstationid(di.getWindpowerstationid());
@@ -289,7 +289,7 @@ public class FaultPlaybackService  {
                         PointVo vo = new PointVo();
                         vo.setId(ai.getCode());
                         vo.setCode(ai.getCode());
-                        vo.setModelid(ai.getModelid());
+                        vo.setModelid(ai.getModelId());
                         vo.setName(ai.getName());
                         vo.setUniformcode(ai.getUniformcode());
                         vo.setWindpowerstationid(ai.getWindpowerstationid());
@@ -306,7 +306,7 @@ public class FaultPlaybackService  {
                         PointVo vo = new PointVo();
                         vo.setId(di.getCode());
                         vo.setCode(di.getCode());
-                        vo.setModelid(di.getModelid());
+                        vo.setModelid(di.getModelId());
                         vo.setName(di.getName());
                         vo.setUniformcode(di.getUniformcode());
                         vo.setWindpowerstationid(di.getWindpowerstationid());

web/health-hb/src/main/java/com/gyee/frame/service/ModelpowerRdService.java

@@ -112,13 +112,13 @@ public class ModelpowerRdService implements BaseService<ModelpowerRd, Modelpower
 
 		if(list != null && !list.isEmpty()){
 			for(ModelpowerRd mp : list){
-				if(res.containsKey(mp.getModelid())){
-					map = res.get(mp.getModelid());
+				if(res.containsKey(mp.getModelId())){
+					map = res.get(mp.getModelId());
 					map.put(mp.getSpeed(), mp);
 				}else{
 					map = new HashMap<Double, ModelpowerRd>();
 					map.put(mp.getSpeed(), mp);
-					res.put(mp.getModelid(), map);
+					res.put(mp.getModelId(), map);
 				}
 			}
 		}

web/health-hb/src/main/java/com/gyee/frame/service/ParttemperaturesubService.java

@@ -103,7 +103,7 @@ public class ParttemperaturesubService implements BaseService<Parttemperaturesub
 
 			ParttemperaturesubExample example=new ParttemperaturesubExample();
 
-			example.setOrderByClause("recodedate DESC");
+			example.setOrderByClause("trange DESC");
 
 			ParttemperaturesubExample.Criteria criteria =example.createCriteria();
 

web/health-hb/src/main/java/com/gyee/frame/service/Shutdownevent2Service.java

@@ -166,7 +166,7 @@ public class Shutdownevent2Service implements BaseService<Shutdownevent2, Shutdo
 				event.setProjectName(pj.getName());
 				event.setFaultView(wr.getFaultview());
 				event.setHandleWay(wr.getHandleway());
-				event.setModelId(wt.getModelid());
+				event.setModelId(wt.getModelId());
 //				event.setModelCode(CacheContext.mlmap.get(rs.getString("modelId")).getCode());
 
 				ls.add(event);

web/health-hb/src/main/java/com/gyee/frame/service/StopAnalysismainService.java

@@ -107,7 +107,7 @@ public class StopAnalysismainService implements BaseService<StopAnalysismain, St
 
 //				po.setId(vo.getId());
 				po.setMainid(mainId);
-				po.setModelid(vo.getModelid());
+				po.setModelid(vo.getModelId());
 				po.setWtid(vo.getWtid());
 				po.setJudegvulue(vo.getJudegvulue());
 

web/health-hb/src/main/java/com/gyee/frame/service/WindTurbineTestingPointAiService.java

@@ -195,8 +195,8 @@ public class WindTurbineTestingPointAiService implements BaseService<Windturbine
 
 				for (Windturbinetestingpointnew wind : winds) {
 					if (wind != null && wind.getCode().contains("FJ")) {
-						lists.add(wind.getCode() + "$" + wind.getName() + "@" + wind.getModelid());
-//						System.out.println(wind.getId() + "," + wind.getModelid());
+						lists.add(wind.getCode() + "$" + wind.getName() + "@" + wind.getModelId());
+//						System.out.println(wind.getId() + "," + wind.getModelId());
 						break;
 					}
 				}

web/health-hb/src/main/java/com/gyee/frame/service/WindturbinetestingpointnewService.java

@@ -259,8 +259,8 @@ public class WindturbinetestingpointnewService implements BaseService<Windturbin
 //
 //                for (Windturbinetestingpointnew wind : winds) {
 //                    if (wind != null && wind.getId().contains("FJ")) {
-//                        lists.add(wind.getId() + "$" + wind.getName() + "@" + wind.getModelid());
-////						System.out.println(wind.getId() + "," + wind.getModelid());
+//                        lists.add(wind.getId() + "$" + wind.getName() + "@" + wind.getModelId());
+////						System.out.println(wind.getId() + "," + wind.getModelId());
 //                        break;
 //                    }
 //                }

web/health-hb/src/main/java/com/gyee/frame/service/health/LossPowerRateHealthService.java

@@ -65,7 +65,7 @@ public class LossPowerRateHealthService {
             vo.setWpname(InitialRunner.wpmap.get(wt.getWindpowerstationid()).getName());
             vo.setWtid(wt.getId());
             vo.setWtname(wt.getId());
-            vo.setModel(wt.getModelid());
+            vo.setModel(wt.getModelId());
 
             String[] points = new String[codels.size()];
 

web/health-hb/src/main/java/com/gyee/frame/service/health/WindTurbineHealthListService.java

@@ -66,7 +66,7 @@ public class WindTurbineHealthListService {
                 vo.setWpname(InitialRunner.wpmap.get(wt.getWindpowerstationid()).getName());
                 vo.setWtid(wt.getId());
                 vo.setWtname(wt.getId());
-                vo.setModel(wt.getModelid());
+                vo.setModel(wt.getModelId());
 
                 String[] points = new String[codels.size()];
 

web/health-hb/src/main/java/com/gyee/frame/service/initialpoint/InitialPointEdosService.java

@@ -819,8 +819,8 @@ public class InitialPointEdosService implements  IinitialPoint{
 //                                sb =new StringBuilder();
 //                                sb.append(wt.getName()).append(stp.getName());
 //                                po.setName(String.valueOf(sb));
-//                                po.setModel(wt.getModelid());
-//                                po.setModelid(wt.getModelid());
+//                                po.setModel(wt.getModelId());
+//                                po.setModelid(wt.getModelId());
 //                                po.setWindturbineid(wt.getId());
 //                                po.setUniformcode(stp.getUniformcode());
 //                                po.setWindpowerstationid(wt.getWindpowerstationid());
@@ -872,9 +872,9 @@ public class InitialPointEdosService implements  IinitialPoint{
                 for(Windturbine wt:wtls)
                 {
 
-//                    if(wpsmap.containsKey(wt.getModelid()))
+//                    if(wpsmap.containsKey(wt.getModelId()))
 //                    {
-//                        List<Windturbinestandardpoints> wpsls=wpsmap.get(wt.getModelid());
+//                        List<Windturbinestandardpoints> wpsls=wpsmap.get(wt.getModelId());
 
                         List<Windturbinetestingpointnew> points=new ArrayList<>();
                         for(int i=0;i<stpointls.size();i++)
@@ -925,8 +925,8 @@ public class InitialPointEdosService implements  IinitialPoint{
                             sb =new StringBuilder();
                             sb.append(wt.getName()).append(stp.getName());
                             po.setName(String.valueOf(sb));
-                            po.setModel(wt.getModelid());
-                            po.setModelid(wt.getModelid());
+                            po.setModel(wt.getModelId());
+                            po.setModelid(wt.getModelId());
                             po.setWindturbineid(wt.getId());
                             po.setUniformcode(stp.getUniformcode());
                             po.setWindpowerstationid(wt.getWindpowerstationid());

web/health-hb/src/main/java/com/gyee/frame/service/initialpoint/InitialPointGoldenService.java

@@ -668,8 +668,8 @@
 //                                sb =new StringBuilder();
 //                                sb.append(wt.getName()).append(stp.getName());
 //                                po.setName(String.valueOf(sb));
-//                                po.setModel(wt.getModelid());
-//                                po.setModelid(wt.getModelid());
+//                                po.setModel(wt.getModelId());
+//                                po.setModelid(wt.getModelId());
 //                                po.setWindturbineid(wt.getId());
 //                                po.setUniformcode(stp.getUniformcode());
 //                                po.setWindpowerstationid(wt.getWindpowerstationid());

web/health-hb/src/main/java/com/gyee/frame/service/leaderboard/LeaderboardService.java

@@ -312,8 +312,8 @@ public class LeaderboardService {
                 for (StatisticalAnalysisTopVo vo : vos) {
                     if (StringUtils.notEmp(vo.getWindturbine()) && wtmap.containsKey(vo.getWindturbine())) {
                         Windturbine wt = wtmap.get(vo.getWindturbine());
-                        if (StringUtils.notEmp(wt.getModelid()) && mlmap.containsKey(wt.getModelid())) {
-                            Equipmentmodel ml = mlmap.get(wt.getModelid());
+                        if (StringUtils.notEmp(wt.getModelId()) && mlmap.containsKey(wt.getModelId())) {
+                            Equipmentmodel ml = mlmap.get(wt.getModelId());
                             if (ml.getPowerproduction() != 0) {
                                 BigDecimal b1 = new BigDecimal(vo.getGeneratingCapacity());
                                 BigDecimal b2 = new BigDecimal(ml.getPowerproduction());
@@ -414,8 +414,8 @@ public class LeaderboardService {
             Map<String, ModelPower> modelmap = null;
             if (wtmap.containsKey(wtId)) {
                 Windturbine wt = wtmap.get(wtId);
-                if (modelPowermap.containsKey(wt.getModelid())) {
-                    modelmap = modelPowermap.get(wt.getModelid());
+                if (modelPowermap.containsKey(wt.getModelId())) {
+                    modelmap = modelPowermap.get(wt.getModelId());
                 }
             }
 
@@ -727,8 +727,8 @@ public class LeaderboardService {
             Map<String, ModelPower> modelmap = null;
             if (wtmap.containsKey(wtId)) {
                 Windturbine wt = wtmap.get(wtId);
-                if (modelPowermap.containsKey(wt.getModelid())) {
-                    modelmap = modelPowermap.get(wt.getModelid());
+                if (modelPowermap.containsKey(wt.getModelId())) {
+                    modelmap = modelPowermap.get(wt.getModelId());
                 }
             }
 

web/health-hb/src/main/java/com/gyee/frame/service/singleanalysis/SingleAnalysisService.java

@@ -56,8 +56,8 @@ public class SingleAnalysisService {
                         vo.setWindPowerStationName(wp.getName());
                     }
 
-                    if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
-                        Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
+                    if (InitialRunner.mlmap.containsKey(wt.getModelId())) {
+                        Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelId());
                         vo.setFjrl(model.getPowerproduction());
                     }
 
@@ -353,8 +353,8 @@ public class SingleAnalysisService {
             vo.setWindPowerStationId(wt.getWindpowerstationid());
             vo.setWindPowerStationName(wp.getName());
             vo.setWindturbineName(wt.getName());
-            if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
-                Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
+            if (InitialRunner.mlmap.containsKey(wt.getModelId())) {
+                Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelId());
                 vo.setFjrl(model.getPowerproduction());
             }
 

web/health-hb/src/main/java/com/gyee/frame/service/stopanalysis/StopAnalysisStaticService.java

@@ -128,7 +128,7 @@ public class StopAnalysisStaticService {
                     double zk = zkvalues[x].DValue;
                     StopAnalysismainVo vo = new StopAnalysismainVo();
                     vo.setWtid(wt.getId());
-                    vo.setModelid(wt.getModelid());
+                    vo.setModelid(wt.getModelId());
                     if (zt == 2.0) {
                         vo.setJudegvulue(GZ);
                     } else {
@@ -156,7 +156,7 @@ public class StopAnalysisStaticService {
                     String wtId = wt.getId();
                     StopAnalysismainVo vo = new StopAnalysismainVo();
                     vo.setWtid(wt.getId());
-                    vo.setModelid(wt.getModelid());
+                    vo.setModelid(wt.getModelId());
 //                    public static final String CLXJKZT = "JKZT002";// 齿轮箱健康状态
 //                    public static final String FDJJKZT = "JKZT003";// 发电机健康状态
 //                    public static final String BJJKZT = "JKZT004";// 变桨健康

web/health-hb/src/main/java/com/gyee/frame/service/websocket/MatrixDetialPushService.java

@@ -351,7 +351,7 @@ public class MatrixDetialPushService {
                     //风机转数
 
                     double fdjzs = MathUtil.twoBit(fjzblist.get(i * step + 3).getPointValueInDouble());
-                    Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
+                    Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelId());
                     if (model.getPowerproduction() == 2000) {
                         vo.setFdjzs(fdjzs * 9.55);
                     } else {

web/health-hb/src/main/java/com/gyee/frame/service/websocket/MatrixPushByWpService.java

@@ -288,8 +288,8 @@ public class MatrixPushByWpService {
                         if (fjzt == 3) {
                             vo.setLyl(0.0);
                         } else {
-                            if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
-                                Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelid());
+                            if (InitialRunner.mlmap.containsKey(wt.getModelId())) {
+                                Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelId());
                                 double generatingcapacity = ml.getPowerproduction();
                                 BigDecimal temp = new BigDecimal(generatingcapacity).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                                 double lyl = new BigDecimal(gl).divide(temp, 2, RoundingMode.HALF_UP).doubleValue();
@@ -789,8 +789,8 @@ public class MatrixPushByWpService {
 //                        if (fjzt == 3) {
 //                            vo.setLyl(0.0);
 //                        } else {
-//                            if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
-//                                Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelid());
+//                            if (InitialRunner.mlmap.containsKey(wt.getModelId())) {
+//                                Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelId());
 //                                double generatingcapacity = ml.getPowerproduction();
 //                                BigDecimal temp = new BigDecimal(generatingcapacity).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
 //                                double lyl = new BigDecimal(gl).divide(temp, 2, RoundingMode.HALF_UP).doubleValue();

web/health-hb/src/main/java/com/gyee/frame/service/websocket/MatrixQfPushService.java

@@ -241,8 +241,8 @@ public class MatrixQfPushService {
                     if (fjzt == 3) {
                         vo.setLyl(0.0);
                     } else {
-                        if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
-                            Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelid());
+                        if (InitialRunner.mlmap.containsKey(wt.getModelId())) {
+                            Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelId());
                             double generatingcapacity = ml.getPowerproduction();
                             BigDecimal temp = new BigDecimal(generatingcapacity).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                             double lyl = new BigDecimal(gl).divide(temp, 2, RoundingMode.HALF_UP).doubleValue();

web/health-hb/src/main/java/com/gyee/frame/service/websocket/WtInfoPushService.java

@@ -68,7 +68,7 @@ public class WtInfoPushService {
                 Map<String, String[]> namemap = new HashMap<String, String[]>();
                 Windturbine wt = InitialRunner.wtmap.get(id);
 
-                map.put("model", wt.getModelid());
+                map.put("model", wt.getModelId());
                 map.put("wpid", wt.getWindpowerstationid());
                 map.put("pjid", wt.getProjectid());
                 map.put("lnid", wt.getLineid());
@@ -829,7 +829,7 @@ public class WtInfoPushService {
                             {
                                 String[] temparr=namemap.get(keyls.get(i));
                                 if (keyls.get(i).equals("FDJZS")) {
-                                    Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
+                                    Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelId());
                                     Double fdjzs = (zblist.get(num).getPointValueInDouble());
                                     if (model.getPowerproduction() == 2000) {
                                         temparr[3]=String.valueOf(StringUtils.round(fdjzs * 9.55, 2));
@@ -870,9 +870,9 @@ public class WtInfoPushService {
  /**************************************************************基础指标***********************************************************************************/
                 }
 
-                if(InitialRunner.mlmap.containsKey(wt.getModelid()))
+                if(InitialRunner.mlmap.containsKey(wt.getModelId()))
                 {
-                    Equipmentmodel model=InitialRunner.mlmap.get(wt.getModelid());
+                    Equipmentmodel model=InitialRunner.mlmap.get(wt.getModelId());
                     jczbmap.put("zjrl",model.getPowerproduction());
                   //  jczbmap.add(new String[]{"装机容量","","ai",String.valueOf(model.getPowerproduction())});
                 }
@@ -1090,7 +1090,7 @@ public class WtInfoPushService {
 
                     Map<String, Object> zbmap = new HashMap<>();
 
-                    zbmap.put("model", wt.getModelid());
+                    zbmap.put("model", wt.getModelId());
                     zbmap.put("wpid", wt.getWindpowerstationid());
                     zbmap.put("pjid", wt.getProjectid());
                     zbmap.put("lnid", wt.getLineid());
@@ -1146,7 +1146,7 @@ public class WtInfoPushService {
 			List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wpId);
 			for (Windturbine wt : wtls) {
 				Map<String, Object> map = new HashMap<String, Object>();
-				map.put("model", wt.getModelid());
+				map.put("model", wt.getModelId());
 				map.put("wpid", wt.getWindpowerstationid());
 				map.put("pjid", wt.getProjectid());
 				map.put("lnid", wt.getLineid());
@@ -1244,7 +1244,7 @@ public class WtInfoPushService {
 		if (StringUtils.notEmp(id)) {
 			if (InitialRunner.wtmap.containsKey(id)) {
 				Windturbine wt = InitialRunner.wtmap.get(id);
-				map.put("model", wt.getModelid());
+				map.put("model", wt.getModelId());
 				map.put("wpid", wt.getWindpowerstationid());
 				map.put("pjid", wt.getProjectid());
 				map.put("lnid", wt.getLineid());

web/health-hb/src/main/java/com/gyee/frame/service/websocket/WtWarnPushService.java

@@ -47,7 +47,7 @@ public class WtWarnPushService {
 
                 Windturbine wt = InitialRunner.wtmap.get(id);
 
-                List<Warning2> warnls=InitialRunner.warnmap.get(wt.getModelid());
+                List<Warning2> warnls=InitialRunner.warnmap.get(wt.getModelId());
 
                 if (!warnls.isEmpty()) {
 

web/health-hb/src/main/java/com/gyee/frame/util/MongoEdosUtil.java

@@ -59,7 +59,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate);
         Optional<Long> endTs = Optional.ofNullable(endDate);
@@ -108,7 +108,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistoryDatasRaw(Windpowerstationpointnew point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate);
         Optional<Long> endTs = Optional.ofNullable(endDate);
@@ -142,7 +142,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public PointData getRealData(Windturbinetestingpointnew point) throws Exception {
         Optional<String> keys = Optional.ofNullable(point.getCode());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
 
@@ -172,7 +172,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
 
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate);
         Optional<Long> endTs = Optional.ofNullable(endDate);
@@ -213,7 +213,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistoryDatasRaw(Windturbinetestingpointnew point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate);
         Optional<Long> endTs = Optional.ofNullable(endDate);
@@ -407,7 +407,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistStat(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate);
         Optional<Long> endTs = Optional.ofNullable(endDate);
@@ -449,7 +449,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistStat(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
         Optional<Long> endTs = Optional.ofNullable(endDate * 1000);

web/health-hb/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -107,7 +107,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         {
             Optional<String> tagName = Optional.ofNullable(point.getCode());
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelId());
             Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
             Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
             Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
@@ -302,7 +302,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         {
             Optional<String> tagName = Optional.ofNullable(point.getCode());
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelId());
             Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
             Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
             Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
@@ -367,7 +367,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()) && !V2Config.getInitialcode().equals(point.getCode()))
         {
             Optional<String> keys = Optional.ofNullable(point.getCode());
-            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelId());
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
             Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
 
@@ -428,7 +428,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         {
             Optional<String> tagName = Optional.ofNullable(point.getCode());
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelId());
             Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
             Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
             Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
@@ -573,7 +573,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         {
             Optional<String> tagName = Optional.ofNullable(point.getCode());
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelId());
             Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
             Optional<Long> startTs = Optional.ofNullable(beginDate);
             Optional<Long> endTs = Optional.ofNullable(endDate);
@@ -1269,7 +1269,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         {
             Optional<String> tagName = Optional.ofNullable(point.getCode());
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelId());
             Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
             Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
             Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
@@ -1351,7 +1351,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         {
             Optional<String> tagName = Optional.ofNullable(point.getCode());
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelId());
             Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
             Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
             Optional<Long> endTs = Optional.ofNullable(endDate * 1000);

web/health-hb/src/main/java/com/gyee/frame/util/hwy/HwyUtil.java

@@ -76,7 +76,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getModel());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
         Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
@@ -234,7 +234,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistoryDatasRaw(Windpowerstationpointnew point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getModel());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
         Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
@@ -279,7 +279,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     @Override
     public PointData getRealData(Windturbinetestingpointnew point) throws Exception {
         Optional<String> keys = Optional.ofNullable(point.getCode());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
 
@@ -322,7 +322,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistoryDatasSnap(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
         Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
@@ -433,7 +433,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistoryDatasRaw(Windturbinetestingpointnew point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate);
         Optional<Long> endTs = Optional.ofNullable(endDate);
@@ -868,7 +868,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistStat(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
         Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
@@ -930,7 +930,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistStat(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getModel());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-        Optional<String> thingType = Optional.ofNullable(point.getModelid());
+        Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
         Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
         Optional<Long> endTs = Optional.ofNullable(endDate * 1000);