src/main/java/com/whyc/controller/DevA200TestparamController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevInf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DevA200TestparamService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DevActmTestparamService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/DevA200TestparamController.java
@@ -27,37 +27,37 @@ return service.getA200Param(devId); } @ApiOperation(value = "设置a200均衡仪参数") @ApiOperation(value = "设置a200一体机参数") @PostMapping("setA200Param") public Object setA200Param(@RequestBody A200ResDto param){ return service.setA200Param(param); } @ApiOperation(value = "批量设置a200均衡仪参数") @ApiOperation(value = "批量设置a200一体机参数") @PostMapping("setA200ParamPl") public Object setA200ParamPl(@RequestBody A200ResDto param){ return service.setA200ParamPl(param); } @ApiOperation(value = "启动a200均衡仪放电/充电") @ApiOperation(value = "启动a200一体机放电/充电") @GetMapping("startA200Param") public Object startA200Param(@RequestParam int devId,@RequestParam int type){ return service.startA200Param(devId,type); } @ApiOperation(value = "停止a200均衡仪放电/充电") @ApiOperation(value = "停止a200一体机放电/充电") @GetMapping("stopA200Param") public Object stopA200Param(@RequestParam int devId){ return service.stopA200Param(devId); } @ApiOperation(value = "批量启动a200均衡仪") @ApiOperation(value = "批量启动a200一体机") @PostMapping("startA200ParamPl") public Response startA200ParamPl(@RequestBody List<Integer> devIds,@RequestParam int type){ return service.startA200ParamPl(devIds,type); } @ApiOperation(value = "批量停止a200均衡仪") @ApiOperation(value = "批量停止a200一体机") @PostMapping("stopA200ParamPl") public Response stopA200ParamPl(@RequestBody List<Integer> devIds){ return service.stopA200ParamPl(devIds); src/main/java/com/whyc/pojo/db_lithium_ram_db/DevInf.java
@@ -54,6 +54,8 @@ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date createTime; @ApiModelProperty(value = "设备批量测试状态[0-未批量 1-批量中]") private Integer batchState; @ApiModelProperty(value = "经度") private Double longitude; src/main/java/com/whyc/service/DevA200TestparamService.java
@@ -61,7 +61,7 @@ } //设置a200均衡仪参数 //设置a200一体机参数 public Object setA200Param(A200ResDto param) { QueryWrapper wrapper=new QueryWrapper(); wrapper.eq("dev_id",param.getDevId()); @@ -76,7 +76,7 @@ return dto; } //批量设置a200均衡仪参数 //批量设置a200一体机参数 public Object setA200ParamPl2(A200ResDto param) { Map<Integer,Object> map=new HashMap<>(); int size=param.getDevIds().size(); @@ -97,9 +97,9 @@ } catch (InterruptedException e) { e.printStackTrace(); } return new Response().setII(1,true,map,"批量设置a200均衡仪参数"); return new Response().setII(1,true,map,"批量设置a200一体机参数"); } //批量设置a200均衡仪参数 //批量设置a200一体机参数 public Object setA200ParamPl(A200ResDto param) { Map<Integer,Object> map=new HashMap<>(); int size=param.getDevIds().size(); @@ -109,10 +109,10 @@ ResultA200Dto dto= (ResultA200Dto) setA200Param(param); map.put(finaldevId,dto); } return new Response().setII(1,true,map,"批量设置a200均衡仪参数"); return new Response().setII(1,true,map,"批量设置a200一体机参数"); } //启动a200均衡仪放电/充电 //启动a200一体机放电/充电 public Object startA200Param(int devId,int type) { QueryWrapper wrapper=new QueryWrapper(); wrapper.eq("dev_id",devId); @@ -125,7 +125,7 @@ ResultA200Dto dto= (ResultA200Dto) TestparamHttpUtil.postforform_dataA200(restTemplate,url,paramMap); return dto; } //停止a200均衡仪放电/充电 //停止a200一体机放电/充电 public Object stopA200Param(int devId) { QueryWrapper wrapper=new QueryWrapper(); wrapper.eq("dev_id",devId); @@ -137,7 +137,7 @@ return dto; } //批量启动a200均衡仪 //批量启动a200一体机 public Response startA200ParamPl2(List<Integer> devIds,int type) { Map<Integer,Object> map=new HashMap<>(); try { @@ -154,20 +154,26 @@ } catch (InterruptedException e) { e.printStackTrace(); } return new Response().set(1,true,"批量控制a200均衡仪"); return new Response().set(1,true,"批量控制a200一体机"); } //批量启动a200均衡仪 //批量启动a200一体机 public Response startA200ParamPl(List<Integer> devIds,int type) { Map<Integer,Object> map=new HashMap<>(); for (int devId:devIds) { ResultA200Dto dto= (ResultA200Dto) startA200Param(devId,type); if(dto.getCode().equals("200")){ UpdateWrapper wrapper=new UpdateWrapper(); wrapper.eq("dev_id",devId); wrapper.set("batch_state",1); dinfMapper.update(null,wrapper); } map.put(devId,dto); } return new Response().set(1,true,"批量控制a200均衡仪"); return new Response().set(1,true,"批量控制a200一体机"); } //批量停止a200均衡仪 //批量停止a200一体机 public Response stopA200ParamPl2(List<Integer> devIds) { Map<Integer,Object> map=new HashMap<>(); try { @@ -184,16 +190,16 @@ } catch (InterruptedException e) { e.printStackTrace(); } return new Response().set(1,true,"批量停止a200均衡仪"); return new Response().set(1,true,"批量停止a200一体机"); } //批量停止a200均衡仪 //批量停止a200一体机 public Response stopA200ParamPl(List<Integer> devIds) { Map<Integer,Object> map=new HashMap<>(); for (int devId:devIds) { ResultA200Dto dto= (ResultA200Dto) stopA200Param(devId); map.put(devId,dto); } return new Response().set(1,true,"批量停止a200均衡仪"); return new Response().set(1,true,"批量停止a200一体机"); } //将dto拷贝至param src/main/java/com/whyc/service/DevActmTestparamService.java
@@ -163,6 +163,12 @@ Map<Integer,Object> map=new HashMap<>(); for (ActmPlContDto actmPlContDto:actmPlContDtos) { ResultActmDto dto= (ResultActmDto) controllerActmParam(actmPlContDto.getDevId(),actmPlContDto.getIndex(),actmPlContDto.getType()); if(dto.getCode().equals("200")&&actmPlContDto.getType()==1){ UpdateWrapper wrapper=new UpdateWrapper(); wrapper.eq("dev_id",actmPlContDto.getDevId()); wrapper.set("batch_state",1); dinfMapper.update(null,wrapper); } map.put(actmPlContDto.getDevId(),dto); } return new Response().set(1,true,"批量设置Actm均衡仪参数");