代码格式调整

src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java

@@ -78,9 +78,9 @@ public class WaterQualityController {
 
     @Operation(summary = "水质监测数据导入")
     @PostMapping("/import")
-    public R<String> importExcel(@RequestParam("file") MultipartFile file) {
+    public R<Boolean> importExcel(@RequestParam("file") MultipartFile file) {
         if (file.isEmpty()) {
-            return R.error(400, "请选择上传文件");
+            return R.error(400, "请选择上传文件",false);
         }
 
         try {
@@ -89,7 +89,7 @@ public class WaterQualityController {
 
         } catch (IOException e) {
 
-            return R.error(500, "文件上传失败: " + e.getMessage());
+            return R.error(500, "文件上传失败: " + e.getMessage(),false);
 
         }
     }

src/main/java/com/gunshi/project/xyt/service/WaterQualityService.java

@@ -22,13 +22,13 @@ public interface WaterQualityService {
 
     void export(WaterQualityPageSo waterQualityPageSo, HttpServletResponse response);
 
-    String importExcel(MultipartFile file) throws IOException;
+    Boolean importExcel(MultipartFile file) throws IOException;
 
-    String add(StWaterQualityR stWaterQualityR);
+    Boolean add(StWaterQualityR stWaterQualityR);
 
-    String addList(List<StWaterQualityR> stWaterQualityRList);
+    Boolean addList(List<StWaterQualityR> stWaterQualityRList);
 
-    String update(StWaterQualityR StWaterQualityR);
+//    String update(StWaterQualityR StWaterQualityR);
 
-    String delete(String id);
+//    String delete(String id);
 }

src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java

@@ -28,8 +28,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * Description:
  * Created by xusan on 2023/1/23.
@@ -67,6 +65,7 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
 
 
         return super.page(pageQueryCriteria.getPageSo().toPage(), query);
+
     }
 
     /**
@@ -121,18 +120,15 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
     }
 
     @Override
-    public String importExcel(MultipartFile file) throws IOException {
+    public Boolean importExcel(MultipartFile file) throws IOException {
 
         // 创建一个用于存储数据的List
         List<StWaterQualityR> data = new ArrayList<>();
 
         EasyExcel.read(file.getInputStream(), StWaterQualityR.class, new PageReadListener<StWaterQualityR>(data::addAll)).sheet().doRead();
 
-        for (StWaterQualityR o : data) {
-            o.setId(null);
-        }
-
         return this.addList(data);
+
     }
 
 
@@ -142,41 +138,60 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
          * @param o 水质
          */
     @Override
-    public String add(StWaterQualityR o) {
+    public Boolean add(StWaterQualityR o) {
-        return this.save(o) ? "成功":"失败";
+        // 排除id
+        o.setId(null);
+
+        // 判断 站码和时间是否重复
+        final LambdaQueryWrapper<StWaterQualityR> queryWrapper = Wrappers.lambdaQuery();
+
+        queryWrapper.eq(StWaterQualityR::getStcd,o.getStcd())
+                .eq(StWaterQualityR::getSpt,o.getSpt());
+
+        if (this.count(queryWrapper) > 0) {
+
+            log.info("站码和采样时间重复 {}", String.format("%s", o));
+
+            throw new IllegalArgumentException("站码和采样时间必须唯一");
+
+        }
+
+        return this.save(o);
+
     }
 
     @Override
-    public String addList(List<StWaterQualityR> stWaterQualityRList) {
+    public Boolean addList(List<StWaterQualityR> stWaterQualityRList) {
         try {
             for (StWaterQualityR o : stWaterQualityRList) {
                 this.add(o);
             }
         }catch (Exception e) {
-            return "失败";
+            return false;
         }
-        return "成功";
+        return true;
 
 //        return this.saveBatch(stWaterQualityRList) ? "成功":"失败";
+
     }
 
-    /**
+//    /**
-     * 修改水质
+//     * 修改水质
-     *
+//     *
-     * @param o 水质
+//     * @param o 水质
-     */
+//     */
-    @Override
+//    @Override
-    public String update(StWaterQualityR o) {
+//    public String update(StWaterQualityR o) {
-        return this.updateById(o) ? "成功":"失败";
+//        return this.updateById(o) ? "成功":"失败";
-    }
+//    }
-
+//
-    /**
+//    /**
-     * 删除水质
+//     * 删除水质
-     *
+//     *
-     * @param id id
+//     * @param id id
-     */
+//     */
-    @Override
+//    @Override
-    public String delete(String id) {
+//    public String delete(String id) {
-        return this.removeById(id) ? "成功":"失败";
+//        return this.removeById(id) ? "成功":"失败";
-    }
+//    }
 }