From 5a31b2ea65bc435ae8a57f5a692fc71685e990ad Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期四, 12 五月 2022 10:51:29 +0800
Subject: [PATCH] 提交代码
---
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java | 6 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SgIpcController.java | 17 +++++++++++++++++
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java | 14 ++++++++++++++
3 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SgIpcController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SgIpcController.java
index dca1bf2..37eaf43 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SgIpcController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SgIpcController.java
@@ -4,7 +4,11 @@
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.DataDictClass;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.oa.domain.SgIpc;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -80,6 +84,19 @@
}
/**
+ * 鑾峰彇ipc璁惧璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇ipc璁惧璇︾粏淇℃伅")
+ @GetMapping("/copy")
+ public AjaxResult copy() {
+ List<SgIpc> list = iSgIpcService.list(new LambdaQueryWrapper<SgIpc>().orderByDesc(SgIpc::getUpdateTime));
+ if (list.size() == 0) {
+ throw new ServiceException("鏆傛棤鏁版嵁", HttpStatus.HTTP_PARTIAL);
+ }
+ return AjaxResult.success(list.get(0));
+ }
+
+ /**
* 鏂板ipc璁惧
*/
@ApiOperation("鏂板ipc璁惧")
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java
index e3ab457..47c6461 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java
@@ -2,6 +2,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.Dict;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import io.swagger.annotations.ApiModel;
@@ -46,6 +47,7 @@
*/
@ExcelProperty(value = "閫氶亾")
@ApiModelProperty("閫氶亾")
+ @Dict(dicCode = "DICT109")
private String passageway;
/**
@@ -95,6 +97,7 @@
*/
@ExcelProperty(value = "寤虹瓚鍗曞厓")
@ApiModelProperty("寤虹瓚鍗曞厓")
+ @Dict(dictTable = "bs_building", dicCode = "id", dicText = "detailed_name")
private Long buildingId;
/**
@@ -102,6 +105,7 @@
*/
@ExcelProperty(value = "鎵�灞炴満鏋�")
@ApiModelProperty("鎵�灞炴満鏋�")
+ @Dict(dictTable = "bs_organization", dicCode = "id", dicText = "detailed_name")
private Long organizationId;
/**
@@ -109,6 +113,7 @@
*/
@ExcelProperty(value = "鏂藉伐鎵规")
@ApiModelProperty("鏂藉伐鎵规")
+ @Dict(dictTable = "sg_construction_batch", dicCode = "id", dicText = "batch")
private Long constructionBatchId;
/**
@@ -130,6 +135,7 @@
*/
@ExcelProperty(value = "鐢熶骇鍘傚晢")
@ApiModelProperty("鐢熶骇鍘傚晢")
+ @Dict(dictTable = "dev_manufacturer", dicCode = "id", dicText = "name")
private Long manufacturerId;
/**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java
index 98b5d91..16bf05f 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java
@@ -7,6 +7,9 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.oa.domain.SgNvr;
+import com.ruoyi.oa.mapper.SgNvrMapper;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,6 +32,9 @@
*/
@Service
public class SgIpcServiceImpl extends ServicePlusImpl<SgIpcMapper, SgIpc, SgIpcVo> implements ISgIpcService {
+
+ @Autowired
+ private SgNvrMapper nvrMapper;
@Override
public SgIpcVo queryById(Long id) {
@@ -65,6 +71,10 @@
if (list.size() > 0) {
throw new ServiceException("MAC閲嶅", HttpStatus.HTTP_PARTIAL);
}
+ SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
+ if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
+ throw new ServiceException("IPC鎵�灞炲崟浣嶄笌鎵�閫塏VR鎵�灞炲崟浣嶄笉绗�", HttpStatus.HTTP_PARTIAL);
+ }
SgIpc add = BeanUtil.toBean(bo, SgIpc.class);
validEntityBeforeSave(add);
boolean flag = save(add);
@@ -83,6 +93,10 @@
if (list.size() > 0) {
throw new ServiceException("MAC閲嶅", HttpStatus.HTTP_PARTIAL);
}
+ SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
+ if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
+ throw new ServiceException("IPC鎵�灞炲崟浣嶄笌鎵�閫塏VR鎵�灞炲崟浣嶄笉绗�", HttpStatus.HTTP_PARTIAL);
+ }
SgIpc update = BeanUtil.toBean(bo, SgIpc.class);
validEntityBeforeSave(update);
return updateById(update);
--
Gitblit v1.9.1