1.试运行报告微调

2.全景展示稳态超标9指标扩展
3.技术监督变电站台账调整
4.调整登录名正则表达式增加._

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
@@ -30,6 +31,7 @@ import com.njcn.harmonic.pojo.po.report.ReportTarget;
 import com.njcn.harmonic.pojo.vo.ReportValue;
 import com.njcn.harmonic.service.ReportService;
 import com.njcn.harmonic.utils.WordUtil2;
+import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.ThemeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
@@ -87,7 +89,7 @@ public class ExportModelJBController extends BaseController {
     private final DeviceUnitClient deviceUnitClient;
     private final WordUtil2 wordUtil2;
     private final EventDetailFeignClient eventDetailFeignClient;
-
+    private final FileStorageUtil fileStorageUtil;
     /**
      * @param response
      * @param startTime    开始时间
@@ -199,7 +201,7 @@ public class ExportModelJBController extends BaseController {
         }
 
         String rtfPath;
-        String picPath = "file/default.jpg";
+        String picPath = "file/jxt.jpg";
 
         Theme theme = themeFeignClient.getTheme().getData();
         if (theme.getRemark().equals("国网")) {
@@ -262,7 +264,12 @@ public class ExportModelJBController extends BaseController {
             InputStream inStream = null;
             byte[] data = null;
             try {
-                inStream = picPathResource.getInputStream();
+                if(StrUtil.isNotBlank(lineDto.getWiringDiagram())){
+                    String wiringDiagram = lineDto.getWiringDiagram();
+                    inStream =  fileStorageUtil.getFileStream(wiringDiagram.substring(wiringDiagram.indexOf("/")));
+                }else{
+                    inStream = picPathResource.getInputStream();
+                }
                 data = new byte[inStream.available()];
                 inStream.read(data);
             } catch (Exception e) {