From 4864c87d65e797d2ecd827b1eca9d46aec0950aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java |   70 +++++++++++++++++++++++++++++------
 1 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
index db1d86f..b879e2f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
@@ -1,23 +1,30 @@
 package org.jeecg.modules.eam.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.util.TranslateDictTextUtils;
 import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
 import org.jeecg.modules.eam.service.IEamEquipmentPrecisionParametersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
- /**
+/**
  * @Description: 璁惧绮惧害鍙傛暟
  * @Author: jeecg-boot
  * @Date:   2025-04-27
@@ -26,10 +33,14 @@
 @Slf4j
 @Api(tags="璁惧绮惧害鍙傛暟")
 @RestController
-@RequestMapping("/eam/eamEquipmentPrecisionParameters")
+@RequestMapping("/eam/equipmentPrecisionParameters")
 public class EamEquipmentPrecisionParametersController extends JeecgController<EamEquipmentPrecisionParameters, IEamEquipmentPrecisionParametersService> {
 	@Autowired
 	private IEamEquipmentPrecisionParametersService eamEquipmentPrecisionParametersService;
+	@Autowired
+	private ObjectMapper objectMapper;
+	@Autowired
+	private TranslateDictTextUtils translateDictTextUtils;
 	
 	/**
 	 * 鍒嗛〉鍒楄〃鏌ヨ
@@ -46,38 +57,44 @@
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<EamEquipmentPrecisionParameters> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("equipment_id", equipmentId);
 		Page<EamEquipmentPrecisionParameters> page = new Page<EamEquipmentPrecisionParameters>(pageNo, pageSize);
-		IPage<EamEquipmentPrecisionParameters> pageList = eamEquipmentPrecisionParametersService.page(page, queryWrapper);
+		IPage<EamEquipmentPrecisionParameters> pageList = eamEquipmentPrecisionParametersService.queryPageList(equipmentId, page);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 * 娣诲姞
 	 *
-	 * @param eamEquipmentPrecisionParameters
+	 * @param req
 	 * @return
 	 */
 	@AutoLog(value = "璁惧绮惧害鍙傛暟-娣诲姞")
 	@ApiOperation(value="璁惧绮惧害鍙傛暟-娣诲姞", notes="璁惧绮惧害鍙傛暟-娣诲姞")
 	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody EamEquipmentPrecisionParameters eamEquipmentPrecisionParameters) {
-		eamEquipmentPrecisionParametersService.save(eamEquipmentPrecisionParameters);
+	public Result<?> add(@RequestBody EamEquipmentPrecisionParameters req) {
+		EamEquipmentPrecisionParameters entity = eamEquipmentPrecisionParametersService.queryByEquipmentIdAndParameterId(req.getEquipmentId(), req.getParameterId());
+		if(entity != null){
+			return Result.error("鍙傛暟宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
+		}
+		eamEquipmentPrecisionParametersService.save(req);
 		return Result.OK("娣诲姞鎴愬姛锛�");
 	}
 	
 	/**
 	 * 缂栬緫
 	 *
-	 * @param eamEquipmentPrecisionParameters
+	 * @param req
 	 * @return
 	 */
 	@AutoLog(value = "璁惧绮惧害鍙傛暟-缂栬緫")
 	@ApiOperation(value="璁惧绮惧害鍙傛暟-缂栬緫", notes="璁惧绮惧害鍙傛暟-缂栬緫")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<?> edit(@RequestBody EamEquipmentPrecisionParameters eamEquipmentPrecisionParameters) {
-		eamEquipmentPrecisionParametersService.updateById(eamEquipmentPrecisionParameters);
+	public Result<?> edit(@RequestBody EamEquipmentPrecisionParameters req) {
+		EamEquipmentPrecisionParameters entity = eamEquipmentPrecisionParametersService.getById(req.getId());
+		if(entity == null){
+			return Result.error("瑕佺紪杈戠殑鍙傛暟涓嶅瓨鍦紝璇峰埛鏂伴噸璇�!");
+		}
+		eamEquipmentPrecisionParametersService.updateById(req);
 		return Result.OK("缂栬緫鎴愬姛!");
 	}
 	
@@ -108,4 +125,33 @@
 		this.eamEquipmentPrecisionParametersService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
 	}
+
+
+	 /**
+	  * 鍒楄〃鏌ヨ
+	  *
+	  * @param equipmentId 璁惧ID
+	  * @return
+	  */
+	 @ApiOperation(value="璁惧绮惧害鍙傛暟-鍒楄〃鏌ヨ", notes="璁惧绮惧害鍙傛暟-鍒楄〃鏌ヨ")
+	 @GetMapping(value = "/queryList")
+	 public Result<?> queryList(@RequestParam(name="equipmentId") String equipmentId) {
+		 List<EamEquipmentPrecisionParameters> list = eamEquipmentPrecisionParametersService.queryList(equipmentId);
+		 if(CollectionUtil.isEmpty(list)) {
+			 return Result.OK(Collections.emptyList());
+		 }
+		 List<JSONObject> items = new ArrayList<>();
+		 try {
+			 for(EamEquipmentPrecisionParameters vo : list) {
+				 String json = objectMapper.writeValueAsString(vo);
+				 JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+				 translateDictTextUtils.translateField("parameterId", vo.getParameterId(), item, "eam_precision_parameters,parameter_name,id");
+				 translateDictTextUtils.translateField("parameterCode", vo.getParameterId(), item, "eam_precision_parameters,parameter_code,id");
+				 items.add(item);
+			 }
+			 return Result.OK(items);
+		 }catch (Exception e) {
+			 return Result.error("鏁版嵁杞瘧澶辫触锛�");
+		 }
+	 }
 }

--
Gitblit v1.9.3