add 状态转换记录接口

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

@@ -41,4 +41,16 @@ public class OperationrecordController {
         return R.ok(Map.size()).data(Map);
     }
 
+    @GetMapping("/zhlb")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R zhlb(@RequestParam(value = "WindPowerStation",required = true)String WindPowerStation,
+                  @RequestParam( value ="wtid",required = false)String wtid,
+                  @RequestParam(value = "beginDate",required = false) String beginDate,
+                  @RequestParam(value = "endDate",required = true) String endDate){
+
+        List<Map> Map = operationrecordService.conversion(WindPowerStation,wtid,DateUtils.parseDate(beginDate),DateUtils.parseDate(endDate));
+        return R.ok(Map.size()).data(Map);
+    }
+
 }

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

@@ -24,4 +24,8 @@ 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);
+
+    @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,
+                                @Param(value = "beginDate")Date beginDate,@Param(value = "endDate")Date endDate);
 }

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

@@ -20,4 +20,6 @@ public interface IOperationrecordService extends IService<Operationrecord> {
 
     public List<Map> listBy (String WindPowerStation,String wtid,Date beginDate, Date endDate);
 
+    public List<Map> conversion (String WindPowerStation,String wtid,Date beginDate, Date endDate);
+
 }

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

@@ -4,15 +4,14 @@ import com.gyee.benchmarkingimpala.model.auto.Benchmarkingbetween;
 import com.gyee.benchmarkingimpala.model.auto.Operationrecord;
 import com.gyee.benchmarkingimpala.mapper.auto.OperationrecordMapper;
 import com.gyee.benchmarkingimpala.model.auto.Windpowerstation;
+import com.gyee.benchmarkingimpala.model.auto.Windturbinetestingpointai2;
 import com.gyee.benchmarkingimpala.service.auto.IOperationrecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -35,4 +34,23 @@ public class OperationrecordServiceImpl extends ServiceImpl<OperationrecordMappe
         return operationrecordMapper.listBy(WindPowerStation,wtid,beginDate,endDate);
     }
 
+    public List<Map> conversion (String WindPowerStation,String wtid,Date beginDate, Date endDate) {
+        List<Map> map = operationrecordMapper.conversion(WindPowerStation,wtid,beginDate,endDate);
+
+        List<Map> conversiontype = new ArrayList<Map>();
+
+        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("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;
+    }
+
 }