From 2086b1f359f4a59c1f6de67b38dd29be88f2c7bf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 21 七月 2023 09:19:19 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-21早上
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/ClassifyMapper.java | 16 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 16 +
pom.xml | 1
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java | 9
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java | 20 +
standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java | 3
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 7
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 9
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java | 20 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java | 20 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/MetricalInformation.java | 71 +++++
laboratory-server/pom.xml | 24 ++
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/ClassifyService.java | 16 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java | 16 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/EquipmentPointService.java | 16 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/EquipmentPointMapper.java | 16 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Classify.java | 50 ++++
standard-server/src/main/java/com/yuanchu/limslaboratory/vo/UpdateSpeStateSpecifications.java | 18 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java | 20 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java | 20 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Instrument.java | 92 +++++++
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java | 16 +
laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml | 5
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 5
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java | 20 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MetricalInformationMapper.java | 16 +
laboratory-server/src/main/resources/mapper/ClassifyMapper.xml | 5
sys/pom.xml | 11
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 10
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 1
laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/EquipmentPoint.java | 62 +++++
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java | 12 +
laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml | 5
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java | 20 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java | 20 +
35 files changed, 685 insertions(+), 3 deletions(-)
diff --git a/laboratory-server/pom.xml b/laboratory-server/pom.xml
new file mode 100644
index 0000000..f8e87c8
--- /dev/null
+++ b/laboratory-server/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>lims-laboratory</artifactId>
+ <groupId>com.yuanchu</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>laboratory-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>laboratory-server</name>
+ <description>laboratory-server</description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
new file mode 100644
index 0000000..a47de28
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@RestController
+@RequestMapping("/classify")
+public class ClassifyController {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
new file mode 100644
index 0000000..ae1075c
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@RestController
+@RequestMapping("/equipment-point")
+public class EquipmentPointController {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
new file mode 100644
index 0000000..3b1ee87
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@RestController
+@RequestMapping("/instrument")
+public class InstrumentController {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
new file mode 100644
index 0000000..6b7ceb6
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@RestController
+@RequestMapping("/metrical-information")
+public class MetricalInformationController {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Classify.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Classify.java
new file mode 100644
index 0000000..f2b7f24
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Classify.java
@@ -0,0 +1,50 @@
+package com.yuanchu.limslaboratory.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Classify瀵硅薄", description="")
+public class Classify implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鍒嗙被涓婚敭")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒嗙被鐖跺悕绉�")
+ private String name;
+
+ @ApiModelProperty(value = "鍒嗙被瀛愬悕绉�")
+ private String sonName;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎")
+ private Integer state;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "涔愯閿�")
+ private Integer version;
+
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/EquipmentPoint.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/EquipmentPoint.java
new file mode 100644
index 0000000..88a2b46
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/EquipmentPoint.java
@@ -0,0 +1,62 @@
+package com.yuanchu.limslaboratory.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="EquipmentPoint瀵硅薄", description="")
+public class EquipmentPoint implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "浠櫒Id 鍏宠仈")
+ private Integer instrumentId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛Id 鍏宠仈")
+ private Integer userId;
+
+ @ApiModelProperty(value = "鐮佺偣缂栧彿")
+ private String equipmentPoint;
+
+ @ApiModelProperty(value = "鐮佺偣鍚嶇О")
+ private String equipmentPointName;
+
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty(value = "鎻忚堪")
+ private String describe;
+
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎")
+ private Integer state;
+
+ @ApiModelProperty(value = "涔愯閿�")
+ private Integer version;
+
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Instrument.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Instrument.java
new file mode 100644
index 0000000..2f9f6f9
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Instrument.java
@@ -0,0 +1,92 @@
+package com.yuanchu.limslaboratory.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Instrument瀵硅薄", description="")
+public class Instrument implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒嗙被ID 鍏宠仈")
+ private Integer classifyId;
+
+ @ApiModelProperty(value = "浠櫒璁惧缂栧彿")
+ private String equipmentCode;
+
+ @ApiModelProperty(value = "浠櫒璁惧鍚嶇О")
+ private String equipmentName;
+
+ @ApiModelProperty(value = "榛樿1锛�1锛氳繍琛屻��2锛氭晠闅溿��3锛氭姤淇��4锛氭淇��5锛氬緟鏈�")
+ private Integer condition;
+
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ private String specificationsModels;
+
+ @ApiModelProperty(value = "娴嬮噺鑼冨洿")
+ private String measuringRange;
+
+ @ApiModelProperty(value = "璇樊")
+ private String errorRate;
+
+ @ApiModelProperty(value = "鐢熶骇鍘傚")
+ private String manufacturer;
+
+ @ApiModelProperty(value = "鍒拌揣鏃ユ湡")
+ private LocalDateTime arrivalDate;
+
+ @ApiModelProperty(value = "楠屾敹鏃ユ湡")
+ private LocalDateTime acceptanceDate;
+
+ @ApiModelProperty(value = "瀛樻斁鍦�")
+ private String storagePlace;
+
+ @ApiModelProperty(value = "淇濈浜�")
+ private Integer keeper;
+
+ @ApiModelProperty(value = "鏄惁鏀寔鏁伴噰")
+ private Integer whetherDataAcquisition;
+
+ @ApiModelProperty(value = "鏄惁闇�瑕佷华鍣ㄨ澶囪閲忥細濡傛灉闇�瑕佽閲忓懆鏈熷繀濉紱濡傛灉涓嶉渶瑕佽閲忓懆鏈熶笉蹇呭～")
+ private Integer equipmentMeasurement;
+
+ @ApiModelProperty(value = "璁￠噺鎴鏈夋晥鏈�")
+ private LocalDateTime termValidity;
+
+ @ApiModelProperty(value = "鎻忚堪")
+ private String describe;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎")
+ private Integer state;
+
+ @ApiModelProperty(value = "涔愯閿�")
+ private Integer version;
+
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/MetricalInformation.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/MetricalInformation.java
new file mode 100644
index 0000000..413f938
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/MetricalInformation.java
@@ -0,0 +1,71 @@
+package com.yuanchu.limslaboratory.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="MetricalInformation瀵硅薄", description="")
+public class MetricalInformation implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "鐢ㄦ埛鍏宠仈Id")
+ private Integer userId;
+
+ @ApiModelProperty(value = "璁￠噺鍗曚綅")
+ private String measurementUnit;
+
+ @ApiModelProperty(value = "寮�濮嬫棩鏈�")
+ private LocalDateTime beginDate;
+
+ @ApiModelProperty(value = "缁撴潫鏃ユ湡")
+ private LocalDateTime endDate;
+
+ @ApiModelProperty(value = "涓嶇‘瀹氬害")
+ private String uncertainty;
+
+ @ApiModelProperty(value = "缁撴灉 1锛氬悎鏍硷紱2锛氱煫姝ｅ悗鍙敤锛�3锛氫笉鍚堟牸")
+ private Integer result;
+
+ @ApiModelProperty(value = "鎬ц兘鎸囨爣")
+ private String performanceIndex;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remarks;
+
+ @ApiModelProperty(value = "鏂囦欢璺緞")
+ private String filePath;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎")
+ private Integer state;
+
+ @ApiModelProperty(value = "涔愯閿�")
+ private Integer version;
+
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/ClassifyMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/ClassifyMapper.java
new file mode 100644
index 0000000..44ca9c2
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/ClassifyMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.entity.Classify;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+public interface ClassifyMapper extends BaseMapper<Classify> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/EquipmentPointMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/EquipmentPointMapper.java
new file mode 100644
index 0000000..f84a489
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/EquipmentPointMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.entity.EquipmentPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+public interface EquipmentPointMapper extends BaseMapper<EquipmentPoint> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
new file mode 100644
index 0000000..9c784a7
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.entity.Instrument;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+public interface InstrumentMapper extends BaseMapper<Instrument> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MetricalInformationMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MetricalInformationMapper.java
new file mode 100644
index 0000000..a10d744
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MetricalInformationMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.entity.MetricalInformation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+public interface MetricalInformationMapper extends BaseMapper<MetricalInformation> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/ClassifyService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/ClassifyService.java
new file mode 100644
index 0000000..7b1577d
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/ClassifyService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.entity.Classify;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+public interface ClassifyService extends IService<Classify> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/EquipmentPointService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/EquipmentPointService.java
new file mode 100644
index 0000000..493ae64
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/EquipmentPointService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.entity.EquipmentPoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+public interface EquipmentPointService extends IService<EquipmentPoint> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
new file mode 100644
index 0000000..b120270
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.entity.Instrument;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+public interface InstrumentService extends IService<Instrument> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java
new file mode 100644
index 0000000..3b74442
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.entity.MetricalInformation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+public interface MetricalInformationService extends IService<MetricalInformation> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
new file mode 100644
index 0000000..0f03757
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.entity.Classify;
+import com.yuanchu.limslaboratory.mapper.ClassifyMapper;
+import com.yuanchu.limslaboratory.service.ClassifyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@Service
+public class ClassifyServiceImpl extends ServiceImpl<ClassifyMapper, Classify> implements ClassifyService {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
new file mode 100644
index 0000000..d05430d
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.entity.EquipmentPoint;
+import com.yuanchu.limslaboratory.mapper.EquipmentPointMapper;
+import com.yuanchu.limslaboratory.service.EquipmentPointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@Service
+public class EquipmentPointServiceImpl extends ServiceImpl<EquipmentPointMapper, EquipmentPoint> implements EquipmentPointService {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
new file mode 100644
index 0000000..367bd37
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.entity.Instrument;
+import com.yuanchu.limslaboratory.mapper.InstrumentMapper;
+import com.yuanchu.limslaboratory.service.InstrumentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@Service
+public class InstrumentServiceImpl extends ServiceImpl<InstrumentMapper, Instrument> implements InstrumentService {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
new file mode 100644
index 0000000..267662c
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.entity.MetricalInformation;
+import com.yuanchu.limslaboratory.mapper.MetricalInformationMapper;
+import com.yuanchu.limslaboratory.service.MetricalInformationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-20
+ */
+@Service
+public class MetricalInformationServiceImpl extends ServiceImpl<MetricalInformationMapper, MetricalInformation> implements MetricalInformationService {
+
+}
diff --git a/laboratory-server/src/main/resources/mapper/ClassifyMapper.xml b/laboratory-server/src/main/resources/mapper/ClassifyMapper.xml
new file mode 100644
index 0000000..f6e5f1c
--- /dev/null
+++ b/laboratory-server/src/main/resources/mapper/ClassifyMapper.xml
@@ -0,0 +1,5 @@
+<?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.ClassifyMapper">
+
+</mapper>
diff --git a/laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml b/laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml
new file mode 100644
index 0000000..80c2839
--- /dev/null
+++ b/laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml
@@ -0,0 +1,5 @@
+<?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.EquipmentPointMapper">
+
+</mapper>
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
new file mode 100644
index 0000000..c66d06b
--- /dev/null
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -0,0 +1,5 @@
+<?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.InstrumentMapper">
+
+</mapper>
diff --git a/laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml b/laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml
new file mode 100644
index 0000000..d338ba4
--- /dev/null
+++ b/laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml
@@ -0,0 +1,5 @@
+<?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.MetricalInformationMapper">
+
+</mapper>
diff --git a/pom.xml b/pom.xml
index 932290a..3b1776c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
<module>framework</module>
<module>standard-server</module>
<module>inspection-server</module>
+ <module>laboratory-server</module>
</modules>
<properties>
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
index 7ce1a8b..6e39015 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -52,6 +52,16 @@
return Result.success(listMaterialInformation);
}
+ @ApiOperation("鐗╂枡搴�-->鏍规嵁瑙勬牸ID鏌ヨ鐗╂枡璇︽儏")
+ @GetMapping("/list_id")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
+ })
+ public Result<?> getListIdMaterialInformation(String materialId) {
+ Material listIdMaterialInformation = materialService.ListIdMaterialInformation(materialId);
+ return Result.success(listIdMaterialInformation);
+ }
+
@ApiOperation("鐗╂枡搴�-->鏍规嵁鐗╂枡ID鍒犻櫎鐗╂枡")
@DeleteMapping("/delete")
@ApiImplicitParams(value = {
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 0edbaab..25f5465 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
@@ -6,8 +6,10 @@
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.yuanchu.limslaboratory.service.SpecificationsService;
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 com.yuanchu.limslaboratory.vo.UpdateSpeStateSpecifications;
import com.yuanchu.limslaboratory.vo.UpdateSpecificationsInformation;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -98,4 +100,14 @@
}
return Result.fail("鍒犻櫎澶辫触锛�");
}
+
+ @ApiOperation("鏍囧噯搴�-->浜у搧瑙勬牸-->鏇存柊瑙勬牸鐘舵��")
+ @PutMapping("/update_spe_state")
+ public Result<?> updateSpeStateSpecifications(@RequestBody UpdateSpeStateSpecifications updateSpeStateSpecifications) {
+ Integer isStandardsSuccess = specificationsService.updateSpeStateSpecifications(updateSpeStateSpecifications);
+ if (isStandardsSuccess == 1) {
+ return Result.success("鎿嶄綔鎴愬姛锛�");
+ }
+ return Result.fail("鎿嶄綔澶辫触锛�");
+ }
}
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 034b5e3..984d4ac 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
@@ -48,4 +48,11 @@
List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId);
Map selectMaterialById(String materialId);
+
+ /**
+ * 鏍规嵁Id鏌ヨ瑙勬牸璇︽儏
+ * @param materialId
+ * @return
+ */
+ Material ListIdMaterialInformation(String materialId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
index 9f85e64..538b400 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.vo.UpdateSpeStateSpecifications;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -39,4 +40,6 @@
Integer deleteSpecifications(Integer specificationsId);
List<Integer> SerialNumberIdDeleteSpecifications(List<String> deleteSerialNumberId);
+
+ Integer updateSpeStateSpecifications(UpdateSpeStateSpecifications updateSpeStateSpecifications);
}
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 98c4cc0..ce8ba0b 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
@@ -43,6 +43,15 @@
return materialMapper.selectMaterialById(materialId);
}
+ @Override
+ public Material ListIdMaterialInformation(String materialId) {
+ LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Material::getId, materialId);
+ wrapper.select(Material::getId, Material::getName, Material::getSupplier, Material::getLocation, Material::getNum, Material::getBatch,
+ Material::getReelNumber);
+ return materialMapper.selectOne(wrapper);
+ }
+
@Autowired
private ProductService productService;
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
index ac60c11..6a9bf6d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
@@ -9,6 +9,7 @@
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.yuanchu.limslaboratory.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.vo.UpdateSpeStateSpecifications;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -116,4 +117,12 @@
}
return list;
}
+
+ @Override
+ public Integer updateSpeStateSpecifications(UpdateSpeStateSpecifications updateSpeStateSpecifications) {
+ LambdaUpdateWrapper<Specifications> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Specifications::getId, updateSpeStateSpecifications.getId());
+ updateWrapper.set(Specifications::getSpe_state, updateSpeStateSpecifications.getSpe_state());
+ return specificationsMapper.update(new Specifications(), updateWrapper);
+ }
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/vo/UpdateSpeStateSpecifications.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/vo/UpdateSpeStateSpecifications.java
new file mode 100644
index 0000000..23ec903
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/vo/UpdateSpeStateSpecifications.java
@@ -0,0 +1,18 @@
+package com.yuanchu.limslaboratory.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="鏍囧噯搴�-->瑙勬牸鍨嬪彿-->鐢ㄤ簬瀵硅鏍肩姸鎬佺殑淇敼", description="鐢ㄤ簬瀵硅鏍肩姸鎬佺殑淇敼")
+public class UpdateSpeStateSpecifications {
+
+ @ApiModelProperty(value = "瑙勬牸id", example = "2", required = true)
+ private Integer id;
+
+ @ApiModelProperty(value = "瑙勬牸鐘舵�� 0锛氬仠鐢紱1锛氭甯革紱-1锛氳崏绋�", example = "1", required = true)
+ private Integer spe_state;
+}
diff --git a/sys/pom.xml b/sys/pom.xml
index fb7feff..effbb79 100644
--- a/sys/pom.xml
+++ b/sys/pom.xml
@@ -16,6 +16,13 @@
<packaging>jar</packaging>
<dependencies>
+ <!--鍩虹妗嗘灦绫�-->
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<!--鐢ㄦ埛鏈嶅姟妯″潡-->
<dependency>
<groupId>com.yunchu.limslaboratory</groupId>
@@ -37,10 +44,10 @@
<version>${project.parent.version}</version>
</dependency>
- <!--鍩虹妗嗘灦绫�-->
+ <!--瀹為獙瀹ゆā鍧�-->
<dependency>
<groupId>com.yunchu.limslaboratory</groupId>
- <artifactId>framework</artifactId>
+ <artifactId>laboratory-server</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index e3a5649..9efad92 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -97,7 +97,6 @@
if (!ObjectUtils.isEmpty(o)){
unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(o), Map.class);
Map<String, String> map = userService.selectUserByUserId((Integer) unmarshal.get("id"));
- MyUtil.PrintLog(map.toString());
return Result.success(map);
}
return Result.fail("Token閿欒锛�");
--
Gitblit v1.9.3