From 0042c9bee29a876a754e4d542bfba956822e7844 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 17 七月 2023 13:40:00 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-17-v1.0.0
---
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 16
user-server/src/main/java/com/yuanchu/limslaboratory/vo/NewPersonnelVo.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 51 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java | 0
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 2
sys/src/main/java/com/yuanchu/limslaboratory/backup/MysqlDataBackup.java | 190 ++++++++
sys/src/main/resources/application-prod.yml | 31 +
standard-server/src/main/java/com/yuanchu/limslaboratory/vo/ListSpecificationsInformation.java | 0
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java | 6
standard-server/src/main/resources/mapper/StandardsMapper.xml | 0
sys/src/main/resources/application.yml | 4
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/StandardsMapper.java | 0
inspection-server/pom.xml | 21
sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java | 6
user-server/src/main/java/com/yuanchu/limslaboratory/config/FeignConfig.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 16
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 16
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 20
standard-server/src/main/resources/mapper/SerialNumberMapper.xml | 0
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardsServiceImpl.java | 0
user-server/src/main/resources/mapper/UserMapper.xml | 9
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java | 0
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java | 64 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Standards.java | 0
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 6
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 16
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 40 +
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 90 ++++
user-server/pom.xml | 12
standard-server/src/main/resources/mapper/SpecificationsMapper.xml | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java | 16
framework/src/main/java/com/yuanchu/limslaboratory/config/MyBatisPlusConfig.java | 2
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 2
inspection-server/src/main/resources/mapper/PlanMapper.xml | 2
sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java | 20
standard-server/src/main/resources/mapper/MaterialMapper.xml | 2
user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java | 1
pom.xml | 128 ++++-
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 6
standard-server/src/main/java/com/yuanchu/limslaboratory/service/SerialNumberService.java | 0
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java | 16
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 70 +++
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java | 58 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java | 0
framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java | 17
sys/src/main/resources/logback-spring.xml | 50 +-
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/SerialNumber.java | 0
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 16
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 20
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 3
framework/pom.xml | 18
standard-server/src/main/resources/mapper/ProductMapper.xml | 2
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 6
standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardsService.java | 0
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 16
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SerialNumberController.java | 0
sys/src/main/resources/application-dev.yml | 31 +
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 20
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 16
/dev/null | 20
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 16
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 20
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java | 0
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SerialNumberServiceImpl.java | 3
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java | 0
sys/src/main/resources/mysqldump.exe | 0
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 10
sys/pom.xml | 15
standard-server/pom.xml | 8
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 6
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SerialNumberMapper.java | 0
76 files changed, 1,068 insertions(+), 202 deletions(-)
diff --git a/framework/pom.xml b/framework/pom.xml
index 2265f26..9a79668 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -27,34 +27,16 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
- <!--Swagger3-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- </dependency>
-
<!--Swagger3-Ui缇庡寲-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-ui</artifactId>
</dependency>
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- </dependency>
-
<!--redis jar鍖�-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
- </dependency>
-
- <!-- JWT -->
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
</dependency>
</dependencies>
diff --git a/framework/src/main/java/com/yuanchu/limslaboratory/config/MyBatisPlusConfig.java b/framework/src/main/java/com/yuanchu/limslaboratory/config/MyBatisPlusConfig.java
index 33b08c6..ccb86fc 100644
--- a/framework/src/main/java/com/yuanchu/limslaboratory/config/MyBatisPlusConfig.java
+++ b/framework/src/main/java/com/yuanchu/limslaboratory/config/MyBatisPlusConfig.java
@@ -4,11 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-@MapperScan("com.yuanchu.limslaboratory.mapper") // 鎵弿Mybatis涓殑mapper鍖�
@Configuration
public class MyBatisPlusConfig {
diff --git a/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java b/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java
index 64012d1..aa0c995 100644
--- a/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java
+++ b/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java
@@ -1,21 +1,15 @@
package com.yuanchu.limslaboratory.config;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import java.io.File;
-import java.util.List;
-
@Configuration
public class WebMvcConfig extends WebMvcConfigurationSupport {
+
+ @Value("${file.path}")
+ private String filePath;
@Override
protected void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -25,6 +19,7 @@
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
//璁剧疆鏂囦欢铏氭嫙璺緞鏄犲皠
- registry.addResourceHandler("/img/**").addResourceLocations("file:E:\\webapp\\images\\");
+ registry.addResourceHandler("/img/**").addResourceLocations("file:"+filePath+"/")
+ .addResourceLocations("file:"+filePath+"/");
}
}
diff --git a/inspection-server/pom.xml b/inspection-server/pom.xml
new file mode 100644
index 0000000..edd5cda
--- /dev/null
+++ b/inspection-server/pom.xml
@@ -0,0 +1,21 @@
+<?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>inspection-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>inspection-server</name>
+ <description>inspection-server</description>
+
+ <packaging>jar</packaging>
+
+ <dependencies>
+
+ </dependencies>
+</project>
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
similarity index 72%
rename from user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
rename to inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index 4265bd6..3e22a62 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -11,10 +11,10 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
+ * @since 2023-07-17
*/
@RestController
-@RequestMapping("/enterprise-user-list")
-public class EnterpriseUserListController {
+@RequestMapping("/inspection")
+public class InspectionController {
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
similarity index 71%
copy from user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
copy to inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
index 4265bd6..e8328ef 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
@@ -11,10 +11,10 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
+ * @since 2023-07-17
*/
@RestController
-@RequestMapping("/enterprise-user-list")
-public class EnterpriseUserListController {
+@RequestMapping("/inspection-product-list")
+public class InspectionProductListController {
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
similarity index 72%
copy from user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
copy to inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 4265bd6..b587e5c 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -11,10 +11,10 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
+ * @since 2023-07-17
*/
@RestController
-@RequestMapping("/enterprise-user-list")
-public class EnterpriseUserListController {
+@RequestMapping("/plan")
+public class PlanController {
}
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
new file mode 100644
index 0000000..296c623
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface InspectionMapper extends BaseMapper<Inspection> {
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
new file mode 100644
index 0000000..9cc381c
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface InspectionProductListMapper extends BaseMapper<InspectionProductList> {
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
new file mode 100644
index 0000000..cc21ce2
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.Plan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface PlanMapper extends BaseMapper<Plan> {
+
+}
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
new file mode 100644
index 0000000..841eb00
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
@@ -0,0 +1,90 @@
+package com.yuanchu.limslaboratory.pojo;
+
+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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Inspection瀵硅薄", description="")
+public class Inspection implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鎶ユ缂栧彿")
+ private String id;
+
+ @ApiModelProperty(value = "鎶ユ鐘舵�� 1锛氬凡妫�楠岋紱0鏈楠�")
+ private Integer inspectionStatus;
+
+ @ApiModelProperty(value = "鏄惁鍚堟牸 1锛氭槸锛�0鍚�")
+ private Integer qualifiedState;
+
+ @ApiModelProperty(value = "1锛氬緟鎻愪氦锛�2锛氬凡鎻愪氦锛�0锛氬凡浣滃簾")
+ private Integer state;
+
+ @ApiModelProperty(value = "鎶ユ鏃堕棿")
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+ private Integer version;
+
+ @ApiModelProperty(value = "鎶ユ浜�")
+ private String userName;
+
+ @ApiModelProperty(value = "鍏宠仈 妫�楠屼汉锛堢敤鎴穒d锛�")
+ private Integer inspectUserId;
+
+ @ApiModelProperty(value = "妫�楠屽紑濮嬫棩鏈�")
+ private LocalDateTime inspectStartTime;
+
+ @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;
+
+
+}
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
new file mode 100644
index 0000000..349d581
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -0,0 +1,70 @@
+package com.yuanchu.limslaboratory.pojo;
+
+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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="InspectionProductList瀵硅薄", description="")
+public class InspectionProductList implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "椤圭洰id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
+ private String method;
+
+ @ApiModelProperty(value = "璇曢獙瑕佹眰")
+ private String ask;
+
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty(value = "鎷涙爣浜鸿姹傚��")
+ private String required;
+
+ @ApiModelProperty(value = "鍐呮帶鍊�")
+ private String internal;
+
+ @ApiModelProperty(value = "寮�濮嬫棩鏈�")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃ユ湡")
+ private LocalDateTime endTime;
+
+ private Integer state;
+
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+ private Integer version;
+
+ @ApiModelProperty(value = "鍏宠仈 鎶ユid")
+ private String inspectionId;
+
+ @ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
+ private Integer userId;
+
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
new file mode 100644
index 0000000..52e57f1
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
@@ -0,0 +1,51 @@
+package com.yuanchu.limslaboratory.pojo;
+
+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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Plan瀵硅薄", description="")
+public class Plan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "璁″垝缂栧彿")
+ private Integer id;
+
+ @ApiModelProperty(value = "妫�楠岀粨鏋�")
+ private String results;
+
+ @ApiModelProperty(value = "璇曢獙璇存槑")
+ private String thing;
+
+ @ApiModelProperty(value = "1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾")
+ private Integer state;
+
+ @ApiModelProperty(value = "浠诲姟鐧昏鏃堕棿")
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+ private Integer version;
+
+ @ApiModelProperty(value = "鍏宠仈 鎶ユid(鐢宠鍗曠紪鍙�)")
+ private String inspectionId;
+
+ @ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id(璐熻矗浜篿d)")
+ private Integer userId;
+
+
+}
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
new file mode 100644
index 0000000..db31469
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface InspectionProductListService extends IService<InspectionProductList> {
+
+}
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
new file mode 100644
index 0000000..5f85c4d
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface InspectionService extends IService<Inspection> {
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
new file mode 100644
index 0000000..688c602
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.Plan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface PlanService extends IService<Plan> {
+
+}
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
new file mode 100644
index 0000000..c862407
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+@Service
+public class InspectionProductListServiceImpl extends ServiceImpl<InspectionProductListMapper, InspectionProductList> implements InspectionProductListService {
+
+}
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
new file mode 100644
index 0000000..4cfef0f
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+import com.yuanchu.limslaboratory.service.InspectionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+@Service
+public class InspectionServiceImpl extends ServiceImpl<InspectionMapper, Inspection> implements InspectionService {
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
new file mode 100644
index 0000000..ba9c8cf
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.Plan;
+import com.yuanchu.limslaboratory.mapper.PlanMapper;
+import com.yuanchu.limslaboratory.service.PlanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+@Service
+public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements PlanService {
+
+}
diff --git a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
similarity index 66%
copy from user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
copy to inspection-server/src/main/resources/mapper/InspectionMapper.xml
index a9293d3..d4ca8ca 100644
--- a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -1,5 +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.EnterpriseUserListMapper">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionMapper">
</mapper>
diff --git a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
similarity index 65%
copy from user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
copy to inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index a9293d3..d85407a 100644
--- a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -1,5 +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.EnterpriseUserListMapper">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionProductListMapper">
</mapper>
diff --git a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
similarity index 66%
copy from user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
copy to inspection-server/src/main/resources/mapper/PlanMapper.xml
index a9293d3..23b2b8b 100644
--- a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -1,5 +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.EnterpriseUserListMapper">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.PlanMapper">
</mapper>
diff --git a/pom.xml b/pom.xml
index 390cd93..932290a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,8 @@
<module>user-server</module>
<module>sys</module>
<module>framework</module>
- <module>standard-library</module>
+ <module>standard-server</module>
+ <module>inspection-server</module>
</modules>
<properties>
@@ -34,6 +35,9 @@
<openfeign.version>3.1.3</openfeign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
<shiro.version>1.5.3</shiro.version>
+
+ <!-- 鎵撳寘鍚庡鍑虹殑璺緞 -->
+ <package.path>${project.build.directory}/LIMS</package.path>
</properties>
<dependencies>
@@ -41,10 +45,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
+
<!--鐑儴缃瞐-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -52,10 +58,25 @@
<scope>runtime</scope>
<optional>true</optional>
</dependency>
+
<!--lombok-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ </dependency>
+
+ <!--Swagger3-->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+
+ <!--mybatis-plus-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
</dependency>
</dependencies>
<dependencyManagement>
@@ -81,32 +102,11 @@
<version>${druid.version}</version>
</dependency>
- <!--jwt-->
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
- <version>${jwt.version}</version>
- </dependency>
-
- <!--Swagger3-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>${swagger.version}</version>
- </dependency>
-
<!--Swagger3-Ui缇庡寲-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-ui</artifactId>
<version>${knife4j-spring-ui.version}</version>
- </dependency>
-
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>${mybatis-plus.version}</version>
</dependency>
<!--mybatis-plus浠ｇ爜鐢熸垚鍣�-->
@@ -136,29 +136,89 @@
<artifactId>shiro-spring-boot-starter</artifactId>
<version>${shiro.version}</version>
</dependency>
+
+ <!--jwt-->
+ <dependency>
+ <groupId>com.auth0</groupId>
+ <artifactId>java-jwt</artifactId>
+ <version>${jwt.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
+ <!-- 涓婄嚎閮ㄧ讲 JAR鍚姩鍒嗙渚濊禆lib鍜岄厤缃� -->
+ <!-- 鎵撳寘jar -->
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
+ <!-- 涓嶆墦鍖呰祫婧愭枃浠� -->
<excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
+ <exclude>*.**</exclude>
</excludes>
- <mainClass>
- com.yuanchu.limslaboratory.SysApplication
- </mainClass>
- <!--<fork>false</fork>
- <includeSystemScope>true</includeSystemScope>
- <skip>true</skip>-->
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <!-- MANIFEST.MF 涓� Class-Path 鍔犲叆鍓嶇紑 -->
+ <classpathPrefix>lib/</classpathPrefix>
+ <!-- jar鍖呬笉鍖呭惈鍞竴鐗堟湰鏍囪瘑 -->
+ <useUniqueVersions>false</useUniqueVersions>
+ <!-- 鎸囧畾鍏ュ彛绫� -->
+ <mainClass>com.yuanchu.limslaboratory.SysApplication</mainClass>
+ </manifest>
+ <!-- 鎸囧畾閰嶇疆鏂囦欢鐩綍锛岃繖鏍穓ar杩愯鏃朵細鍘绘壘鍒板悓鐩綍涓嬬殑conf鏂囦欢澶逛笅鏌ユ壘 -->
+ <manifestEntries>
+ <Class-Path>conf/</Class-Path>
+ </manifestEntries>
+ </archive>
+ <outputDirectory>${package.path}</outputDirectory>
</configuration>
</plugin>
+ <!-- 鎷疯礉渚濊禆 copy-dependencies -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${package.path}/lib/ </outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- 鎷疯礉璧勬簮鏂囦欢 copy-resources -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <!-- 鎸囧畾鍙備笌鏋勫缓鐨剅esource -->
+ <includes>
+ <include>*.**</include>
+ <!--鎺掗櫎application-dev.yml鏂囦欢-->
+ </includes>
+ </resource>
+ </resources>
+ <outputDirectory>${package.path}/conf</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/standard-library/pom.xml b/standard-server/pom.xml
similarity index 82%
rename from standard-library/pom.xml
rename to standard-server/pom.xml
index aaf8e17..617d5f9 100644
--- a/standard-library/pom.xml
+++ b/standard-server/pom.xml
@@ -8,7 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.yunchu.limslaboratory</groupId>
- <artifactId>standard-library</artifactId>
+ <artifactId>standard-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>standard-library</name>
<description>standard-library</description>
@@ -26,12 +26,6 @@
<groupId>com.yunchu.limslaboratory</groupId>
<artifactId>user-server</artifactId>
<version>${project.parent.version}</version>
- </dependency>
-
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
</dependencies>
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
similarity index 72%
copy from user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
copy to standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
index 4265bd6..73bde91 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -11,10 +11,10 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
+ * @since 2023-07-17
*/
@RestController
-@RequestMapping("/enterprise-user-list")
-public class EnterpriseUserListController {
+@RequestMapping("/material")
+public class MaterialController {
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
similarity index 72%
copy from user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
copy to standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index 4265bd6..edd554e 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -11,10 +11,10 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
+ * @since 2023-07-17
*/
@RestController
-@RequestMapping("/enterprise-user-list")
-public class EnterpriseUserListController {
+@RequestMapping("/product")
+public class ProductController {
}
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/controller/SerialNumberController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SerialNumberController.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/controller/SerialNumberController.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SerialNumberController.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
similarity index 96%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
index f19b84f..1a9c8a1 100644
--- a/standard-library/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
@@ -7,6 +7,7 @@
import com.yuanchu.limslaboratory.pojo.Standards;
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.ListSpecificationsInformation;
import com.yuanchu.limslaboratory.vo.Result;
@@ -55,7 +56,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "specificationsName", value = "鍨嬪彿鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "specificationsName", value = "瑙勬牸鍚嶇О", dataTypeClass = String.class),
@ApiImplicitParam(name = "serialNumberId", value = "鍨嬪彿ID", dataTypeClass = String.class),
})
@GetMapping("/list")
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java
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
new file mode 100644
index 0000000..c65e9a7
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.Material;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface MaterialMapper extends BaseMapper<Material> {
+
+}
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
new file mode 100644
index 0000000..57ca6ee
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.Product;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface ProductMapper extends BaseMapper<Product> {
+
+}
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/mapper/SerialNumberMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SerialNumberMapper.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/mapper/SerialNumberMapper.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SerialNumberMapper.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/mapper/StandardsMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/StandardsMapper.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/mapper/StandardsMapper.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/StandardsMapper.java
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
new file mode 100644
index 0000000..a29396b
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
@@ -0,0 +1,58 @@
+package com.yuanchu.limslaboratory.pojo;
+
+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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Material瀵硅薄", description="")
+public class Material implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鐗╂枡id")
+ private String id;
+
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supplier;
+
+ @ApiModelProperty(value = "鐗╂枡瀛樻斁鍦�")
+ private String location;
+
+ @ApiModelProperty(value = "鐗╂枡鏁伴噺")
+ private Integer num;
+
+ @ApiModelProperty(value = "鎵规")
+ private String batch;
+
+ @ApiModelProperty(value = "鐩樺彿")
+ private String reelNumber;
+
+ private Integer state;
+
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+ private Integer version;
+
+ @ApiModelProperty(value = "鍏宠仈 瑙勬牸id")
+ private Integer specificationsId;
+
+
+}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java
new file mode 100644
index 0000000..19479c6
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java
@@ -0,0 +1,64 @@
+package com.yuanchu.limslaboratory.pojo;
+
+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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Product瀵硅薄", description="")
+public class Product implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "椤圭洰id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
+ private String method;
+
+ @ApiModelProperty(value = "椤圭洰鐖剁被")
+ private String father;
+
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty(value = "鎷涙爣浜鸿姹傚��")
+ private String required;
+
+ @ApiModelProperty(value = "鍐呮帶鍊�")
+ private String internal;
+
+ private Integer state;
+
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+ private Integer version;
+
+ @ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id")
+ private Integer userId;
+
+ @ApiModelProperty(value = "鍏宠仈 鐗╂枡id")
+ private String materialId;
+
+
+}
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/pojo/SerialNumber.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/SerialNumber.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/pojo/SerialNumber.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/SerialNumber.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/pojo/Standards.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Standards.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/pojo/Standards.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Standards.java
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
new file mode 100644
index 0000000..572c272
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.Material;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface MaterialService extends IService<Material> {
+
+}
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
new file mode 100644
index 0000000..0fc62ef
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.Product;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+public interface ProductService extends IService<Product> {
+
+}
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/service/SerialNumberService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SerialNumberService.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/service/SerialNumberService.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/service/SerialNumberService.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/service/StandardsService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardsService.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/service/StandardsService.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardsService.java
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
new file mode 100644
index 0000000..9279599
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.Material;
+import com.yuanchu.limslaboratory.mapper.MaterialMapper;
+import com.yuanchu.limslaboratory.service.MaterialService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+@Service
+public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService {
+
+}
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
new file mode 100644
index 0000000..8079756
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.mapper.ProductMapper;
+import com.yuanchu.limslaboratory.service.ProductService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+@Service
+public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
+
+}
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/service/impl/SerialNumberServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SerialNumberServiceImpl.java
similarity index 93%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/service/impl/SerialNumberServiceImpl.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SerialNumberServiceImpl.java
index 65272ac..2c00278 100644
--- a/standard-library/src/main/java/com/yuanchu/limslaboratory/service/impl/SerialNumberServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SerialNumberServiceImpl.java
@@ -3,13 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yuanchu.limslaboratory.pojo.SerialNumber;
import com.yuanchu.limslaboratory.mapper.SerialNumberMapper;
-import com.yuanchu.limslaboratory.pojo.Standards;
-import com.yuanchu.limslaboratory.pojo.User;
import com.yuanchu.limslaboratory.service.SerialNumberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.StandardsService;
import com.yuanchu.limslaboratory.service.UserService;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardsServiceImpl.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardsServiceImpl.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardsServiceImpl.java
diff --git a/standard-library/src/main/java/com/yuanchu/limslaboratory/vo/ListSpecificationsInformation.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/vo/ListSpecificationsInformation.java
similarity index 100%
rename from standard-library/src/main/java/com/yuanchu/limslaboratory/vo/ListSpecificationsInformation.java
rename to standard-server/src/main/java/com/yuanchu/limslaboratory/vo/ListSpecificationsInformation.java
diff --git a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
similarity index 66%
rename from user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
rename to standard-server/src/main/resources/mapper/MaterialMapper.xml
index a9293d3..60237ef 100644
--- a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -1,5 +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.EnterpriseUserListMapper">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
</mapper>
diff --git a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
similarity index 66%
copy from user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
copy to standard-server/src/main/resources/mapper/ProductMapper.xml
index a9293d3..4868b93 100644
--- a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -1,5 +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.EnterpriseUserListMapper">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.ProductMapper">
</mapper>
diff --git a/standard-library/src/main/resources/mapper/SerialNumberMapper.xml b/standard-server/src/main/resources/mapper/SerialNumberMapper.xml
similarity index 100%
rename from standard-library/src/main/resources/mapper/SerialNumberMapper.xml
rename to standard-server/src/main/resources/mapper/SerialNumberMapper.xml
diff --git a/standard-library/src/main/resources/mapper/SpecificationsMapper.xml b/standard-server/src/main/resources/mapper/SpecificationsMapper.xml
similarity index 95%
rename from standard-library/src/main/resources/mapper/SpecificationsMapper.xml
rename to standard-server/src/main/resources/mapper/SpecificationsMapper.xml
index aaf57c3..f5a4457 100644
--- a/standard-library/src/main/resources/mapper/SpecificationsMapper.xml
+++ b/standard-server/src/main/resources/mapper/SpecificationsMapper.xml
@@ -15,7 +15,7 @@
SELECT s.`id`,s.`name`,s.`update_time`,u.`name` username,s.`vel`,s.`spe_state`
FROM specifications s,`user` u
WHERE s.`user_id` = u.`id`
- AND s.`serial_id` = #{serialNumberId}
+ AND s.`number` = #{serialNumberId}
<if test="specificationsName != null">
AND s.`name` = #{specificationsName}
</if>
diff --git a/standard-library/src/main/resources/mapper/StandardsMapper.xml b/standard-server/src/main/resources/mapper/StandardsMapper.xml
similarity index 100%
rename from standard-library/src/main/resources/mapper/StandardsMapper.xml
rename to standard-server/src/main/resources/mapper/StandardsMapper.xml
diff --git a/sys/pom.xml b/sys/pom.xml
index eb71288..fb7feff 100644
--- a/sys/pom.xml
+++ b/sys/pom.xml
@@ -26,7 +26,14 @@
<!--鏍囧噯搴撴ā鍧�-->
<dependency>
<groupId>com.yunchu.limslaboratory</groupId>
- <artifactId>standard-library</artifactId>
+ <artifactId>standard-server</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <!--妫�楠屾ā鍧�-->
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>inspection-server</artifactId>
<version>${project.parent.version}</version>
</dependency>
@@ -41,12 +48,6 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
- </dependency>
-
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<!--mybatis-plus浠ｇ爜鐢熸垚鍣�-->
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java b/sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java
index 6515734..8485701 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java
@@ -1,9 +1,13 @@
package com.yuanchu.limslaboratory;
+import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
+@MapperScan("com.yuanchu.limslaboratory.mapper")// 鎵弿Mybatis涓殑mapper鍖�
+@EnableFeignClients("com.yuanchu.limslaboratory.clients") // 鎵弿feign鎺ュ彛鎵�鍦ㄥ寘 閲嶈
public class SysApplication {
public static void main(String[] args) {
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/backup/MysqlDataBackup.java b/sys/src/main/java/com/yuanchu/limslaboratory/backup/MysqlDataBackup.java
new file mode 100644
index 0000000..2ed3705
--- /dev/null
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/backup/MysqlDataBackup.java
@@ -0,0 +1,190 @@
+package com.yuanchu.limslaboratory.backup;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Component
+@EnableScheduling
+@Slf4j
+public class MysqlDataBackup {
+ /**
+ * 鏁版嵁搴撶増鏈槸鍚︿负 8.0 + 锛坒alse=鍚� true=鏄級锛� mysql8+ 闇�瑕佸弬鏁� --column-statistics=0 锛� mysql8- 涓嶉渶瑕�
+ */
+ Boolean isDbVersion8 = false;
+
+ /**
+ * 澶囦唤鍛戒护
+ * USERNAME 璐﹀彿
+ * PASSWORD 瀵嗙爜
+ * SERVERPATH 鏈嶅姟鍣↖P/鍩熷悕
+ * DBNAME 鏁版嵁搴撳悕绉�
+ * FILEPATH 澶囦唤鏂囦欢瀛樻斁鍦板潃+鍚嶇О
+ * 璇存槑
+ * cmdCompression 锛� 闇�鍘嬬缉 锛堟湰鍦版垨鏈嶅姟鍣ㄩ渶瀹夎 mysqldump 鍛戒护(瀹夎mysql鑷甫鎮ｇ嫭绔嬪畨瑁�) + gzip 鍛戒护(鐙珛瀹夎)锛�
+ * cmd 锛� 涓嶅帇缂� (鏈湴鎴栨湇鍔″櫒闇�瀹夎 mysqldump 鍛戒护(瀹夎mysql鑷甫鎮ｇ嫭绔嬪畨瑁�)
+ * --column-statistics=0 mysql8 娣诲姞璇ュ弬鏁�, 闈瀖ysql8 涓嶆坊鍔�, 鍚﹀垯灏嗗嚭閿�
+ */
+ String cmdMysql8 = "mysqldump --column-statistics=0 -u{USERNAME} -p{PASSWORD} -h{SERVERPATH} -P3306 --databases {DBNAME}"; // > {FILEPATH}.sql
+ String cmd = "mysqldump -u{USERNAME} -p{PASSWORD} -h{SERVERPATH} -P3306 --databases {DBNAME}"; // > {FILEPATH}.sql
+
+ /**
+ * 澶囦唤 sql 瀛樻斁鐩綍(鐩稿璺緞, 娉ㄦ剰鍙兘闇�瑕佸湪 MvcConfig 閰嶇疆璁块棶鏉冮檺)
+ */
+ @Value("${backup.path}")
+ private String filePath;
+
+ @Value("${spring.datasource.url}")
+ private String dbUrl;
+
+ @Value("${spring.datasource.username}")
+ private String dbUserName;
+
+ @Value("${spring.datasource.password}")
+ private String dbPassWord;
+
+ @Value("${backup.destiny}")
+ private Integer destiny;
+
+ @Value("${backup.mysqldump}")
+ private String mysqldump;
+
+ /**
+ * 姣忓ぉ鏅氫笂23鐐�05绉掓墽琛� 銆� 0 0 4 1/1 * ? 銆�
+ * 娴嬭瘯 20 绉掍竴娆°�� 0/20 * * * * ? 銆慇Scheduled(cron = "5 * 23 * * ?")
+ */
+ @Scheduled(cron = "5 0 23 * * ?")
+ private void configureTasks() {
+ log.info("銆愬浠芥暟鎹簱銆�--START");
+ String dbUrl2 = dbUrl.replace("jdbc:mysql://", "");
+
+ // 鑾峰彇鏁版嵁搴撳悕绉�
+ String dbName = dbUrl2.substring(dbUrl2.lastIndexOf("/") + 1, dbUrl2.indexOf("?"));
+ // 鑾峰彇鏁版嵁搴撳湴鍧�
+ String serverPath = dbUrl2.substring(0, dbUrl2.lastIndexOf(":"));
+ // 鏁版嵁搴撹处鍙�
+ String username = dbUserName;
+ // 鏁版嵁搴撳瘑鐮�
+ String password = dbPassWord;
+
+ // 澶囦唤鏂囦欢鐩綍+鍚嶇О 澶囦唤鏂囦欢瀛樻斁鐩綍+鍚嶇О(鍚嶇О = 鏁版嵁搴撳悕+鏃堕棿瀛楃涓�.sql)
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String format = simpleDateFormat.format(new Date());
+ String timeStr = format
+ .replaceAll("-", "_")
+ .replaceAll(" ", "_")
+ .replaceAll(":", "");
+ timeStr = timeStr.substring(0, 15);
+ String pathFileName = filePath + "/" + dbName + "_" + timeStr + ".sql";
+ String newCmd = "";
+ if (isDbVersion8) {
+ newCmd = cmdMysql8;
+ } else {
+ newCmd = cmd;
+ }
+ // 鎵ц鍛戒护
+ newCmd = newCmd.replace("{USERNAME}", username)
+ .replace("{PASSWORD}", password)
+ .replace("{SERVERPATH}", serverPath)
+ .replace("{DBNAME}", dbName)
+ .replace("{FILEPATH}", pathFileName);
+ PrintWriter printWriter = null;
+ BufferedReader bufferedReader = null;
+ try {
+ // 鍒涘缓瀛樻斁sql鐨勬枃浠�
+ existsFile(new File(pathFileName));
+ printWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(pathFileName), "utf8"));
+ Process process = null;
+ String property = System.getProperty("os.name");
+ System.out.println(property);
+ if (property.indexOf("Linux") != -1) {
+ // linux
+ process = Runtime.getRuntime().exec(new String[]{"bash", "-c", newCmd});
+ } else {
+ // 鏈湴win
+ String mysqldumpPath = "cmd /c " + mysqldump + "/" + newCmd;
+ System.out.println(mysqldumpPath);
+ process = Runtime.getRuntime().exec(mysqldumpPath);
+ }
+ InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream(), "utf8");
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line;
+ while ((line = bufferedReader.readLine()) != null) {
+ printWriter.println(line);
+ }
+ // 姝ゆ浼氭墽琛岃繃闀挎椂闂�,鐩村埌澶囦唤瀹屾垚
+ printWriter.flush();
+ printWriter.close();
+ //0 琛ㄧず绾跨▼姝ｅ父缁堟銆�
+ if (process.waitFor() == 0) {
+ // 绾跨▼姝ｅ父鎵ц
+ log.info("銆愬浠芥暟鎹簱銆慡UCCESS锛孲QL鏂囦欢锛歿}", pathFileName);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.info("銆愬浠芥暟鎹簱銆慒AILURE");
+ } finally {
+ try {
+ if (bufferedReader != null) {
+ bufferedReader.close();
+ }
+ if (printWriter != null) {
+ printWriter.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ log.info("銆愬浠芥暟鎹簱銆�--END");
+ }
+
+
+ /**
+ * 姣忓ぉ鏅氫笂23鐐�0鍒�10绉掓墽琛� 銆� 0 0 4 1/1 * ? 銆�
+ * 娴嬭瘯 20 绉掍竴娆°�� 0/20 * * * * ? 銆�
+ */
+ @Scheduled(cron = "6 0 23 * * ?")
+ private void TimerDeleteFile(){
+ Date date = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("d");
+ Integer currentDay = Integer.valueOf(sdf.format(date));
+ File file = new File(filePath);
+ File[] files = file.listFiles();
+ if (files != null) {
+ for(File f : files){
+ if(f.isFile()){//鑻ユ槸鏂囦欢锛岀洿鎺ユ墦鍗�
+ String[] splitFile = f.getName().split("_");
+ Integer fileDay = Integer.valueOf(splitFile[splitFile.length - 2]);
+ Integer i = currentDay - fileDay;
+ if (i.equals(destiny)){
+ f.delete();
+ log.info("澶囦唤sql鏂囦欢杩囧杩涜鍒犻櫎锛�");
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 鍒ゆ柇鏂囦欢鏄惁瀛樺湪锛屼笉瀛樺湪鍒涘缓
+ */
+ private static void existsFile(File file) {
+ // 鍒ゆ柇鏂囦欢璺緞鏄惁瀛樺湪,涓嶅瓨鍦ㄦ柊寤�
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ if (!file.exists()) {
+ try {
+ file.createNewFile();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index f06d3ad..af6697f 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -1,12 +1,37 @@
swagger:
enabled: true
+# 鏃ュ織閰嶇疆
+logging:
+ config: classpath:logback-spring.xml
+ # 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+ file-location: log
+
+# 鏁版嵁搴撳浠借矾寰�
+backup:
+ # 鏁版嵁搴撳浠借矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+ path: E:/webapp/backup
+ # 鏁版嵁搴撳浠藉ぉ鏁�
+ destiny: 7
+ # 鏁版嵁搴撳浠藉伐鍏疯矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+ mysqldump: E:\JavaCode\WMS\WMS_Admin\src\main\resources
+
+# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+file:
+ path: E:/webapp/images
+
+# 榈烽洀绠＄悊绯荤粺瀵嗛挜
+login:
+ userID: c8b1aaacec366c24e5d18c7eea9e551b
+ secret: 701C85FCE0F7CFD714C2052D77098DC7f407b0ee79210bcef51787a0eb8ec7a5
+
+# 榈烽洀缃戠粶IP鎴栬�呭煙鍚�
+customer:
+ url: http://127.0.0.1:6789
+
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 寮�鍚痬ybatis-plus鏃ュ織
-
-logging:
- config: classpath:logback-spring.xml
# 鏁版嵁婧愰厤缃�
spring:
diff --git a/sys/src/main/resources/application-prod.yml b/sys/src/main/resources/application-prod.yml
index f87b422..d401c15 100644
--- a/sys/src/main/resources/application-prod.yml
+++ b/sys/src/main/resources/application-prod.yml
@@ -1,13 +1,36 @@
swagger:
enabled: false
+# 鏃ュ織閰嶇疆
+logging:
+ config: classpath:logback-spring.xml
+ # 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+ file-location: /javaWork/LIMS/log
+
+# 鏁版嵁搴撳浠借矾寰�
+backup:
+ # 鏁版嵁搴撳浠借矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+ path: /javaWork/LIMS/backup
+ # 鏁版嵁搴撳浠藉ぉ鏁�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+ destiny: 7
+ # 鏁版嵁搴撳浠藉伐鍏疯矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+ mysqldump: /javaWork/LIMS/conf
+
+# 鐓х墖璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+file:
+ path: /javaWork/LIMS/images
+
+# 榈烽洀缃戠粶IP鎴栬�呭煙鍚�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+customer:
+ url: http://114.132.189.42:8011
+
+login:
+ userID: c8b1aaacec366c24e5d18c7eea9e551b
+ secret: 701C85FCE0F7CFD714C2052D77098DC7f407b0ee79210bcef51787a0eb8ec7a5
+
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl # 鍏抽棴mybatis-plus鏃ュ織
-
-logging:
- config: classpath:logback-spring.xml
- file-location: /usr/local/webapp/log
# 鏁版嵁婧愰厤缃�
spring:
diff --git a/sys/src/main/resources/application.yml b/sys/src/main/resources/application.yml
index 6b18398..bad7621 100644
--- a/sys/src/main/resources/application.yml
+++ b/sys/src/main/resources/application.yml
@@ -4,10 +4,6 @@
profiles:
active: dev
-login:
- userID: c8b1aaacec366c24e5d18c7eea9e551b
- secret: 701C85FCE0F7CFD714C2052D77098DC7f407b0ee79210bcef51787a0eb8ec7a5
-
mybatis-plus:
type-aliases-package: com.yuanchu.limslaboratory.pojo
mapper-locations: classpath*:/mapper/*.xml
diff --git a/sys/src/main/resources/logback-spring.xml b/sys/src/main/resources/logback-spring.xml
index b519412..4f93925 100644
--- a/sys/src/main/resources/logback-spring.xml
+++ b/sys/src/main/resources/logback-spring.xml
@@ -8,7 +8,7 @@
<!-- name鐨勫�兼槸鍙橀噺鐨勫悕绉帮紝value鐨勫�兼椂鍙橀噺瀹氫箟鐨勫�笺�傞�氳繃瀹氫箟鐨勫�间細琚彃鍏ュ埌logger涓婁笅鏂囦腑銆傚畾涔夊悗锛屽彲浠ヤ娇鈥�${}鈥濇潵浣跨敤鍙橀噺銆� -->
<springProperty scope="context" name="logs" source="logging.file-location" default="/var/log/myapp"/>
- <property name="log.path" value="${myLogLocation}"/>
+ <property name="log.path" value="${logs}"/>
<!--0. 鏃ュ織鏍煎紡鍜岄鑹叉覆鏌� -->
<!-- 褰╄壊鏃ュ織渚濊禆鐨勬覆鏌撶被 -->
@@ -196,29 +196,29 @@
<!-- 4 鏈�缁堢殑绛栫暐锛�
鍩烘湰绛栫暐(root绾�) + 鏍规嵁profile鍦ㄥ惎鍔ㄦ椂, logger鏍囩涓畾鍒跺寲package鏃ュ織绾у埆(浼樺厛绾ч珮浜庝笂闈㈢殑root绾�)-->
- <springProfile name="dev">
- <root level="info">
- <appender-ref ref="CONSOLE" />
- <appender-ref ref="DEBUG_FILE" />
- <appender-ref ref="INFO_FILE" />
- <appender-ref ref="WARN_FILE" />
- <appender-ref ref="ERROR_FILE" />
- <appender-ref ref="ALL_FILE" />
- </root>
- <logger name="com.network_manage.SystemSysApplication" level="debug"/> <!-- 寮�鍙戠幆澧�, 鎸囧畾鏌愬寘鏃ュ織涓篸ebug绾� -->
- </springProfile>
+ <!--<springProfile name="dev">-->
+ <!-- <root level="info">-->
+ <!-- <appender-ref ref="CONSOLE" />-->
+ <!-- <appender-ref ref="DEBUG_FILE" />-->
+ <!-- <appender-ref ref="INFO_FILE" />-->
+ <!-- <appender-ref ref="WARN_FILE" />-->
+ <!-- <appender-ref ref="ERROR_FILE" />-->
+ <!-- <appender-ref ref="ALL_FILE" />-->
+ <!-- </root>-->
+ <!-- <logger name="com.yuanchu.limslaboratory.SysApplication" level="debug"/> <!– 寮�鍙戠幆澧�, 鎸囧畾鏌愬寘鏃ュ織涓篸ebug绾� –>-->
+ <!--</springProfile>-->
- <springProfile name="test">
- <root level="info">
- <appender-ref ref="CONSOLE" />
- <appender-ref ref="DEBUG_FILE" />
- <appender-ref ref="INFO_FILE" />
- <appender-ref ref="WARN_FILE" />
- <appender-ref ref="ERROR_FILE" />
- <appender-ref ref="ALL_FILE" />
- </root>
- <logger name="com.network_manage.SystemSysApplication" level="info"/> <!-- 娴嬭瘯鐜, 鎸囧畾鏌愬寘鏃ュ織涓篿nfo绾� -->
- </springProfile>
+ <!--<springProfile name="test">-->
+ <!-- <root level="info">-->
+ <!-- <appender-ref ref="CONSOLE" />-->
+ <!-- <appender-ref ref="DEBUG_FILE" />-->
+ <!-- <appender-ref ref="INFO_FILE" />-->
+ <!-- <appender-ref ref="WARN_FILE" />-->
+ <!-- <appender-ref ref="ERROR_FILE" />-->
+ <!-- <appender-ref ref="ALL_FILE" />-->
+ <!-- </root>-->
+ <!-- <logger name="com.yuanchu.limslaboratory.SysApplication" level="info"/> <!– 娴嬭瘯鐜, 鎸囧畾鏌愬寘鏃ュ織涓篿nfo绾� –>-->
+ <!--</springProfile>-->
<springProfile name="prod">
<root level="info">
@@ -229,8 +229,8 @@
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
- <logger name="com.network_manage" level="warn"/> <!-- 鐢熶骇鐜, 鎸囧畾鏌愬寘鏃ュ織涓簑arn绾� -->
- <logger name="com.network_manage.SystemSysApplication" level="info"/> <!-- 鐗瑰畾鏌愪釜绫绘墦鍗癷nfo鏃ュ織, 姣斿application鍚姩鎴愬姛鍚庣殑鎻愮ず璇� -->
+ <logger name="com.yuanchu.limslaboratory" level="warn"/> <!-- 鐢熶骇鐜, 鎸囧畾鏌愬寘鏃ュ織涓簑arn绾� -->
+ <logger name="com.yuanchu.limslaboratory.SysApplication" level="info"/> <!-- 鐗瑰畾鏌愪釜绫绘墦鍗癷nfo鏃ュ織, 姣斿application鍚姩鎴愬姛鍚庣殑鎻愮ず璇� -->
</springProfile>
</configuration>
diff --git a/sys/src/main/resources/mysqldump.exe b/sys/src/main/resources/mysqldump.exe
new file mode 100644
index 0000000..9f4ce5e
--- /dev/null
+++ b/sys/src/main/resources/mysqldump.exe
Binary files differ
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java b/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java
index 8cb102c..62440cc 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java
@@ -22,7 +22,7 @@
public static String database_username = "root";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/standard-library"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String model_name = "/inspection-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
public static String setParent = "com.yuanchu.limslaboratory"; // 鍖呰矾寰�
public static Boolean Override = false; // 鏄惁瑕嗙洊鍘熸潵鐨勬枃浠讹紵
diff --git a/user-server/pom.xml b/user-server/pom.xml
index 1fb88b1..a1f86af 100644
--- a/user-server/pom.xml
+++ b/user-server/pom.xml
@@ -21,12 +21,6 @@
<version>${project.parent.version}</version>
</dependency>
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- </dependency>
-
<!--feign-->
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -44,6 +38,12 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
</dependency>
+
+ <!--jwt-->
+ <dependency>
+ <groupId>com.auth0</groupId>
+ <artifactId>java-jwt</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
index 8bc7c5a..7b1ead7 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
@@ -39,6 +39,7 @@
mapRedis.put("id", user.getId());
mapRedis.put("account", user.getAccount());
mapRedis.put("name", user.getName());
+ mapRedis.put("enterpriseId", user.getEnterpriseId());
mapRedis.put("data", data);
//瀛樺叆redis,浜屼釜灏忔椂鍚庡垹闄�
RedisUtil.set(token, mapRedis, 120);
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/config/FeignConfig.java b/user-server/src/main/java/com/yuanchu/limslaboratory/config/FeignConfig.java
index c72c031..52abac8 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/config/FeignConfig.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/config/FeignConfig.java
@@ -14,7 +14,6 @@
import java.util.concurrent.TimeUnit;
-@EnableFeignClients("com.yuanchu.limslaboratory.clients") // 鎵弿feign鎺ュ彛鎵�鍦ㄥ寘 閲嶈
@Configuration
@ConditionalOnClass(Feign.class)
@AutoConfigureBefore(FeignAutoConfiguration.class)
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 e28ea7d..e3a5649 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
@@ -8,6 +8,9 @@
import com.yuanchu.limslaboratory.pojo.User;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.shiro.realm.ShiroRealm;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.utils.SpringUtil;
import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
@@ -20,6 +23,7 @@
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -87,28 +91,30 @@
@PostMapping("/getUserById")
@ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛id鐨勭敤鎴蜂俊鎭拰浼佷笟淇℃伅")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(value = "鐢ㄦ埛id", name = "userId", dataTypeClass = Integer.class, required = true)
- })
- public Result<?> getUserById(int userId) {
- try {
- Map<String, String> map = userService.selectUserByUserId(userId);
- User user = new User(map.get("account"),map.get("uname"),map.get("phone"),map.get("email"),map.get("info"));
- Enterprise enterprise = new Enterprise(map.get("name"),map.get("byname"),map.get("link_name"),map.get("link_phone"));
- Map map1 = new HashMap<>();
- map1.put("enterprise", enterprise);
- map1.put("user", user);
- return Result.success(map1);
- } catch (Exception e) {
- return Result.fail("鐢ㄦ埛id涓虹┖!");
+ public Result<?> getUserById(@RequestHeader("X-Token") String token) throws Exception {
+ Object o = RedisUtil.get(token);
+ Map<String, Object> unmarshal = null;
+ 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閿欒锛�");
}
@PostMapping("/add_new_personnel")
@ApiOperation("瀹為獙瀹ょ鐞�-->浜哄憳绠＄悊-->鏂板浜哄憳")
- public Result<?> addNewPersonnel(@RequestBody NewPersonnelVo newPersonnelVo) {
- newPersonnelVo.setPassword("123456");
- Integer isAddSuccess = userService.addNewPersonnel(newPersonnelVo);
+ public Result<?> addNewPersonnel(@RequestHeader("X-Token") String token, @RequestBody NewPersonnelVo newPersonnelVo) throws Exception {
+ Object redisUserMessage = RedisUtil.get(token);
+ Map<String, Object> user = null;
+ Integer isAddSuccess = 0;
+ if (!ObjectUtils.isEmpty(redisUserMessage)) {
+ user = JackSonUtil.unmarshal(JackSonUtil.marshal(redisUserMessage), Map.class);
+ newPersonnelVo.setPassword("123456");
+ isAddSuccess = userService.addNewPersonnel(newPersonnelVo, user.get("enterpriseId").toString());
+ }
+
if (isAddSuccess == 1){
return Result.success("娣诲姞銆�" + newPersonnelVo.getName() + "銆戞垚鍔燂紝榛樿瀵嗙爜涓猴細" + newPersonnelVo.getPassword());
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseUserListMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseUserListMapper.java
deleted file mode 100644
index cd206d7..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseUserListMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.limslaboratory.mapper;
-
-import com.yuanchu.limslaboratory.pojo.EnterpriseUserList;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-public interface EnterpriseUserListMapper extends BaseMapper<EnterpriseUserList> {
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index 4e78a8f..9be0eee 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -5,8 +5,10 @@
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
+import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+import javax.annotation.Resource;
import java.util.Map;
import java.util.Objects;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
index 6b5fb32..3248894 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
@@ -39,12 +39,6 @@
@ApiModelProperty(value = "浼佷笟绠�绉�")
private String byname;
- @ApiModelProperty(value = "鑱旂郴浜鸿处鍙�")
- private String linkAccount;
-
- @ApiModelProperty(value = "鑱旂郴浜哄瘑鐮�")
- private String linkPassword;
-
@ApiModelProperty(value = "鑱旂郴浜哄悕瀛�")
private String linkName;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/EnterpriseUserList.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/EnterpriseUserList.java
deleted file mode 100644
index 35ae87b..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/EnterpriseUserList.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.yuanchu.limslaboratory.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="EnterpriseUserList瀵硅薄", description="")
-public class EnterpriseUserList implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "浼佷笟鍜岀敤鎴峰叧鑱攊d")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "浼佷笟id")
- private Integer enterpriseId;
-
- @ApiModelProperty(value = "鐢ㄦ埛id")
- private Integer userId;
-
- @TableLogic(value = "1", delval = "0")
- @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0")
- private Integer state;
-
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
- private Date createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
- private Date updateTime;
-
- @Version
- private Integer version;
-
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
index ee1ba41..14cea5b 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -76,6 +76,9 @@
@ApiModelProperty(value = "鍏宠仈 瑙掕壊id")
private Integer roleId;
+ @ApiModelProperty(value = "鍏宠仈 浼佷笟id")
+ private Integer enterpriseId;
+
public User(String account, String name, String phone, String email, String info) {
this.account = account;
this.name = name;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseUserListService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseUserListService.java
deleted file mode 100644
index 5e99cac..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseUserListService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-import com.yuanchu.limslaboratory.pojo.EnterpriseUserList;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-public interface EnterpriseUserListService extends IService<EnterpriseUserList> {
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index cab8442..fee7cd5 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -7,6 +7,7 @@
import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
+import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
@@ -27,7 +28,7 @@
User AccordingUsernameSelectAll(String account);
- Integer addNewPersonnel(NewPersonnelVo newPersonnelVo);
+ Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId);
Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo);
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseUserListServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseUserListServiceImpl.java
deleted file mode 100644
index 5a918b9..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseUserListServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.limslaboratory.service.impl;
-
-import com.yuanchu.limslaboratory.pojo.EnterpriseUserList;
-import com.yuanchu.limslaboratory.mapper.EnterpriseUserListMapper;
-import com.yuanchu.limslaboratory.service.EnterpriseUserListService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-@Service
-public class EnterpriseUserListServiceImpl extends ServiceImpl<EnterpriseUserListMapper, EnterpriseUserList> implements EnterpriseUserListService {
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index fc5490c..4690324 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.User;
import com.yuanchu.limslaboratory.mapper.UserMapper;
@@ -13,13 +12,13 @@
import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
-import java.util.Objects;
/**
* <p>
@@ -74,12 +73,12 @@
public User AccordingUsernameSelectAll(String account) {
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(User::getAccount, account);
- wrapper.select(User::getPassword, User::getId, User::getName, User::getAccount);
+ wrapper.select(User::getPassword, User::getId, User::getName, User::getAccount, User::getEnterpriseId);
return userMapper.selectOne(wrapper);
}
@Override
- public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo) {
+ public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {
User user = new User()
.setName(newPersonnelVo.getName())
.setAccount(newPersonnelVo.getAccount())
@@ -87,7 +86,8 @@
.setPhone(newPersonnelVo.getPhone())
.setEmail(newPersonnelVo.getEmail())
.setRoleId(newPersonnelVo.getRole_id())
- .setPassword(newPersonnelVo.getPassword());
+ .setPassword(newPersonnelVo.getPassword())
+ .setEnterpriseId(Integer.valueOf(enterpriseId));
return userMapper.insert(user);
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/vo/NewPersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/vo/NewPersonnelVo.java
index ab2cc9a..095138e 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/vo/NewPersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/vo/NewPersonnelVo.java
@@ -1,5 +1,6 @@
package com.yuanchu.limslaboratory.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 30e710c..65aa6bb 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -3,11 +3,10 @@
<mapper namespace="com.yuanchu.limslaboratory.mapper.UserMapper">
<select id="selectUserByUserId" parameterType="int" resultType="Map">
- select u.account account,u.name uname,u.phone,u.email,u.info,e.byname,e.`name`,e.link_name,e.link_phone
- from enterprise_user_list el,enterprise e,`user` u
- where e.id = el.enterprise_id
- and el.user_id = u.id
- and u.id = #{userId}
+ SELECT u.account account,u.name uname,u.phone,u.email,u.info,e.byname e_byname,e.`name` e_name,e.link_name e_link_name,e.link_phone e_phone
+ FROM enterprise e,`user` u
+ WHERE e.`id` = u.`enterprise_id`
+ AND u.id = #{userId}
</select>
<resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.vo.PagePersonnelVo">
--
Gitblit v1.9.3