代码提交

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/alarm/AlarmTsController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gyee.power.fitting.common.result.JsonResult;
 import com.gyee.power.fitting.common.result.ResultCode;
 import com.gyee.power.fitting.model.vo.AlarmTsVo;
+import com.gyee.power.fitting.model.vo.AlarmVo;
 import com.gyee.power.fitting.service.IAlarmTsService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +30,8 @@ public class AlarmTsController {
      * @return
      */
     @GetMapping("getData")
-    public JSONObject dataProcessTree(String superTableName, String stationid, long begin, long end){
-        List<AlarmTsVo> result = alarmTsService.selectByWpGroup(superTableName,stationid,begin,end);
+    public JSONObject dataProcessTree(String superTableName, String stationid,String deviceid, long begin, long end){
+        List<AlarmVo> result = alarmTsService.findTagsByDeviceid(superTableName,stationid,deviceid,begin,end);
         return JsonResult.successData(ResultCode.SUCCESS, result);
     }
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/mapper/AlarmTsMapper.java

@@ -80,6 +80,13 @@ public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
     List<AlarmVo> findTags(@Param("stbaleName") String stbaleName);
 
 
+
+
+
+    @Select("select * from ${superTableName} where ts>=${begin} and ts<=${end} and   stationid=#{stationid} and   deviceid=#{deviceid}")
+    List<AlarmVo> findTagsByDeviceid(@Param("superTableName") String superTableName, @Param("stationid") String stationid, @Param("deviceid")  String deviceid, @Param("begin")long begin, @Param("end") long end);
+
+
     @Select("select deviceid,description,count(*) as val from #{superTableName} where ts>=#{begin} and ts<=#{end}  stationid=#{stationid}  group by description,deviceid  ")
     List<AlarmTsVo> selectByWpGroup(@Param("superTableName") String superTableName, @Param("stationid") String stationid, @Param("begin")long begin, @Param("end") long end);
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/IAlarmTsService.java

@@ -53,5 +53,7 @@ public interface IAlarmTsService extends IService<AlarmTs> {
     List<AlarmVo> selectByTbName(String tbName, long limit, long offset);
 
     List<AlarmSimpleVo> selectLastRowByTbname(String superTableName, String tbnames);
+
+    List<AlarmVo> findTagsByDeviceid(String superTableName, String stationid,String deviceid, long begin, long end);
 }
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/AlarmTsServiceImpl.java

@@ -171,4 +171,21 @@ public class AlarmTsServiceImpl extends ServiceImpl<AlarmTsMapper, AlarmTs> impl
 
         return ls;
     }
+
+
+    @Override
+    public List<AlarmVo> findTagsByDeviceid(String superTableName, String stationid, String deviceid, long begin, long end) {
+        try {
+            List<AlarmVo> ls=new ArrayList<>();
+            if(StringUtils.notEmp(superTableName) && StringUtils.notEmp(stationid) && StringUtils.notEmp(begin) && StringUtils.notEmp(end))
+            {
+                ls= alarmTsMapper.findTagsByDeviceid(superTableName, stationid,deviceid, begin, end);
+            }
+
+            return ls;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

power-fitting-JN/src/main/resources/application.yaml

@@ -107,8 +107,8 @@ spring:
             multi-statement-allow: true
 
   redis:
-    host: 127.0.0.1
-    #host: 10.81.3.155
+    #host: 127.0.0.1
+    host: 10.81.3.155
     port: 6379
     timeout: 100000
     password: