状态转换记录以及操作记录接口修改

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/auto/OperationrecordController.java

@@ -33,7 +33,6 @@ public class OperationrecordController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R czlb(@RequestParam(value = "WindPowerStation",required = true)String WindPowerStation,
                      @RequestParam( value ="wtid",required = false)String wtid,
-//                     @RequestParam(value = "type",required = false) String type,
                      @RequestParam(value = "beginDate",required = false) String beginDate,
                      @RequestParam(value = "endDate",required = true) String endDate){
 

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/mapper/auto/OperationrecordMapper.java

@@ -23,7 +23,7 @@ public interface OperationrecordMapper extends BaseMapper<Operationrecord> {
 
     @Select(" select s.name,o.wtid,o.id,w.windpowerstationid,o.time,o.value from operationrecord o left join windturbine w on w.id = o.wtid left join WindPowerStation s on s.id = w.windpowerstationid where w.windpowerstationid = #{WindPowerStation} and o.wtid = #{wtid} and o.time >=#{beginDate} and o.time <=#{endDate}")
     public List<Map> listBy(@Param(value = "WindPowerStation") String WindPowerStation,@Param(value = "wtid")String wtid,
-                            @Param(value = "beginDate")Date beginDate,@Param(value = "endDate")Date endDate);
+                                @Param(value = "beginDate")Date beginDate,@Param(value = "endDate")Date endDate);
 
     @Select(" select s.name,o.wtid,o.id,w.windpowerstationid,o.time,o.value from operationrecord o left join windturbine w on w.id = o.wtid left join WindPowerStation s on s.id = w.windpowerstationid where w.windpowerstationid = #{WindPowerStation} and o.wtid = #{wtid} and o.time >=#{beginDate} and o.time <=#{endDate}")
     public List<Map> conversion(@Param(value = "WindPowerStation") String WindPowerStation,@Param(value = "wtid")String wtid,

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/impl/OperationrecordServiceImpl.java

@@ -31,7 +31,28 @@ public class OperationrecordServiceImpl extends ServiceImpl<OperationrecordMappe
     }
 
     public List<Map> listBy (String WindPowerStation,String wtid,Date beginDate, Date endDate) {
-        return operationrecordMapper.listBy(WindPowerStation,wtid,beginDate,endDate);
+        List<Map> map = operationrecordMapper.listBy(WindPowerStation,wtid,beginDate,endDate);
+
+//        for (int i = 0;i<map.size();i++) {
+//            map.get(i).put("ConversionName",Statedescription(map.get(i).get("VALUE").toString()));
+//        }
+
+
+        List<Map> conversiontype = new ArrayList<Map>();
+
+        for (int i = 0;i<map.size();i++) {
+            Map<String, String> maps = new HashMap<>();
+            maps.put("zhsj",map.get(i).get("TIME").toString());//时间
+            maps.put("ConversionName",Statedescription(map.get(i).get("VALUE").toString()));//状态描述
+            maps.put("wtid",map.get(i).get("WTID").toString());
+            maps.put("name",map.get(i).get("NAME").toString());
+            maps.put("id",map.get(i).get("ID").toString());
+            maps.put("windpowerstationid",map.get(i).get("WINDPOWERSTATIONID").toString());
+            conversiontype.add(maps);
+        }
+
+        return conversiontype;
+
     }
 
     public List<Map> conversion (String WindPowerStation,String wtid,Date beginDate, Date endDate) {
@@ -42,15 +63,68 @@ public class OperationrecordServiceImpl extends ServiceImpl<OperationrecordMappe
         for (int i = 0;i<map.size()-1;i++) {
             Map<String, String> maps = new HashMap<>();
             maps.put("zhsj",map.get(i).get("TIME").toString());//转换时间
-            maps.put("beforeConversion",map.get(i).get("VALUE").toString());//转换前状态
-            maps.put("AfterConversion",map.get(i+1).get("VALUE").toString());//转换后状态
+//            maps.put("beforeConversion",map.get(i).get("VALUE").toString());//转换前状态
+            maps.put("beforeConversionName",Statedescription(map.get(i).get("VALUE").toString()));//转换前状态描述
+//            maps.put("AfterConversion",map.get(i+1).get("VALUE").toString());//转换后状态
+            maps.put("AfterConversionName",Statedescription(map.get(i+1).get("VALUE").toString()));//转换后状态描述
             maps.put("wtid",map.get(i).get("WTID").toString());
             maps.put("name",map.get(i).get("NAME").toString());
             maps.put("id",map.get(i).get("ID").toString());
             maps.put("windpowerstationid",map.get(i).get("WINDPOWERSTATIONID").toString());
             conversiontype.add(maps);
         }
+
         return conversiontype;
     }
 
+
+    public  static String Statedescription(String code) {
+
+
+        String  name = "VALUE";
+
+        switch (code) {
+            case "1":
+                name = "启动";
+                break;
+            case "2":
+                name = "停机";
+                break;
+            case "3":
+                name = "复位";
+                break;
+            case "4":
+                name = "维护";
+                break;
+            case "5":
+                name = "取消维护";
+                break;
+            case "6":
+                name = "挂牌检修";
+                break;
+            case "7":
+                name = "挂牌故障维修";
+                break;
+            case "8":
+                name = "挂牌场内受累检修";
+                break;
+            case "9":
+                name = "挂牌场内受累故障";
+                break;
+            case "10":
+                name = "挂牌场外受累电网";
+                break;
+            case "11":
+                name = "挂牌场外受累天气";
+                break;
+            case "12":
+                name = "取消挂牌";
+                break;
+            default:
+
+        }
+        return name;
+    }
+
+
 }