From cbf4b74927fe51c19c307d89b326ae999cb6a165 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 九月 2023 17:50:25 +0800
Subject: [PATCH] 修改 9.12
---
base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 2
base-server/src/main/java/com/yuanchu/mom/service/SelfcheckModelService.java | 2
base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 2
standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechniqueDto.java | 4 +
standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java | 3
standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java | 7 -
standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java | 3
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java | 1
base-server/src/main/resources/mapper/DeviceMapper.xml | 1
standard-server/src/main/java/com/yuanchu/mom/pojo/dto/ProductDto.java | 10 ++-
base-server/src/main/java/com/yuanchu/mom/controller/SelfcheckModelController.java | 3
standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java | 7 -
standard-server/src/main/resources/mapper/TechniqueMapper.xml | 8 ++
standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyDto.java | 5 +
standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java | 4 -
standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomDto.java | 4 +
standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java | 7 -
standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java | 3
base-server/src/main/resources/mapper/TechniqueModelMapper.xml | 4 +
base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 4
standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java | 3
standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java | 19 +++++
base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 7 +
base-server/src/main/java/com/yuanchu/mom/service/impl/SelfcheckModelServiceImpl.java | 18 ++++-
standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java | 3
standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java | 3
standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java | 7 -
27 files changed, 89 insertions(+), 55 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 50e5980..6dbca36 100644
--- a/base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -67,9 +67,12 @@
}
@ApiOperation(value = "鏂板浠櫒璁惧锛氳澶囩粍涓嬫媺妗�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "type", value = "璁惧鐢ㄩ��", dataTypeClass = Integer.class, required = true)
+ })
@GetMapping("/list_group")
- public Result<?> listGroup() {
- return Result.success(deviceService.listGroup());
+ public Result<?> listGroup(Integer type) {
+ return Result.success(deviceService.listGroup(type));
}
@ApiOperation(value = "鏂板浠櫒璁惧")
diff --git a/base-server/src/main/java/com/yuanchu/mom/controller/SelfcheckModelController.java b/base-server/src/main/java/com/yuanchu/mom/controller/SelfcheckModelController.java
index c63155b..778740d 100644
--- a/base-server/src/main/java/com/yuanchu/mom/controller/SelfcheckModelController.java
+++ b/base-server/src/main/java/com/yuanchu/mom/controller/SelfcheckModelController.java
@@ -46,8 +46,7 @@
@ApiOperation(value = "鏂板鑷椤圭洰缁存姢")
@PostMapping("/addSelfcheck")
public Result addSelfcheck(@Validated @RequestBody SelfcheckModelDto selfcheckModelDto) {
- Integer id = selfcheckModelService.addSelfcheck(selfcheckModelDto);
- return Result.success("鏂板鑷缓椤圭洰"+id+"鎴愬姛!");
+ return Result.success(selfcheckModelService.addSelfcheck(selfcheckModelDto));
}
@ApiOperation(value = "鍒犻櫎")
diff --git a/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index d45d152..32b0c6c 100644
--- a/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -35,6 +35,6 @@
List<Map<String, Object>> chooseDevice();
//鏂板--閫夋嫨璁惧缁�
- List<String> listGroup();
+ List<String> listGroup(Integer type);
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index ee9c1cc..63d3499 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -76,5 +76,5 @@
* 鏂板浠櫒璁惧锛氳澶囩粍涓嬫媺妗�
* @return
*/
- List<String> listGroup();
+ List<String> listGroup(Integer type);
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/SelfcheckModelService.java b/base-server/src/main/java/com/yuanchu/mom/service/SelfcheckModelService.java
index 3163d6d..0e245a9 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/SelfcheckModelService.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/SelfcheckModelService.java
@@ -27,7 +27,7 @@
* @param selfcheckModelDto
* @return
*/
- Integer addSelfcheck(SelfcheckModelDto selfcheckModelDto);
+ String addSelfcheck(SelfcheckModelDto selfcheckModelDto);
/**
* 鍒犻櫎
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 40841f0..db821e7 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -86,7 +86,7 @@
//鏂板浠櫒璁惧锛氳澶囩粍涓嬫媺妗�
@Override
- public List<String> listGroup() {
- return deviceMapper.listGroup();
+ public List<String> listGroup(Integer type) {
+ return deviceMapper.listGroup(type);
}
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/SelfcheckModelServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/SelfcheckModelServiceImpl.java
index 22a6dc4..29df6d2 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/SelfcheckModelServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/SelfcheckModelServiceImpl.java
@@ -31,16 +31,26 @@
//鏂板鑷椤圭洰
@Override
- public Integer addSelfcheck(SelfcheckModelDto selfcheckModelDto) {
+ public String addSelfcheck(SelfcheckModelDto selfcheckModelDto) {
+ String required = selfcheckModelDto.getRequired();
+ String internal = selfcheckModelDto.getInternal();
+ char requ = required.charAt(0);
+ if (requ != '>' && requ != '<' && requ != '=') {
+ return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
+ }
+ char inter = internal.charAt(0);
+ if (inter != '>' && inter != '<' && inter != '=') {
+ return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
+ }
SelfcheckModel selfcheckModel = SelfcheckModel.builder()
.name(selfcheckModelDto.getName())
.techTemId(selfcheckModelDto.getTechTemId())
.unit(selfcheckModelDto.getUnit())
- .required(selfcheckModelDto.getRequired())
- .internal(selfcheckModelDto.getInternal())
+ .required(required)
+ .internal(internal)
.build();
selfcheckModelMapper.insert(selfcheckModel);
- return selfcheckModel.getId();
+ return "鏂板"+selfcheckModel.getId()+"鎴愬姛";
}
//鍒犻櫎
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index d3ae2f5..166307e 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -70,6 +70,7 @@
select distinct father
from mom_ocean.device
where state = 1
+ and type = #{type}
</select>
<!--鎵归噺鍒犻櫎-->
<update id="delAllDevice">
diff --git a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
index 0ec473a..b337acc 100644
--- a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.yuanchu.mom.mapper.TechniqueModelMapper">
<!--鏌ヨ鐢熶骇宸ヨ壓缁存姢鍒楄〃 鍙宠竟灞曠ず璇ュ伐鑹轰笅鑳戒娇鐢ㄧ殑璁惧鎵�鑳藉仛鐨勯」鐩�-->
<resultMap id="selectAllTequeMap" type="map">
- <id property="name" column="dname"/>
+ <id property="dname" column="dname"/>
<collection property="children" resultMap="selectAllTequeMaps" javaType="List"/>
</resultMap>
<resultMap id="selectAllTequeMaps" type="map">
@@ -67,6 +67,8 @@
select tt.type,
tt.father techFather,
tt.name techName,
+ tt.id tid,
+ d.id did,
d.name dname,
cm.father,
cm.name,
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
index e503657..39d235c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
@@ -81,6 +81,7 @@
} else {
inspectionItem.setResult(1);
}
+ inspectionItem.setUsername(username);
inspectionItemMapper.updateById(inspectionItem);
//杩斿洖妫�楠岄」鐩殑缁撹
return inspectionItem.getResult();
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
index 144e91d..676cafb 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
@@ -39,12 +39,9 @@
@ApiOperation("鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "technologyId", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
- })
@PostMapping("/add")
- public Result<?> addMbom(Integer technologyId, @Validated @RequestBody MbomDto mbomDto) {
- mbomService.addMbom(technologyId, mbomDto);
+ public Result<?> addMbom(@Validated @RequestBody MbomDto mbomDto) {
+ mbomService.addMbom( mbomDto);
return Result.success("娣诲姞鐗╂枡娓呭崟銆�" + mbomDto.getName() + "銆戞垚鍔�");
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java
index 5968b60..36cb8d2 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java
@@ -40,12 +40,9 @@
}
@ApiOperation("鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "technologyId", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
- })
@PostMapping("/add")
- public Result<?> addProduct(Integer technologyId, @Validated @RequestBody ProductDto productDto) {
- productService.addProduct(technologyId, productDto);
+ public Result<?> addProduct(@Validated @RequestBody ProductDto productDto) {
+ productService.addProduct(productDto);
return Result.success("娣诲姞鎶�鏈寚鏍囥��" + productDto.getName() + "銆戞垚鍔�");
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java
index 07d5de5..bc044cc 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java
@@ -56,12 +56,9 @@
}
@ApiOperation("鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "technologyId", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
- })
@PostMapping("/add")
- public Result<?> addTechnique(Integer technologyId, @Validated @RequestBody TechniqueDto techniqueDto) {
- techniqueService.addTechnique(technologyId, techniqueDto);
+ public Result<?> addTechnique(@Validated @RequestBody TechniqueDto techniqueDto) {
+ techniqueService.addTechnique(techniqueDto);
return Result.success("娣诲姞鐢熶骇宸ヨ壓鎴愬姛");
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java
index 2d6787b..9ac1511 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java
@@ -45,12 +45,9 @@
}
@ApiOperation("鍙充笂瑙掓柊澧�-->宸ヨ壓璺嚎")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true)
- })
@PostMapping("/add")
- public Result<?> addTechnology(Integer specificationsId, @Validated @RequestBody TechnologyDto technologyDto) {
- technologyService.addTechnology(specificationsId, technologyDto);
+ public Result<?> addTechnology(@Validated @RequestBody TechnologyDto technologyDto) {
+ technologyService.addTechnology(technologyDto);
return Result.success("娣诲姞宸ヨ壓銆�" + technologyDto.getName() + "銆戞垚鍔�");
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomDto.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomDto.java
index 6a59603..b6d29e4 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomDto.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomDto.java
@@ -3,11 +3,15 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
@Data
//鍙充笂瑙掓柊澧炲弬鏁�
public class MbomDto {
+ @NotNull(message = "宸ヨ壓璺嚎id涓嶈兘涓虹┖")
+ private Integer technologyId;
+
/**
* 鍘熸潗鏂欏悕绉�
**/
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/ProductDto.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/ProductDto.java
index 3b1e74e..f164083 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/ProductDto.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/ProductDto.java
@@ -3,28 +3,32 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.util.List;
@Data
//鍙充笂瑙掓柊澧炲弬鏁�
public class ProductDto {
+ @NotNull(message = "宸ヨ壓璺嚎id涓嶈兘涓虹┖")
+ private Integer technologyId;
+
/**
* 椤圭洰鍚嶇О
*/
- @NotBlank(message = "宸ヨ壓鍚嶇О涓嶈兘涓虹┖!")
+ @NotBlank(message = "椤圭洰鍚嶇О涓嶈兘涓虹┖!")
private String name;
/**
* 椤圭洰鐖剁被
*/
- @NotBlank(message = "宸ヨ壓鍚嶇О涓嶈兘涓虹┖!")
+ @NotBlank(message = "椤圭洰鐖剁被涓嶈兘涓虹┖!")
private String father;
/**
* 鍗曚綅
*/
- @NotBlank(message = "宸ヨ壓鍚嶇О涓嶈兘涓虹┖!")
+ @NotBlank(message = "鍗曚綅涓嶈兘涓虹┖!")
private String unit;
/**
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechniqueDto.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechniqueDto.java
index dc12a1a..c162e80 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechniqueDto.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechniqueDto.java
@@ -3,11 +3,15 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
@Data
//鍙充笂瑙掓柊澧炲弬鏁�
public class TechniqueDto {
+ @NotNull(message = "宸ヨ壓璺嚎id涓嶈兘涓虹┖")
+ private Integer technologyId;
+
/**
* 璁惧鍚嶇О
**/
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyDto.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyDto.java
index ada9a56..cc704af 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyDto.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyDto.java
@@ -2,13 +2,18 @@
import lombok.Data;
+import org.apache.ibatis.annotations.Param;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
@Data
//鍙充笂瑙掓柊澧炲弬鏁�
public class TechnologyDto {
+ @NotNull(message = "鍨嬪彿id涓嶈兘涓虹┖!")
+ private Integer specificationsId;
+
//宸ヨ壓鍚嶇О
@NotBlank(message = "宸ヨ壓鍚嶇О涓嶈兘涓虹┖!")
private String name;
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java b/standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java
index 7557a3f..65d99db 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java
@@ -39,10 +39,9 @@
/**
* 鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟
- * @param technologyId
* @param mbomDto
*/
- void addMbom(Integer technologyId, MbomDto mbomDto);
+ void addMbom( MbomDto mbomDto);
/**
* 濉啓鏁伴噺,榧犳爣绉诲紑淇濆瓨
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java
index c1f3c96..892faf0 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java
@@ -52,10 +52,9 @@
/**
* 鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�
- * @param technologyId
* @param productDto
*/
- void addProduct(Integer technologyId, ProductDto productDto);
+ String addProduct(ProductDto productDto);
/**
* 濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java b/standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java
index bb75ca9..10182ec 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java
@@ -53,10 +53,9 @@
/**
* 鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓
- * @param technologyId
* @param techniqueDto
*/
- void addTechnique(Integer technologyId, TechniqueDto techniqueDto);
+ void addTechnique(TechniqueDto techniqueDto);
/**
* 鍒犻櫎
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java b/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java
index b603ed6..bbbbe81 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java
@@ -45,10 +45,9 @@
/**
* 鍙充笂瑙掓柊澧�-->宸ヨ壓璺嚎
- * @param specificationsId
* @param technologyDto
*/
- void addTechnology(Integer specificationsId, TechnologyDto technologyDto);
+ void addTechnology(TechnologyDto technologyDto);
/**
* 濉啓鐢熶骇瀹氶,榧犳爣绉诲紑淇濆瓨
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java
index dff40ee..3457b59 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java
@@ -48,10 +48,9 @@
//鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟
@Override
- public void addMbom(Integer technologyId, MbomDto mbomDto) {
+ public void addMbom(MbomDto mbomDto) {
Mbom mbom = new Mbom();
BeanUtils.copyProperties(mbomDto, mbom);
- mbom.setTechnologyId(technologyId);
mbomMapper.insert(mbom);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
index e40dde9..8f60368 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.TechnologyMapper;
import com.yuanchu.mom.pojo.Product;
@@ -58,11 +59,25 @@
//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�
@Override
- public void addProduct(Integer technologyId, ProductDto productDto) {
+ public String addProduct(ProductDto productDto) {
Product product = new Product();
+ String required = productDto.getRequired();
+ String internal = productDto.getInternal();
+ if (ObjectUtils.isNotEmpty(required)){
+ char requ = required.charAt(0);
+ if (requ != '>' && requ != '<' && requ != '=') {
+ return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
+ }
+ }
+ if (ObjectUtils.isNotEmpty(internal)){
+ char inter = internal.charAt(0);
+ if (inter != '>' && inter != '<' && inter != '=') {
+ return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
+ }
+ }
BeanUtils.copyProperties(productDto, product);
- product.setTechnologyId(technologyId);
productMapper.insert(product);
+ return "鏂板鎴愬姛!";
}
//濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
index 00cc745..a8e14ae 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
@@ -60,10 +60,9 @@
//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓
@Override
- public void addTechnique(Integer technologyId, TechniqueDto techniqueDto) {
+ public void addTechnique(TechniqueDto techniqueDto) {
Technique technique = new Technique();
BeanUtils.copyProperties(techniqueDto, technique);
- technique.setTechnologyId(technologyId);
techniqueMapper.insert(technique);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
index 13d35a1..c70ee4b 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
@@ -71,11 +71,9 @@
//鍙充笂瑙掓柊澧�-->宸ヨ壓璺嚎
@Override
- @Transactional(rollbackFor = Exception.class)
- public void addTechnology(Integer specificationsId, TechnologyDto technologyDto) {
+ public void addTechnology(TechnologyDto technologyDto) {
Technology technology = new Technology();
BeanUtils.copyProperties(technologyDto, technology);
- technology.setSpecificationsId(specificationsId);
technologyMapper.insert(technology);
}
diff --git a/standard-server/src/main/resources/mapper/TechniqueMapper.xml b/standard-server/src/main/resources/mapper/TechniqueMapper.xml
index 2fc35c2..e6c0e9c 100644
--- a/standard-server/src/main/resources/mapper/TechniqueMapper.xml
+++ b/standard-server/src/main/resources/mapper/TechniqueMapper.xml
@@ -23,9 +23,15 @@
<collection property="children" resultMap="threeMap" javaType="List"/>
</resultMap>
<resultMap id="threeMap" type="map">
- <id property="tqid" column="tqid"/>
<result property="device" column="device"/>
+ <collection property="children" resultMap="fourMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="fourMap" type="map">
<result property="productFather" column="product_father"/>
+ <collection property="children" resultMap="fiveMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="fiveMap" type="map">
+ <id property="tqid" column="tqid"/>
<result property="product" column="product"/>
<result property="unit" column="unit"/>
</resultMap>
--
Gitblit v1.9.3