From 7dcb6f8665db1334940dca300c4b83c6cd81373d Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 23 四月 2024 15:00:44 +0800
Subject: [PATCH] 2024-04-23 印章后端关联实验室
---
cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java | 3 +
system-run/src/main/resources/application-dev.yml | 2
cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java | 8 ++-
cnas-server/src/main/resources/mapper/SealMapper.xml | 13 +++---
cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java | 15 +++++--
cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java | 7 ++-
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 1
system-run/src/main/resources/application.yml | 2
cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java | 8 +++
cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 5 ++
10 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 315c89e..d4ca573 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -126,6 +126,5 @@
public Result selectDeviceByCategory(String category) {
return Result.success(deviceService.selectDeviceByCategory(category));
}
-
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index d6ff7a8..fbcae21 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -12,6 +12,9 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.annotation.Resources;
import java.util.Map;
/**
@@ -25,7 +28,7 @@
@Value("${file.path}")
private String filePath;
-
+ @Resource
private LaboratoryService laboratoryService;
@ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
index d406559..3fccae6 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
import com.yuanchu.mom.service.SealService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -10,6 +11,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
/**
@@ -32,7 +34,15 @@
@ApiOperation(value = "娣诲姞鍗扮珷鍙傛暟")
@PostMapping("/addSeal")
public Result addSeal(@RequestBody Seal seal) {
- return Result.success(sealService.addSeal(seal));
+ int i = sealService.addSeal(seal);
+ if(i>0){
+ Integer labId = seal.getLabId();
+ List<Laboratory> laboratory = sealService.Laboratory(labId);
+ return Result.success(laboratory);
+ }else{
+ return Result.fail();
+ }
+
}
@ApiOperation(value = "淇敼鍗扮珷鍙傛暟")
@PostMapping("/upSeal")
@@ -42,11 +52,8 @@
@ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
@PostMapping("/selectSeal")
public Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
- //鑾峰彇褰撳墠椤垫暟
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- //鑾峰彇褰撳墠鍗扮珷淇℃伅
Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
- //鑾峰彇鍒嗛〉鏁版嵁
return Result.success(sealService.selectSeal(page,seal));
}
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
index fd6f001..7577a20 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
@@ -6,8 +6,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Certification;
+import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
+import java.util.List;
+import java.util.Map;
+
public interface SealMapper extends BaseMapper<Seal> {
- IPage<Seal> selectSeal(Page page, QueryWrapper<Seal> ew);
+ IPage<Seal>selectSeal(Page page, QueryWrapper<Seal> ew);
+ List<Laboratory> selectLaboratory (Integer labId);
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
index 8154dec..07e7d1a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
@@ -20,9 +20,11 @@
@ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
-
+ @ValueTableShow(1)
+ @ApiModelProperty(value = "瀹為獙瀹d")
+ private Integer labId;
@ValueTableShow(2)
- @ApiModelProperty(value = "鍗扮珷鍦板潃")
+ @ApiModelProperty(value = "鍗扮珷鍥剧墖")
private String address;
@ValueTableShow(3)
@@ -38,5 +40,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
index fc4cd75..df66ac6 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
@@ -6,6 +6,7 @@
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
+import java.util.List;
import java.util.Map;
public interface SealService extends IService<Seal> {
@@ -19,5 +20,7 @@
//鏌ヨ
Map<String, Object> selectSeal(Page page, Seal seal);
+ List<Laboratory> Laboratory(Integer id);
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
index 589a578..390fbf7 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service
@@ -42,9 +43,10 @@
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(Seal.class));
map.put("body", sealMapper.selectSeal(page, QueryWrappers.queryWrappers(seal)));
- System.out.println(page);
return map;
}
-
-
+ @Override
+ public List<Laboratory> Laboratory(Integer labId) {
+ return sealMapper.selectLaboratory(labId);
+ }
}
diff --git a/cnas-server/src/main/resources/mapper/SealMapper.xml b/cnas-server/src/main/resources/mapper/SealMapper.xml
index 0ae0d6e..c1e4380 100644
--- a/cnas-server/src/main/resources/mapper/SealMapper.xml
+++ b/cnas-server/src/main/resources/mapper/SealMapper.xml
@@ -3,14 +3,15 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SealMapper">
- <select id="selectSeal" resultType="com.yuanchu.mom.mapper.SealMapper">
- select s.address,s.type,u.`name`,s.create_time
- from seal s
- LEFT JOIN `user` u
- on s.create_user=u.id
+ <select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
+ select * from seal
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
-
+ <select id="selectLaboratory" resultType="com.yuanchu.mom.pojo.Laboratory">
+ SELECT *
+ from laboratory
+ WHERE id =#{labId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 87cdec8..8436085 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -67,7 +67,7 @@
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
- password: null
+ password: 123456
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
timeout: 50
# redis杩炴帴姹犻厤缃�
diff --git a/system-run/src/main/resources/application.yml b/system-run/src/main/resources/application.yml
index cfbe348..648b09f 100644
--- a/system-run/src/main/resources/application.yml
+++ b/system-run/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8002
+ port: 8001
spring:
profiles:
active: dev
--
Gitblit v1.9.3