From 527cbd85e37842d93d081f33916dca5c6f7156e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 09:53:58 +0800
Subject: [PATCH] 修改 9.22
---
base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java | 78 +++++++++++----------------------------
1 files changed, 22 insertions(+), 56 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
index 5f408c8..92b5905 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
@@ -1,25 +1,19 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.*;
-import com.yuanchu.mom.pojo.ElementTechnology;
import com.yuanchu.mom.pojo.TechnologyTemplate;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
-import com.yuanchu.mom.service.ElementTechnologyService;
import com.yuanchu.mom.service.TechnologyTemplateService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* 宸ヨ壓璺嚎缁存姢琛�(TechnologyTemplate)琛ㄦ湇鍔″疄鐜扮被
@@ -37,16 +31,7 @@
DeviceMapper deviceMapper;
@Resource
- ElementMapper elementMapper;
-
- @Resource
- ElementTechnologyService elementTechnologyService;
-
- @Resource
TechnicalModelMapper technicalModelMapper;
-
- @Resource
- TechniqueModelMapper techniqueModelMapper;
@Resource
SelfcheckModelMapper selfcheckModelMapper;
@@ -58,7 +43,13 @@
MbomModelMapper mbomModelMapper;
- //鏂板宸ヨ壓璺嚎-->閫夋嫨璁惧缁�
+ //鏂板宸ヨ壓璺嚎-->閫夋嫨绫诲瀷
+ @Override
+ public List<String> chooseType() {
+ return technologyTemplateMapper.chooseType();
+ }
+
+ //鏂板宸ヨ壓璺嚎-->閫夋嫨鐢熶骇璁惧缁�
@Override
public List<Map<String, Object>> chooseDevGroup() {
return deviceMapper.chooseDevGroup();
@@ -66,42 +57,37 @@
//鏂板宸ヨ壓璺嚎-->閫夋嫨宸ュ簭
@Override
- public List<String> chooseTech(Integer type) {
+ public List<String> chooseTech(String type) {
return technologyTemplateMapper.chooseTech(type);
}
- //鏂板宸ヨ壓璺嚎-->閫夋嫨鍏冧欢
- @Override
- public List<Map<String, Object>> chooseElement() {
- return elementMapper.chooseElement();
- }
//鏂板宸ヨ壓璺嚎
@Override
@Transactional(rollbackFor = Exception.class)
- public void addTechTemp(TechnologyTemplateDto technologyTemplateDto) {
+ public String addTechTemp(TechnologyTemplateDto technologyTemplateDto) {
+ /*鏍￠獙鏄惁娣诲姞閲嶅*/
+ if (ObjectUtils.isNotEmpty(technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query()
+ .eq("type", technologyTemplateDto.getType())
+ .eq("state", 1)
+ .eq("father", technologyTemplateDto.getFather())
+ .eq("name", technologyTemplateDto.getName())))) {
+ return "閲嶅娣诲姞!";
+ }
/*鏂板宸ヨ壓*/
TechnologyTemplate technologyTemplate = new TechnologyTemplate();
BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
technologyTemplateMapper.insert(technologyTemplate);
- /*鏂板宸ヨ壓鍏冧欢涓棿琛�*/
- String[] split = technologyTemplateDto.getElementId().split(",");
- List<ElementTechnology> elementTechnologies = Arrays.stream(split).map(s -> {
- ElementTechnology elementTechnology = new ElementTechnology();
- elementTechnology.setTechTemId(technologyTemplate.getId());
- elementTechnology.setElementId(Integer.parseInt(s));
- return elementTechnology;
- }).collect(Collectors.toList());
- elementTechnologyService.saveBatch(elementTechnologies);
+ return "娣诲姞鎴愬姛!";
}
- //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟浜岀骇灞曠ず
+ //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟涓�绾у睍绀�
@Override
- public List<Map<String, Object>> selectAllTechTem(Integer type, String message) {
+ public List<Map<String, Object>> selectAllTechTem(String type, String message) {
return technologyTemplateMapper.selectAllTechTem(type, message);
}
- //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->鍙宠竟灞曠ず宸ヨ壓鍜岃澶�
+ //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->鍙宠竟灞曠ず宸ヨ壓鍜岃澶囧拰鍏冧欢
@Override
public List<Map<String, Object>> selectAllTechNam(String father) {
return technologyTemplateMapper.selectAllTechNam(father);
@@ -122,18 +108,6 @@
BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
technologyTemplate.setId(id);
technologyTemplateMapper.updateById(technologyTemplate);
- /*鏇存敼涓棿琛�*/
- //鎵归噺鍒犻櫎鍘熸湁鐨勪腑闂磋〃(鏍规嵁宸ュ簭id)
- elementTechnologyService.delElemaByTechsId(id);
- //鎵归噺娣诲姞涓棿琛�
- String[] split = technologyTemplateDto.getElementId().split(",");
- List<ElementTechnology> elementTechnologies = Arrays.stream(split).map(s -> {
- ElementTechnology elementTechnology = new ElementTechnology();
- elementTechnology.setTechTemId(technologyTemplate.getId());
- elementTechnology.setElementId(Integer.parseInt(s));
- return elementTechnology;
- }).collect(Collectors.toList());
- elementTechnologyService.saveBatch(elementTechnologies);
}
//鍒犻櫎(宸ヨ壓璺嚎id)
@@ -144,12 +118,8 @@
TechnologyTemplate technologyTemplate = new TechnologyTemplate();
technologyTemplate.setId(id).setState(0);
technologyTemplateMapper.updateById(technologyTemplate);
- //鍒犻櫎涓棿琛�
- elementTechnologyService.delElemaByTechsId(id);
//鍒犻櫎鎶�鏈寚鏍囩淮鎶よ〃
technicalModelMapper.delTeMoByTechId(id);
- //鍒犻櫎鐢熶骇宸ヨ壓缁存姢琛�
- techniqueModelMapper.delQueByTechId(id);
//鍒犻櫎鑷椤圭洰缁存姢琛�
selfcheckModelMapper.delSelfByTechId(id);
//鍒犻櫎璁板綍鍐呭缁存姢琛�
@@ -164,12 +134,8 @@
public void delAllTech(String ids) {
//鎵归噺鍒犻櫎宸ヨ壓琛�
technologyTemplateMapper.delAllTech(ids);
- //鎵归噺鍒犻櫎涓棿琛�
- elementTechnologyService.delAllByTechId(ids);
//鎵归噺鍒犻櫎鎸囨爣缁存姢琛�
technicalModelMapper.delAllByTechId(ids);
- //鎵归噺鍒犻櫎鐢熶骇宸ヨ壓缁存姢琛�
- techniqueModelMapper.delAllByTechId(ids);
//鎵归噺鍒犻櫎鑷椤圭洰缁存姢琛�
selfcheckModelMapper.delAllByTechId(ids);
//鎵归噺鍒犻櫎璁板綍鍐呭缁存姢琛�
--
Gitblit v1.9.3