From c9c4976f4e1e553edc98e4171a1d1741bde542f5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 14:03:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java | 20 ++++
cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java | 102 ++++++++++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 5
cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml | 5 +
sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java | 1
inspection-server/src/main/resources/mapper/PlanMapper.xml | 10 -
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 2
pom.xml | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java | 6 -
/dev/null | 6 -
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 4
sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java | 16 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 10 -
cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasAnnualPlanMapper.java | 16 +++
cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasAnnualPlanService.java | 16 +++
sys/pom.xml | 14 ++
cnas-server/pom.xml | 30 ++++++
cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java | 30 ++++++
18 files changed, 252 insertions(+), 42 deletions(-)
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 35410ca..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 榛樿蹇界暐鐨勬枃浠�
-/shelf/
-/workspace.xml
-# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹�
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/aws.xml b/.idea/aws.xml
deleted file mode 100644
index b63b642..0000000
--- a/.idea/aws.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="accountSettings">
- <option name="activeRegion" value="us-east-1" />
- <option name="recentlyUsedRegions">
- <list>
- <option value="us-east-1" />
- </list>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 87180da..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <annotationProcessing>
- <profile default="true" name="Default" enabled="true" />
- <profile name="Maven default annotation processors profile" enabled="true">
- <sourceOutputDir name="target/generated-sources/annotations" />
- <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
- <outputRelativeToContentRoot value="true" />
- <module name="inspection-server" />
- <module name="framework" />
- <module name="sys" />
- <module name="standard-server" />
- <module name="laboratory-server" />
- <module name="user-server" />
- </profile>
- </annotationProcessing>
- </component>
- <component name="JavacSettings">
- <option name="ADDITIONAL_OPTIONS_OVERRIDE">
- <module name="framework" options="-parameters" />
- <module name="inspection-server" options="-parameters" />
- <module name="laboratory-server" options="-parameters" />
- <module name="standard-server" options="-parameters" />
- <module name="sys" options="-parameters" />
- <module name="user-server" options="-parameters" />
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 343cd9b..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
- <file url="file://$PROJECT_DIR$/framework/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/inspection-server/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/laboratory-server/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/standard-server/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/sys/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/user-server/src/main/java" charset="UTF-8" />
- <file url="PROJECT" charset="UTF-8" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 980588c..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="RemoteRepositoriesConfiguration">
- <remote-repository>
- <option name="id" value="central" />
- <option name="name" value="Maven Central repository" />
- <option name="url" value="https://repo1.maven.org/maven2" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="jboss.community" />
- <option name="name" value="JBoss Community repository" />
- <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="central" />
- <option name="name" value="Central Repository" />
- <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
- </remote-repository>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 132404b..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/cnas-server/pom.xml b/cnas-server/pom.xml
new file mode 100644
index 0000000..da42c64
--- /dev/null
+++ b/cnas-server/pom.xml
@@ -0,0 +1,30 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>lims-laboratory</artifactId>
+ <groupId>com.yuanchu</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.yuanchu.limslaboratory</groupId>
+ <artifactId>cnas-server</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java
new file mode 100644
index 0000000..0095dcc
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java
@@ -0,0 +1,30 @@
+package com.yuanchu.limslaboratory.controller;
+
+import com.yuanchu.limslaboratory.service.CnasAnnualPlanService;
+import com.yuanchu.limslaboratory.vo.Result;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 瀹℃牳骞村害璁″垝琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-10 11:50:11
+ */
+@Controller
+@RequestMapping("/cnasAnnualPlan")
+public class CnasAnnualPlanController {
+
+ @Resource
+ private CnasAnnualPlanService cnasAnnualPlanService;
+
+
+// public Result selectAll() {
+//
+// }
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasAnnualPlanMapper.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasAnnualPlanMapper.java
new file mode 100644
index 0000000..bf89357
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasAnnualPlanMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 瀹℃牳骞村害璁″垝琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-10 11:50:11
+ */
+public interface CnasAnnualPlanMapper extends BaseMapper<CnasAnnualPlan> {
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java
new file mode 100644
index 0000000..5c81917
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java
@@ -0,0 +1,102 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 瀹℃牳骞村害璁″垝琛�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-10 11:50:11
+ */
+@Getter
+@Setter
+@TableName("cnas_annual_plan")
+public class CnasAnnualPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鎬ц川,0:鍐呭,1:绠＄悊璇勫
+ */
+ private Integer auditType;
+
+ /**
+ * 閮ㄩ棬
+ */
+ private String department;
+
+ /**
+ * 瀹℃牳鐩殑
+ */
+ private String auditPurpose;
+
+ /**
+ * 瀹℃牳缁勯暱
+ */
+ private String auditLeader;
+
+ /**
+ * 瀹℃牳缁勫憳
+ */
+ private String auditEmp;
+
+ /**
+ * 瀹℃牳渚濇嵁
+ */
+ private String auditPursuant;
+
+ /**
+ * 瀹℃牳鑼冨洿
+ */
+ private String auditScope;
+
+ /**
+ * 缂栧埗浜哄憳
+ */
+ private String writeUser;
+
+ /**
+ * 褰曞叆浜哄憳
+ */
+ private String keyboarder;
+
+ /**
+ * 璁″垝鏃堕棿
+ */
+ private LocalDateTime planTime;
+
+ /**
+ * 涓嶅悎鏍奸」鐩暟
+ */
+ private Integer count;
+
+ /**
+ * 瀹℃牳鐘舵��,0:鍗冲皢寮�濮�,1:瀹屾垚,2:閫炬湡
+ */
+ private Integer auditState;
+
+ private Integer state;
+
+ /**
+ * 瀹℃牳鏃ユ湡
+ */
+ private LocalDateTime auditTime;
+
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasAnnualPlanService.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasAnnualPlanService.java
new file mode 100644
index 0000000..1a5e0f3
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasAnnualPlanService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 瀹℃牳骞村害璁″垝琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-10 11:50:11
+ */
+public interface CnasAnnualPlanService extends IService<CnasAnnualPlan> {
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java
new file mode 100644
index 0000000..d763642
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
+import com.yuanchu.limslaboratory.mapper.CnasAnnualPlanMapper;
+import com.yuanchu.limslaboratory.service.CnasAnnualPlanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 瀹℃牳骞村害璁″垝琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-10 11:50:11
+ */
+@Service
+public class CnasAnnualPlanServiceImpl extends ServiceImpl<CnasAnnualPlanMapper, CnasAnnualPlan> implements CnasAnnualPlanService {
+
+}
diff --git a/cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml b/cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml
new file mode 100644
index 0000000..cd9b447
--- /dev/null
+++ b/cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml
@@ -0,0 +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.CnasAnnualPlanMapper">
+
+</mapper>
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 6768f4c..79bace6 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -1,7 +1,5 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
@@ -36,14 +34,14 @@
@ApiOperation("鏌ヨ妫�楠岃鍒�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "deviceId", value = "璁惧鍚嶇ОId", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "device", value = "璁惧鍚嶇ОId", dataTypeClass = String.class),
@ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = Date.class),
@ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = Date.class),
- @ApiImplicitParam(name = "userId", value = "妫�楠屼汉", dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "user", value = "妫�楠屼汉", dataTypeClass = String.class)
})
@GetMapping("/selectAllPlan")
- public Result selectAllPlan(Integer deviceId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, Integer userId) {
- List<PlanVo> planVoList = planService.selectAllPlan(deviceId, beginTime, endTime, userId);
+ public Result selectAllPlan(String device, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, String user) {
+ List<PlanVo> planVoList = planService.selectAllPlan(device, beginTime, endTime, user);
return Result.success(planVoList);
}
}
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
index 356a29d..b725119 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
@@ -10,5 +10,5 @@
* 鏌ヨ妫�楠岃鍒�
* @return
*/
- List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
+ List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
index b876d6a..a2a6253 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
@@ -48,12 +48,6 @@
@ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date finishtime;
- @ApiModelProperty(value = "璁惧id")
- @JsonSerialize
- private Integer deviceId;
- @ApiModelProperty(value = "妫�楠屼汉id")
- @JsonSerialize
- private Integer userId;
//鍒ゆ柇椤圭洰鐘舵��
private Integer state;
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
index 205e0c8..474e8ff 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
@@ -1,12 +1,9 @@
package com.yuanchu.limslaboratory.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* <p>
@@ -21,6 +18,6 @@
* 鏌ヨ妫�楠岃鍒�
* @return
*/
- List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
+ List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);
}
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
index df39e9c..5819ccd 100644
--- 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
@@ -29,9 +29,9 @@
* @return
*/
@Override
- public List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId) {
+ public List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user) {
//鑾峰彇鏁版嵁搴撴暟鎹�
- List<PlanVo> planVos = planMapper.selectAllPlan(deviceId, beginTime, endTime, userId);
+ List<PlanVo> planVos = planMapper.selectAllPlan(device, beginTime, endTime, user);
//娣诲姞璁″垝宸ユ湡鍜屾楠岃繘搴�
planVos.forEach(planVo -> {
//娣诲姞妫�楠岃繘搴�
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index 3f04caf..ed990c0 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -14,8 +14,6 @@
u.name checker,
ip.start_time starttime,
ip.end_time finishtime,
- i.id deviceId,
- u.id userId,
ip.test_state state
from instrument i
left join (select ip.*
@@ -28,11 +26,11 @@
left join inspection_material im on im.id = ip.inspection_material_id
left join user u on u.id = ip.user_id
<where>
- <if test="deviceId != null">
- and i.id = #{deviceId}
+ <if test="device != null and device != null">
+ and i.equipment_name = #{device}
</if>
- <if test="userId != null">
- and u.id = #{userId}
+ <if test="user != null and user != null">
+ and u.name = #{user}
</if>
<if test="beginTime != null and endTime != null">
and ip.start_time between #{beginTime} and #{endTime}
diff --git a/pom.xml b/pom.xml
index b6025a8..c9ca960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
<module>standard-server</module>
<module>inspection-server</module>
<module>laboratory-server</module>
+ <module>cnas-server</module>
</modules>
<properties>
diff --git a/sys/pom.xml b/sys/pom.xml
index effbb79..668acec 100644
--- a/sys/pom.xml
+++ b/sys/pom.xml
@@ -22,6 +22,12 @@
<artifactId>framework</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <!--cnas妯″潡-->
+ <dependency>
+ <groupId>com.yuanchu.limslaboratory</groupId>
+ <artifactId>cnas-server</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<!--鐢ㄦ埛鏈嶅姟妯″潡-->
<dependency>
@@ -63,12 +69,14 @@
<artifactId>mybatis-plus-generator</artifactId>
</dependency>
- <!-- framework: mybatis-plus浠ｇ爜鐢熸垚闇�瑕佷竴涓ā鏉垮紩鎿� -->
+ <!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity-engine-core -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-freemarker</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
+
<!--mysql-->
<dependency>
<groupId>mysql</groupId>
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java b/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
index 0807851..b7544d0 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
@@ -12,21 +12,23 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://localhost:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
- public static String database_username = "root";
+ public static String database_url = "jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ public static String database_username = "user";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/inspect-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
- public static String setParent = "com.yuanchu.mom"; // 鍖呰矾寰�
+ public static String model_name = "/cnas-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String setParent = "com.yuanchu.limslaboratory"; // 鍖呰矾寰�
public static void main(String[] args) {
String projectPath = System.getProperty("user.dir");
- System.out.println(projectPath+"===================");
+ String s = projectPath + "/lims-after" + model_name + "/src/main/java";
+ String s1 = projectPath + "/lims-after" + model_name + "/src/main/resources/mapper";
+ System.out.println();
FastAutoGenerator.create(database_url, database_username, database_password)
// 鍏ㄥ眬閰嶇疆
.globalConfig(builder -> {
builder.author(author) // 璁剧疆浣滆��
.commentDate("yyyy-MM-dd hh:mm:ss") //娉ㄩ噴鏃ユ湡
- .outputDir(projectPath + model_name + "/src/main/java") // 鎸囧畾杈撳嚭鐩綍
+ .outputDir(s) // 鎸囧畾杈撳嚭鐩綍
.disableOpenDir() //绂佹鎵撳紑杈撳嚭鐩綍锛岄粯璁ゆ墦寮�
;
})
@@ -34,7 +36,7 @@
.packageConfig(builder -> {
builder.entity("pojo");
builder.parent(setParent) // 璁剧疆鐖跺寘鍚�
- .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + model_name + "/src/main/resources/mapper")); // 璁剧疆mapperXml鐢熸垚璺緞
+ .pathInfo(Collections.singletonMap(OutputFile.xml, s1)); // 璁剧疆mapperXml鐢熸垚璺緞
})
// 绛栫暐閰嶇疆
.strategyConfig(builder -> {
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
index 8d48ad9..f3671e0 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
@@ -1,7 +1,6 @@
package com.yuanchu.limslaboratory;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
--
Gitblit v1.9.3