ReliabilitySimulation.git

			@@ -136,8 +136,8 @@
			Map<String, Object> errMap = new HashMap<>();
			Map<String, Integer> reliabType = new HashMap<>();
			reliabType.put("指数分布", 1);
			reliabType.put("二项分布", 2);
			reliabType.put("威布尔分布", 3);
			reliabType.put("二项分布", 3);
			reliabType.put("威布尔分布", 2);
			Map<String, Integer> repairType = new HashMap<>();
			repairType.put("指数分布", 1);
			repairType.put("威布尔分布", 2);
			@@ -146,14 +146,14 @@
			isOrNot.put("否", 0);

			//获取是否有数据，如果有则删除数据
			List<XhProductModel> productList = this.getByShipId(shipId);
			/* List<XhProductModel> productList = this.getByShipId(shipId);
			List<ParamData> dataList = paramDataService.getByShipId(shipId);
			if (productList.size() > 0) {
			this.deleteByShipId(shipId);
			}
			if (dataList.size() > 0) {
			paramDataService.deleteByShipId(shipId);
			}
			}*/

			try {
			// 获取导入文件的后缀名
			@@ -169,33 +169,41 @@
			int sheets = workbook.getNumberOfSheets();

			//List<LifeManagement> lifeManagementList = new ArrayList<LifeManagement>();
			String xt = null;
			String fxt = null;
			Long xtId = null;
			Long fxtId = null;
			Long curXtId = null;
			Long curFxtId = null;
			Long curSbId = null;
			String curXtName = "";
			String curFxtName = "";

			Map<String, XhProductModel> modelMap = new HashMap<>();
			List<XhProductModel> prductList = baseDao.getProductPath(shipId);

			//导入预计参数
			ParamData itemEntity1 = new ParamData();
			itemEntity1.setShipId(shipId);
			itemEntity1.setProductId(shipId);
			itemEntity1.setPageCode("expect");
			paramDataService.insert(itemEntity1);
			for (XhProductModel product : prductList) {
			if (StringUtils.isNotBlank(product.getNamePath())) {
			modelMap.put(product.getNamePath(), product);
			}
			}

			boolean insertXt;
			boolean insertFxt;
			Boolean insertSb;
			for (int i = 0; i < sheets; i++) {
			Sheet sheet = workbook.getSheetAt(i);
			int num = sheet.getLastRowNum(); // 一共有多少行
			String sheetName = sheet.getSheetName(); //获取当前sheet名称
			for (int j = 1; j <= num; j++) {
			insertXt = false;
			insertFxt = false;
			insertSb = false;
			CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
			CacheUtils.put(progressId, "msg", "共" + num + "行，已完成第" + j + "行");
			boolean isToggleXt = false;
			boolean isToggleFxt = false;
			/* boolean isToggleXt = false;
			boolean isToggleFxt = false;*/
			row1 = j + 1;
			String pattern = "yyyy-MM-dd";
			Row row = sheet.getRow(row1);
			String sort = com.zt.core.shiro.ImportUtil.getCellValue(row, 0, pattern); //序号
			if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern))) {
			/* if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern))) {
			if (!com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern).equals(xt)) {
			isToggleXt = true;
			xtId = UUIDUtil.generateId();
			@@ -216,8 +224,10 @@
			fxt = null;
			isToggleFxt = true;
			}
			}
			}*/

			String xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //系统
			String fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern);
			String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //设备
			String equipType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //设备类型
			String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //可靠性分布类型
			@@ -236,10 +246,54 @@
			String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr其他参数2
			String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 19, pattern); //mttcr其他参数3

			if (StringUtils.isBlank(sb))
			continue;

			if (StringUtils.isBlank(xt)) {
			if (StringUtils.isBlank(curXtName))
			continue;
			else
			xt = curXtName;
			} else {
			if (StringUtils.isBlank(curXtName) \|\| !xt.equals(curXtName)) {
			curXtName = xt;
			if (modelMap.get(curXtName) == null) {
			curXtId = UUIDUtil.generateId();
			insertXt = true;
			} else {
			curXtId = modelMap.get(curXtName).getId();
			}
			curFxtId = null;
			curFxtName = "";
			}
			}
			String fxtPath = "";
			if (StringUtils.isNotBlank(fxt) && !fxt.equals(curFxtName)) {
			curFxtName = fxt;
			fxtPath = curXtName + "," + curFxtName;
			if (modelMap.get(fxtPath) == null) {
			curFxtId = UUIDUtil.generateId();
			insertFxt = true;
			} else {
			curFxtId = modelMap.get(fxtPath).getId();
			}
			}

			Long paramId = null;
			String sbPath = curXtName + "," + (StringUtils.isBlank(curFxtName) ? "" : curFxtName + ",") + sb;
			if (modelMap.get(sbPath) == null) {
			curSbId = UUIDUtil.generateId();
			insertSb = true;
			} else {
			curSbId = modelMap.get(sbPath).getId();
			paramId = modelMap.get(sbPath).getParamId();
			}

			if (StringUtils.isEmpty(sb)) {
			com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写设备名称", sheetName, row1);
			continue;
			}

			//导入型号产品结果库
			XhProductModel xhProductModel = new XhProductModel();

			@@ -247,63 +301,63 @@
			xhProductModel.setShipId(shipId);

			//添加系统
			if (isToggleXt) {
			if (insertXt) {
			xhProductModel.setPid(shipId);
			xhProductModel.setId(xtId);
			xhProductModel.setId(curXtId);
			xhProductModel.setName(xt);
			xhProductModel.setProductType("3");
			xhProductModel.setSort(Integer.valueOf(sort));
			defultImg = sysPictureBaseService.getDefaultImg(3).getId();
			xhProductModel.setOperatImg(defultImg);
			xhProductModel.setNamePath(curXtName);
			this.insert(xhProductModel);

			//导入预计参数
			ParamData itemEntity = new ParamData();
			itemEntity.setShipId(shipId);
			itemEntity.setProductId(xtId);
			itemEntity.setProductId(curXtId);
			itemEntity.setPageCode("expect");
			paramDataService.insert(itemEntity);
			}


			if (StringUtils.isNotBlank(fxt) && isToggleFxt) {
			xhProductModel.setPid(xtId);
			xhProductModel.setId(fxtId);
			if (insertFxt) {
			xhProductModel.setPid(curXtId);
			xhProductModel.setId(curFxtId);
			xhProductModel.setName(fxt);
			xhProductModel.setProductType("4");
			xhProductModel.setSort(Integer.valueOf(sort));
			defultImg = sysPictureBaseService.getDefaultImg(4).getId();
			xhProductModel.setOperatImg(defultImg);
			xhProductModel.setNamePath(fxtPath);
			this.insert(xhProductModel);

			//导入预计参数
			ParamData itemEntity = new ParamData();
			itemEntity.setShipId(shipId);
			itemEntity.setProductId(fxtId);
			itemEntity.setProductId(curFxtId);
			itemEntity.setPageCode("expect");
			paramDataService.insert(itemEntity);
			}

			Long sbId = UUIDUtil.generateId();
			if (StringUtils.isNotBlank(fxt)) {
			xhProductModel.setPid(fxtId);
			} else {
			xhProductModel.setPid(xtId);
			}
			xhProductModel.setId(sbId);
			if (insertSb) {
			xhProductModel.setPid(curFxtId == null ? curXtId : curFxtId);
			xhProductModel.setId(curSbId);
			xhProductModel.setName(sb);
			xhProductModel.setEquipType(equipType);
			xhProductModel.setProductType("5");
			xhProductModel.setSort(Integer.valueOf(sort));
			defultImg = sysPictureBaseService.getDefaultImg(5).getId();
			xhProductModel.setOperatImg(defultImg);
			xhProductModel.setNamePath(sbPath);
			this.insert(xhProductModel);
			}

			//导入预计参数
			ParamData itemEntity = new ParamData();
			//绑定设备ID
			itemEntity.setShipId(shipId);
			itemEntity.setProductId(sbId);
			itemEntity.setProductId(curSbId);
			itemEntity.setPageCode("expect");
			itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
			itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
			@@ -346,7 +400,12 @@
			if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
			itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
			}
			if (modelMap.get(sbPath) == null) {
			paramDataService.insert(itemEntity);
			} else {
			itemEntity.setId(paramId);
			paramDataService.update(itemEntity);
			}
			}
			}