From 59ae18f04a602bdfdc91299bbe2ff74a2ae1d215 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 13:56:43 +0800
Subject: [PATCH] 改动2.0
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java | 6 -
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java | 48 ++++++++++++---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 14 ++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java | 18 ++++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java | 13 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 8 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java | 6 -
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java | 8 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java | 10 ++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ProjectNumVo.java | 4
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 17 +++++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java | 5 -
12 files changed, 110 insertions(+), 47 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
index 04a96f4..a274678 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
@@ -1,19 +1,18 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.ProjectNum;
+import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
import com.yuanchu.limslaboratory.service.HomeService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* 棣栭〉
@@ -31,7 +30,14 @@
@ApiOperation("璁＄畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺鎺ュ彛")
@GetMapping("/checkProjectNum")
public Result checkProjectNum() {
- ProjectNum projectNum=homeService.checkProjectNum();
- return Result.success(projectNum);
+ ProjectNumVo projectNumVo =homeService.checkProjectNum();
+ return Result.success(projectNumVo);
+ }
+
+ @ApiOperation("宸叉楠宼op3")
+ @GetMapping("/checktop3")
+ public Result checktop3() {
+ List<Map<String, Object>> checktop3s =homeService.checktop3();
+ return Result.success(checktop3s);
}
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
index 5ae9960..0613f0d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Inspection;
+
+import java.util.List;
import java.util.Map;
/**
@@ -28,5 +30,11 @@
//璁＄畻鏈楠岀殑鏁伴噺
Integer seleCountUnIns();
+
+ //鑾峰彇妫�楠屽崟鎬绘暟
+ Integer getcount();
+
+ //鑾峰彇妫�楠岀粨璁�,妫�楠屾暟閲�
+ List<Map<String, Object>> getResultNum();
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProjectNum.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ProjectNumVo.java
similarity index 79%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProjectNum.java
rename to inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ProjectNumVo.java
index 3f9c2e1..5c17ac3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProjectNum.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ProjectNumVo.java
@@ -1,9 +1,9 @@
-package com.yuanchu.limslaboratory.pojo;
+package com.yuanchu.limslaboratory.pojo.vo;
import lombok.Data;
@Data
-public class ProjectNum {
+public class ProjectNumVo {
private int insNum; //宸叉楠岀殑妫�楠屽崟鏁伴噺
private int insUnNum; //鏈楠岀殑妫�楠屽崟鏁伴噺
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
index beb6b24..e6ff068 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
@@ -1,6 +1,9 @@
package com.yuanchu.limslaboratory.service;
-import com.yuanchu.limslaboratory.pojo.ProjectNum;
+import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
+
+import java.util.List;
+import java.util.Map;
public interface HomeService {
@@ -8,6 +11,12 @@
* 璁＄畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺鎺ュ彛
* @return
*/
- ProjectNum checkProjectNum();
+ ProjectNumVo checkProjectNum();
+
+ /**
+ * 宸叉楠宼op3
+ * @return
+ */
+ List<Map<String, Object>> checktop3();
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
index e08a03e..e105696 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
@@ -1,14 +1,15 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductMapper;
-import com.yuanchu.limslaboratory.pojo.Inspection;
-import com.yuanchu.limslaboratory.pojo.ProjectNum;
+import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
import com.yuanchu.limslaboratory.service.HomeService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
@Service
@@ -23,16 +24,43 @@
//璁＄畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺鎺ュ彛
@Override
- public ProjectNum checkProjectNum() {
- ProjectNum projectNum = new ProjectNum();
+ public ProjectNumVo checkProjectNum() {
+ ProjectNumVo projectNumVo = new ProjectNumVo();
//宸叉楠岀殑妫�楠屽崟鏁伴噺
- projectNum.setInsNum(inspectionMapper.seleCountIns());
+ projectNumVo.setInsNum(inspectionMapper.seleCountIns());
//鏈楠岀殑妫�楠屽崟鏁伴噺
- projectNum.setInsUnNum(inspectionMapper.seleCountUnIns());
+ projectNumVo.setInsUnNum(inspectionMapper.seleCountUnIns());
//宸叉楠岀殑妫�楠岄」鐩暟閲�
- projectNum.setInsproNum(inspectionProductMapper.seleCountInspro());
+ projectNumVo.setInsproNum(inspectionProductMapper.seleCountInspro());
//鏈楠岀殑妫�楠岄」鐩暟閲�
- projectNum.setInsproUnNum(inspectionProductMapper.seleCountUnInspro());
- return projectNum;
+ projectNumVo.setInsproUnNum(inspectionProductMapper.seleCountUnInspro());
+ return projectNumVo;
+ }
+
+ //宸叉楠宼op3
+ @Override
+ public List<Map<String, Object>> checktop3() {
+ //鑾峰彇妫�楠屽崟鎬绘暟
+ Integer allIns = inspectionMapper.getcount();
+ //妫�楠岀粨璁�,妫�楠屾暟閲�
+ List<Map<String, Object>> mapList = inspectionMapper.getResultNum();
+ for (Map<String, Object> map : mapList) {
+ //閬嶅巻鑾峰彇鏁伴噺
+ Long num = (Long) map.get("num");
+ //璁＄畻鐧惧垎姣斿苟瀛樺叆map涓�
+ map.put("chact",getRadio(allIns,num));
+ }
+ return mapList;
+ }
+
+ /*璁＄畻鐧惧垎姣�*/
+ private BigDecimal getRadio(Integer all, Long num) {
+ if (all.intValue() == 0) {
+ return new BigDecimal(0);
+ }
+ BigDecimal numBigDecimal = new BigDecimal(num);
+ BigDecimal allBigDecimal = new BigDecimal(all);
+ BigDecimal divide = numBigDecimal.divide(allBigDecimal, 4, BigDecimal.ROUND_HALF_UP);
+ return divide.multiply(new BigDecimal(100));
}
}
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index 5314b40..d324cf1 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -42,4 +42,21 @@
where state = 1
and inspection_status is null
</select>
+
+ <!--鑾峰彇妫�楠屽崟鎬绘暟-->
+ <select id="getcount" resultType="java.lang.Integer">
+ select count(id)
+ from lims_laboratory.inspection
+ where state = 1
+ </select>
+
+ <!--妫�楠岀粨璁�,妫�楠屾暟閲�-->
+ <select id="getResultNum" resultType="java.util.Map">
+ select inspection_status result,
+ count(id) num
+ from lims_laboratory.inspection
+ where state=1
+ group by result
+ order by num desc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
index 15fa65e..f5cf461 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
@@ -33,11 +33,7 @@
@Autowired
private ProductModelService productModelService;
- @ApiOperation(value = "閫夋嫨鏍峰搧鍚嶇О")
- @GetMapping("/selectmater")
- public Result selectmater() {
- return Result.success(productModelService.selectmater());
- }
+
@ApiOperation(value = "娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍")
@GetMapping("/selectfather")
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java
index 144d1bf..f34e701 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java
@@ -17,11 +17,7 @@
*/
public interface ProductModelService extends IService<ProductModel> {
- /**
- * 閫夋嫨鏍峰搧鍚嶇О
- * @return
- */
- List<String> selectmater();
+
/**
* 娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍
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 3169392..1c66d67 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
@@ -1,10 +1,9 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
@@ -17,14 +16,11 @@
import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.service.SpecificationsService;
import com.yuanchu.limslaboratory.service.StandardService;
-import com.yuanchu.limslaboratory.utils.MyUtil;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -106,8 +102,12 @@
List<Product> productList = productModel.stream().map(stringObjectMap -> {
Product product = new Product();
product.setName(stringObjectMap.get("name").toString());
- product.setFather(stringObjectMap.get("father").toString());
- product.setUnit(stringObjectMap.get("unit").toString());
+ if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
+ product.setFather(stringObjectMap.get("father").toString());
+ }
+ if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
+ product.setUnit(stringObjectMap.get("unit").toString());
+ }
product.setSpecifications_id(specifications.getId());
return product;
}).collect(Collectors.toList());
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
index a42754d..3aca4c6 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
@@ -28,11 +28,6 @@
@Resource
ProductModelMapper productModelMapper;
- //閫夋嫨鏍峰搧
- @Override
- public List<String> selectmater() {
- return productModelMapper.selectmater();
- }
//娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍
@Override
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
index d318960..d6a5bd6 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.Specifications;
@@ -14,7 +15,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -87,8 +87,12 @@
List<Product> productList = productModel.stream().map(stringObjectMap -> {
Product product = new Product();
product.setName(stringObjectMap.get("name").toString());
- product.setFather(stringObjectMap.get("father").toString());
- product.setUnit(stringObjectMap.get("unit").toString());
+ if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
+ product.setFather(stringObjectMap.get("father").toString());
+ }
+ if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
+ product.setUnit(stringObjectMap.get("unit").toString());
+ }
product.setSpecifications_id(specifications.getId());
return product;
}).collect(Collectors.toList());
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java
index 9c7ab92..479ea03 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java
@@ -107,8 +107,12 @@
List<Product> productList = productModel.stream().map(stringObjectMap -> {
Product product = new Product();
product.setName(stringObjectMap.get("name").toString());
- product.setFather(stringObjectMap.get("father").toString());
- product.setUnit(stringObjectMap.get("unit").toString());
+ if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
+ product.setFather(stringObjectMap.get("father").toString());
+ }
+ if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
+ product.setUnit(stringObjectMap.get("unit").toString());
+ }
product.setSpecifications_id(specifications.getId());
return product;
}).collect(Collectors.toList());
--
Gitblit v1.9.3