소스 검색

添加taos查询相关业务类

全业务考评 1 년 전
부모
커밋
b56d182c3a

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

@@ -0,0 +1,38 @@
+package com.gyee.power.fitting.controller.alarm;
+
+
+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.service.IAlarmTsService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Controller
+@RequestMapping("/alarm")
+@Api(value = "权限管理", tags = "权限管理")
+public class AlarmTsController {
+
+
+    @Autowired
+    private IAlarmTsService alarmTsService;
+
+
+
+    /** getData
+     * @return
+     */
+    @GetMapping("getData")
+    public JSONObject dataProcessTree(String superTableName, String stationid, long begin, long end){
+        List<AlarmTsVo> result = alarmTsService.selectByWpGroup(superTableName,stationid,begin,end);
+        return JsonResult.successData(ResultCode.SUCCESS, result);
+    }
+
+}

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

@@ -13,48 +13,45 @@ import java.util.List;
 
 public interface IAlarmTsService extends IService<AlarmTs> {
 
-    public void createSuperTable(String type);
+    void createSuperTable(String type);
 
 
-    public void dropSuperTable(String type);
+    void dropSuperTable(String type);
 
 
-    public int createTable(AlarmVo vo) ;
+    int createTable(AlarmVo vo);
 
-    public int createTable(String tbName, String alarmid, String alarmtype,
-                           String characteristic, String components,
-                           String description,
-                           String deviceid, String devicename,
-                           String devicetype, Boolean enabled,
-                           String lineid, String linename,
-                           String modelId, String projectid,
-                           String projectname, Integer rank,
-                           Boolean resettable, String stationid,
-                           String stationname, String subcomponents,
-                           String suffix, String tagid,
-                           Integer triggertype, String uniformcode,String superTableName
+    int createTable(String tbName, String alarmid, String alarmtype,
+                    String characteristic, String components,
+                    String description,
+                    String deviceid, String devicename,
+                    String devicetype, Boolean enabled,
+                    String lineid, String linename,
+                    String modelId, String projectid,
+                    String projectname, Integer rank,
+                    Boolean resettable, String stationid,
+                    String stationname, String subcomponents,
+                    String suffix, String tagid,
+                    Integer triggertype, String uniformcode, String superTableName
 
     );
 
 
+    int insertOne(AlarmTs one);
 
-    public int insertOne(AlarmTs one);
 
+    void insertList(List<AlarmTag> alarmTags);
 
+    void createSql(List<AlarmTag> alarmTags);
 
 
-    public void insertList(List<AlarmTag>  alarmTags ) ;
+    List<AlarmVo> findTags(String stbaleName);
 
-    public void createSql(List<AlarmTag>  alarmTags )  ;
+    List<AlarmTsVo> selectByWpGroup(String superTableName, String stationid, long begin, long end);
 
 
-    public List<AlarmVo> findTags(String stbaleName);
+    List<AlarmVo> selectByTbName(String tbName, long limit, long offset);
 
-    public List<AlarmTsVo> selectByWpGroup(String superTableName, String stationid, long begin, long end);
-
-
-    public   List<AlarmVo> selectByTbName(String tbName,long limit,long offset);
-
-    public List<AlarmSimpleVo> selectLastRowByTbname(String superTableName, String tbnames);
+    List<AlarmSimpleVo> selectLastRowByTbname(String superTableName, String tbnames);
 }
 

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

@@ -147,7 +147,8 @@ public class AlarmTsServiceImpl extends ServiceImpl<AlarmTsMapper, AlarmTs> impl
 
 
 
-    public   List<AlarmVo> selectByTbName(String tbName,long limit,long offset)
+    @Override
+    public  List<AlarmVo> selectByTbName(String tbName,long limit,long offset)
     {
         List<AlarmVo> ls=new ArrayList<>();
         if(StringUtils.notEmp(tbName) && StringUtils.notEmp(limit) && StringUtils.notEmp(offset))