From e0b71ec3eac62ec7fa29d2da74bff7712b8ae39d Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 03 三月 2025 17:56:17 +0800
Subject: [PATCH] 代码迁移bug解决
---
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java | 8 ++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 3 +
basic-server/src/main/resources/mapper/StandardTemplateMapper.xml | 4 ++
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java | 5 ++
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java | 2 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java | 3 -
ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java | 3 +
cnas-manage/src/main/java/com/ruoyi/manage/excel/ManageDocumentListListener.java | 29 +++++++++++++-
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 3 +
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserVo.java | 12 ++++++
11 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
index 175aa97..5c2bd2b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
@@ -25,6 +25,14 @@
* @return
*/
String selectCompressThing(@Param("templateId") Integer templateId);
+
+ /**
+ * 缁戝畾璇ユā鏉挎楠岄」鍙傛暟缁熻
+ *
+ * @param templateId
+ * @return
+ */
+ int countBindTemplateItemParameter(@Param("templateId") Integer templateId);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
index c96a957..5278795 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
@@ -66,6 +66,11 @@
@Override
public int delStandardTemplate(Integer id) {
+ // 鍒ゆ柇鏄惁琚粦瀹�
+ int count = standardTemplateMapper.countBindTemplateItemParameter(id);
+ if (count > 0) {
+ throw new RuntimeException("璇ユā鏉垮凡缁戝畾妫�楠岄」鐩弬鏁帮紝绂佹鍒犻櫎");
+ }
return standardTemplateMapper.deleteById(id);
}
diff --git a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
index 34a8b0e..dbf9d94 100644
--- a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
@@ -36,5 +36,9 @@
WHERE id = #{templateId}
</select>
+ <select id="countBindTemplateItemParameter">
+ SELECT COUNT(*) FROM structure_item_parameter WHERE template_id = #{templateId}
+ </select>
+
</mapper>
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
index 91851f3..b480c4f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
@@ -1,6 +1,7 @@
package com.ruoyi.manage.controller;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.read.builder.ExcelReaderBuilder;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,6 +66,7 @@
@PostMapping("/exportManageDocumentList")
public Result exportManageDocumentList(MultipartFile file) {
try {
+ // 琛ㄥご鏍￠獙妯℃澘鏄惁姝ｇ‘
EasyExcel.read(file.getInputStream(), ManageDocumentList.class, new ManageDocumentListListener(manageDocumentListService)).sheet().doRead();
} catch (IOException e) {
e.printStackTrace();
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/excel/ManageDocumentListListener.java b/cnas-manage/src/main/java/com/ruoyi/manage/excel/ManageDocumentListListener.java
index 389b6b6..362fee6 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/excel/ManageDocumentListListener.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/excel/ManageDocumentListListener.java
@@ -2,12 +2,13 @@
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.manage.pojo.ManageDocumentList;
import com.ruoyi.manage.service.ManageDocumentListService;
import lombok.Data;
+import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
@Data
public class ManageDocumentListListener extends AnalysisEventListener<ManageDocumentList> {
@@ -31,7 +32,29 @@
@Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
- save();
+ int size = list.size();
+ if(size == 0){
+ throw new BaseException("瀵煎叆鏁版嵁涓嶅緱涓虹┖");
+ }else {
+ save();
+ }
+ }
+
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ // 鑾峰彇琛ㄥご淇℃伅
+ if(CollectionUtils.isEmpty(headMap) || headMap.size() != 8){
+ throw new RuntimeException("瀵煎叆妯℃澘鏈夎");
+ }
+ List<String> colums = Arrays.asList(
+ "搴忓彿", "鏂囦欢缂栧彿", "绫诲埆", "鍚嶇О",
+ "鏂囦欢鐗堟湰", "浣滆��", "鐢熸晥鏃ユ湡", "鏂囦欢鐘舵��"
+ );
+ for (int i = 0; i < colums.size(); i++) {
+ if(!headMap.get(i).equals(colums.get(i))){
+ throw new BaseException("瀵煎叆妯℃澘鏈夎");
+ }
+ }
}
private void save() {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
index e5f795a..eb50fe3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
@@ -96,8 +96,5 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "閮ㄩ棬id")
- private Long departId;
-
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserVo.java
new file mode 100644
index 0000000..a32cff0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserVo.java
@@ -0,0 +1,12 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.common.core.domain.entity.User;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserVo extends User {
+
+ @ApiModelProperty(value = "閮ㄩ棬id")
+ private Long departId;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
index f0dc2b3..b5d0ddb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.system.domain.vo.UserVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -43,6 +44,6 @@
* @param userId
* @return
*/
- User getUserNow(@Param("userId") int userId);
+ UserVo getUserNow(@Param("userId") int userId);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
index b75fdb4..c0d0abe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.system.domain.vo.UserVo;
import java.util.List;
@@ -26,7 +27,7 @@
* 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
* @return
*/
- User getUserNow();
+ UserVo getUserNow();
/**
* 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
index cc655fc..f98f967 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.vo.UserVo;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.UserService;
import org.springframework.stereotype.Service;
@@ -38,7 +39,7 @@
* @return
*/
@Override
- public User getUserNow() {
+ public UserVo getUserNow() {
return baseMapper.getUserNow(SecurityUtils.getUserId().intValue());
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 6487371..922251a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -49,7 +49,7 @@
</select>
<!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 -->
- <select id="getUserNow" resultType="com.ruoyi.common.core.domain.entity.User">
+ <select id="getUserNow" resultType="com.ruoyi.system.domain.vo.UserVo">
select u.id,
c.company,
u.name,
--
Gitblit v1.9.3