update

whycrzg

2021-01-29 0f24731e84183146193ed19d1a51f7f63a98cd1a

 src/main/java/com/fgkj/controller/Batt_rtdataController.java

@@ -8,10 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -23,30 +20,32 @@
   @Resource
   private Batt_rtdataService service;

   @GetMapping("byCondition")
   @PostMapping("byCondition")
   @ApiOperation(notes = "",value="实时监测")
   public ServiceModel serchByCondition(@RequestBody Batt_rtdata rtdata){
      // Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
   public ServiceModel serchByCondition(@RequestParam Integer battGroupId){
      Batt_rtdata rtdata= new Batt_rtdata();
      rtdata.setBattGroupId(battGroupId);
      ServiceModel model=service.serchByCondition(rtdata);
      return model;
   }
   //历史监测中查询出电池组的实时内阻并将其导出报表
   @GetMapping("resById")
   @PostMapping("resById")
   @ApiOperation(notes = "",value="历史监测中查询出电池组的实时内阻并将其导出报表")
   public ServiceModel serchResById(@RequestBody Batt_rtdata rtdata){
      // Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
   public ServiceModel serchResById(@RequestParam Integer battGroupId){
      Batt_rtdata rtdata= new Batt_rtdata();
      rtdata.setBattGroupId(battGroupId);
      ServiceModel model=service.serchResById(rtdata);

      return model;
   }
   //跨域访问查询电池组的单体数据         < ! ---- ----  跨域访问  ------------>
   @GetMapping("byCondition_ky")
   @PostMapping("byCondition_ky")
   @ApiOperation(tags = "跨域", notes = "跨域访问",value="跨域访问查询电池组的单体数据 跨域访问")
   public ServiceModel serchByCondition_ky(@RequestBody Batt_rtdata rtdata){
   public ServiceModel serchByCondition_ky(@RequestParam Integer battGroupId){
      Batt_rtdata rtdata= new Batt_rtdata();
      rtdata.setBattGroupId(battGroupId);
      //ActionUtil.isAllowHeaders();
      ServiceModel model = new ServiceModel();		
      // Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
      model=service.serchByCondition_ky(rtdata);			
      ServiceModel model=service.serchByCondition_ky(rtdata);
      return model;
   }