From 2e1ed0beca16b136a42ea9a3db58ec8f6cbb654f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 16 三月 2026 16:04:29 +0800
Subject: [PATCH] 浪潮对接:lims实验室管理系统
---
src/main/java/com/ruoyi/lims/pojo/RealtimeMonitor.java | 2 ++
src/main/resources/application-lims.yml | 12 ++++++------
pom.xml | 2 +-
src/main/java/com/ruoyi/lims/pojo/DataCollection.java | 2 ++
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index e2b697f..41c3bb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-mis</artifactId>
+ <artifactId>ruoyi-lims</artifactId>
<version>3.8.9</version>
<packaging>jar</packaging>
diff --git a/src/main/java/com/ruoyi/lims/pojo/DataCollection.java b/src/main/java/com/ruoyi/lims/pojo/DataCollection.java
index 006aa01..b0d6f9c 100644
--- a/src/main/java/com/ruoyi/lims/pojo/DataCollection.java
+++ b/src/main/java/com/ruoyi/lims/pojo/DataCollection.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -58,6 +59,7 @@
* 閲囬泦鏃堕棿
*/
@ApiModelProperty(value="閲囬泦鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime collectionTime;
/**
* 閲囬泦鐘舵��(collecting-閲囬泦涓�,processing-澶勭悊涓�,completed-宸插畬鎴�,failed-澶辫触)
diff --git a/src/main/java/com/ruoyi/lims/pojo/RealtimeMonitor.java b/src/main/java/com/ruoyi/lims/pojo/RealtimeMonitor.java
index e727ca5..520ada7 100644
--- a/src/main/java/com/ruoyi/lims/pojo/RealtimeMonitor.java
+++ b/src/main/java/com/ruoyi/lims/pojo/RealtimeMonitor.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -78,6 +79,7 @@
* 鐩戞帶鏃堕棿
*/
@ApiModelProperty(value="鐩戞帶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime monitorTime;
/**
* 棰勮鎻忚堪
diff --git a/src/main/resources/application-lims.yml b/src/main/resources/application-lims.yml
index 3579ebf..85767b0 100644
--- a/src/main/resources/application-lims.yml
+++ b/src/main/resources/application-lims.yml
@@ -1,7 +1,7 @@
# 鑺-浠撳偍鐗╂祦绯荤粺椤圭洰鐩稿叧閰嶇疆
inspur:
- appId: 1205971611543404544
- appSecret: VkyDMDYwMTIwMjYxNzQxNDM2OTItrv
+ appId: a3b0e3f1-7210-4ed0-8eed-c6c443e04e36
+ appSecret: 7aab6b10061962e861ab69596eec6c037daffd2b56cdf518df8554ff56daa9c8
ruoyi:
# 鍚嶇О
name: RuoYi
@@ -20,7 +20,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7003
+ port: 8080
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -65,7 +65,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://172.17.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/lims-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: zttZTT123!
# 浠庡簱鏁版嵁婧�
@@ -137,8 +137,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
+ host: 127.0.0.1
+# host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
--
Gitblit v1.9.3