From 4bd78750b67ae269d8dc18dfd95f7d929cd46937 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Wed, 18 Dec 2024 16:39:45 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentController.java      |  6 +-----
 .../impl/ExperimentSequenceServiceImpl.java   |  8 +++++--
 .../service/impl/ExperimentServiceImpl.java   |  2 +-
 scripts/.prettierignore                       |  9 ++++++++
 scripts/.python-version                       |  1 +
 scripts/pyproject.toml                        | 21 +++++++++++++++++++
 6 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 scripts/.prettierignore
 create mode 100644 scripts/.python-version
 create mode 100644 scripts/pyproject.toml

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index fc43259..2be2e26 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -118,11 +118,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         experimentLog.setCreateBy(userByName.getRealname());
         experimentLogService.save(experimentLog);
 
-        String[] split = experimentNo.split("-", 4);
-        ExperimentSequence seq = new ExperimentSequence();
-        seq.setSequenceYear(split[1]);
-        seq.setSequenceValue(Integer.parseInt(split[3]));
-        experimentSequenceService.save(seq);
+
         return Result.OK("添加成功！");
     }
 
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSequenceServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSequenceServiceImpl.java
index 6212af6..a79cf75 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSequenceServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSequenceServiceImpl.java
@@ -34,11 +34,15 @@ public class ExperimentSequenceServiceImpl extends ServiceImpl<ExperimentSequenc
             sequence.setSequenceYear(year + "");
             save(sequence);
         }
-        return assembleSequence(sequence);
+        ExperimentSequence seq = new ExperimentSequence();
+        seq.setSequenceYear(year + "");
+        seq.setSequenceValue(sequence.getSequenceValue() + 1);
+        save(seq);
+        return assembleSequence(seq);
     }
 
     public String assembleSequence(ExperimentSequence experimentSequence) {
-        return "KC-" + experimentSequence.getSequenceYear() + "-JL-" + StringUtils.leftPad((experimentSequence.getSequenceValue() + 1) + "",
+        return "KC-" + experimentSequence.getSequenceYear() + "-JL-" + StringUtils.leftPad(experimentSequence.getSequenceValue() + "",
                 3, "0");
     }
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
index 6ba3de9..287f6d0 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
@@ -96,7 +96,7 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
     @Override
     public Experiment copy(Experiment oldExperiment) {
         Experiment experiment = new Experiment();
-        BeanUtil.copyProperties(this, experiment);
+        BeanUtil.copyProperties(oldExperiment, experiment);
         experiment.setId(null);
         experiment.setExperimentNo(experimentSequenceService.next());
         experiment.setCopyCount(0);
diff --git a/scripts/.prettierignore b/scripts/.prettierignore
new file mode 100644
index 0000000..f7e39e6
--- /dev/null
+++ b/scripts/.prettierignore
@@ -0,0 +1,9 @@
+/dist/*
+.local
+.output.js
+/node_modules/**
+
+**/*.svg
+**/*.sh
+
+/public/*
diff --git a/scripts/.python-version b/scripts/.python-version
new file mode 100644
index 0000000..c10780c
--- /dev/null
+++ b/scripts/.python-version
@@ -0,0 +1 @@
+3.13.1
diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml
new file mode 100644
index 0000000..fb8c98e
--- /dev/null
+++ b/scripts/pyproject.toml
@@ -0,0 +1,21 @@
+[tool.poetry]
+name = "physical-web"
+version = "0.1.0"
+description = ""
+authors = ["ls <lslvxy@163.com>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.13"
+requests = "^2.32.3"
+beautifulsoup4 = "^4.12.3"
+lxml = "^5.3.0"
+flask = "^3.1.0"
+minio = "^7.2.12"
+mysql-connector-python = "^9.1.0"
+urllib3 = "^2.2.3"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"