From d2ce4553e18131b9a60d7be53c496f0cbce699ca Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 08 九月 2023 14:47:47 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 217 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 148 insertions(+), 69 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index d5419af..d2a5876 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -1,35 +1,43 @@
package com.yuanchu.limslaboratory.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import java.text.ParseException;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
+import com.yuanchu.limslaboratory.mapper.InstrumentMapper;
+import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
-import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
-import com.yuanchu.limslaboratory.pojo.InspectionProductList;
-import com.yuanchu.limslaboratory.pojo.Product;
-import com.yuanchu.limslaboratory.service.*;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
+import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.*;
+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.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.service.InspectionService;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
+ * 鐢宠琛�(Inspection)琛ㄦ帶鍒跺眰
*
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:03:36
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "璇曢獙绠＄悊-->妫�楠岀敵璇�")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
@@ -37,83 +45,154 @@
@Autowired
private InspectionService inspectionService;
- @Autowired
- private InspectionMaterialListService inspectionMaterialListService;
+ @Resource
+ RawMaterialService rawMaterialService;
- @Autowired
- private InspectionProductListService inspectionProductListService;
+ @Resource
+ LinkBasicInformationService linkBasicInformationService;
- @Autowired
- private MaterialService materialService;
+ @Resource
+ UserMapper userMapper;
- @ApiOperation("娣诲姞妫�楠岀敵璇峰崟")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�", dataTypeClass = Integer.class, required = true),
- })
- @PostMapping("/addInspection")
- public Result addInspection(@RequestHeader("X-Token") String token, int type) throws Exception {
- System.out.println(token);
- System.out.println(type);
- Object object = RedisUtil.get(token);
- System.out.println(object);
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- return Result.success(inspectionService.addInspection("" + unmarshal.get("name"), type));
- }
+ @Resource
+ private InstrumentMapper instrumentMapper;
- @ApiOperation("鏌ヨ鎵�鏈夋楠屽崟鍒楄〃")
+ @ApiOperation(value = "鏌ヨ妫�楠岀敵璇峰崟鍒楄〃")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "state", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "message", value = "鐢宠鍗曞彿/鍘熸潗鏂欏悕绉�", dataTypeClass = String.class)
})
- @GetMapping("/selectAllInspection")
- public Result selectAllInspection(int pageSize, int countSize, Integer state) {
- return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
+ @GetMapping("/selectInspectsList")
+ @AuthHandler
+ public Result selectInspectsList(int pageSize, int countSize, String message) {
+ IPage<Map<String, Object>> inspectionPage = inspectionService.selectInspectsList(new Page<Object>(pageSize, countSize), message);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", inspectionPage.getTotal());
+ map.put("row", inspectionPage.getRecords());
+ return Result.success(map);
}
- @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�")
+
+ @ApiOperation(value = "鏌ヨ鎵�鏈夋姤妫�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionId", value = "鎶ユ鍗旾D", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class, required = true)
})
- @PostMapping("/selectMaterialByInsId")
- public Result selectMaterialByInsId(String inspectionId) {
- return Result.success(inspectionMaterialListService.selectInspectionMaterialListByInsId(inspectionId));
+ @GetMapping("/selectAll")
+ @AuthHandler
+ public Result selectAll(Integer type) {
+ switch (type) {
+ case 0:
+ //鍘熸潗鏂�
+ return Result.success(rawMaterialService.selectRawmaAll());
+ case 2:
+ //濮旀墭鍗�
+ return Result.success(linkBasicInformationService.selectLinkAll());
+ case 1:
+ //鎴愬搧妫�楠�
+ return Result.success("璇疯緭鍏ユ楠屼俊鎭�!");
+ }
+ return Result.fail("绫诲瀷閿欒!");
}
- @ApiOperation("鏌ヨ鐗╂枡淇℃伅")
+ @ApiOperation(value = "鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true)
+ @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)
})
- @GetMapping("/selectMaterialLimit")
- public Result selectMaterialLimit(int pageSize, int countSize) {
- return Result.success(materialService.selectMaterialLimit(pageSize, countSize));
+ @GetMapping("/chooseVer")
+ @AuthHandler
+ public Result chooseVer(String name, String mcode, String specifications) {
+ return Result.success(inspectionService.chooseVer(name, mcode, specifications));
+ }
+ @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 = "experiment", value = "璇曢獙椤圭洰(濮旀墭涓撳睘)", dataTypeClass = String.class )
+ })
+ @GetMapping("/lookProByVer")
+ @AuthHandler
+ public Result lookProByVer(String name, String mcode, String specifications,Integer version,String experiment) {
+ return Result.success(inspectionService.lookProByVer(name, mcode, specifications,version,experiment));
}
- @ApiOperation("閫夋嫨鐗╂枡淇℃伅")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "materialId", value = "鐗╂枡ID", dataTypeClass = Integer.class, required = true),
- })
- @PostMapping("/selectMaterialById")
- public Result selectMaterialById(String materialId) {
- return Result.success(materialService.selectMaterialById(materialId));
+
+ @ApiOperation(value = "鏂板妫�楠屽崟")
+ @PostMapping("/addInspect")
+ @AuthHandler
+ 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);
+ return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
}
- @ApiOperation("鎻愪氦鐢宠")
+ @ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ妫�楠屽崟璇︽儏")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
})
- @PostMapping("/submitInspection")
- public Result submitInspection(String inspectionId) {
- return Result.success(inspectionService.subInspectionByInsId(inspectionId));
+ @GetMapping("/selectInspectsListById")
+ @AuthHandler
+ public Result selectInspectsListById(Integer id) {
+ return Result.success(inspectionService.selectInspectsListById(id));
}
- @ApiOperation("浣滃簾鐢宠")
+ @ApiOperation(value = "閫夋嫨妫�楠岄」鐩殑璐ｄ换浜�")
+ @GetMapping("/selectUser")
+ @AuthHandler
+ public Result selectUser() {
+ return Result.success(userMapper.selectUser());
+ }
+
+ @ApiOperation(value = "閫夋嫨妫�楠岃澶�")
+ @GetMapping("/selectEquipment")
+ @AuthHandler
+ public Result selectEquipment(){return Result.success(instrumentMapper.getInstrument());}
+
+ @ApiOperation(value = "淇濆瓨妫�楠岄」鐩矗浠讳汉")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟椤圭洰id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "userProId", value = "璐ｄ换浜篿d", dataTypeClass = Integer.class, required = true)
})
- @PostMapping("/delInspection")
- public Result delInspection(String inspectionId) {
- return Result.success(inspectionService.delInspectionByInsId(inspectionId));
+ @GetMapping("/chooseUseProId")
+ @AuthHandler
+ public Result chooseUseProId(Integer id, Integer userProId) {
+ return Result.success(inspectionService.chooseUseProId(id, userProId));
+ }
+
+ @ApiOperation("淇濆瓨璁惧id")
+ @GetMapping("/chooseEquipment")
+ @AuthHandler
+ public Result chooseEquipment(Integer id,Integer equipmentId){
+ return Result.success(inspectionService.chooseEquipment(id, equipmentId));
+ }
+
+ @ApiOperation(value = "浣滃簾妫�楠屽崟")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delInspect")
+ @AuthHandler
+ public Result delInspect(Integer id) {
+ return Result.success(inspectionService.delInspect(id));
+ }
+
+ @ApiOperation(value = "鑾峰彇鎴愬搧淇℃伅")
+ @PostMapping("/getMaterielTypeIsOne")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.inspectionApplication,isAdd = true)
+ public Result getMaterielTypeIsOne(){
+ return Result.success(inspectionService.getMaterielTypeIsOne());
+ }
+
+
+ @ApiOperation(value = "鏍规嵁鎴愬搧鑾峰彇瑙勬牸鍨嬪彿")
+ @PostMapping("/getSpecificationByMaterielId")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.inspectionApplication,isAdd = true)
+ public Result getSpecification(Integer id){
+ return Result.success(inspectionService.getSpecification(id));
}
}
+
--
Gitblit v1.9.3