diff --git a/busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiSensorController.java b/busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiSensorController.java index 6442294..dd0b32a 100644 --- a/busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiSensorController.java +++ b/busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiSensorController.java @@ -12,6 +12,7 @@ import com.huatek.busi.vo.BusiSensorVo; import com.huatek.busi.vo.generator.BusiGeneratorAmplTypeVo; import com.huatek.torch.frame.tools.ConstantUtil; import com.huatek.torch.frame.tools.ResultUtil; +import com.sun.org.apache.regexp.internal.RE; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -76,6 +77,23 @@ public class BusiSensorController { return ResultUtil.put(ConstantUtil.REQUEST_SUCCESS, "", ""); } + /** + * 批量新增 批量生成Sensor编码 + * @param frontCode 前置编码 + * @param code 后面两位数编码 + * @param number 传感器个数 + * @return + */ + @PostMapping(value = "/batchAdd", produces = {"application/json;charset=utf-8"}) + public Map batchAdd( + @RequestBody BusiSensorVo busiSensorVo, + @RequestParam(value = "frontCode", required = true) String frontCode, + @RequestParam(value = "code", required = true) String code, + @RequestParam(value = "number", required = true) String number) { + busiSensorService.batchAdd(busiSensorVo,frontCode,code,Integer.parseInt(number)); + return ResultUtil.put(ConstantUtil.REQUEST_SUCCESS, "", ""); + } + /** * @Title: update @Description: 修改传感器 @createDate: Jul 18, 2019 3:10:20 PM @param @return Map @throws */ diff --git a/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiSensorService.java b/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiSensorService.java index 031568e..5abef46 100644 --- a/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiSensorService.java +++ b/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiSensorService.java @@ -44,7 +44,12 @@ public interface BusiSensorService { * @throws */ boolean add(BusiSensorVo busiSensorVo); - + + /** + * 批量新增 + */ + boolean batchAdd(BusiSensorVo busiSensorVo, String frontCode, String code, int number); + /** * @Title: update * @Description: 修改传感器 diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiSensorServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiSensorServiceImpl.java index 1957307..231dd46 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiSensorServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiSensorServiceImpl.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.util.*; @@ -116,6 +117,37 @@ public class BusiSensorServiceImpl implements BusiSensorService { return false; } + @Override + public boolean batchAdd(BusiSensorVo busiSensorVo, String frontCode, String code, int number) { + String equipmentType = busiSensorVo.getEquipmentType(); + for(int i=1; i<=number; i++) { + String n = "000"; + if(i>9){ + n = "00"; + }else if(i>99){ + n = "0"; + } + String sensorCode = frontCode + n + i + code; + busiSensorVo.setSensorCode(sensorCode); + if (SiteConstants.ExternalTypeEnum.BYQ.getValue().equals(equipmentType)) { + busiTransformerSensorService.add(busiSensorVo); + } else if (SiteConstants.ExternalTypeEnum.GIS.getValue().equals(equipmentType)) { + busiGisSensorService.add(busiSensorVo); + } else if (SiteConstants.ExternalTypeEnum.CW.getValue().equals(equipmentType)) { + busiTemperPointService.add(busiSensorVo); + } else if (SiteConstants.ExternalTypeEnum.BLQ.getValue().equals(equipmentType)) { + busiArresterSensorService.add(busiSensorVo); + } else if (SiteConstants.ExternalTypeEnum.OTHER.getValue().equals(equipmentType)) { + busiOtherSensorService.add(busiSensorVo); + } else if (SiteConstants.ExternalTypeEnum.GEN.getValue().equals(equipmentType)) { + busiGeneratorSensorService.add(busiSensorVo); + } else if (SiteConstants.ExternalTypeEnum.DL.getValue().equals(equipmentType)) { + busiCableSensorService.add(busiSensorVo); + } + } + return false; + } + @Override public boolean update(String token, BusiSensorVo busiSensorVo) { String equipmentType = busiSensorVo.getEquipmentType();