From 616c9c94af30ae75eb5994a2cea3fac16acaa005 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 20 七月 2023 11:21:50 +0800
Subject: [PATCH] 增加请求“检验模块”
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java | 20 +
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java | 24 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java | 8
standard-server/src/main/resources/mapper/MaterialMapper.xml | 26 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java | 15 +
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 11
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 3
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 13 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 111 ++++-----
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 12
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 5
/dev/null | 129 -----------
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 55 +++++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 45 +---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java | 83 +++++++
inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml | 23 ++
25 files changed, 373 insertions(+), 237 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 501a4fa..816739d 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
@@ -5,21 +5,14 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Product;
-import com.yuanchu.limslaboratory.service.InspectionProductListService;
-import com.yuanchu.limslaboratory.service.InspectionService;
-import com.yuanchu.limslaboratory.service.ProductService;
-import com.yuanchu.limslaboratory.service.SpecificationsService;
+import com.yuanchu.limslaboratory.service.*;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -44,68 +37,62 @@
private InspectionService inspectionService;
@Autowired
- private ProductService productService;
-
- @Autowired
- private SpecificationsService specificationsService;
+ private InspectionMaterialListService inspectionMaterialListService;
@Autowired
private InspectionProductListService inspectionProductListService;
+ @Autowired
+ private MaterialService materialService;
+
@ApiOperation("娣诲姞妫�楠岀敵璇峰崟")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "materialId", value = "鐗╂枡淇℃伅id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�", dataTypeClass = Integer.class, required = true),
})
@PostMapping("/addInspection")
- @Transactional(rollbackFor = Exception.class)
- public Result addInspection(@RequestHeader("X-Token") String token, int materialId,int type) throws Exception {
- List<Product> list = productService.selectProductByMaterialId(materialId);
- Map<String, Object> map = specificationsService.selectSNameSNName(materialId);
- if (map==null)return Result.fail("鎵句笉鍒拌鐗╂枡淇℃伅");
+ public Result addInspection(@RequestHeader("X-Token") String token, int type) throws Exception {
Object object = RedisUtil.get(token);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- Inspection inspection = new Inspection();
- inspection.setId(IdWorker.getIdStr())
- .setType(type)
- .setInspectionStatus(0)
- .setState(1)
- .setVersion(1)
- .setUserName("" + unmarshal.get("name"))
- .setMaterialNum(Integer.valueOf("" + map.get("num")))
- .setMaterialSupplier("" + map.get("supplier"))
- .setMaterialName("" + map.get("m_name"))
- .setMaterialLocation("" + map.get("location"))
- .setMaterialBatch("" + map.get("batch"))
- .setMaterialReelNumber("" + map.get("reel_number"))
- .setSpecificationsSerialNumber("" + map.get("ss_name"))
- .setSpecificationsVoltageLevel("" + map.get("voltage_level"))
- .setSpecificationsCrossSection("" + map.get("cross_section"))
- .setSpecificationsNumberOfCores("" + map.get("number_of_cores"))
- .setSpecificationsInstruct("" + map.get("instruct"));
- int judge1 = 0;
- int judge2 = 0;
- try {
- judge1 = inspectionService.addInspection(inspection);
- List<InspectionProductList> list2 = new ArrayList<>();
- list.forEach(a -> {
- InspectionProductList inspectionProductList = new InspectionProductList();
- inspectionProductList.setName(a.getName())
- .setMethod(a.getMethod())
- .setUnit(a.getUnit())
- .setRequired(a.getRequired())
- .setInternal(a.getInternal())
- .setState(1)
- .setVersion(1)
- .setInspectionId(inspection.getId())
- .setUserId(Integer.parseInt("" + unmarshal.get("id")))
- .setCreateTime(new Date())
- .setUpdateTime(new Date());
- list2.add(inspectionProductList);
- });
- judge2 = inspectionProductListService.addInspectionProductList(list2);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return Result.success(judge1 > 0 && judge2 > 0 ? "鎻愪氦鎴愬姛" : "鎻愪氦澶辫触", judge1 > 0 && judge2 > 0);
+ return Result.success(inspectionService.addInspection("" + unmarshal.get("name"), type));
}
+
+ @ApiOperation("鏌ヨ鎵�鏈夋楠屽崟鍒楄〃")
+ @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)
+ })
+ @GetMapping("/selectAllInspection")
+ public Result selectAllInspection(int pageSize, int countSize, Integer state) {
+ return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
+ }
+
+ @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionId", value = "鎶ユ鍗旾D", dataTypeClass = String.class, required = true),
+ })
+ @PostMapping("/selectMaterialByInsId")
+ public Result selectMaterialByInsId(String inspectionId) {
+ return Result.success(inspectionMaterialListService.selectInspectionMaterialListByInsId(inspectionId));
+ }
+
+ @ApiOperation("鏌ヨ鐗╂枡淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectMaterialLimit")
+ public Result selectMaterialLimit(int pageSize, int countSize) {
+ return Result.success(materialService.selectMaterialLimit(pageSize, countSize));
+ }
+
+ @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));
+ }
+
}
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
new file mode 100644
index 0000000..f545d9d
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
@@ -0,0 +1,55 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.Material;
+import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.vo.Result;
+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.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+@Api(tags = "妫�楠屾ā鍧�")
+@RestController
+@RequestMapping("/inspectionMaterialList")
+public class InspectionMaterialListController {
+
+ @Autowired
+ InspectionMaterialListService inspectionMaterialListService;
+
+ @ApiOperation("娣诲姞鏍峰搧")
+ @PostMapping("/addInspectionMaterialList")
+ public Result addInspectionMaterialList(@RequestHeader("X-Token") String token, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
+ inspectionMaterialList.setState(1);
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ return Result.success(inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, ""+unmarshal.get("id")));
+ }
+
+ @ApiOperation("鍒犻櫎鏍峰搧")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/delInspectionMaterialList")
+ public Result delInspectionMaterialList(int inspectionMaterialListId) {
+ return Result.success(inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId));
+ }
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
index e8328ef..ecad45c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
@@ -1,6 +1,11 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -17,4 +22,5 @@
@RequestMapping("/inspection-product-list")
public class InspectionProductListController {
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
index 2a3cb96..fc125fe 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
@@ -2,6 +2,7 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
import java.util.List;
import java.util.Map;
@@ -16,4 +17,6 @@
*/
public interface InspectionMapper extends BaseMapper<Inspection> {
+ List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state);
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
new file mode 100644
index 0000000..964cc98
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface InspectionMaterialListMapper extends BaseMapper<InspectionMaterialList> {
+
+ List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId);
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
index e37a342..5c1f45f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
@@ -10,8 +10,10 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
@@ -24,6 +26,8 @@
*/
@Data
@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="Inspection瀵硅薄", description="")
public class Inspection implements Serializable {
@@ -69,38 +73,11 @@
@ApiModelProperty(value = "妫�楠岀粨鏉熸棩鏈�")
private LocalDateTime inspectEndTime;
- @ApiModelProperty(value = "鎶ユ鏁伴噺-鐗╂枡鏁伴噺")
- private Integer materialNum;
-
- @ApiModelProperty(value = "渚涘簲鍟�")
- private String materialSupplier;
-
- @ApiModelProperty(value = "鐗╂枡鍚嶇О")
- private String materialName;
-
- @ApiModelProperty(value = "鐗╂枡瀛樻斁鍦�")
- private String materialLocation;
-
- @ApiModelProperty(value = "鐗╂枡鎵规")
- private String materialBatch;
-
- @ApiModelProperty(value = "鐗╂枡鐩樺彿")
- private String materialReelNumber;
-
- @ApiModelProperty(value = "瑙勬牸鍚嶇О/鍨嬪彿鍚嶇О")
- private String specificationsSerialNumber;
-
- @ApiModelProperty(value = "鐢靛帇绛夌骇")
- private String specificationsVoltageLevel;
-
- @ApiModelProperty(value = "涓荤嚎蹇冩埅闈�")
- private String specificationsCrossSection;
-
- @ApiModelProperty(value = "涓荤嚎鑺姱鏁�")
- private String specificationsNumberOfCores;
-
- @ApiModelProperty(value = "鐢熶骇鎸囦护鍙�")
- private String specificationsInstruct;
-
-
+ public Inspection(Integer type, Integer inspectionStatus, Integer state, Integer version, String userName) {
+ this.type = type;
+ this.inspectionStatus = inspectionStatus;
+ this.state = state;
+ this.version = version;
+ this.userName = userName;
+ }
}
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 291a62c..c9d4426 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
@@ -74,7 +74,7 @@
private Integer version;
@ApiModelProperty(value = "鍏宠仈 鎶ユid")
- private String inspectionId;
+ private int inspectionMaterialListId;
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
private Integer userId;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
new file mode 100644
index 0000000..2f3174e
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
@@ -0,0 +1,15 @@
+package com.yuanchu.limslaboratory.pojo.dto;
+
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+public class InspectionDto extends Inspection implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "妫�楠屼汉鍚嶇О")
+ private String inspectUserName;
+
+}
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
new file mode 100644
index 0000000..060408c
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
@@ -0,0 +1,24 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.Plan;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface InspectionMaterialListService extends IService<InspectionMaterialList> {
+ List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId);
+
+ InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);
+
+ boolean delInspectionMaterialListByInsId(int inspectionMaterialListId);
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
index a8559b5..4703c1f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
@@ -18,4 +18,6 @@
int addInspectionProductList(List<InspectionProductList> list);
+ int delInspectionProductList(int inspectionMaterialListId);
+
}
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 45bb54f..fa2ead0 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
@@ -2,6 +2,7 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
import java.util.List;
import java.util.Map;
@@ -16,6 +17,7 @@
*/
public interface InspectionService extends IService<Inspection> {
- int addInspection(Inspection inspection);
+ Inspection addInspection(String userName,int type);
+ List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state);
}
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
new file mode 100644
index 0000000..7c002bf
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
@@ -0,0 +1,83 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+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.service.InspectionMaterialListService;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
+import com.yuanchu.limslaboratory.service.PlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+@Service
+public class InspectionMaterialListServiceImpl extends ServiceImpl<InspectionMaterialListMapper, InspectionMaterialList> implements InspectionMaterialListService {
+
+ @Resource
+ InspectionMaterialListMapper inspectionMaterialListMapper;
+
+ @Resource
+ ProductMapper productMapper;
+
+ @Resource
+ InspectionProductListMapper inspectionProductListMapper;
+
+ @Override
+ public List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId) {
+ return inspectionMaterialListMapper.selectInspectionMaterialListByInsId(insId);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId) {
+ int judge = inspectionMaterialListMapper.insert(inspectionMaterialList);
+ List<Product> list = productMapper.selectProductByMaterialId(inspectionMaterialList.getMaterialId());
+ List<InspectionProductList> list1 = new ArrayList<>();
+ list.forEach(a-> {
+ InspectionProductList inspectionProductList = new InspectionProductList();
+ inspectionProductList.setName(a.getName())
+ .setMethod(a.getMethod())
+ .setUnit(a.getUnit())
+ .setRequired(a.getRequired())
+ .setInternal(a.getInternal())
+ .setState(1)
+ .setInspectionMaterialListId(inspectionMaterialList.getId())
+ .setUserId(Integer.parseInt(userId));
+ list1.add(inspectionProductList);
+ });
+ int judge2 = inspectionProductListMapper.addInspectionProductList(list1);
+ return judge>0&&judge2>0?inspectionMaterialList:null;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean delInspectionMaterialListByInsId(int inspectionMaterialListId) {
+ InspectionMaterialList list = new InspectionMaterialList();
+ list.setState(0);
+ list.setId(inspectionMaterialListId);
+ int judge1 = inspectionMaterialListMapper.updateById(list);
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspection_material_list_id", inspectionMaterialListId).set("state", 0);
+ int judge2 = inspectionProductListMapper.update(new InspectionProductList(), wrapper);
+ return judge1>0&&judge2>0;
+ }
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
index 7efeb91..ff46f33 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.pojo.Product;
@@ -28,4 +29,11 @@
public int addInspectionProductList(List<InspectionProductList> list) {
return inspectionProductListMapper.addInspectionProductList(list);
}
+
+ @Override
+ public int delInspectionProductList(int inspectionMaterialListId) {
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspectionMaterialListId", inspectionMaterialListId).set("state", 0);
+ return inspectionProductListMapper.update(new InspectionProductList(),wrapper);
+ }
}
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 68a5caf..a9f7f82 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
@@ -2,6 +2,7 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+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;
@@ -25,7 +26,14 @@
private InspectionMapper inspectionMapper;
@Override
- public int addInspection(Inspection inspection) {
- return inspectionMapper.insert(inspection);
+ public Inspection addInspection(String userName,int type) {
+ Inspection inspection = new Inspection(type, 0,1,1, userName);
+ int judge = inspectionMapper.insert(inspection);
+ return judge>0?inspection:null;
+ }
+
+ @Override
+ public List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state) {
+ return inspectionMapper.selectAllInspection((pageSize - 1) * countSize,pageSize * countSize, state);
}
}
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index d4ca8ca..dd3aef4 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -1,5 +1,14 @@
<?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.InspectionMapper">
-
+ <select id="selectAllInspection" resultType="InspectionDto">
+ select i.id, type, inspection_status, qualified_state, i.state, i.create_time, user_name, inspect_user_id, inspect_start_time, inspect_end_time, u.name inspectUserName
+ from inspection i left join user u
+ on i.inspect_user_id = u.id
+ <if test="state!=null">
+ where state = #{state}
+ </if>
+ order by i.create_time desc
+ limit #{pageSize},#{countSize}
+ </select>
</mapper>
diff --git a/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml
new file mode 100644
index 0000000..e907133
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml
@@ -0,0 +1,23 @@
+<?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.InspectionMaterialListMapper">
+ <select id="selectInspectionMaterialListByInsId" resultType="InspectionMaterialList">
+ select id,
+ material_id,
+ material_num,
+ material_supplier,
+ material_name,
+ material_location,
+ material_batch,
+ material_reel_number,
+ specifications_serial_number,
+ specifications_voltage_level,
+ specifications_cross_section,
+ specifications_number_of_cores,
+ specifications_instruct,
+ notes
+ from inspection_material_list
+ where state = 1
+ and inspection_id = #{insId}
+ </select>
+</mapper>
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index f66e7a0..78af136 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionProductListMapper">
<insert id="addInspectionProductList">
- INSERT INTO inspection_product_list (name, method, ask, unit, required, internal, create_time, update_time, inspection_id, user_id) VALUES
+ INSERT INTO inspection_product_list (name, method, ask, unit, required, internal, create_time, update_time,inspection_material_list_id, user_id) VALUES
<foreach collection="list" separator="," item="i">
- (#{i.name}, #{i.method}, #{i.ask}, #{i.unit}, #{i.required}, #{i.internal}, #{i.createTime}, #{i.updateTime}, #{i.inspectionId},
+ (#{i.name}, #{i.method}, #{i.ask}, #{i.unit}, #{i.required}, #{i.internal}, #{i.createTime}, #{i.updateTime}, #{i.inspectionMaterialListId},
#{i.userId})
</foreach>
</insert>
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
index c65e9a7..ebd51aa 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
@@ -3,6 +3,9 @@
import com.yuanchu.limslaboratory.pojo.Material;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* Mapper 鎺ュ彛
@@ -12,5 +15,7 @@
* @since 2023-07-17
*/
public interface MaterialMapper extends BaseMapper<Material> {
+ List<Material> selectMaterialLimit(int num1,int num2);
+ Map selectMaterialById(String materialId);
}
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 da22e00..3a02fc6 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
@@ -17,7 +17,7 @@
*/
public interface ProductMapper extends BaseMapper<Product> {
- List<Product> selectProductByMaterialId(int materialId);
+ List<Product> selectProductByMaterialId(String materialId);
Map<String, Object> getProductInformation(Integer productId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
index e8b6dc5..b355c3c 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -15,6 +15,7 @@
* @since 2023-07-17
*/
public interface MaterialService extends IService<Material> {
+ List<Material> selectMaterialLimit(int pageSize,int countSize);
Integer addMaterialInformation(Material material);
@@ -45,4 +46,6 @@
* @return
*/
List<String> deleteMaterialEqSpecification(String specificationsId);
+
+ Map selectMaterialById(String materialId);
}
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 419bdf6..7733f7f 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
@@ -18,7 +18,7 @@
public interface ProductService extends IService<Product> {
/*閫氳繃鐗╂枡id鑾峰彇鐗╂枡淇″強涓嬪睘鐨勯」鐩垪琛�*/
- List<Product> selectProductByMaterialId(int materialId);
+ List<Product> selectProductByMaterialId(String materialId);
Integer addProductInformation(Product product);
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
index 0a4c757..56a9a88 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -6,7 +6,6 @@
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -27,7 +26,17 @@
public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService {
@Resource
- private MaterialMapper materialMapper;
+ MaterialMapper materialMapper;
+
+ @Override
+ public List<Material> selectMaterialLimit(int pageSize, int countSize) {
+ return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize);
+ }
+
+ @Override
+ public Map selectMaterialById(String materialId) {
+ return materialMapper.selectMaterialById(materialId);
+ }
@Override
public Integer addMaterialInformation(Material material) {
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 7bf984d..3d20a4c 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
@@ -30,7 +30,7 @@
private ProductMapper productMapper;
@Override
- public List<Product> selectProductByMaterialId(int materialId) {
+ public List<Product> selectProductByMaterialId(String materialId) {
return productMapper.selectProductByMaterialId(materialId);
}
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 60237ef..a14fe8e 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -2,4 +2,30 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
+ <select id="selectMaterialLimit" resultType="com.yuanchu.limslaboratory.pojo.Material">
+ select id, name
+ from material
+ where state = 1
+ order by create_time desc
+ limit #{num1},#{num2}
+ </select>
+ <select id="selectMaterialById" resultType="java.util.Map">
+ select m.id,
+ m.num,
+ m.supplier,
+ m.name,
+ m.location,
+ m.batch,
+ m.reel_number reelNumber,
+ concat(s.name, '/', sn.name) specificationSerialNum,
+ s.voltage_level voltageLevel,
+ s.cross_section crossSection,
+ s.number_of_cores numberOfCores,
+ s.instruct
+ from material m,
+ specifications s,
+ serial_number sn
+ where m.specifications_id = s.id
+ and s.serial_id = sn.id
+ </select>
</mapper>
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java b/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java
deleted file mode 100644
index 62440cc..0000000
--- a/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.yuanchu.limslaboratory;
-
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
-public class CodeGenerator {
-
- public static String database_url = "jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
- public static String database_driver_name = "com.mysql.cj.jdbc.Driver";
- public static String database_username = "root";
- public static String database_password= "123456";
- public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/inspection-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
- public static String setParent = "com.yuanchu.limslaboratory"; // 鍖呰矾寰�
- public static Boolean Override = false; // 鏄惁瑕嗙洊鍘熸潵鐨勬枃浠讹紵
-
- public static void main(String[] args) {
- // 浠ｇ爜鐢熸垚鍣�
- AutoGenerator mpg = new AutoGenerator();
-
- String projectPath = System.getProperty("user.dir");
- System.out.println(projectPath+"===================");
-
- GlobalConfig gc = new GlobalConfig() // 鍏ㄥ眬閰嶇疆
- .setOutputDir(projectPath + model_name + "/src/main/java") // 杈撳嚭璺緞
- .setAuthor(author) // 浣滆�呮敞閲�
- .setOpen(false) // 鏄惁鎵撳紑
- .setSwagger2(true) //瀹炰綋灞炴�� Swagger2 娉ㄨВ
- .setServiceName("%sService") // 璁剧疆serviceName鐨勫悕绉板幓澶у啓I
- .setFileOverride(Override);// 鏄惁瑕嗙洊宸茬敓鎴愭枃浠�
- mpg.setGlobalConfig(gc);
-
- // 鏁版嵁婧愰厤缃� 鏁版嵁搴撳悕 璐﹀彿瀵嗙爜
- DataSourceConfig dsc = new DataSourceConfig()
- .setUrl(database_url)
- .setDriverName(database_driver_name)
- .setUsername(database_username)
- .setPassword(database_password);
- mpg.setDataSource(dsc);
-
-
- // 鍖呴厤缃�
- PackageConfig pc = new PackageConfig()
- .setModuleName(null)
- .setParent(setParent)
- .setEntity("pojo");// 鍖呰矾寰�
- mpg.setPackageInfo(pc);
-
- // 鑷畾涔夐厤缃�
- InjectionConfig cfg = new InjectionConfig() {
- @Override
- public void initMap() {
- // to do nothing
- }
- };
-
- // 濡傛灉妯℃澘寮曟搸鏄� freemarker
- String templatePath = "/templates/mapper.xml.ftl";
- // 濡傛灉妯℃澘寮曟搸鏄� velocity
- // String templatePath = "/templates/mapper.xml.vm";
-
- // 鑷畾涔夎緭鍑洪厤缃�
- List<FileOutConfig> focList = new ArrayList<>();
- // 鑷畾涔夐厤缃細琚紭鍏堣緭鍑�
- focList.add(new FileOutConfig(templatePath) {
- @Override
- public String outputFile(TableInfo tableInfo) {
- // 鑷畾涔夎緭鍑烘枃浠跺悕 锛� 濡傛灉浣� Entity 璁剧疆浜嗗墠鍚庣紑銆佹澶勬敞鎰� xml 鐨勫悕绉颁細璺熺潃鍙戠敓鍙樺寲锛�
- return projectPath + model_name + "/src/main/resources/mapper/"
- + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
- }
- });
-
- cfg.setFileOutConfigList(focList);
- mpg.setCfg(cfg);
-
- // 閰嶇疆妯℃澘
- TemplateConfig templateConfig = new TemplateConfig()
- .setXml(null);
-
- mpg.setTemplate(templateConfig);
-
- // 绛栫暐閰嶇疆
- StrategyConfig strategy = new StrategyConfig()
- .setNaming(NamingStrategy.underline_to_camel)
- .setColumnNaming(NamingStrategy.underline_to_camel)
- .setEntityLombokModel(true)
- .setRestControllerStyle(true)
- .setInclude(scanner("琛ㄥ悕锛屽涓亾鍙峰垎鍓�").split(","))
- .setControllerMappingHyphenStyle(true)
- .setTablePrefix("m_");
- mpg.setStrategy(strategy);
- mpg.setTemplateEngine(new FreemarkerTemplateEngine());
- //濡傛灉涓嶈皟鐢ㄨ鏂规硶銆佸氨浼氫娇鐢∕yBatis-Plus榛樿鐨勬枃浠剁敓鎴愯矾寰勫拰鍖呰矾寰勭敓鎴愭枃浠躲�佷絾鍙互浣跨敤涓婇潰鐨凱ackageConfig鍋氫竴浜涚畝鍗曠殑閰嶇疆
- mpg.execute();
- }
-
- /**
- * <p>
- * 璇诲彇鎺у埗鍙板唴瀹�
- * </p>
- */
- public static String scanner(String tip) {
- Scanner scanner = new Scanner(System.in);
- StringBuilder help = new StringBuilder();
- help.append("璇疯緭鍏�" + tip + "锛�");
- System.out.println(help.toString());
- if (scanner.hasNext()) {
- String ipt = scanner.next();
-
- if (StringUtils.isNotBlank(ipt)) {
- return ipt;
- }
- }
- throw new MybatisPlusException("璇疯緭鍏ユ纭殑" + tip + "锛�");
- }
-}
--
Gitblit v1.9.3