From c9da1b0da1178911e383ddcaebecd1e088fa6004 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:37:07 +0800
Subject: [PATCH] 修改bug
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 1 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
index 367bd37..c3af267 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
@@ -1,10 +1,24 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.yuanchu.limslaboratory.entity.Instrument;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.UserMapper;
+import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.mapper.InstrumentMapper;
+import com.yuanchu.limslaboratory.pojo.User;
import com.yuanchu.limslaboratory.service.InstrumentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.utils.JsonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -17,4 +31,65 @@
@Service
public class InstrumentServiceImpl extends ServiceImpl<InstrumentMapper, Instrument> implements InstrumentService {
+ @Resource
+ private InstrumentMapper instrumentMapper;
+
+ @Resource
+ private UserMapper userMapper;
+
+ @Override
+ public Integer addInstrumentInformation(Instrument instrument) {
+ LambdaQueryWrapper<Instrument> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Instrument::getEquipmentCode, instrument.getEquipmentCode());
+ wrapper.eq(Instrument::getState, 1);
+ wrapper.select(Instrument::getEquipmentCode);
+ Instrument instrument1 = instrumentMapper.selectOne(wrapper);
+ if (ObjectUtils.isEmpty(instrument1)){
+ return instrumentMapper.insert(instrument);
+ }
+ return 0;
+ }
+
+ @Override
+ public Boolean deleteInstrumentInformation(String instrumentId) {
+ LambdaUpdateWrapper<Instrument> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Instrument::getId, instrumentId);
+ updateWrapper.set(Instrument::getState, 0);
+ int isUpdateSuccess = instrumentMapper.update(new Instrument(), updateWrapper);
+ return isUpdateSuccess > 0;
+ }
+
+ @Override
+ public IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions, Boolean whetherWhether, String numberOrNameOrSpecifications,
+ Integer classifyId, Page<Objects> page) {
+ return instrumentMapper.getListInstrumentInformation(conditions, whetherWhether, numberOrNameOrSpecifications, classifyId, page);
+ }
+
+ @Override
+ public Map<String, Object> getIdInstrumentInformation(Integer instrumentId) {
+ LambdaQueryWrapper<Instrument> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Instrument::getId, instrumentId);
+ Instrument instrument = instrumentMapper.selectOne(wrapper);
+ User user = userMapper.selectById(instrument.getUserId());
+ Map<String, Object> map = JsonUtil.jsonToPojo(JsonUtil.jsonToString(instrument), Map.class);
+ map.put("userName",user.getName());
+ return map;
+ }
+
+ @Override
+ public Integer updateEquipmentPointInformation(Instrument instrument) {
+ LambdaQueryWrapper<Instrument> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Instrument::getEquipmentCode, instrument.getEquipmentCode());
+ wrapper.eq(Instrument::getState, 1);
+ wrapper.select(Instrument::getEquipmentCode, Instrument::getId);
+ Instrument instrument1 = instrumentMapper.selectOne(wrapper);
+ if (ObjectUtils.isEmpty(instrument1)){
+ return instrumentMapper.updateById(instrument);
+ } else if (instrument.getId().equals(instrument1.getId())){
+ return instrumentMapper.updateById(instrument);
+ }
+ return 0;
+ }
+
+
}
--
Gitblit v1.9.3