From 1faae0508c2f55b25fdacad9eb18d00cc5aa86ef Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 20 七月 2023 16:58:03 +0800
Subject: [PATCH] 提交删除申请,编辑样品
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 3 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 19 +++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 21 ++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 4 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 26 +++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java | 15 +++++--
sys/src/main/resources/application-dev.yml | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 2
9 files changed, 87 insertions(+), 6 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 816739d..d5419af 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
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.*;
@@ -51,7 +52,10 @@
})
@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));
}
@@ -95,4 +99,21 @@
return Result.success(materialService.selectMaterialById(materialId));
}
+ @ApiOperation("鎻愪氦鐢宠")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
+ })
+ @PostMapping("/submitInspection")
+ public Result submitInspection(String inspectionId) {
+ return Result.success(inspectionService.subInspectionByInsId(inspectionId));
+ }
+
+ @ApiOperation("浣滃簾鐢宠")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
+ })
+ @PostMapping("/delInspection")
+ public Result delInspection(String inspectionId) {
+ return Result.success(inspectionService.delInspectionByInsId(inspectionId));
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
index f545d9d..fb71110 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
@@ -12,6 +12,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -52,4 +53,22 @@
return Result.success(inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId));
}
+ @ApiOperation("鏍规嵁Id鏌ヨ鏍峰搧淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/selectInspectionMaterialListById")
+ public Result selectInspectionMaterialListById(int inspectionMaterialListId) throws Exception {
+ return Result.success(inspectionMaterialListService.getById(inspectionMaterialListId));
+ }
+
+ @ApiOperation("淇敼鏍峰搧淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
+ public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
+ return Result.success(inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId,inspectionMaterialList));
+ }
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
index c9d4426..b91650e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -79,5 +79,8 @@
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
private Integer userId;
+ @ApiModelProperty(value = "鍏宠仈 璁惧id ")
+ private Integer instrument_id;
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
index db6113c..8d5562b 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
@@ -32,7 +32,7 @@
private Integer id;
@ApiModelProperty(value = "妫�楠岀粨鏋�")
- private String results;
+ private Integer results;
@ApiModelProperty(value = "璇曢獙璇存槑")
private String thing;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
index 060408c..b6c72a1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
@@ -21,4 +21,5 @@
boolean delInspectionMaterialListByInsId(int inspectionMaterialListId);
+ boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
index fa2ead0..f4c1e86 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
@@ -20,4 +20,8 @@
Inspection addInspection(String userName,int type);
List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state);
+
+ boolean delInspectionByInsId(String inspectionId);
+
+ boolean subInspectionByInsId(String inspectionId);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
index 7c002bf..548330f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
@@ -1,15 +1,13 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.mapper.PlanMapper;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
-import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
-import com.yuanchu.limslaboratory.pojo.InspectionProductList;
-import com.yuanchu.limslaboratory.pojo.Plan;
-import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.PlanService;
@@ -80,4 +78,13 @@
int judge2 = inspectionProductListMapper.update(new InspectionProductList(), wrapper);
return judge1>0&&judge2>0;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList) {
+ LambdaUpdateWrapper<InspectionMaterialList> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(InspectionMaterialList::getId,inspectionMaterialListId);
+ int judge = inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
+ return judge>0;
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index a9f7f82..0f49d8c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -1,13 +1,17 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
import com.yuanchu.limslaboratory.service.InspectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -28,7 +32,9 @@
@Override
public Inspection addInspection(String userName,int type) {
Inspection inspection = new Inspection(type, 0,1,1, userName);
+ System.out.println(inspection);
int judge = inspectionMapper.insert(inspection);
+ System.out.println(judge);
return judge>0?inspection:null;
}
@@ -36,4 +42,24 @@
public List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state) {
return inspectionMapper.selectAllInspection((pageSize - 1) * countSize,pageSize * countSize, state);
}
+
+ @Override
+ public boolean delInspectionByInsId(String inspectionId) {
+ Inspection inspection = new Inspection();
+ inspection.setState(0);
+ inspection.setId(inspectionId);
+ int judge = inspectionMapper.updateById(inspection);
+ return judge>0;
+
+ }
+
+ @Override
+ public boolean subInspectionByInsId(String inspectionId) {
+ Inspection inspection = new Inspection();
+ inspection.setState(2);
+ inspection.setId(inspectionId);
+ inspection.setInspectStartTime(LocalDateTime.now());
+ int judge = inspectionMapper.updateById(inspection);
+ return judge>0;
+ }
}
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index c8ae754..35f3bd4 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -69,7 +69,7 @@
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
password: null
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
- timeout: 5000
+ timeout: 5
# redis杩炴帴姹犻厤缃�
pool:
# 鏈�澶у彲鐢ㄨ繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
--
Gitblit v1.9.3