Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -25,6 +25,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoVO extends BaseVO implements Serializable {
+
     private String sortNum;
     /**
      * 自定义参数列表:[{name:name1, content:content1},{name:name2, content:content2}]
@@ -524,4 +525,23 @@ public class SbInfoVO extends BaseVO implements Serializable {
      *
      */
     private CheckStandard checkStandard;
+
+
+    private String bpNo;
+
+    private Double sbWorkPa;
+
+    private String securityType;
+
+    private String securityModel;
+
+    private Integer gctj;
+
+    private Double gcPa;
+
+    private Double maxPa;
+
+    private Double zdPa;
+
+    private String reportNo;
 }

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -117,7 +117,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
                 mmScb.add(item);
             });
         }
-        sendMessageToRepairManger(form,sysUserVOList,CommonConstants.CALL_REPAIR_NOTICE);
+        sendMessageToRepairManger(form,mmScb,CommonConstants.CALL_REPAIR_NOTICE);
         // 给该部门班组长推送信息
         /*List<SysUserVO> banzuzhangs = getRepairMangers(repairDeptId,null,SysRoleCodeEnum.Maintenance_Leader.name());
         if(banzuzhangs != null && banzuzhangs.size() > 0){

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -80,6 +80,7 @@ import com.platform.service.util.CodeFileUtils;
 import com.platform.service.util.ExecuteSql;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -1408,6 +1409,44 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         }
         PageHelper.startPage(pageNum, pageSize);
         List<SbInfoVO> sbList = mapper.selectVOList(model);
+        if (model.getUseType()!=null&&model.getUseType()==5){
+            Map<String, Object> map = new HashedMap();
+            for (SbInfoVO vo:sbList){
+                try {
+                    String jsonStr = vo.getParamList().substring(1,vo.getParamList().length()-1);
+                    String[] strArr = jsonStr.split("},");
+                    for (int i=0;i<strArr.length;i++){
+                        String str=null;
+                        if (i!=strArr.length-1){
+                            str = strArr[i]+"}";
+                        }
+                        Map<String,String> map1= JsonUtils.jsonToMap(str);
+                        map.put(map1.get("name"),map1.get("content"));
+
+                    }
+
+
+                    if (map!=null) {
+                        vo.setBpNo(map.get("标牌号") == null ? null : map.get("标牌号").toString());
+                        vo.setSbWorkPa(map.get("设备工作压力MPa") == null ? null : Double.parseDouble(map.get("设备工作压力MPa").toString()));
+                        vo.setSecurityType(map.get("安全阀类型") == null ? null : map.get("安全阀类型").toString());
+                        vo.setSecurityModel(map.get("安全阀型号") == null ? null : map.get("安全阀型号").toString());
+                        vo.setGctj(map.get("公称通径") == null ? null : Integer.parseInt(map.get("公称通径").toString()));
+                        vo.setGcPa(map.get("公称压力MPa") == null ? null : Double.parseDouble(map.get("公称压力MPa").toString()));
+                        vo.setMaxPa(map.get("所在设备最高工作压力") == null ? null : Double.parseDouble(map.get("所在设备最高工作压力").toString()));
+                        vo.setZdPa(map.get("整定压力") == null ? null : Double.parseDouble(map.get("整定压力").toString()));
+                        vo.setReportNo(map.get("报告编号") == null ? null : map.get("报告编号").toString());
+                    }
+                }catch (Exception e){
+
+                }
+//                param.setId(vo.getId());
+//                param.setSbName(vo.getName());
+//                param.setPositionName(vo.getPositionName());
+//                vo.setDeFinedParam(param);
+
+            }
+        }
        /* for (SbInfoVO vo : sbList) {
             vo.setChildren(new ArrayList<>());
         }*/