From a92b6f6175b1401071e5fb3bd9fab8a2a3b72011 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 九月 2023 14:34:28 +0800
Subject: [PATCH] version
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 145 ++++++++++++++++++++++++++++++++---------------
1 files changed, 98 insertions(+), 47 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
index 2e9b26e..8523b82 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
@@ -1,22 +1,32 @@
package com.yuanchu.limslaboratory.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
+import com.yuanchu.limslaboratory.mapper.LinkDetectionMapper;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
-import com.yuanchu.limslaboratory.pojo.Material;
-import com.yuanchu.limslaboratory.pojo.Standard;
+import com.yuanchu.limslaboratory.pojo.LinkDetection;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import com.yuanchu.limslaboratory.service.InspectionService;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
-import com.yuanchu.limslaboratory.service.MaterialService;
-import com.yuanchu.limslaboratory.service.StandardService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,22 +38,24 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-08-03
*/
-@Api(tags = "鎶ユ绠＄悊-->濮旀墭妫�楠�-->閾炬帴")
+@Api(tags = "鎶ユ绠＄悊-->濮旀墭妫�楠�")
@RestController
-@RequestMapping("/link-basic")
+@RequestMapping("/link-basic-table")
public class LinkBasicInformationController {
@Autowired
private LinkBasicInformationService linkBasicInformationService;
- @Autowired
- private MaterialService materialService;
- @Autowired
- private StandardService standardService;
+ @Resource
+ private InspectionService inspectionService;
- @ApiOperation("鑾峰彇閾炬帴")
+ @Resource
+ private LinkDetectionMapper linkDetectionMapper;
+
+ @ApiOperation("閾炬帴-->鑾峰彇閾炬帴")
@GetMapping("/link")
+ @AuthHandler
public Result<?> getLink() {
Object link1 = null;
try {
@@ -56,43 +68,82 @@
return Result.success(link1);
}
- @ApiOperation("鑾峰彇鏍峰搧鍚嶇О")
- @GetMapping("/material")
- public Result<?> getMaterialIdAndName(@RequestHeader("link") String link) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
- LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(Material::getId, Material::getName, Material::getCode);
- List<Map<String, Object>> maps = materialService.listMaps(wrapper);
- return Result.success(maps);
- }
- return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
+ @ApiOperation(value = "鍒嗛〉琛ㄦ牸")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "entrustCoding", value = "濮旀墭缂栧彿", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "sampleName", value = "鏍峰搧鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "entrusted", value = "濮旀墭鍗曚綅", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "inspectionStatus", value = "妫�楠岀姸鎬�", dataTypeClass = Integer.class)
+ })
+ @GetMapping("/page")
+ @AuthHandler
+ public Result<?> getLinkBasicPage(Integer pageNo, Integer pageSize, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus) {
+ IPage<Map<String, Object>> linkBasicPage = linkBasicInformationService.getLinkBasicPage(new Page<Object>(pageNo, pageSize), entrustCoding, sampleName, entrusted, inspectionStatus);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", linkBasicPage.getTotal());
+ map.put("row", linkBasicPage.getRecords());
+ return Result.success(map);
}
- @ApiOperation("鑾峰彇瑙勬牸鍨嬪彿")
- @GetMapping("/specification")
- public Result<?> getSpecificationIdAndName(@RequestHeader("link") String link, String materialId) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
- List<Map<String, Object>> specificationIdAndName = standardService.getSpecificationIdAndName(materialId);
- return Result.success(specificationIdAndName);
- }
- return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
+ @ApiOperation("鏍规嵁id鏌ヨSpecifications琛ㄧ殑Name")
+ @GetMapping("/getSpecificationsName")
+ public Result<?> getSpecificationsName(String id){
+ return Result.success(linkBasicInformationService.getSpecificationsName(id));
}
- @ApiOperation("娣诲姞妫�楠岀敵璇峰崟")
- @PostMapping("/addInspection")
- public Result<?> addLinkBasicInformation(@RequestHeader("link") String link, @RequestBody LinkBasicInformation linkBasicInformation) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
- String code = linkBasicInformationService.addLinkBasicInformation(linkBasicInformation);
- if (!ObjectUtils.isEmpty(code)){
- return Result.success("娣诲姞鎴愬姛锛�", code);
- } else {
- return Result.fail("娣诲姞澶辫触!");
- }
- }
- return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
-
+ @ApiOperation("鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "濮旀墭鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delLink")
+ @AuthHandler(type = InterfaceType.DELETE,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result<?> delLink(Integer id){
+ linkBasicInformationService.delLink(id);
+ return Result.success("鍒犻櫎鎴愬姛!");
}
+
+
+ @ApiOperation("閫夋嫨鐗堟湰")
+ @GetMapping("/chooseVer")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "id", dataTypeClass = String.class, required = true),
+ })
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result<?> chooseVer(String name, String id, String specifications) {
+ LinkDetection linkDetection = linkDetectionMapper.selectById(id);
+ return Result.success(linkBasicInformationService.chooseVer(linkDetection));
+ }
+
+
+ @ApiOperation(value = "鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "mcode", value = "浜у搧缂栧彿", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "specifications", value = "瑙勬牸鍨嬪彿", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "version", value = "鐗堟湰(榛樿鏈�鏂扮増鏈�)", dataTypeClass = Integer.class,required = true ),
+ @ApiImplicitParam(name = "id", value = "濮旀墭淇℃伅id", dataTypeClass = Integer.class,required = true )
+ })
+ @GetMapping("/lookProByVer")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result lookProByVer(String name, String mcode, String specifications,Integer version,Integer id) {
+ return Result.success(linkBasicInformationService.lookProByVer(name,mcode, specifications,version,id));
+ }
+
+
+ @ApiOperation(value = "濮旀墭鍝佺敓鎴愭姤妫�鍗�")
+ @PostMapping("/addInspect")
+ @AuthHandler(type = InterfaceType.ADD,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result addInspect(@RequestHeader("X-Token") String token, @Validated @RequestBody InspectionVo inspectionVo) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ LinkDetection linkDetection = linkDetectionMapper.selectById(inspectionVo.getId());
+ inspectionVo.setMcode(linkDetection.getSampleNumber());
+ inspectionVo.setExperiment(linkDetection.getExperiment());
+ inspectionVo.setSpecificationId(linkDetection.getSpecificationsModels());
+ inspectionVo.setUnit(linkDetection.getUnit());
+ return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
+ }
+
}
--
Gitblit v1.9.3