From 262a25011e097ed8725c76ea56de175d66835442 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 8 Nov 2024 16:36:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=80=9F=E5=8A=9F=E7=8E=87=E6=9B=B2?=
 =?UTF-8?q?=E7=BA=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../das/common/interceptor/FilterConfig.java  |  3 +-
 .../TheoreticalPowerCurveServiceImpl.java     | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/das/src/main/java/com/das/common/interceptor/FilterConfig.java b/das/src/main/java/com/das/common/interceptor/FilterConfig.java
index b3e51d59..c7d55b72 100644
--- a/das/src/main/java/com/das/common/interceptor/FilterConfig.java
+++ b/das/src/main/java/com/das/common/interceptor/FilterConfig.java
@@ -22,7 +22,8 @@ public class FilterConfig {
         FilterRegistrationBean registrationBean = new FilterRegistrationBean();
         //注册过滤器
         registrationBean.setFilter(new DecryptingOncePerRequestFilter(aesProperties.getKey()));
-        registrationBean.addUrlPatterns("/api/*"); // 设置过滤器应用的URL模式
+//        registrationBean.addUrlPatterns("/api/*"); // 设置过滤器应用的URL模式
+        registrationBean.addUrlPatterns("/a/*"); // 设置过滤器应用的URL模式
         registrationBean.setOrder(2); // 设置过滤器的顺序
         return registrationBean;
     }
diff --git a/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java b/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java
index 856bddab..cb255df3 100644
--- a/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java
+++ b/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java
@@ -36,9 +36,16 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
 
     @Override
     public PageDataInfo<TheoreticalPowerCurveEntity> getAllCurves(PageQuery pageQuery) {
-        QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
-        Page<TheoreticalPowerCurveEntity> pageList = theoreticalPowerCurveMapper.selectPage(pageQuery.build(), queryWrapper);
-        return PageDataInfo.build(pageList.getRecords(), pageList.getTotal());
+        if (pageQuery.getPageNum() == null || pageQuery.getPageSize() == null){
+            QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
+            List<TheoreticalPowerCurveEntity> powerCurveEntityList = theoreticalPowerCurveMapper.selectList(queryWrapper);
+            return PageDataInfo.build(powerCurveEntityList, powerCurveEntityList.size());
+        }
+        else {
+            QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
+            Page<TheoreticalPowerCurveEntity> pageList = theoreticalPowerCurveMapper.selectPage(pageQuery.build(), queryWrapper);
+            return PageDataInfo.build(pageList.getRecords(), pageList.getTotal());
+        }
     }
 
     /**
@@ -61,6 +68,9 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
         theoreticalPowerCurveEntity.setCreatedBy(sysUserVo.getAccount());
         theoreticalPowerCurveEntity.setUpdatedBy(sysUserVo.getAccount());
         theoreticalPowerCurveEntity.setRevision(1);
+
+        //校验制造商规格型号
+        checkFactoryModelExsit(theoreticalPowerCurveEntity);
         theoreticalPowerCurveMapper.insert(theoreticalPowerCurveEntity);
         return theoreticalPowerCurveEntity;
     }
@@ -82,6 +92,9 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
         theoreticalPowerCurveEntity.setUpdatedTime(new Date());
         theoreticalPowerCurveEntity.setUpdatedBy(sysUserVo.getAccount());
         theoreticalPowerCurveEntity.setRevision(1);
+
+        //校验制造商规格型号
+        checkFactoryModelExsit(theoreticalPowerCurveEntity);
         theoreticalPowerCurveMapper.updateById(theoreticalPowerCurveEntity);
         return theoreticalPowerCurveEntity;
     }
@@ -137,6 +150,16 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
         return curveItemMapper.selectList(itemEntityQueryWrapper);
     }
 
+    private void checkFactoryModelExsit(TheoreticalPowerCurveEntity theoreticalPowerCurveEntity){
+        QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("madeinfactory",theoreticalPowerCurveEntity.getMadeinfactory());
+        queryWrapper.eq("model",theoreticalPowerCurveEntity.getModel());
+        TheoreticalPowerCurveEntity sameInfo = theoreticalPowerCurveMapper.selectOne(queryWrapper);
+        if (sameInfo != null){
+            throw new ServiceException("制造商规格型号已存在，请检查修改");
+        }
+    }
+
     public void batchProcessing(List<CurveItemEntity> curveItemList, Long parent){
         //先删除制造商数据
         QueryWrapper<CurveItemEntity> queryWrapper = new QueryWrapper<>();