From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java |  579 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 579 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java
new file mode 100644
index 0000000..c1859cd
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java
@@ -0,0 +1,579 @@
+package org.jeecg.modules.tms.controller;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.PmsUtil;
+import org.jeecg.modules.tms.entity.*;
+import org.jeecg.modules.tms.enums.AccuracyClass;
+import org.jeecg.modules.tms.service.IBaseToolsService;
+import org.jeecg.modules.tms.service.IParaTurningToolsService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.tms.service.IToolsClassifyService;
+import org.jeecg.modules.tms.service.IToolsConfigPropertyService;
+import org.jeecg.modules.tms.utils.ExcelUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: tms_para_turning_tools
+ * @Author: jeecg-boot
+ * @Date:   2025-05-12
+ * @Version: V1.0
+ */
+@Api(tags="tms_para_turning_tools")
+@RestController
+@RequestMapping("/tms/paraTurningTools")
+@Slf4j
+public class ParaTurningToolsController extends JeecgController<ParaTurningTools, IParaTurningToolsService> {
+	@Autowired
+	private IParaTurningToolsService paraTurningToolsService;
+	@Autowired
+	private IToolsClassifyService toolsClassifyService;
+	@Autowired
+	private IBaseToolsService baseToolsService;
+	@Autowired
+	private IToolsConfigPropertyService toolsConfigPropertyService;
+	
+	/**
+	 * 鍒嗛〉鍒楄〃鏌ヨ
+	 *
+	 * @param paraTurningTools
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "tms_para_turning_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	@ApiOperation(value="tms_para_turning_tools-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_para_turning_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	@GetMapping(value = "/list")
+	public Result<IPage<ParaTurningTools>> queryPageList(ParaTurningTools paraTurningTools,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ParaTurningTools> queryWrapper = QueryGenerator.initQueryWrapper(paraTurningTools, req.getParameterMap());
+		Page<ParaTurningTools> page = new Page<ParaTurningTools>(pageNo, pageSize);
+		IPage<ParaTurningTools> pageList = paraTurningToolsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   娣诲姞
+	 *
+	 * @param paraTurningTools
+	 * @return
+	 */
+	@AutoLog(value = "tms_para_turning_tools-娣诲姞")
+	@ApiOperation(value="tms_para_turning_tools-娣诲姞", notes="tms_para_turning_tools-娣诲姞")
+	//@RequiresPermissions("org.jeecg.modules:tms_para_turning_tools:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ParaTurningTools paraTurningTools) {
+		paraTurningToolsService.save(paraTurningTools);
+		return Result.OK("娣诲姞鎴愬姛锛�");
+	}
+	
+	/**
+	 *  缂栬緫
+	 *
+	 * @param paraTurningTools
+	 * @return
+	 */
+	@AutoLog(value = "tms_para_turning_tools-缂栬緫")
+	@ApiOperation(value="tms_para_turning_tools-缂栬緫", notes="tms_para_turning_tools-缂栬緫")
+	//@RequiresPermissions("org.jeecg.modules:tms_para_turning_tools:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ParaTurningTools paraTurningTools) {
+		paraTurningToolsService.updateById(paraTurningTools);
+		return Result.OK("缂栬緫鎴愬姛!");
+	}
+	
+	/**
+	 *   閫氳繃id鍒犻櫎
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "tms_para_turning_tools-閫氳繃id鍒犻櫎")
+	@ApiOperation(value="tms_para_turning_tools-閫氳繃id鍒犻櫎", notes="tms_para_turning_tools-閫氳繃id鍒犻櫎")
+	//@RequiresPermissions("org.jeecg.modules:tms_para_turning_tools:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		paraTurningToolsService.removeById(id);
+		return Result.OK("鍒犻櫎鎴愬姛!");
+	}
+	
+	/**
+	 *  鎵归噺鍒犻櫎
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "tms_para_turning_tools-鎵归噺鍒犻櫎")
+	@ApiOperation(value="tms_para_turning_tools-鎵归噺鍒犻櫎", notes="tms_para_turning_tools-鎵归噺鍒犻櫎")
+	//@RequiresPermissions("org.jeecg.modules:tms_para_turning_tools:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.paraTurningToolsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+	}
+	
+	/**
+	 * 閫氳繃id鏌ヨ
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "tms_para_turning_tools-閫氳繃id鏌ヨ")
+	@ApiOperation(value="tms_para_turning_tools-閫氳繃id鏌ヨ", notes="tms_para_turning_tools-閫氳繃id鏌ヨ")
+	@GetMapping(value = "/queryById")
+	public Result<ParaTurningTools> queryById(@RequestParam(name="id",required=true) String id) {
+		ParaTurningTools paraTurningTools = paraTurningToolsService.getById(id);
+		if(paraTurningTools==null) {
+			return Result.error("鏈壘鍒板搴旀暟鎹�");
+		}
+		return Result.OK(paraTurningTools);
+	}
+
+    /**
+    * 瀵煎嚭excel
+    *
+    * @param request
+    * @param paraTurningTools
+    */
+    //@RequiresPermissions("org.jeecg.modules:tms_para_turning_tools:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ParaTurningTools paraTurningTools) {
+        return super.exportXls(request, paraTurningTools, ParaTurningTools.class, "tms_para_turning_tools");
+    }
+
+    /**
+      * 閫氳繃excel瀵煎叆鏁版嵁
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("tms_para_turning_tools:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+		// 閿欒淇℃伅
+		List<String> errorMessage = new ArrayList<>();
+		int successLines = 0, errorLines = 0, dataLines = 0;
+		List<ParaTurningTools> paraTurningToolsImportList = new ArrayList<>();
+		try {
+			for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+				// 鑾峰彇涓婁紶鏂囦欢瀵硅薄
+				MultipartFile file = entity.getValue();
+				InputStream inputStream = file.getInputStream();
+				Workbook workbook = new XSSFWorkbook(inputStream);
+				Sheet sheet = workbook.getSheetAt(0);
+				for (Row row : sheet) {
+					ParaTurningTools paraTurningTools = new ParaTurningTools();
+					int rowNum = row.getRowNum();
+					int currentRowNum = rowNum + 1;
+					//琛ㄥご琛屽拰绌鸿鐣ヨ繃
+					if (rowNum == 0 || ExcelUtils.isRowEmpty(row)) {
+						continue;
+					}
+					dataLines++;
+					Cell cell0 = row.getCell(0);
+					if (cell0 == null || cell0.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍒�鍏风紪鐮佷负绌�! ");
+						errorLines++;
+						continue;
+					}
+					Cell cell1 = row.getCell(1);
+					if (cell1 == null || cell1.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,搴撲綅鍙蜂负绌�! ");
+						errorLines++;
+						continue;
+					}
+					Cell cell3 = row.getCell(3);
+					if (cell3 == null || cell3.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,涓�绾у垎绫诲悕绉颁负绌�! ");
+						errorLines++;
+						continue;
+					}
+
+					Cell cell4 = row.getCell(4);
+					if (cell4 == null || cell4.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,浜岀骇鍒嗙被鍚嶇О涓虹┖! ");
+						errorLines++;
+						continue;
+					}
+					Cell cell5 = row.getCell(5);
+					if (cell5 == null || cell5.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,涓夌骇鍒嗙被鍚嶇О涓虹┖! ");
+						errorLines++;
+						continue;
+					}
+					Cell cell6 = row.getCell(6);
+					if (cell6 == null || cell6.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍥涚骇鍒嗙被鍚嶇О涓虹┖! ");
+						errorLines++;
+						continue;
+					}
+
+					ToolsClassify classify;
+					List<ToolsClassify> class1List = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
+							.eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell3))
+							.eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
+					if (CollectionUtil.isEmpty(class1List)) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,绯荤粺涓嶅瓨鍦ㄨ涓�绾у垎绫诲悕绉�! ");
+						errorLines++;
+						continue;
+					} else {
+						ToolsClassify classify1 = class1List.get(0);
+						List<ToolsClassify> class2List = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
+								.eq(ToolsClassify::getParentId, classify1.getId())
+								.eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell4))
+								.eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
+						if (CollectionUtil.isEmpty(class2List)) {
+							errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,绯荤粺涓嶅瓨鍦ㄨ浜岀骇鍒嗙被鍚嶇О! ");
+							errorLines++;
+							continue;
+						} else {
+							ToolsClassify classify2 = class2List.get(0);
+							List<ToolsClassify> class3List = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
+									.eq(ToolsClassify::getParentId, classify2.getId())
+									.eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell5))
+									.eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
+							if (CollectionUtil.isEmpty(class3List)) {
+								errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,绯荤粺涓嶅瓨鍦ㄨ涓夌骇鍒嗙被鍚嶇О! ");
+								errorLines++;
+								continue;
+							} else {
+								ToolsClassify classify3 = class3List.get(0);
+								List<ToolsClassify> class4List = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
+										.eq(ToolsClassify::getParentId, classify3.getId())
+										.eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell6))
+										.eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
+								if (CollectionUtil.isEmpty(class4List)) {
+									errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,绯荤粺涓嶅瓨鍦ㄨ鍥涚骇鍒嗙被鍚嶇О! ");
+									errorLines++;
+									continue;
+								} else {
+									classify = class4List.get(0);
+									paraTurningTools.setClassifyId(classify.getId());
+								}
+							}
+						}
+					}
+
+					Cell cell2 = row.getCell(2);//搴忓彿(鎴栦紒涓氬唴鍘熶唬鐮�)
+					paraTurningTools.setSignCode(ExcelUtils.getCellValueAsString(cell2));
+					Cell cell7 = row.getCell(7);//鐗╁搧涓枃鍚嶇О
+					if (cell7 == null || cell7.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鐗╁搧涓枃鍚嶇О涓虹┖! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setChineseName(ExcelUtils.getCellValueAsString(cell7));
+					}
+					Cell cell8 = row.getCell(8);//鐗╁搧澶栨枃鍚嶇О
+					paraTurningTools.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8));
+					Cell cell9 = row.getCell(9);//鏍囧噯绾у埆
+					paraTurningTools.setStandardLevel(ExcelUtils.getCellValueAsString(cell9));
+					Cell cell10 = row.getCell(10);//鏍囧噯鍙�
+					paraTurningTools.setStandardCode(ExcelUtils.getCellValueAsString(cell10));
+					Cell cell11 = row.getCell(11);
+					if (cell11 == null || cell11.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍨嬪彿/鍥惧彿涓虹┖! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setToolModel(ExcelUtils.getCellValueAsString(cell11));
+					}
+					Cell cell12 = row.getCell(12);
+					String accuracyClassCode;
+					if (cell12 == null || cell12.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,绮惧害绛夌骇涓虹┖! ");
+						errorLines++;
+						continue;
+					} else {
+						accuracyClassCode = AccuracyClass.getCodeFromValue(ExcelUtils.getCellValueAsString(cell12));
+						if (accuracyClassCode == null) {
+							errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,绮惧害绛夌骇涓嶇鍚堣姹�! ");
+							errorLines++;
+							continue;
+						}
+					}
+
+					BaseTools baseTools = new BaseTools()
+							.setToolCode(ExcelUtils.getCellValueAsString(cell0))
+							.setClassifyId(classify.getId())
+							.setSignCode(ExcelUtils.getCellValueAsString(cell2))
+							.setChineseName(ExcelUtils.getCellValueAsString(cell7))
+							.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8))
+							.setStandardLevel(ExcelUtils.getCellValueAsString(cell9))
+							.setStandardCode(ExcelUtils.getCellValueAsString(cell10))
+							.setToolModel(ExcelUtils.getCellValueAsString(cell11))
+							.setCurrentCode("0000")//褰撳墠缂栫爜鍒濆鍖�
+							.setParamaTableName("5")//5锛氳溅鍓婂垁鍏�
+							.setAccuracyClass(accuracyClassCode);
+
+					//鏍规嵁鍒�鍏风紪鐮併�佸瀷鍙�/鍥惧彿銆佸垎绫籭d鏌ヨ鍒�鍏蜂俊鎭�
+					List<BaseTools> toolsList = baseToolsService.list(new LambdaQueryWrapper<BaseTools>()
+							.eq(BaseTools::getToolCode, ExcelUtils.getCellValueAsString(cell0))
+							.eq(BaseTools::getClassifyId, classify.getId())
+							.eq(BaseTools::getToolModel, ExcelUtils.getCellValueAsString(cell11)));
+					if (CollectionUtil.isEmpty(toolsList)) {
+						//涓嶅瓨鍦ㄧ浉搴斿垁鍏凤紝鏂板
+						baseToolsService.save(baseTools);
+					} else {
+						//瀛樺湪鐩稿簲鍒�鍏凤紝鏇存柊
+						BaseTools tools = toolsList.get(0);
+						baseTools.setId(tools.getId());
+						baseToolsService.updateById(baseTools);
+					}
+
+					paraTurningTools.setToolCode(baseTools.getId());
+					ToolsConfigProperty configProperty = new ToolsConfigProperty()
+							.setChineseName(ExcelUtils.getCellValueAsString(cell7))
+							.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8))
+							.setStandardLevel(ExcelUtils.getCellValueAsString(cell9))
+							.setStandardCode(ExcelUtils.getCellValueAsString(cell10))
+							.setToolModel(ExcelUtils.getCellValueAsString(cell11))
+							.setPositionCode(ExcelUtils.getCellValueAsString(cell1))
+							.setApplicationType("1");//1:閫氱敤宸ュ叿绫诲瀷
+					//鏍规嵁鍒�鍏穒d銆佸垎绫籭d鏌ヨ閫氱敤鍙傛暟淇℃伅
+					List<ToolsConfigProperty> configPropertyList = toolsConfigPropertyService.list(new LambdaQueryWrapper<ToolsConfigProperty>()
+							.eq(ToolsConfigProperty::getToolCode, baseTools.getId())
+							.eq(ToolsConfigProperty::getClassifyId, classify.getId())
+							.eq(ToolsConfigProperty::getStatus, CommonConstant.STATUS_1));
+					if (CollectionUtil.isEmpty(configPropertyList)) {
+						//涓嶅瓨鍦ㄩ�氱敤鍙傛暟淇℃伅锛屾柊澧�
+						configProperty.setStatus(CommonConstant.STATUS_1);
+						configProperty.setToolCode(baseTools.getId());
+						configProperty.setClassifyId(classify.getId());
+						toolsConfigPropertyService.save(configProperty);
+					} else {
+						//瀛樺湪閫氱敤鍙傛暟淇℃伅锛屾洿鏂�
+						ToolsConfigProperty property = configPropertyList.get(0);
+						configProperty.setId(property.getId());
+						toolsConfigPropertyService.updateById(configProperty);
+					}
+
+					List<ParaTurningTools> paraTurningToolsList = paraTurningToolsService.list(new LambdaQueryWrapper<ParaTurningTools>()
+							.eq(ParaTurningTools::getToolCode, baseTools.getId())
+							.eq(ParaTurningTools::getClassifyId, classify.getId())
+							.eq(ParaTurningTools::getToolModel, ExcelUtils.getCellValueAsString(cell11)));
+					if (CollectionUtil.isNotEmpty(paraTurningToolsList)) {
+						//瀛樺湪璇ヨ溅鍓婂垁鍏峰弬鏁颁俊鎭紝鏇存柊
+						ParaTurningTools turningTools = paraTurningToolsList.get(0);
+						paraTurningTools.setId(turningTools.getId());
+					}
+
+					Cell cell13 = row.getCell(13);//鍒�澶磋鏍�
+					if (cell13 == null || cell13.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍒�澶磋鏍间负绌�! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setHeadSpecifications(ExcelUtils.getCellValueAsString(cell13));
+					}
+					Cell cell14 = row.getCell(14);//閰嶅鍒�鐗囧彿
+					if (cell14 == null || cell14.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,閰嶅鍒�鐗囧彿涓虹┖! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setMatchingNumber(ExcelUtils.getCellValueAsString(cell14));
+					}
+					Cell cell15 = row.getCell(15);//涓诲亸瑙�
+					if (cell15 == null || cell15.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,涓诲亸瑙掍负绌�! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setLeadAngle(ExcelUtils.getCellValueAsString(cell15));
+					}
+					Cell cell16 = row.getCell(16);//鍒�鍏锋埅闈㈠昂瀵�
+					if (cell16 == null || cell16.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍒�鍏锋埅闈㈠昂瀵镐负绌�! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setCrossSectionalSize(ExcelUtils.getCellValueAsString(cell16));
+					}
+					Cell cell17 = row.getCell(17);//鍒�鍏锋�婚暱
+					if (cell17 == null || cell17.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍒�鍏锋�婚暱涓虹┖! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setTotalLength(ExcelUtils.getCellValueAsString(cell17));
+					}
+					Cell cell18 = row.getCell(18);//鍒囧墛鏂瑰悜
+					if (cell18 == null || cell18.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍒囧墛鏂瑰悜涓虹┖! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setCuttingDirection(ExcelUtils.getCellValueAsString(cell18));
+					}
+
+					Cell cell19 = row.getCell(19);//鍒�鍏锋潗鏂�
+					if (cell19 == null || cell19.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍒�鍏锋潗鏂欎负绌�! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setToolMaterial(ExcelUtils.getCellValueAsString(cell19));
+					}
+					Cell cell20 = row.getCell(20);//闆朵欢鏉愭枡
+					paraTurningTools.setPartMaterial(ExcelUtils.getCellValueAsString(cell20));
+					Cell cell21 = row.getCell(21);//鍒�鍏峰瀷寮�
+					if (cell21 == null || cell21.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鍒�鍏峰瀷寮忎负绌�! ");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setToolPattern(ExcelUtils.getCellValueAsString(cell21));
+					}
+					Cell cell22 = row.getCell(22);//鏄惁娑傚眰
+					if (cell22 == null || cell22.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,鏄惁娑傚眰涓虹┖锛�");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell22));
+					}
+					Cell cell23 = row.getCell(23);//闄勫姞鎶�鏈潯浠�
+					if (cell23 == null || cell23.getCellType() == CellType.BLANK) {
+						errorMessage.add("绗�" + currentRowNum + "琛岋紝鏁版嵁瀵煎叆澶辫触,闄勫姞鎶�鏈潯浠朵负绌猴紒");
+						errorLines++;
+						continue;
+					} else {
+						paraTurningTools.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell23));
+					}
+					Cell cell24 = row.getCell(24);//闄勫姞鎶�鏈潯浠惰鏄�
+					paraTurningTools.setConditionsInfo(ExcelUtils.getCellValueAsString(cell24));
+					Cell cell25 = row.getCell(25);//鍝佺墝
+					paraTurningTools.setBrand(ExcelUtils.getCellValueAsString(cell25));
+					Cell cell26 = row.getCell(26);//鍒跺紡
+					paraTurningTools.setTypes(ExcelUtils.getCellValueAsString(cell26));
+					Cell cell27 = row.getCell(27);//鍒�鐗囧昂瀵�
+					paraTurningTools.setKnifeSize(ExcelUtils.getCellValueAsString(cell27));
+					Cell cell28 = row.getCell(28);//鍐峰嵈鏂瑰紡
+					paraTurningTools.setCoolingMethod(ExcelUtils.getCellValueAsString(cell28));
+					Cell cell29 = row.getCell(29);//鍒�鏉嗙被鍒�
+					paraTurningTools.setHolderCategory(ExcelUtils.getCellValueAsString(cell29));
+					Cell cell30 = row.getCell(30);//鍒�鍏风洿寰�
+					paraTurningTools.setToolDiameter(ExcelUtils.getCellValueAsString(cell30));
+					Cell cell31 = row.getCell(31);//鎺ュ彛绱у浐褰㈠紡
+					paraTurningTools.setFasteningForm(ExcelUtils.getCellValueAsString(cell31));
+					Cell cell32 = row.getCell(32);//闀楁潌鐩村緞
+					paraTurningTools.setBoringBarDiameter(ExcelUtils.getCellValueAsString(cell32));
+					Cell cell33 = row.getCell(33);//鍒�鏉嗛暱搴�
+					paraTurningTools.setBladeLength(ExcelUtils.getCellValueAsString(cell33));
+					Cell cell34 = row.getCell(34);//鍒�鐗囧舰鐘�
+					paraTurningTools.setBladeShape(ExcelUtils.getCellValueAsString(cell34));
+					Cell cell35 = row.getCell(35);//鍒�鐗囧悗瑙�
+					paraTurningTools.setBladePosterior(ExcelUtils.getCellValueAsString(cell35));
+					Cell cell36 = row.getCell(36);//鍒�鏉嗘柟鍚�
+					paraTurningTools.setBarDirection(ExcelUtils.getCellValueAsString(cell36));
+					Cell cell37 = row.getCell(37);//鍒�鏉嗛珮搴�
+					paraTurningTools.setBladeHeight(ExcelUtils.getCellValueAsString(cell37));
+					Cell cell38 = row.getCell(38);//鍒�鏉嗗搴�
+					paraTurningTools.setBladeWide(ExcelUtils.getCellValueAsString(cell38));
+					Cell cell39 = row.getCell(39);//鍒�鏉嗗昂瀵�
+					paraTurningTools.setBladeSize(ExcelUtils.getCellValueAsString(cell39));
+					Cell cell40 = row.getCell(40);//鍒�澶瑰瀷鍙�
+					paraTurningTools.setKnifeClipModel(ExcelUtils.getCellValueAsString(cell40));
+					Cell cell41 = row.getCell(41);//鍒�鐗囪澶规柟寮�
+					paraTurningTools.setClampingMethod(ExcelUtils.getCellValueAsString(cell41));
+					Cell cell42 = row.getCell(42);//鍒�鐗囨Ы瀹�
+					paraTurningTools.setSlotWidth(ExcelUtils.getCellValueAsString(cell42));
+					Cell cell43 = row.getCell(43);//鏈�灏忓垏鍏ョ洿寰�
+					paraTurningTools.setSmallDiameter(ExcelUtils.getCellValueAsString(cell43));
+					Cell cell44 = row.getCell(44);//鏈�澶у垏鍏ョ洿寰�
+					paraTurningTools.setMaxDiameter(ExcelUtils.getCellValueAsString(cell44));
+					Cell cell45 = row.getCell(45);//鏈�澶у垏妲芥繁搴�
+					paraTurningTools.setMaxDepth(ExcelUtils.getCellValueAsString(cell45));
+					Cell cell46 = row.getCell(46);//鍒�鏉嗗舰寮�
+					paraTurningTools.setKnifeBarForm(ExcelUtils.getCellValueAsString(cell46));
+					Cell cell47 = row.getCell(47);//鍒�鏉垮帤搴�
+					paraTurningTools.setBladeThickness(ExcelUtils.getCellValueAsString(cell47));
+					Cell cell48 = row.getCell(48);//鏈�灏忓姞宸ョ洿寰�
+					paraTurningTools.setMinDiameter(ExcelUtils.getCellValueAsString(cell48));
+					Cell cell49 = row.getCell(49);//闆嗗洟鍏徃缂栫爜
+					paraTurningTools.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell49));
+					Cell cell50 = row.getCell(50);//闆嗗洟鍏徃鏍囪
+					if (cell50 == null || cell50.getCellType() == CellType.BLANK) {
+						//鏍囪涓虹┖锛屾嫾鎺�
+						String sign = ExcelUtils.getCellValueAsString(cell7)//涓枃鍚嶇О
+								+ "-" + ExcelUtils.getCellValueAsString(cell11)//鍨嬪彿/鍥惧彿
+								+ "-" + ExcelUtils.getCellValueAsString(cell13)//鍒�澶磋鏍�
+								+ "-" + ExcelUtils.getCellValueAsString(cell15);//涓诲亸瑙�
+						paraTurningTools.setGroupCompanySign(sign);
+					} else {
+						paraTurningTools.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell50));
+					}
+					Cell cell51 = row.getCell(51);//宸ュ叿绠�绉�
+					paraTurningTools.setShortCalled(ExcelUtils.getCellValueAsString(cell51));
+
+					paraTurningToolsImportList.add(paraTurningTools);
+					successLines++;
+				}
+			}
+			paraTurningToolsService.saveOrUpdateBatch(paraTurningToolsImportList);
+			if (successLines == dataLines) {
+				return Result.OK("鍏�" + dataLines + "琛屾暟鎹叏閮ㄥ鍏ユ垚鍔燂紒");
+			} else {
+				JSONObject result = new JSONObject(5);
+				result.put("successCount", successLines);
+				result.put("msg", "鎬讳笂浼犺鏁帮細" + dataLines + "锛屾垚鍔熷鍏ヨ鏁帮細" + successLines);
+				result.put("errorMsg", errorMessage);
+				String fileUrl = PmsUtil.saveErrorMsgByList(errorMessage, "userImportExcelErrorLog");
+				int lastIndex = fileUrl.lastIndexOf(File.separator);
+				String fileName = fileUrl.substring(lastIndex + 1);
+				result.put("fileUrl", "/sys/common/static/" + fileUrl);
+				result.put("fileName", fileName);
+				Result res = Result.ok(result);
+				res.setCode(201);
+				res.setMessage("鏂囦欢瀵煎叆鎴愬姛锛屼絾鏈夐敊璇��");
+				return res;
+			}
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+    }
+
+}

--
Gitblit v1.9.3