1.自定义报表,模板选择修改

2.自定义报告调度,更具部门绑定来选择监测点
3.技术监督附件代码更新

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java

@@ -3,6 +3,8 @@ package com.njcn.device.pq.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pq.api.fallback.DeptLineFeignClientFallbackFactory;
+import com.njcn.device.pq.pojo.po.DeptLine;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -34,4 +36,7 @@ public interface DeptLineFeignClient {
     */
     @PostMapping("getLineByDeptRelation")
     HttpResult<Map<String,List<String>>> getLineByDeptRelation(@RequestParam("devDataType") Integer devDataType);
+
+    @PostMapping("/getLineByLineIds")
+    HttpResult<DeptLine> getLineByLineIds(@RequestParam("id") String ids);
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/DeptLineFeignClientFallbackFactory.java

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pq.api.DeptLineFeignClient;
 import com.njcn.device.biz.utils.DeviceEnumUtil;
+import com.njcn.device.pq.pojo.po.DeptLine;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -55,6 +56,12 @@ public class DeptLineFeignClientFallbackFactory implements FallbackFactory<DeptL
                 log.error("{}异常，降级处理，异常为：{}", "获取部门和监测点的关系（分稳态暂态）", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<DeptLine> getLineByLineIds(String ids) {
+                log.error("{}异常，降级处理，异常为：{}", "根据监测点id集合查询部门信息id", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }