Merge branch 'master' of http://116.63.33.55/git/industry-data-platform

industry-admin/src/api/report/print.js

@@ -13,4 +13,47 @@ export function getAllPrintConfig(data) {
         method: 'get',
         params: data
     })
-}
+}
+
+//查询打印机
+export function getPrint() {
+    return request({
+        url: 'http://localhost:8084/api/getPrintName',
+        method: 'get'
+    })
+}
+
+/** 新增打印配置 */
+export function addPrintConfig(data) {
+    return request({
+        url: "/print/addPrintConfig",
+        method: "post",
+        data,
+    });
+}
+
+/** 查询打印配置 */
+export function getPrintConfigById(params) {
+    return request({
+        url: "/print/getPrintConfigById",
+        method: "get",
+        params,
+    });
+}
+
+/** 修改打印配置 */
+export function updatePrintConfigById(data) {
+    return request({
+        url: "/print/updatePrintConfig",
+        method: "post",
+        data,
+    });
+}
+
+/** 删除打印配置 */
+export function delPrintConfigById(id) {
+    return request({
+        url: "/print/delPrintConfigById?id=" + id,
+        method: "post"
+    });
+}

industry-system/industry-da/src/main/java/com/example/opc_da/controller/ReportDataPolicyController.java

@@ -1,10 +1,12 @@
 package com.example.opc_da.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.example.opc_common.entity.ReportDataPolicy;
 import com.example.opc_common.enums.ModelEnum;
 import com.example.opc_common.enums.OperationEnum;
 import com.example.opc_common.enums.ResultEnum;
 import com.example.opc_common.enums.ServerEnum;
+import com.example.opc_common.exception.CustomException;
 import com.example.opc_common.util.Blank;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.annotation.WebLog;
@@ -13,7 +15,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 报表数据策略
@@ -176,23 +180,31 @@ public class ReportDataPolicyController {
     }
 
     /**
-     * 通过策略数据项itemIdList获取对应的实时数据
+     * 通过策略数据项itemIdList获取对应的历史数据
      *
      * @param id
      * @return
      */
     /**
-     * @param idList
+     * @param idList    报表策略数据项对应的id集合
      * @param valueType 取值类型：0原始值，1计算值
      * @param startTime 开始时间
      * @param endTime   结束时间
      * @param limit     为空则查全部
      * @return
      */
-    @RequestMapping(value = "/getPolicyHistoryDataByItemIdList", method = RequestMethod.GET)
+    @RequestMapping(value = "/getPolicyHistoryDataByItemIdList", method = RequestMethod.POST)
     @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.REPORTDATAPOLICY, OperationEnum = OperationEnum.SELECT)
-    public Result getPolicyHistoryDataByItemIdList(@RequestParam List<Integer> idList, @RequestParam Integer valueType
+    public Result getPolicyHistoryDataByItemIdList(@RequestParam String idList, @RequestParam Integer valueType
             , @RequestParam String startTime, @RequestParam String endTime, Integer limit) {
-        return reportDataPolicyService.getPolicyHistoryDataByItemIdList(idList, valueType, startTime, endTime, limit);
+        idList = idList.substring(1, idList.length() - 1);
+        // 将字符串分割并转换成整数集合
+        List<Integer> newIdList = Arrays.stream(idList.split(","))
+                .map(Integer::parseInt)
+                .collect(Collectors.toList());
+        if (CollUtil.isEmpty(newIdList)) {
+            throw new CustomException(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "报表数据策略数据项不能为空");
+        }
+        return reportDataPolicyService.getPolicyHistoryDataByItemIdList(newIdList, valueType, startTime, endTime, limit);
     }
 }

industry-system/industry-da/src/main/java/com/example/opc_da/util/InFluxDBServiceUtil.java

@@ -74,7 +74,7 @@ public class InFluxDBServiceUtil {
             //将数据项信息组装为后面map的形式Map<policyId,List<policyItemId>>
             Map<String, List<String>> policyData = tList.stream().collect(Collectors.groupingBy(
                     p -> p.getReportDataPolicyId().toString()
-                    , Collectors.mapping(p -> p.getItemReadName(), Collectors.toList())
+                    , Collectors.mapping(p -> p.getId().toString(), Collectors.toList())
             ));
 
             //根据分组信息，查询对应的数据项值，并转换为相应的map格式
@@ -89,7 +89,7 @@ public class InFluxDBServiceUtil {
             //将返回的值赋值给对应的数据项中
             for (int i = 0; i < tList.size(); i++) {
                 ReportDataPolicyItem policyItem = tList.get(i);
-                List<Item> items = mapData.get(policyItem.getReportDataPolicyId().toString()).get(policyItem.getItemReadName());
+                List<Item> items = mapData.get(policyItem.getReportDataPolicyId().toString()).get(policyItem.getId().toString());
                 policyItemHistroyVlaue(policyItem, items);
             }
         }

industry-system/industry-da/src/main/resources/mapper/ReportTableDao.xml

@@ -117,7 +117,7 @@
                                    is_run_print, print_ip, print_config_id, cron_id,cron,
                                    create_time, is_delete) VALUE
             (#{id},#{reportTableType},#{tableTemplateId}, #{userId}, #{reportTableName}, #{reportTableData}, #{startTime},
-            #{currentNum}, #{isGenCountTime}, #{version}, #{isRunPrint}, #{printIp}, #{printConfigId}
+            #{currentNum}, #{isGenCountTime}, #{version}, #{isRunPrint}, #{printIp}, #{printConfigId},
             #{cronId}, #{cron}, #{createTime}, #{isDelete})
     </insert>