Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.修改变压器代码

Browse Source 
2.优化策略,策略添加和修改的验证
This commit is contained in:
wurui
2023-03-24 16:30:21 +08:00
parent 73a09d2556
commit ba4f6124b6
16 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java
View File

@@ -18,6 +18,7 @@ import java.util.List;
public interface PowerClientMapper extends BaseMapper<PowerClient> {
List<PowerClientVO> getPowerClientSelect(@Param("orgIds") List<String> orgIds);
List<PowerClientVO> getPowerClientSelect(@Param("orgIds") List<String> orgIds,
@Param("id") String id);
}

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerGenerationUserMapper.java
View File

@@ -19,6 +19,7 @@ import java.util.List;
public interface PowerGenerationUserMapper extends BaseMapper<PowerGenerationUser> {
List<PowerGenerationUserVO> getPowerGenerationUserSelect(@Param("orgIds") List<String> orgIds);
List<PowerGenerationUserVO> getPowerGenerationUserSelect(@Param("orgIds") List<String> orgIds,
@Param("id") String id);
}

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml
View File

@@ -23,5 +23,8 @@
#{item}
</foreach>
</if>
<if test="id !=null and id!='' ">
and pms_power_client.id like CONCAT(CONCAT('%', #{id}), '%')
</if>
</select>
</mapper>

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerGenerationUserMapper.xml
View File

@@ -24,5 +24,8 @@
#{item}
</foreach>
</if>
<if test="id !=null and id!='' ">
and pms_power_generation_user.id like CONCAT(CONCAT('%', #{id}), '%')
</if>
</select>
</mapper>

7
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java
View File

@@ -54,11 +54,12 @@ public interface ITransformerService extends IService<Transformer> {
*/
boolean delTransformer(List<String> ids);
/**
/***
* 修改变压器台账数据状态
*
* @author wr
* @date 2023-03-24 15:01
* @param monitorParam
* @return
* @return boolean
*/
boolean updateStatus(MonitorStatus.Status monitorParam);
}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java
View File

@@ -90,7 +90,7 @@ public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, Power
if(StrUtil.isNotBlank(powerClientParam.getOrgId())){
deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(powerClientParam.getOrgId()).getData();
}
return this.baseMapper.getPowerClientSelect(deptCodes);
return this.baseMapper.getPowerClientSelect(deptCodes,powerClientParam.getId());
}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java
View File

@@ -93,7 +93,7 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationU
if(StrUtil.isNotBlank(powerDistributionareaParam.getOrgId())){
deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerDistributionareaParam.getOrgId()).getData();
}
return this.baseMapper.getPowerGenerationUserSelect(deptIds);
return this.baseMapper.getPowerGenerationUserSelect(deptIds,powerDistributionareaParam.getId());
}
@Override

16
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransformerServiceImpl.java
View File

@@ -3,18 +3,25 @@ package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
import com.njcn.device.pms.mapper.majornetwork.TransformerMapper;
import com.njcn.device.pms.pojo.param.MonitorAuditParam;
import com.njcn.device.pms.pojo.param.MonitorStatus;
import com.njcn.device.pms.pojo.param.TransformerParam;
import com.njcn.device.pms.pojo.po.Transformer;
import com.njcn.device.pms.service.majornetwork.ITransformerService;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -28,8 +35,11 @@ import java.util.List;
* @since 2023-02-20
*/
@Service
@RequiredArgsConstructor
public class TransformerServiceImpl extends ServiceImpl<TransformerMapper, Transformer> implements ITransformerService {
private final DeptFeignClient deptFeignClient;
@Override
public Page<Transformer> getAllTransformerList(MonitorAuditParam baseParam) {
LambdaQueryWrapper<Transformer> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -43,11 +53,13 @@ public class TransformerServiceImpl extends ServiceImpl<TransformerMapper, Trans
@Override
public boolean addTransformer(TransformerParam param) {
int count = this.count(new LambdaQueryWrapper<Transformer>()
.eq(Transformer::getName, param.getName())
.eq(Transformer::getId, param.getId())
.eq(Transformer::getStatus, DataStateEnum.ENABLE.getCode())
);
Assert.isTrue(count == 0 , "变压器名称重复，请重新编写变压器名称");
if(count>0){
throw new BusinessException(PmsDeviceResponseEnum.TRANSFORMER_ID_REPEAT);
}
Transformer transformer = BeanUtil.copyProperties(param, Transformer.class);
transformer.setStatus(1);
return this.save(transformer);