From 6d7b4c2e4c0a1dd15afb71b11c8f3c19ef7c946c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 19 八月 2023 16:06:52 +0800
Subject: [PATCH] 优化
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java | 2 +-
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 13 +++++++++++--
standard-server/src/main/resources/mapper/ProductMapper.xml | 7 ++++---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 10 ++++++++++
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java | 4 ++--
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 11 ++++++++++-
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 13 ++++++++++++-
7 files changed, 50 insertions(+), 10 deletions(-)
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 cc804a8..eff45e8 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
@@ -38,6 +38,15 @@
return Result.success(productService.pageProductInformation(specificationsId));
}
- //@ApiOperation("濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨")
+ @ApiOperation("濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鏍囧噯椤圭洰ID", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "required", value = "鏍囧噯鍊�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "internal", value = "鍐呮帶鍊�", dataTypeClass = String.class, required = true)
+ })
+ @PostMapping("/write")
+ public Result<?> write(Integer id, String required, String internal) {
+ return Result.success(productService.write(id, required, internal));
+ }
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
index 17d1426..49ca632 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
@@ -21,7 +21,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-11
*/
-@Api(tags = "鏍囧噯搴�-->3銆佷骇鍝佽鏍�")
+@Api(tags = "鏍囧噯搴�-->3銆佷骇鍝佸瀷鍙�")
@RestController
@RequestMapping("/specifications")
public class SpecificationsController {
@@ -41,7 +41,7 @@
@ApiOperation("鍒犻櫎浜у搧鍨嬪彿")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "瑙勬牸Id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿Id", dataTypeClass = Integer.class, required = true)
})
@DeleteMapping("/delete")
public Result<?> deleteSpecificationsInformation(Integer specificationsId) {
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java
index 98ac612..eb29f8f 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardController.java
@@ -17,7 +17,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-11
*/
-@Api(tags = "鏍囧噯搴�-->2銆佹爣鍑�")
+@Api(tags = "鏍囧噯搴�-->2銆佽鏍�(鏍囧噯)")
@RestController
@RequestMapping("/standards")
public class StandardController {
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 cb7502c..60a08ea 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
@@ -28,4 +28,14 @@
* @return
*/
List<Map<String,Object>> pageProductInformation(Integer specificationsId);
+
+ /**
+ * 濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
+ * @param id
+ * @param required
+ * @param internal
+ * @return
+ */
+ Integer write(Integer id, String required, String internal);
+
}
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 c27c343..49064d0 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
@@ -44,7 +44,7 @@
@Override
public void deleteProductInformation(List<Integer> SpecificationsId) {
- for (Integer materialId : SpecificationsId){
+ for (Integer materialId : SpecificationsId) {
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(Product::getSpecifications_id, materialId);
wrapper.set(Product::getState, 0);
@@ -59,5 +59,16 @@
return productMapper.pageProductInformation(specificationsId);
}
+ //濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
+ @Override
+ public Integer write(Integer id, String required, String internal) {
+ Product product = new Product();
+ product.setId(id);
+ product.setRequired(required);
+ product.setInternal(internal);
+ productMapper.updateById(product);
+ return 1;
+ }
+
}
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 29b90c5..5de0d90 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -13,13 +13,14 @@
<!--灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->
<select id="pageProductInformation" resultType="java.util.Map">
- select name,
+ select id,
+ name,
father,
unit,
required,
internal
from lims_laboratory.product
- where state=1
- and specifications_id=#{specificationsId}
+ where state = 1
+ and specifications_id = #{specificationsId}
</select>
</mapper>
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index bc6f8cd..6af2685 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -1,8 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.limslaboratory.mapper.ProductModelMapper">
+ <resultMap id="selectproductModelMap" type="map">
+ <id property="father" column="father"/>
+ <collection property="children" resultMap="selectproductModelTowMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="selectproductModelTowMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="unit" column="unit"/>
+ </resultMap>
<!--鏌ヨ鏍囧噯妯＄増鍒楄〃-->
- <select id="selectproductModel" resultType="java.util.Map">
+ <select id="selectproductModel" resultMap="selectproductModelMap">
select id,
father,
name,
@@ -16,7 +26,6 @@
<if test="father!=null and father!=''">
and father like concat('%',#{father},'%')
</if>
- order by father
</select>
<update id="delAllproductModel">
--
Gitblit v1.9.3