From d0b151e77c735167bfc1b29a3d34f8019d0a9885 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期二, 26 四月 2022 16:55:31 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/whyc/controller/A059StationInfController.java |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whyc/controller/A059StationInfController.java b/src/main/java/com/whyc/controller/A059StationInfController.java
index a6fe06a..03371dc 100644
--- a/src/main/java/com/whyc/controller/A059StationInfController.java
+++ b/src/main/java/com/whyc/controller/A059StationInfController.java
@@ -1,16 +1,19 @@
 package com.whyc.controller;
 
-import com.whyc.dto.A059StationInfDTO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.whyc.dto.Response;
+import com.whyc.mapper.BattInfMapper;
+import com.whyc.pojo.Battinf;
+import com.whyc.pojo.UserInf;
 import com.whyc.service.A059StationInfService;
+import com.whyc.service.BattInfService;
+import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @Api(tags = "閰嶇疆淇℃伅-A059")
@@ -18,11 +21,29 @@
 public class A059StationInfController {
     @Resource
     private A059StationInfService service;
+    @Resource
+    private BattInfService battInfService;
+    @Resource
+    private BattInfMapper battInfMapper;
 
     @GetMapping("/getAll")
     @ApiOperation("鑾峰彇A059閰嶇疆淇℃伅")
-    public Response<A059StationInfDTO> getA059StationInfList(@RequestParam int pageNum, @RequestParam int pageSize){
-        return service.getA059StationInfListAndBattInf(pageNum,pageSize);
+    public Response getA059StationInfList(@RequestParam int pageNum, @RequestParam int pageSize,@RequestParam String province,@RequestParam String city,@RequestParam String county){
+        return service.getA059StationInfListAndBattInf(pageNum,pageSize,province,city,county);
+    }
+
+    @PostMapping("/importBatt")
+    @ApiOperation("鏂板鐢垫睜缁勫苟鏇存柊鍘熷厛瀵瑰簲璁惧缂栧彿涓�0")
+    public Response addBattAndUpdateDevNum(@RequestBody Battinf battinf){
+        UserInf userInf = (UserInf) ActionUtil.getUser();
+        QueryWrapper<Battinf> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dev_num",battinf.getDevNum());
+        List<Battinf> list = battInfMapper.selectList(queryWrapper);
+        for (Battinf batt:list) {
+            batt.setDevNum(0+"");
+            battInfMapper.updateById(batt);
+        }
+        return battInfService.add(battinf,userInf.getUId().intValue());
     }
 
 }

--
Gitblit v1.9.1