Merge remote-tracking branch 'origin/master'

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpListTableDataServiceImpl.java

@@ -85,7 +85,7 @@ public class FdpListTableDataServiceImpl implements IFdpListTableDataService {
         page.setCurrent(req.getPageIndex() + 1);
         req.setDisplay(1);
         req.setIsRoot(0);
-        req.setOrderBy("NAME");
+        req.setOrderBy("STATION,ORD,NAME");
         req.setOrderKind("desc");
         String result = HttpRequestUtil.postCallObjectParam(req, getNeoFaultTableData, "POST");
         log.info("FdpFaultTableListEntity接口："+result.toString());

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java

@@ -205,7 +205,7 @@ public class MonitorServiceImpl implements MonitorService {
                 List<String> objects = redisClient.getBatchRealDataByRealId(stationReal.getStation(),realIds);
                 for(int i = 0; i < realIds.size() ;i++){
                     if(ObjectUtil.isEmpty(objects.get(i))){
-                        log.error(realIds.get(i) + "is null");
+//                        log.error(realIds.get(i) + "is null");
                     }else{
                         Map<String,String> attribute = (Map<String, String>) JSONObject.parse(objects.get(i));
                         attribute.put("realId",attribute.get("k"));

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java

@@ -1571,7 +1571,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("startDate", startTime);
         paramMap.put("endDate", endTime);
-        paramMap.put("deptList", deptId);
+        paramMap.put("deptList", Arrays.asList(deptId));
         R<List<WorkTicketInfoEntity>> workTicketInfo = ticketInfoClient.getWorkTicketInfo(paramMap);
         if(workTicketInfo.isSuccess()&& cn.hutool.core.util.ObjectUtil.isNotEmpty(workTicketInfo.getData())){
             List<WorkTicketInfoEntity> ticketInfoData = workTicketInfo.getData();
@@ -1583,10 +1583,9 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             List<WorkTicketInfoEntity> invalidList = ticketInfoData.stream().filter(item -> "废票".equals(item.getFlowTaskName()))
                     .collect(Collectors.toList());
             dutyLogEntity.setWorkCancel(String.valueOf(invalidList.size()));
-            Integer i=0;
             //工作票未执行数量
             List<WorkTicketInfoEntity> unExecutedList = ticketInfoData.stream()
-                    .filter(item -> i.equals(item.getImplementStatus()))
+                    .filter(item -> "0".equals(item.getImplementStatus()))
                     .collect(Collectors.toList());
             dutyLogEntity.setWorkUnFinish(String.valueOf(unExecutedList.size()));
             // 工作票执行数量

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java

@@ -78,6 +78,7 @@ public class BaseUtil {
             BaseUtil.exportWord(res, wordPath);
         } catch (Exception e) {
             log.error("文件导出异常: {}", e.getMessage());
+            e.printStackTrace();
         }
         AsposeUtil.wordToPdf(wordPath, pdfPath);
         BaseUtil.readPdf(response,pdfPath);
@@ -138,6 +139,7 @@ public class BaseUtil {
                                                 JSONObject jsonObject = jsonArray.getJSONObject(i);
                                                 String name = jsonObject.getString("name");
                                                 String url = jsonObject.getString("url");
+                                                url = URLEncoder.encode(url, "UTF-8");
                                                 String id = paragraph.getDocument().getPackagePart().addExternalRelationship(url, XWPFRelation.HYPERLINK.getRelation()).getId();
                                                 CTHyperlink cLink = paragraph.getCTP().addNewHyperlink();
                                                 cLink.setId(id);