From a33396e17dd847f31b62f416f7d9c5a58b79126b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 28 七月 2023 09:02:29 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-28早上
---
laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml | 5 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MeteringPlan.java | 76 +++++++++++++++++++
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java | 17 ++++
sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java | 3
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java | 41 ++++++++++
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MeteringPlanMapper.java | 16 ++++
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java | 2
laboratory-server/src/main/resources/mapper/pojoMapper.xml | 5 +
sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java | 3
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 1
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java | 42 ++++++++++
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java | 2
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java | 2
14 files changed, 210 insertions(+), 7 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
index 7b4b808..6e18c6c 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
@@ -23,7 +23,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->1銆佸垎绫绘ā鍧�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->1銆佸垎绫绘ā鍧�")
@RestController
@RequestMapping("/classify")
public class ClassifyController {
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
index 2e403fe..7849ec4 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
@@ -31,7 +31,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->3銆佽澶囩爜鐐�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->3銆佽澶囩爜鐐�")
@RestController
@RequestMapping("/equipment-point")
public class EquipmentPointController {
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
index 6a886ea..ad3e993 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
@@ -29,7 +29,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->2銆佷华鍣ㄦā鍧�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->2銆佷华鍣ㄦā鍧�")
@RestController
@RequestMapping("/instrument")
public class InstrumentController {
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
new file mode 100644
index 0000000..38e22ae
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
@@ -0,0 +1,42 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.yuanchu.limslaboratory.pojo.Instrument;
+import com.yuanchu.limslaboratory.pojo.MeteringPlan;
+import com.yuanchu.limslaboratory.service.MeteringPlanService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-27
+ */
+@Api(tags = "瀹為獙瀹�-->2銆佽閲忕鐞�")
+@RestController
+@RequestMapping("/metering-plan")
+public class MeteringPlanController {
+
+ @Autowired
+ private MeteringPlanService meteringPlanService;
+
+ @ApiOperation("娣诲姞璁￠噺璁″垝")
+ @PostMapping("/add")
+ public Result<?> addMeteringPlanInformation(@RequestBody MeteringPlan meteringPlan) {
+ Integer isInsertSuccess = meteringPlanService.addMeteringPlanInformation(meteringPlan);
+ if (isInsertSuccess == 1){
+ return Result.success("娣诲姞璁￠噺璁″垝鎴愬姛!");
+ }
+ return Result.fail("娣诲姞璁￠噺璁″垝澶辫触! ");
+ }
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
index a2f4c7c..a409b73 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
@@ -25,7 +25,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->4銆佽閲忎俊鎭�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->4銆佽閲忎俊鎭�")
@RestController
@RequestMapping("/metrical-information")
public class MetricalInformationController {
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MeteringPlanMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MeteringPlanMapper.java
new file mode 100644
index 0000000..06d0b84
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MeteringPlanMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.MeteringPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-27
+ */
+public interface MeteringPlanMapper extends BaseMapper<MeteringPlan> {
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MeteringPlan.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MeteringPlan.java
new file mode 100644
index 0000000..9bb3814
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MeteringPlan.java
@@ -0,0 +1,76 @@
+package com.yuanchu.limslaboratory.pojo;
+
+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;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="MeteringPlan瀵硅薄", description="")
+public class MeteringPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "Id涓婚敭", hidden = true)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "璁￠噺璐熻矗浜� 鍏宠仈鐢ㄦ埛琛�", example = "10", required = true)
+ private Integer measurePerson;
+
+ @ApiModelProperty(value = "鍒涘缓浜� 鍏宠仈鐢ㄦ埛琛�", example = "21", required = true)
+ @TableField("create_Person")
+ private Integer createPerson;
+
+ @ApiModelProperty(value = "璁″垝鍗曞彿", hidden = true)
+ private String plannedOrderNumber;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE_TIME)
+ @ApiModelProperty(value = "寮�濮嬫棩鏈�", example = "2023-07-06", required = true, dataType = "date")
+ private Date beginTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE_TIME)
+ @ApiModelProperty(value = "缁撴潫鏃ユ湡", example = "2023-07-06", required = true, dataType = "date")
+ private Date endTime;
+
+ @ApiModelProperty(value = "璁″垝鐘舵�侊細涓夌锛�1锛氬凡瀹屾垚锛�2锛氬緟鎻愪氦锛�3锛氭湭瀹屾垚", example = "1", required = true)
+ private Integer planningStatus;
+
+ @ApiModelProperty(value = "璁￠噺鍗曚綅", example = "GB")
+ private String unit;
+
+ @TableLogic(value = "1", delval = "0")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
+ private Integer state;
+
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ private Date createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "涔愯閿�", hidden = true)
+ private Integer version;
+
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java
new file mode 100644
index 0000000..a6ccc4c
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java
@@ -0,0 +1,17 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.MeteringPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-27
+ */
+public interface MeteringPlanService extends IService<MeteringPlan> {
+
+ Integer addMeteringPlanInformation(MeteringPlan meteringPlan);
+}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java
new file mode 100644
index 0000000..7befcaa
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java
@@ -0,0 +1,41 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.MeteringPlan;
+import com.yuanchu.limslaboratory.mapper.MeteringPlanMapper;
+import com.yuanchu.limslaboratory.service.MeteringPlanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.utils.MyUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-27
+ */
+@Service
+public class MeteringPlanServiceImpl extends ServiceImpl<MeteringPlanMapper, MeteringPlan> implements MeteringPlanService {
+
+ @Resource
+ private MeteringPlanMapper meteringPlanMapper;
+
+ @Override
+ public Integer addMeteringPlanInformation(MeteringPlan meteringPlan) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String format = simpleDateFormat.format(new Date());
+ String replace = format.replace("-", "");
+ MyUtil.PrintLog("P" + replace);
+ long num = RedisUtil.incr("num", 1);
+
+ MyUtil.PrintLog(String.valueOf(num));
+// return meteringPlanMapper.insert(meteringPlan);
+ return 1;
+ }
+}
diff --git a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
new file mode 100644
index 0000000..8011603
--- /dev/null
+++ b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.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.MeteringPlanMapper">
+
+</mapper>
diff --git a/laboratory-server/src/main/resources/mapper/pojoMapper.xml b/laboratory-server/src/main/resources/mapper/pojoMapper.xml
new file mode 100644
index 0000000..8011603
--- /dev/null
+++ b/laboratory-server/src/main/resources/mapper/pojoMapper.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.MeteringPlanMapper">
+
+</mapper>
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
index 15fcd8d..83e6236 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -120,7 +120,6 @@
if (!ObjectUtils.isEmpty(standardMaps)){
for (Map<String, Object> standardMap : standardMaps){
LambdaQueryWrapper<Specifications> specificationWrapper = new LambdaQueryWrapper<>();
- MyUtil.PrintLog(standardMap.get("id").toString());
specificationWrapper.eq(Specifications::getStandardId, standardMap.get("id"));
if (!ObjectUtils.isEmpty(specificationName)){
specificationWrapper.eq(Specifications::getName, specificationName);
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java b/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
index 83b89ac..e881ded 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
@@ -39,8 +39,7 @@
.setOpen(false) // 鏄惁鎵撳紑
.setSwagger2(true) //瀹炰綋灞炴�� Swagger2 娉ㄨВ
.setServiceName("%sService") // 璁剧疆serviceName鐨勫悕绉板幓澶у啓I
- .setFileOverride(Override)
- .setEntityName("pojo");// 鏄惁瑕嗙洊宸茬敓鎴愭枃浠�
+ .setFileOverride(Override);// 鏄惁瑕嗙洊宸茬敓鎴愭枃浠�
mpg.setGlobalConfig(gc);
// 鏁版嵁婧愰厤缃� 鏁版嵁搴撳悕 璐﹀彿瀵嗙爜
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
index 7efe309..37f1d72 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
@@ -8,6 +8,9 @@
@Test
void contextLoads() {
+ String newString = String.format("%06d", 77);
+ System.out.println("newString === " + newString);
+
}
}
--
Gitblit v1.9.3