仿真评估检查模型时，总体工况模型里未使用的节点，不检查其模型是否存在。

xyc

2024-11-07 0091dd076ed7d6dfb06fa820dabd9cf5e738514c

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -102,10 +102,9 @@
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 5) {
                    List<XhProductModel> dbList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).gt("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)));
                    List<XhProductModel> dbList = baseDao.getProductListByShip(productId,2,5);
                    for (XhProductModel row : dbList) {
                        if (row.getSameSbNum() > 1) {
                        if (row.getSameSbNum()!=null && row.getSameSbNum() > 1) {
                            for (int i = 1; i <= row.getSameSbNum(); i++) {
                                try {
                                    XhProductModel newRow = row.clone();
@@ -138,8 +137,8 @@
        return baseDao.getNo(pid, productType);
    }

    public List<XhProductModel> getProductList() {
        List<XhProductModel> ProductList = baseDao.getProductList();
    public List<XhProductModel> getProductList(Long shipId, Integer type) {
        List<XhProductModel> ProductList = baseDao.getProductList(shipId,type);
        return TreeUtils.build(ProductList);
    }

@@ -325,6 +324,7 @@
                        ParamData itemEntity = new ParamData();
                        itemEntity.setShipId(shipId);
                        itemEntity.setProductId(curXtId);
                        itemEntity.setBasicUnitNum(1);
                        paramDataService.insert(itemEntity);
                    }

@@ -344,6 +344,7 @@
                        ParamData itemEntity = new ParamData();
                        itemEntity.setShipId(shipId);
                        itemEntity.setProductId(curFxtId);
                        itemEntity.setBasicUnitNum(1);
                        paramDataService.insert(itemEntity);
                    }

@@ -368,9 +369,9 @@
                    //绑定设备ID
                    itemEntity.setShipId(shipId);
                    itemEntity.setProductId(curSbId);
                    itemEntity.setBasicUnitNum(sameSbNum);
                    itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
                    itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
                    itemEntity.setBasicUnitNum(sameSbNum);
                    itemEntity.setBasicMtbfRegulate(basicMtbfRegulate);
                    itemEntity.setBasicMtbfRegulSuccRate(basicMtbfRegulSuccRate);
                    itemEntity.setBasicMtbfOperatingRatio(basicMtbfOperatingRatio);
@@ -581,4 +582,19 @@
            writeList(dto.getChildren(), List);
        }
    }
    public void refreshCache() {
        List<XhProductModel> productList = baseDao.getProductListAll();
        Map<Long, XhProductModel> imgMap = new HashMap<>();
        for (XhProductModel product : productList) {
            imgMap.put(product.getId(), product);
        }
        CacheUtils.put("sysImgCache", "sysImgCache", imgMap);
    }

    public void getImg(HttpServletResponse response, Long id) {
        Map<Long, XhProductModel> imgMap = new HashMap<>();
        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache","sysImgCache");
        XhProductModel product = imgMap.get(id);
        sysPictureBaseService.getSvgImage(response,product.getOperatImg());
    }
}