From 232fd37c627f703d3908dc1bdf8225defe4efd7c Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 20 七月 2023 16:02:53 +0800
Subject: [PATCH] 修改实体类的字段
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 3
sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java | 129 +++++++++++++++++++++++++++++++++++++++++++
sys/src/main/resources/application-dev.yml | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 4
4 files changed, 134 insertions(+), 4 deletions(-)
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 c9d4426..104c16a 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
@@ -79,5 +79,6 @@
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
private Integer userId;
-
+ @ApiModelProperty(value = "鍏宠仈 璁惧id")
+ private Integer instrument_id;
}
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 db6113c..a0f82f6 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
@@ -31,8 +31,8 @@
@ApiModelProperty(value = "璁″垝缂栧彿")
private Integer id;
- @ApiModelProperty(value = "妫�楠岀粨鏋�")
- private String results;
+ @ApiModelProperty(value = "妫�楠岀粨鏋� 0锛氬緟鎻愪氦锛�1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃")
+ private int results;
@ApiModelProperty(value = "璇曢獙璇存槑")
private String thing;
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java b/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
new file mode 100644
index 0000000..62440cc
--- /dev/null
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
@@ -0,0 +1,129 @@
+package com.yuanchu.limslaboratory;
+
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
+public class CodeGenerator {
+
+ public static String database_url = "jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ public static String database_driver_name = "com.mysql.cj.jdbc.Driver";
+ public static String database_username = "root";
+ public static String database_password= "123456";
+ public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
+ public static String model_name = "/inspection-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String setParent = "com.yuanchu.limslaboratory"; // 鍖呰矾寰�
+ public static Boolean Override = false; // 鏄惁瑕嗙洊鍘熸潵鐨勬枃浠讹紵
+
+ public static void main(String[] args) {
+ // 浠ｇ爜鐢熸垚鍣�
+ AutoGenerator mpg = new AutoGenerator();
+
+ String projectPath = System.getProperty("user.dir");
+ System.out.println(projectPath+"===================");
+
+ GlobalConfig gc = new GlobalConfig() // 鍏ㄥ眬閰嶇疆
+ .setOutputDir(projectPath + model_name + "/src/main/java") // 杈撳嚭璺緞
+ .setAuthor(author) // 浣滆�呮敞閲�
+ .setOpen(false) // 鏄惁鎵撳紑
+ .setSwagger2(true) //瀹炰綋灞炴�� Swagger2 娉ㄨВ
+ .setServiceName("%sService") // 璁剧疆serviceName鐨勫悕绉板幓澶у啓I
+ .setFileOverride(Override);// 鏄惁瑕嗙洊宸茬敓鎴愭枃浠�
+ mpg.setGlobalConfig(gc);
+
+ // 鏁版嵁婧愰厤缃� 鏁版嵁搴撳悕 璐﹀彿瀵嗙爜
+ DataSourceConfig dsc = new DataSourceConfig()
+ .setUrl(database_url)
+ .setDriverName(database_driver_name)
+ .setUsername(database_username)
+ .setPassword(database_password);
+ mpg.setDataSource(dsc);
+
+
+ // 鍖呴厤缃�
+ PackageConfig pc = new PackageConfig()
+ .setModuleName(null)
+ .setParent(setParent)
+ .setEntity("pojo");// 鍖呰矾寰�
+ mpg.setPackageInfo(pc);
+
+ // 鑷畾涔夐厤缃�
+ InjectionConfig cfg = new InjectionConfig() {
+ @Override
+ public void initMap() {
+ // to do nothing
+ }
+ };
+
+ // 濡傛灉妯℃澘寮曟搸鏄� freemarker
+ String templatePath = "/templates/mapper.xml.ftl";
+ // 濡傛灉妯℃澘寮曟搸鏄� velocity
+ // String templatePath = "/templates/mapper.xml.vm";
+
+ // 鑷畾涔夎緭鍑洪厤缃�
+ List<FileOutConfig> focList = new ArrayList<>();
+ // 鑷畾涔夐厤缃細琚紭鍏堣緭鍑�
+ focList.add(new FileOutConfig(templatePath) {
+ @Override
+ public String outputFile(TableInfo tableInfo) {
+ // 鑷畾涔夎緭鍑烘枃浠跺悕 锛� 濡傛灉浣� Entity 璁剧疆浜嗗墠鍚庣紑銆佹澶勬敞鎰� xml 鐨勫悕绉颁細璺熺潃鍙戠敓鍙樺寲锛�
+ return projectPath + model_name + "/src/main/resources/mapper/"
+ + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+ }
+ });
+
+ cfg.setFileOutConfigList(focList);
+ mpg.setCfg(cfg);
+
+ // 閰嶇疆妯℃澘
+ TemplateConfig templateConfig = new TemplateConfig()
+ .setXml(null);
+
+ mpg.setTemplate(templateConfig);
+
+ // 绛栫暐閰嶇疆
+ StrategyConfig strategy = new StrategyConfig()
+ .setNaming(NamingStrategy.underline_to_camel)
+ .setColumnNaming(NamingStrategy.underline_to_camel)
+ .setEntityLombokModel(true)
+ .setRestControllerStyle(true)
+ .setInclude(scanner("琛ㄥ悕锛屽涓亾鍙峰垎鍓�").split(","))
+ .setControllerMappingHyphenStyle(true)
+ .setTablePrefix("m_");
+ mpg.setStrategy(strategy);
+ mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+ //濡傛灉涓嶈皟鐢ㄨ鏂规硶銆佸氨浼氫娇鐢∕yBatis-Plus榛樿鐨勬枃浠剁敓鎴愯矾寰勫拰鍖呰矾寰勭敓鎴愭枃浠躲�佷絾鍙互浣跨敤涓婇潰鐨凱ackageConfig鍋氫竴浜涚畝鍗曠殑閰嶇疆
+ mpg.execute();
+ }
+
+ /**
+ * <p>
+ * 璇诲彇鎺у埗鍙板唴瀹�
+ * </p>
+ */
+ public static String scanner(String tip) {
+ Scanner scanner = new Scanner(System.in);
+ StringBuilder help = new StringBuilder();
+ help.append("璇疯緭鍏�" + tip + "锛�");
+ System.out.println(help.toString());
+ if (scanner.hasNext()) {
+ String ipt = scanner.next();
+
+ if (StringUtils.isNotBlank(ipt)) {
+ return ipt;
+ }
+ }
+ throw new MybatisPlusException("璇疯緭鍏ユ纭殑" + tip + "锛�");
+ }
+}
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index c8ae754..35f3bd4 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -69,7 +69,7 @@
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
password: null
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
- timeout: 5000
+ timeout: 5
# redis杩炴帴姹犻厤缃�
pool:
# 鏈�澶у彲鐢ㄨ繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
--
Gitblit v1.9.3