修改 左侧

haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java

@@ -4,7 +4,9 @@ import com.haiwei.common.core.domain.AjaxResult;
 
 import static com.haiwei.common.core.domain.AjaxResult.*;
 
+import com.haiwei.common.utils.poi.ExcelUtil;
 import com.haiwei.manage.domain.BaseDeviceInfo;
+import com.haiwei.manage.domain.RecordRaramData;
 import com.haiwei.manage.service.IApiService;
 import com.haiwei.manage.service.IBaseCustomerService;
 import com.haiwei.manage.service.IBaseDeviceInfoService;
@@ -13,11 +15,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -67,9 +68,18 @@ public class ApiController {
     @ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势、获取数据记录")
     @GetMapping("/home/queryParamList")
     public AjaxResult queryPramList(Date beginTime, Date endTime) {
+        System.out.println(beginTime.toString());
         return success(iApiService.queryPramList(beginTime, endTime));
     }
-
+   /* @PostMapping("/home/exportParamList")
+    @ResponseBody
+    public AjaxResult export(Date beginTime, Date endTime)
+    {
+        List<RecordRaramData> recordRaramData = iApiService.queryPramList(beginTime, endTime);
+        List<BaseDeviceInfo> list = baseDeviceInfoService.selectBaseDeviceInfoList(baseDeviceInfo);
+        ExcelUtil<BaseDeviceInfo> util = new ExcelUtil<BaseDeviceInfo>(BaseDeviceInfo.class);
+        return util.exportExcel(list, "base_device_info");
+    }*/
     @ApiOperation(tags = {"60脱水机"}, value = "设备介绍")
     @GetMapping("/home/deviceInfo")
     public AjaxResult deviceInfo() {

haiwei-admin/src/main/resources/templates/board/board1.html

@@ -112,8 +112,8 @@
         el: '#chart2',
         rowNum: 10,
         timeout: 5,
-        header: ['序号', '采集日期', '一体机A转速', '一体机A电流', '一体机A机头压力', '一体机A机头温度', '一体机切刀A电流', '一体机切刀A转速'],
-        data: e.data.map((val, i) => [i, val.time, val['一体机A转速'], val['一体机A电流'], val['一体机A机头压力'], val['一体机A机头温度'], val['一体机切刀A电流'], val['一体机切刀A转速']]),
+        header: ['序号', '采集日期', '一体机A转速', '一体机A电流', '一体机A机头压力', '一体机A机头温度', '一体机A切刀电流', '一体机A切刀转速'],
+        data: e.data.map((val, i) => [i, val.time, val['一体机A转速'], val['一体机A电流'], val['一体机A机头压力'], val['一体机A机头温度'], val['一体机A切刀电流'], val['一体机A切刀转速']]),
         index: true,
         fontColor: '#03BCD4 ',
         indexBGC: '#86F3FF',

haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramData.java

@@ -8,8 +8,8 @@ public class RecordRaramData {
     private String time,
             一体机A转速,
             一体机A电流,
-            一体机切刀A转速,
-            一体机切刀A电流,
+            一体机A切刀转速,
+            一体机A切刀电流,
             一体机A机头温度,
             一体机A机头压力;
 
@@ -37,20 +37,20 @@ public class RecordRaramData {
         this.一体机A电流 = 一体机A电流;
     }
 
-    public String get一体机切刀A转速() {
-        return 一体机切刀A转速;
+    public String get一体机A切刀转速() {
+        return 一体机A切刀转速;
     }
 
-    public void set一体机切刀A转速(String 一体机切刀A转速) {
-        this.一体机切刀A转速 = 一体机切刀A转速;
+    public void set一体机A切刀转速(String 一体机A切刀转速) {
+        this.一体机A切刀转速 = 一体机A切刀转速;
     }
 
-    public String get一体机切刀A电流() {
-        return 一体机切刀A电流;
+    public String get一体机A切刀电流() {
+        return 一体机A切刀电流;
     }
 
-    public void set一体机切刀A电流(String 一体机切刀A电流) {
-        this.一体机切刀A电流 = 一体机切刀A电流;
+    public void set一体机A切刀电流(String 一体机A切刀电流) {
+        this.一体机A切刀电流 = 一体机A切刀电流;
     }
 
     public String get一体机A机头温度() {

haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml

@@ -36,24 +36,12 @@
     </select>
 
     <select id="queryPramList" resultType="com.haiwei.manage.domain.RecordRaramData">
-        select * from (
-        SELECT ee.name + info.PointName as pointname,
-        ed.Data as data,
-        CONVERT(varchar, ed.CreateTime, 120) time
+        select *
+        from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120) time
         FROM EPointData ed
         right join EPointsInfo info on ed.PID = info.ID
-        left join EEquipmentMaintenance ee on ee.ID = info.EID
-        where ee.EquipmentType = 1
-        ) a
-        PIVOT
-        (max(data) FOR pointname IN (
-        一体机A转速,
-        一体机A电流,
-        一体机切刀A转速,
-        一体机切刀A电流,
-        一体机A机头温度,
-        一体机A机头压力
-        ))t
+        left join base_point_info ee on ee.objid = info.EID
+        where info.Status = 1) a PIVOT (max(data) FOR pointname IN ( 一体机A转速, 一体机A电流, 一体机A切刀转速, 一体机A切刀电流, 一体机A机头温度, 一体机A机头压力 )) t
         <where>
             <if test="beginTime !=null and endTime !=null">
                 time between #{beginTime} and #{endTime}