~whyclxw/CadDrawManager.git

			@@ -9,7 +9,6 @@
			import com.whyc.dto.FileDirPath;
			import com.whyc.dto.Response;
			import com.whyc.mapper.SoftwareMapper;
			import com.whyc.pojo.AttachLock;
			import com.whyc.pojo.DocUser;
			import com.whyc.pojo.Software;
			import com.whyc.util.ActionUtil;
			@@ -53,6 +52,13 @@
			//取第一个sheet表
			Sheet sheet = workbook.getSheetAt(0);
			int lastRowNum = sheet.getLastRowNum();
			//校准lastRowNum
			for (int i = 8; i <= lastRowNum; i++) {
			if(sheet.getRow(i).getCell(1).getStringCellValue().equals("发布说明")){
			lastRowNum = i;
			break;
			}
			}
			//固定5列
			short cellNum = 5;
			//取固定部分值
			@@ -101,7 +107,23 @@
			//取第3列,第5列
			Cell cell = sheet.getRow(8 + i).getCell(2);
			cell.setCellType(Cell.CELL_TYPE_STRING);
			software.setApplyMaterialCode(cell.getStringCellValue());
			String stringCellValue = cell.getStringCellValue();
			if(!stringCellValue.equals("")) {
			int length = stringCellValue.length();
			if (length == 9) {
			stringCellValue = "0" + stringCellValue;
			} else if (length < 9) {
			int centerZeroNum = 10 - length - 1;
			StringBuilder centerZeroStr = new StringBuilder();
			for (int j = 0; j < centerZeroNum; j++) {
			centerZeroStr.append("0");
			}
			String strFront = stringCellValue.substring(0, 3);
			String strBehind = stringCellValue.substring(3);
			stringCellValue = "0" + strFront + centerZeroStr + strBehind;
			}
			}
			software.setApplyMaterialCode(stringCellValue);
			software.setApplyModel(sheet.getRow(8+i).getCell(4).getStringCellValue());

			softwareList.add(software);
			@@ -113,9 +135,9 @@

			}
			//查询软件列表的信息
			public Response getAllSoftware(String fileName,String applyMaterialCode,String applyModel,String owner, String boardNumber,int pageCurr, int pageSize) {
			public Response getAllSoftware(Integer lockFlag, String fileName, String applyMaterialCode, String applyModel, String owner, String boardNumber, int pageCurr, int pageSize) {
			PageHelper.startPage(pageCurr,pageSize);
			List list=mapper.getFileUrl(fileName,applyMaterialCode,applyModel,owner,boardNumber);
			List list=mapper.getFileUrl(lockFlag,fileName,applyMaterialCode,applyModel,owner,boardNumber);
			PageInfo pageInfo=new PageInfo(list);
			return new Response().setII(1,list.size()>0,pageInfo,"软件信息返回");
			}
			@@ -136,10 +158,12 @@
			wrapper.eq("id",id);
			wrapper.last("limit 1");
			Software software=mapper.selectOne(wrapper);

			String filename=software.getFileUrl().substring(software.getFileUrl().lastIndexOf("\\")+1);
			try {
			// 转码防止乱码
			//resp.addHeader("Content-Disposition", "attachment;filename=" + new String(softwareName.getBytes("UTF-8"), "ISO8859-1"));
			resp.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode ( software.getFileName()+".zip", "utf-8"));
			resp.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode (filename, "utf-8"));
			OutputStream out = resp.getOutputStream();
			FileInputStream in = new FileInputStream(fileDirName+File.separator+software.getFileUrl());
			int len=0;
			@@ -156,14 +180,13 @@
			e.printStackTrace();
			}
			//记录日志
			DocUser docUser= ActionUtil.getUser();
			String operationDetail="具体软件名称为:"+software.getFileName();
			String opreationMsg="执行了软件下载操作";
			String terminalIp=req.getRemoteAddr();
			logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
			logService.recordOperationLogDownLoad(ActionUtil.getUser().getId(),ActionUtil.getUser().getName(), UserOperation.TYPE_DOWNLOAD_SOFWARE.getType(),new Date(),req.getRemoteAddr()
			,filename,fileDirName+File.separator+software.getFileUrl(),"",String.valueOf(id),software.getVersion());

			}

			public Response upload(MultipartFile file1, MultipartFile file2, List<Software> softwareList) throws IOException {
			@Transactional
			public Response upload(MultipartFile file1, MultipartFile file2, String fontUpdateTime, List<Software> softwareList) throws IOException {
			String file1Name = file1.getOriginalFilename();
			String file2Name = file2.getOriginalFilename();
			Software software = softwareList.get(0);
			@@ -191,13 +214,31 @@
			file2.transferTo(new File(softwareDir+File.separator+file2Name));
			//设置路径
			for (Software software1:softwareList){
			software1.setFontUpdateTime(fontUpdateTime);
			software1.setFileUrl(softwareHttpUrl+File.separator+file1Name);
			software1.setExcelUrl(softwareHttpUrl+File.separator+file2Name);
			software1.setCreateTime(date);
			//锁定-专供测试人员才能解锁
			software1.setLockFlag(-1);
			}
			/* 取消自动锁定原来版本,因为新版本需要进行测试才能使用
			//锁定原来的所有版本:根据版号和软件类型
			List<String> materialCodeList = softwareList.stream().map(Software::getApplyMaterialCode).collect(Collectors.toList());
			lockByBoardNumberAndTypeAndMaterialCode(software.getBoardNumber(),software.getType(),materialCodeList);*/
			//写入数据库
			insertBatch(softwareList);
			return new Response().set(1,true,"上传完成");
			}

			private void lockByBoardNumberAndTypeAndMaterialCode(String boardNumber, String type, List<String> materialCodeList) {
			UpdateWrapper<Software> update = Wrappers.update();
			update.set("lock_flag",1)
			.set("local_reason","软件版本升级")
			.eq("board_number",boardNumber)
			.eq("type",type)
			.ne("lock_flag",-1)
			.in("apply_material_code",materialCodeList);
			mapper.update(null,update);
			}

			private Software getByFilename(String fileName) {
			@@ -229,23 +270,61 @@
			UpdateWrapper<Software> update = Wrappers.update();
			update.eq("file_name",softwareDB.getFileName());
			mapper.delete(update);
			String fontUpdateTime = softwareDB.getFontUpdateTime();
			softwareList.forEach(software2 -> {
			software2.setFileUrl(softwareDB.getFileUrl());
			software2.setExcelUrl(softwareHttpUrl + File.separator + originalFilename);
			software2.setCreateTime(new Date());
			software2.setLockFlag(-1);
			software2.setFontUpdateTime(fontUpdateTime);
			});
			mapper.insertBatchSomeColumn(softwareList);

			return new Response().set(1,true,"更新完成");
			}
			}
			//根据软件id修改软件锁定状态
			public Response updateSoftwareLock(String fileUrl,int lockFlag,String localReason) {

			/**
			* 根据软件唯一值字段修改软件锁定状态,这里选取fileUrl
			*
			* @param fileUrl
			* @param lockFlagNow
			* @param lockFlag
			* @param localReason
			* @return
			*/
			public Response updateSoftwareLock(String fileUrl, int lockFlagNow, int lockFlag, String localReason) {
			String userName = ActionUtil.getUser().getName();
			if(lockFlag ==0){
			//只有李桂华才能解锁待测试锁定的软件
			QueryWrapper<Software> query = Wrappers.query();
			query.eq("file_url",fileUrl);
			List<Software> softwareListInDB = mapper.selectList(query);
			Software softwareInDB = softwareListInDB.get(0);
			if(softwareInDB.getLockFlag() == -1){
			//if(!userName.equals("李桂华")){
			// return new Response().set(1,false,"无权限解锁待测试的软件");
			//}else{
			//锁定原来的所有版本:根据版号和软件类型,排除待测试版本
			List<String> materialCodeList = softwareListInDB.stream().map(Software::getApplyMaterialCode).collect(Collectors.toList());
			lockByBoardNumberAndTypeAndMaterialCode(softwareInDB.getBoardNumber(),softwareInDB.getType(),materialCodeList);

			//}
			}
			}
			UpdateWrapper uwrapper=new UpdateWrapper();
			uwrapper.set("lock_flag",lockFlag);
			uwrapper.set("local_reason",localReason);
			uwrapper.eq("file_url",fileUrl);
			uwrapper.eq("lock_flag",lockFlagNow);
			int flag=mapper.update(null,uwrapper);
			return new Response().set(1,flag>0,"锁定/解锁成功");
			}
			//根据软件id实现软件删除
			public Response deleteSoftware(int id) {
			UpdateWrapper wrapper=new UpdateWrapper();
			wrapper.eq("id",id);
			int flag=mapper.delete(wrapper);
			return new Response().set(1,flag>0,"件id实现软件删除");
			}
			}