From 62e0e2910b2858a60e5fa4ffda2590c05b0caf9d Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 18:02:11 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-22
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 4 +++-
inspection-server/src/main/resources/mapper/ReportMapper.xml | 1 -
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 3 +--
standard-server/src/main/resources/mapper/ProductMapper.xml | 8 +++++++-
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 1 +
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 17 ++++++++++++++++-
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 9 +++++++--
7 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
index 46c9563..01c93e6 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
@@ -6,6 +6,7 @@
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
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;
@@ -67,9 +68,10 @@
@ApiImplicitParam(name = "result", value = "瀹℃牳缁撹", dataTypeClass = String.class, required = true)
})
@PostMapping("/check")
- public Result check(@RequestHeader("token") String token, Integer id, String result) throws Exception {
+ public Result check(@RequestHeader("X-Token") String token, Integer id, String result) throws Exception {
Object object = RedisUtil.get(token);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ MyUtil.PrintLog(unmarshal + "-------id" + id + "=========" + result);
return Result.success(reportService.check((String) unmarshal.get("name"), id, result));
}
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 7634937..63bc801 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -11,7 +11,6 @@
im.name materialName,
r.conclusion ,
r.status ,
- r.approver ,
check_time,
u.name
from lims_laboratory.report r
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index eff45e8..31b730b 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.service.ProductService;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +47,21 @@
})
@PostMapping("/write")
public Result<?> write(Integer id, String required, String internal) {
- return Result.success(productService.write(id, required, internal));
+ Integer write = productService.write(id, required, internal);
+ if (write >= 1){
+ return Result.success("鏇存柊鎴愬姛");
+ }
+ return Result.fail("鏇存柊澶辫触");
}
+ @ApiOperation("椤圭洰Id鍒楄〃鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "ids", value = "鏍囧噯椤圭洰ID", dataTypeClass = String.class, required = true)
+ })
+ @DeleteMapping("/deleteList")
+ public Result<?> deleteList(String ids) {
+ MyUtil.PrintLog(ids);
+ productService.deleteList(ids);
+ return Result.success("鍒犻櫎鎴愬姛");
+ }
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
index ff4ec4e..5abf378 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -26,6 +26,5 @@
//灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
List<Map<String, Object>> pageProductInformation(Integer specificationsId);
-
-
+ void deleteList(String ids);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
index 60a08ea..7836058 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -38,4 +38,5 @@
*/
Integer write(Integer id, String required, String internal);
+ void deleteList(String ids);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index 49064d0..a08eb0e 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -66,8 +66,13 @@
product.setId(id);
product.setRequired(required);
product.setInternal(internal);
- productMapper.updateById(product);
- return 1;
+ MyUtil.PrintLog(product.toString());
+ return productMapper.updateById(product);
+ }
+
+ @Override
+ public void deleteList(String ids) {
+ productMapper.deleteList(ids);
}
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 732c389..1014cc6 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -14,7 +14,7 @@
<!--灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->
<resultMap id="pageProductInformationMap" type="map">
- <id property="father" column="father"/>
+ <id property="name" column="father"/>
<collection property="children" resultMap="pageProductInformationTowMap" javaType="List"/>
</resultMap>
<resultMap id="pageProductInformationTowMap" type="map">
@@ -36,4 +36,10 @@
where state = 1
and specifications_id = #{specificationsId}
</select>
+
+ <select id="deleteList">
+ update lims_laboratory.product
+ set state=0
+ where id in (${ids})
+ </select>
</mapper>
--
Gitblit v1.9.3