修改

jinlin

2024-11-19 195bb5267a6ece13363303e177fee7d1fa3941aa

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

@@ -104,22 +104,30 @@
                } else if (ztShow == 5) {
                    List<XhProductModel> dbList = baseDao.getProductListByShip(productId,2,5);
                    for (XhProductModel row : dbList) {
                        if (row.getSameSbNum()!=null && row.getSameSbNum() > 1) {
                            for (int i = 1; i <= row.getSameSbNum(); i++) {
                        int sameNum = row.getSameSbNum() == null ? 1 : row.getSameSbNum();
                        for (int i = 1; i <= sameNum; i++) {
                                try {
                                    XhProductModel newRow = row.clone();
                                XhProductModel newRow = null;
                                if (sameNum > 1) {
                                    newRow = row.clone();
                                }
                                else
                                    newRow = row;
                                if ("5".equals(newRow.getProductType())){
                                    newRow.setDeviceNo(i);
                                    newRow.setName(row.getName() + "-" + i);
                                    newRow.setDataId(row.getId().toString() + "-" + i);
                                    if (i>1){
                                        newRow.setName(row.getName() + "-" + i);
                                    }
                                }
                                else{
                                    newRow.setDeviceNo(0);
                                    newRow.setDataId(row.getId().toString());
                                }
                                    productList.add(newRow);
                                } catch (CloneNotSupportedException e) {
                                    e.printStackTrace();
                                }
                            }
                        } else {
                            row.setDeviceNo(0);
                            row.setDataId(row.getId().toString());
                            productList.add(row);
                        }
                    }
                    productList.sort(Comparator.comparing(XhProductModel::getSort, Comparator.naturalOrder())
@@ -153,6 +161,7 @@
    }

    public List<Map<String, Object>> importProductExcel(MultipartFile mutFile, String progressId, Long shipId) {
        Map<Long, XhProductModel> imgMap = new HashMap<>();
        Date beginDate = new Date();
        List<Map<String, Object>> list = new ArrayList<>();//存储所有的导入状态
        Map<String, Object> map;//存储每一行的状态
@@ -319,6 +328,8 @@
                        xhProductModel.setOperatImg(defultImg);
                        xhProductModel.setNamePath(curXtName);
                        this.insert(xhProductModel);
                        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
                        imgMap.put(xhProductModel.getId(), xhProductModel);

                        //导入预计参数
                        ParamData itemEntity = new ParamData();
@@ -339,6 +350,8 @@
                        xhProductModel.setOperatImg(defultImg);
                        xhProductModel.setNamePath(fxtPath);
                        this.insert(xhProductModel);
                        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
                        imgMap.put(xhProductModel.getId(), xhProductModel);

                        //导入预计参数
                        ParamData itemEntity = new ParamData();
@@ -360,8 +373,12 @@
                    xhProductModel.setNamePath(sbPath);
                    if (insertSb) {
                        this.insert(xhProductModel);
                        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
                        imgMap.put(xhProductModel.getId(), xhProductModel);
                    } else {
                        this.update(xhProductModel);
                        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
                        imgMap.put(xhProductModel.getId(), xhProductModel);
                    }

                    //导入预计参数
@@ -589,6 +606,7 @@
            writeList(dto.getChildren(), List);
        }
    }

    public void refreshCache() {
        List<XhProductModel> productList = baseDao.getProductListAll();
        Map<Long, XhProductModel> imgMap = new HashMap<>();
@@ -604,4 +622,50 @@
        XhProductModel product = imgMap.get(id);
        sysPictureBaseService.getSvgImage(response,product.getOperatImg());
    }

    public void insertProduct(XhProductModel xhProductModel) {
        Integer no = this.getNo(xhProductModel.getPid(), xhProductModel.getProductType());
        if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) {
            xhProductModel.setSort(no + 1);
        }
        if (xhProductModel.getProductType().equals("2")) {
            Long id = UUIDUtil.generateId();
            xhProductModel.setId(id);
            xhProductModel.setShipId(id);

            ParamData data = new ParamData();
            data.setShipId(id);
            data.setProductId(id);

            paramDataService.insert(data);
        } else {
            xhProductModel.setNamePath(xhProductModel.getNamePath() + "," + xhProductModel.getName());
            this.insert(xhProductModel);
            ParamData data = new ParamData();
            data.setShipId(xhProductModel.getShipId());
            data.setProductId(xhProductModel.getId());
            paramDataService.insert(data);
        }
        Map<Long, XhProductModel> imgMap = new HashMap<>();
        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
        imgMap.put(xhProductModel.getId(), xhProductModel);
    }

    public void updateProduct(XhProductModel xhProductModel) {
        XhProductModel oldXh = this.get(xhProductModel.getId());
        if (oldXh != null) {
            if (!oldXh.getPid().equals(xhProductModel.getPid())) {
                XhProductModel parentXh = this.get(xhProductModel.getPid());
                if (parentXh.getProductType().equals("3")) {
                    xhProductModel.setNamePath(parentXh.getName() + "," + xhProductModel.getName());
                } else if (parentXh.getProductType().equals("4")) {
                    xhProductModel.setNamePath(parentXh.getNamePath() + "," + xhProductModel.getName());
                }
            }
        }
        this.update(xhProductModel);
        Map<Long, XhProductModel> imgMap = new HashMap<>();
        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
        imgMap.put(xhProductModel.getId(), xhProductModel);
    }
}