diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java index 95e98bd3f..7f4341155 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java @@ -96,8 +96,8 @@ public enum DeviceResponseEnum { SAME_ALARM_STRATEGY("A0361","当前等级策略已存在"), LINE_GRADE_INDEX_ERR("A0362","异常等级索引"), LINE_GRADE_LESS("A0363","监测点等级策略缺失"), - FLOW_UPDATE("A0364","默认类型必须存在一个") - + FLOW_UPDATE("A0364","默认类型必须存在一个"), + NEWSTATION_IS_BIND_LINE("A0365","已绑定监测点") ; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java index 939c709f3..04642c4e4 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java @@ -180,6 +180,11 @@ public class LineDetail{ */ private Integer runFlag; + /** + * 新能源场站信息ID + */ + private String newStationId; + /** * 通讯状态 */ diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NewStationController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NewStationController.java index 59a8f0303..bb1211cc5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NewStationController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NewStationController.java @@ -68,7 +68,7 @@ public class NewStationController extends BaseController { } @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY) - @DeleteMapping("/selectDown") + @GetMapping("/selectDown") @ApiOperation("获取新能源场站高低电压穿越信息下拉框(用于监测点维护界面)") public HttpResult> selectDown(@RequestParam(name = "name",required = false) String name) { String methodDescribe = getMethodDescribe("selectDown"); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java index b4e46adbf..fc9f98ca7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java @@ -62,4 +62,9 @@ public interface LineDetailMapper extends BaseMapper { * @return 结果 */ List getLineDetailByIds(@Param("ids") List Ids); + + /** + * 判断该新能源场站信息是否绑定了测点ID + */ + Integer checkExistsLineByNewStationId(@Param("newStationId") String newStationId); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml index bb48e8799..2fa516f63 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml @@ -96,4 +96,9 @@ set run_flag = #{runFlag} where id = #{id} + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java index b29150219..05d283708 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java @@ -4,6 +4,9 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.pq.mapper.LineDetailMapper; import com.njcn.device.pq.mapper.NewStationMapper; import com.njcn.device.pq.pojo.param.NewStationQueryParam; import com.njcn.device.pq.pojo.po.NewStation; @@ -27,6 +30,8 @@ import java.util.Map; @RequiredArgsConstructor public class NewStationServiceImpl extends ServiceImpl implements INewStationService { + private final LineDetailMapper lineDetailMapper; + @Override public Page queryPage(NewStationQueryParam newStationQueryParam) { Page returnpage = new Page<> (newStationQueryParam.getPageNum(),newStationQueryParam.getPageSize()); @@ -51,9 +56,19 @@ public class NewStationServiceImpl extends ServiceImpl listIds = Arrays.asList(ids.split(",")); + //判断该新能源场站信息是否绑定了测点ID + for(String id : listIds){ + if(lineDetailMapper.checkExistsLineByNewStationId(id)!=0){ + LambdaUpdateWrapper queryWrapper = new LambdaUpdateWrapper<>(); + queryWrapper.eq(NewStation::getId,id); + NewStation newStation = this.baseMapper.selectOne(queryWrapper); + throw new BusinessException(newStation == null?"":newStation.getName()+DeviceResponseEnum.NEWSTATION_IS_BIND_LINE.getMessage()); + } + } LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); lambdaUpdateWrapper.set(NewStation::getState,0) - .in(NewStation::getId, Arrays.asList(ids.split(","))); + .in(NewStation::getId, listIds); boolean update = this.update(lambdaUpdateWrapper); return update; }