电力汇总-代码优化（3）

ruoyi-wages/src/main/java/com/ruoyi/system/controller/PowerWagesController.java

@@ -22,30 +22,16 @@ import java.util.List;
 @RequiredArgsConstructor
 public class PowerWagesController {
     private final PowerWagesService powerWagesService;
-
-    /**
-     * 返回前端所需要的数据
-     * @param mineId
-     * @param date
-     * @return 前端所需要的数据
-     */
-    @GetMapping
-    public AjaxResult list(@RequestParam("mineId") String mineId,
-                           @RequestParam("date") String date)  {
-        List<PowerVo> data = powerWagesService.selectByMineIdAndDate(mineId,date);
-        return AjaxResult.success(data);
-    }
-
-
     /**
      * 唐山矿电力表格导入
+     *
      * @return
      */
     @PostMapping("/all")
     public AjaxResult save(@RequestParam("file") MultipartFile file,
                            @RequestPart String powerDAO,
                            @RequestPart String powerAllDAO
-            ){
+    ) {
         //字符串转json格式
         Gson gson = new Gson();
         PowerDAO powerDAO1 = gson.fromJson(powerDAO, PowerDAO.class);
@@ -53,16 +39,16 @@ public class PowerWagesController {
         //1、处理表格
         String date = powerDAO1.getImportTime();
         String mineId = powerDAO1.getMineId();
-        Boolean cAnalyzed = powerWagesService.readCExcel(file,date,mineId);
+        Boolean cAnalyzed = powerWagesService.readCExcel(file, date, mineId);
         if (!cAnalyzed) {
             return AjaxResult.error("解析失败");
         }
-        Boolean dAnalyzed =  powerWagesService.readDExcel(file,date,mineId);
+        Boolean dAnalyzed = powerWagesService.readDExcel(file, date, mineId);
         if (!dAnalyzed) {
             return AjaxResult.error("解析失败");
         }
         //2、处理特殊表的表头
-       Boolean added = powerWagesService.add(powerDAO1);
+        Boolean added = powerWagesService.add(powerDAO1);
         if (!added) {
             return AjaxResult.error("对照处理失败");
         }
@@ -71,23 +57,9 @@ public class PowerWagesController {
         if (!pAdd) {
             return AjaxResult.error("数据处理失败");
         }
-        return AjaxResult.success();
-    }
-
-    /**
-     * 林西矿电力表格导入
-     * @param file 文件
-     * @param date 日期
-     * @param mineId 矿id
-     * @return
-     */
-    @PostMapping("lxExcel")
-    public AjaxResult readExcel(@RequestParam("file") MultipartFile file,
-                                @RequestParam("date") String date,
-                                @RequestParam("mineId") String mineId
-                                ){
-
-       return AjaxResult.success();
+        //返回数据
+        List<PowerVo> data = powerWagesService.selectByMineIdAndDate(mineId, date);
+        return AjaxResult.success(data);
     }
 
 }