From abe2c2fbea21d63678bc21bd77f3102a2b535973 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 22 五月 2025 10:28:35 +0800
Subject: [PATCH] art: 设备管理-三保-列表、新增修改，增加精度参数明细项
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java | 202 +++++++++++++-------------------------------------
1 files changed, 53 insertions(+), 149 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
index 12bce48..c4245dd 100644
--- 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
@@ -1,41 +1,29 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
-import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService;
-import java.util.Date;
-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.common.system.base.controller.JeecgController;
-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.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 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
@@ -44,124 +32,40 @@
@Slf4j
@Api(tags="璁惧绮惧害妫�娴嬫槑缁�")
@RestController
-@RequestMapping("/eam/eamPrecisionCheckDetail")
+@RequestMapping("/eam/precisionCheckDetail")
public class EamPrecisionCheckDetailController extends JeecgController<EamPrecisionCheckDetail, IEamPrecisionCheckDetailService> {
@Autowired
private IEamPrecisionCheckDetailService eamPrecisionCheckDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamPrecisionCheckDetail
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧绮惧害妫�娴嬫槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamPrecisionCheckDetail eamPrecisionCheckDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamPrecisionCheckDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamPrecisionCheckDetail, req.getParameterMap());
- Page<EamPrecisionCheckDetail> page = new Page<EamPrecisionCheckDetail>(pageNo, pageSize);
- IPage<EamPrecisionCheckDetail> pageList = eamPrecisionCheckDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamPrecisionCheckDetail
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-娣诲姞")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-娣诲姞", notes="璁惧绮惧害妫�娴嬫槑缁�-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamPrecisionCheckDetail eamPrecisionCheckDetail) {
- eamPrecisionCheckDetailService.save(eamPrecisionCheckDetail);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamPrecisionCheckDetail
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-缂栬緫")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-缂栬緫", notes="璁惧绮惧害妫�娴嬫槑缁�-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamPrecisionCheckDetail eamPrecisionCheckDetail) {
- eamPrecisionCheckDetailService.updateById(eamPrecisionCheckDetail);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-閫氳繃id鍒犻櫎", notes="璁惧绮惧害妫�娴嬫槑缁�-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name="id",required=true) String id) {
- eamPrecisionCheckDetailService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-鎵归噺鍒犻櫎")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-鎵归噺鍒犻櫎", notes="璁惧绮惧害妫�娴嬫槑缁�-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.eamPrecisionCheckDetailService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-閫氳繃id鏌ヨ")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-閫氳繃id鏌ヨ", notes="璁惧绮惧害妫�娴嬫槑缁�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamPrecisionCheckDetail eamPrecisionCheckDetail = eamPrecisionCheckDetailService.getById(id);
- return Result.OK(eamPrecisionCheckDetail);
- }
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamPrecisionCheckDetail
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamPrecisionCheckDetail eamPrecisionCheckDetail) {
- return super.exportXls(request, eamPrecisionCheckDetail, EamPrecisionCheckDetail.class, "璁惧绮惧害妫�娴嬫槑缁�");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamPrecisionCheckDetail.class);
- }
-
+ /**
+ * 鍒楄〃鏌ヨ
+ *
+ * @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