获取回路历史数据

src/main/java/com/welampiot/controller/LampController.java

@@ -561,8 +561,8 @@ public class LampController {
 
             lampInfo.setControlType(controlType);
             lampInfo.setRatedPower(power);
-            lampInfo.setLongitude(Float.valueOf(longitude));
-            lampInfo.setLatitude(Float.valueOf(latitude));
+            lampInfo.setLongitude(Double.valueOf(longitude));
+            lampInfo.setLatitude(Double.valueOf(latitude));
             lampInfo.setAreaId(areaId);
             lampInfo.setSectionId(sectionId);
             lampInfo.setAddress(sn);
@@ -679,8 +679,8 @@ public class LampController {
             lampInfoDTO.setSectionId(sectionId);
             lampInfoDTO.setName(name);
 //            lampInfoDTO.setNetworkId(oldLamp.getNetworkId());
-            lampInfoDTO.setLatitude(Float.valueOf(latitude));
-            lampInfoDTO.setLongitude(Float.valueOf(longitude));
+            lampInfoDTO.setLatitude(Double.valueOf(latitude));
+            lampInfoDTO.setLongitude(Double.valueOf(longitude));
             lampInfoDTO.setNumber(number);
             lampInfoDTO.setSn(sn);
             lampInfoDTO.setAreaId(areaId);
@@ -1519,7 +1519,7 @@ public class LampController {
                 if (type.equals("1")) continue;
                 lamp.setSelect(0);
             }
-            if (lamp.getLighteness() == 0){
+            if (lamp.getLighteness().equals(0)){
                 lamp.setLampStatusStr("关");
             }else {
                 lamp.setLampStatusStr("开");
@@ -1590,8 +1590,8 @@ public class LampController {
         LampInfoDTO lampInfoDTO = new LampInfoDTO();
 
         if ((sectionId == null || sectionId.intValue() == 0) && (areaId == null || areaId.intValue() == 0)) {
-            lampInfoDTO.setLongitude(114.06807299140166f);
-            lampInfoDTO.setLatitude(22.5324106360218f);
+            lampInfoDTO.setLongitude(114.06807299140166);
+            lampInfoDTO.setLatitude(22.5324106360218);
             return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampInfoDTO);
         }
         if (areaId == null || areaId.intValue() == 0){

src/main/java/com/welampiot/controller/LoopController.java

@@ -2,17 +2,12 @@ package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
 import com.welampiot.common.InterfaceResultEnum;
-import com.welampiot.dto.GlobalLocationDTO;
-import com.welampiot.dto.LampInfoDTO;
-import com.welampiot.dto.LoopDTO;
-import com.welampiot.dto.SectionDTO;
-import com.welampiot.service.GlobalLocationService;
-import com.welampiot.service.LampService;
-import com.welampiot.service.LoopService;
-import com.welampiot.service.SectionService;
+import com.welampiot.dto.*;
+import com.welampiot.service.*;
 import com.welampiot.utils.ExcelUtil;
 import com.welampiot.utils.ToolUtils;
 import com.welampiot.vo.LampVO;
+import com.welampiot.vo.LoopDataLogVO;
 import com.welampiot.vo.LoopVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -51,6 +46,9 @@ public class LoopController {
     @Autowired
     private GlobalLocationService globalLocationService;
 
+    @Autowired
+    private LoopDataLogService loopDataLogService;
+
     /**
      * 获取回路列表
      * @param request 路段筛选，分页
@@ -491,4 +489,19 @@ public class LoopController {
 
         return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
     }
+
+    /**
+     * 获取回路历史数据
+     */
+    @RequestMapping(value = "/getLogList", method = RequestMethod.POST)
+    public BaseResult<?> getLogList(LoopDataLogVO loopDataLogVO) {
+        Integer version = loopDataLogVO.getVersion();
+        Integer id = loopDataLogVO.getId();
+        if (id == null || id == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
+        loopDataLogVO.setPageAndCount(loopDataLogVO.getPage(), loopDataLogVO.getCount());
+        List<LoopDataLogDTO> loopDatalogList = loopDataLogService.getLoopDataLogListByLoopDataLogVO(loopDataLogVO);
+        LoopDataLogVO loopDataLogVO1 = new LoopDataLogVO();
+        loopDataLogVO1.setList(loopDatalogList);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,loopDataLogVO1);
+    }
 }

src/main/java/com/welampiot/controller/MapController.java

@@ -1700,8 +1700,8 @@ public class MapController{
         } else if (type == 1) {
             LampInfoDTO lampInfoDTO = new LampInfoDTO();
             lampInfoDTO.setId(id);
-            lampInfoDTO.setLongitude(Float.valueOf(longitude));
-            lampInfoDTO.setLatitude(Float.valueOf(latitude));
+            lampInfoDTO.setLongitude(Double.valueOf(longitude));
+            lampInfoDTO.setLatitude(Double.valueOf(latitude));
             lampService.changeLampLocationById(lampInfoDTO);
         }
         return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);

src/main/java/com/welampiot/dao/LoopDataLogDao.java

@@ -0,0 +1,10 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.LoopDataLogDTO;
+import com.welampiot.vo.LoopDataLogVO;
+
+import java.util.List;
+
+public interface LoopDataLogDao {
+    List<LoopDataLogDTO> getLoopDataLogListByLoopDataLogVO(LoopDataLogVO loopDataLogVO);
+}

src/main/java/com/welampiot/dto/LoopDataLogDTO.java

@@ -0,0 +1,21 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+@Data
+public class LoopDataLogDTO {
+    private Integer id;
+    private Integer loopId;
+    private Double volPa;
+    private Double curA;
+    private Double insPa;
+    private Double curB;
+    private Double insPb;
+    private Double volPb;
+    private Double curC;
+    private Double insPc;
+    private Double volPc;
+    private String updateTime;
+    /** 开合闸状态（0 合闸，1 分闸） */
+    private Integer status;
+}

src/main/java/com/welampiot/service/LoopDataLogService.java

@@ -0,0 +1,10 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.LoopDataLogDTO;
+import com.welampiot.vo.LoopDataLogVO;
+
+import java.util.List;
+
+public interface LoopDataLogService {
+    List<LoopDataLogDTO> getLoopDataLogListByLoopDataLogVO(LoopDataLogVO loopDataLogVO);
+}

src/main/java/com/welampiot/service/impl/LoopDataLogServiceImpl.java

@@ -0,0 +1,22 @@
+package com.welampiot.service.impl;
+
+import com.welampiot.dao.LoopDataLogDao;
+import com.welampiot.dto.LoopDataLogDTO;
+import com.welampiot.service.LoopDataLogService;
+import com.welampiot.vo.LoopDataLogVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class LoopDataLogServiceImpl implements LoopDataLogService {
+
+    @Autowired
+    private LoopDataLogDao loopDataLogDao;
+
+    @Override
+    public List<LoopDataLogDTO> getLoopDataLogListByLoopDataLogVO(LoopDataLogVO loopDataLogVO) {
+        return loopDataLogDao.getLoopDataLogListByLoopDataLogVO(loopDataLogVO);
+    }
+}

src/main/java/com/welampiot/vo/LoopDataLogVO.java

@@ -0,0 +1,14 @@
+package com.welampiot.vo;
+
+import com.welampiot.dto.LoopDataLogDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LoopDataLogVO extends BaseVO {
+    private Integer id;
+    List<LoopDataLogDTO> list;
+}

src/main/resources/mapper/LoopDataLogMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.welampiot.dto.LoopDataLogDao">
+
+    <select id="getLoopDataLogListByLoopDataLogVO" resultType="LoopDataLogDTO">
+        select l.id,l.cura AS curA,l.curb AS curB,l.curc AS curC,
+               l.insPa,l.insPb,l.insPc,l.volPa,l.volPb,l.volPc,
+               l.updatetime AS updateTime,l.status
+        from loop_data_log l
+        where l.loop_id = #{loopId}
+        order by l.updatetime desc
+        <if test="page != null and count != null">
+            limit #{page},#{count}
+        </if>
+    </select>
+
+</mapper>