From 588ea850eb02ad1fe98ff13c3f45e3d06475fa49 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 17 七月 2023 14:04:46 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-17-v1.0.0
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 21 ++++++++--
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java | 18 ++++++++-
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java | 21 ++++++++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 19 +++++++--
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 14 ++++++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 19 +++++++--
6 files changed, 90 insertions(+), 22 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
index 841eb00..e55775d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
@@ -2,6 +2,12 @@
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,7 +15,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -34,10 +40,15 @@
@ApiModelProperty(value = "1锛氬緟鎻愪氦锛�2锛氬凡鎻愪氦锛�0锛氬凡浣滃簾")
private Integer state;
- @ApiModelProperty(value = "鎶ユ鏃堕棿")
- private LocalDateTime createTime;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
- private LocalDateTime updateTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
private Integer version;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
index 349d581..8b543c9 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -1,9 +1,12 @@
package com.yuanchu.limslaboratory.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+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;
@@ -11,7 +14,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -52,11 +55,19 @@
@ApiModelProperty(value = "缁撴潫鏃ユ湡")
private LocalDateTime endTime;
+ @TableLogic(value = "1", delval = "0")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
- private LocalDateTime createTime;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
- private LocalDateTime updateTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
private Integer version;
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
index 52e57f1..db6113c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
@@ -2,6 +2,12 @@
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,7 +15,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -34,10 +40,15 @@
@ApiModelProperty(value = "1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾")
private Integer state;
- @ApiModelProperty(value = "浠诲姟鐧昏鏃堕棿")
- private LocalDateTime createTime;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
- private LocalDateTime updateTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
private Integer version;
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index edd554e..abe2d9d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -1,9 +1,16 @@
package com.yuanchu.limslaboratory.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.yuanchu.limslaboratory.pojo.SerialNumber;
+import com.yuanchu.limslaboratory.service.ProductService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
/**
* <p>
@@ -17,4 +24,7 @@
@RequestMapping("/product")
public class ProductController {
+ @Autowired
+ private ProductService productService;
+
}
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
index a29396b..7641c02 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
@@ -2,6 +2,12 @@
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -43,11 +49,19 @@
@ApiModelProperty(value = "鐩樺彿")
private String reelNumber;
+ @TableLogic(value = "1", delval = "0")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
- private LocalDateTime createTime;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
- private LocalDateTime updateTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
private Integer version;
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
index 19479c6..be8b55b 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java
@@ -1,9 +1,12 @@
package com.yuanchu.limslaboratory.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+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;
@@ -11,7 +14,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -46,11 +49,19 @@
@ApiModelProperty(value = "鍐呮帶鍊�")
private String internal;
+ @TableLogic(value = "1", delval = "0")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
- private LocalDateTime createTime;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
- private LocalDateTime updateTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
private Integer version;
--
Gitblit v1.9.3