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-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java | 71 +++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java new file mode 100644 index 0000000..c4245dd --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.eam.controller; + +import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; +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.system.base.controller.JeecgController; +import org.jeecg.common.util.TranslateDictTextUtils; +import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters; +import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail; +import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * @Description: 璁惧绮惧害妫�娴嬫槑缁� + * @Author: jeecg-boot + * @Date: 2025-05-13 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="璁惧绮惧害妫�娴嬫槑缁�") +@RestController +@RequestMapping("/eam/precisionCheckDetail") +public class EamPrecisionCheckDetailController extends JeecgController<EamPrecisionCheckDetail, IEamPrecisionCheckDetailService> { + @Autowired + private IEamPrecisionCheckDetailService eamPrecisionCheckDetailService; + @Autowired + private ObjectMapper objectMapper; + @Autowired + private TranslateDictTextUtils translateDictTextUtils; + + /** + * 鍒楄〃鏌ヨ + * + * @param orderId 宸ュ崟ID + * @return + */ + @ApiOperation(value="璁惧绮惧害鍙傛暟-鍒楄〃鏌ヨ", notes="璁惧绮惧害鍙傛暟-鍒楄〃鏌ヨ") + @GetMapping(value = "/queryList") + public Result<?> queryList(@RequestParam(name="orderId") String orderId) { + List<EamPrecisionCheckDetail> list = eamPrecisionCheckDetailService.getByOrderId(orderId); + if(CollectionUtil.isEmpty(list)) { + return Result.OK(Collections.emptyList()); + } + List<JSONObject> items = new ArrayList<>(); + try { + for(EamPrecisionCheckDetail 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