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

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

 package com.ruoyi.system.controller;
 
 
+import com.google.gson.Gson;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.model.wages.dao.PowerAllDAO;
 import com.ruoyi.system.model.wages.dao.PowerDAO;
-import com.ruoyi.system.model.wages.dao.PowerWagesComparation;
-import com.ruoyi.system.model.wages.dao.PowerWagesDetails;
 import com.ruoyi.system.model.wages.vo.PowerVo;
 import com.ruoyi.system.service.PowerWagesService;
 import lombok.RequiredArgsConstructor;
@@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author haiwe
@@ -39,15 +37,22 @@ public class PowerWagesController {
     }
 
 
+    /**
+     * 唐山矿电力表格导入
+     * @return
+     */
     @PostMapping("/all")
     public AjaxResult save(@RequestParam("file") MultipartFile file,
-                           @RequestPart PowerDAO powerDAO,
-                           @RequestPart PowerAllDAO powerAllDAO
-
-    ){
+                           @RequestPart String powerDAO,
+                           @RequestPart String powerAllDAO
+            ){
+        //字符串转json格式
+        Gson gson = new Gson();
+        PowerDAO powerDAO1 = gson.fromJson(powerDAO, PowerDAO.class);
+        PowerAllDAO powerAllDAO1 = gson.fromJson(powerAllDAO, PowerAllDAO.class);
         //1、处理表格
-        String date = powerDAO.getImportTime();
-        String mineId = powerDAO.getMineId();
+        String date = powerDAO1.getImportTime();
+        String mineId = powerDAO1.getMineId();
         Boolean cAnalyzed = powerWagesService.readCExcel(file,date,mineId);
         if (!cAnalyzed) {
             return AjaxResult.error("解析失败");
@@ -57,16 +62,32 @@ public class PowerWagesController {
             return AjaxResult.error("解析失败");
         }
         //2、处理特殊表的表头
-        Boolean added = powerWagesService.add(powerDAO);
+       Boolean added = powerWagesService.add(powerDAO1);
         if (!added) {
             return AjaxResult.error("对照处理失败");
         }
         //3、处理特殊表的数据
-        Boolean pAdd = powerWagesService.pAdd(powerAllDAO);
+        Boolean pAdd = powerWagesService.pAdd(powerAllDAO1);
         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();
+    }
+
 }

ruoyi-wages/src/main/java/com/ruoyi/system/service/PowerWagesService.java

@@ -23,7 +23,7 @@ public interface PowerWagesService {
 
     List<PowerVo> selectByMineIdAndDate(String mineId, String date);
 
-    Boolean add(PowerDAO powerDAO);
+    Boolean add(PowerDAO powerDAO1);
 
-    Boolean pAdd(PowerAllDAO powerAllDAO);
+    Boolean pAdd(PowerAllDAO powerAllDAO1);
 }