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

pms台账bug提交,台账日志操作

Browse Source
This commit is contained in:
雨木c
2023-02-28 08:55:41 +08:00
parent 43e60ec946
commit fb0e59b68f
15 changed files with 288 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalLogParam.java Normal file
View File

@@ -0,0 +1,25 @@
package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* pqs
*
* @author cdf
* @date 2023/2/27
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class PmsTerminalLogParam extends BaseParam {
@ApiModelProperty(name = "type",value = "0.电站 1.装置 2.线路 3.台区 4.发电用户 5.用电用户 6.主网监测点 7.配网监测点")
private Integer type;
@ApiModelProperty(name = "createBy",value = "操作用户")
private String createBy;
}

9
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
View File

@@ -60,15 +60,6 @@ public class Monitor extends BaseEntity {
*/
private String powerrId;
/**
* 母线名称
*/
private String generatrixWireName;
/**
* 母线ID(外键)
*/
private String generatrixId;
/**
* 监测线路名称

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalLog.java
View File

@@ -6,6 +6,7 @@ import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -30,6 +31,7 @@ public class TerminalLog extends BaseEntity implements Serializable,Cloneable {
/**
* 0.电站 1.装置 2.台区 3.线路 4.监测点
*/
@ApiModelProperty(name = "type",value = "0.电站 1.装置 2.线路 3.台区 4.发电用户 5.用电用户 6.主网监测点 7.配网监测点")
private Integer type;
/**
@@ -45,11 +47,13 @@ public class TerminalLog extends BaseEntity implements Serializable,Cloneable {
/**
* 操作描述
*/
@ApiModelProperty(name = "operatorDescribe",value = "操作描述")
private String operatorDescribe;
/**
* 操作结果 0.失败 1.成功
*/
@ApiModelProperty(name = "results",value = "0.失败 1.成功")
private Integer results;
/**

126
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PowerGenerationUserVO.java Normal file
View File

@@ -0,0 +1,126 @@
package com.njcn.device.pms.pojo.vo;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
/**
* pqs
*
* @author cdf
* @date 2023/2/27
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class PowerGenerationUserVO extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 用户编号
*/
private String id;
/**
* 用户名称
*/
private String name;
/**
* 组织机构名称
*/
private String orgName;
/**
* 组织机构ID(外键)
*/
private String orgId;
/**
* 运维单位名称
*/
private String operationName;
/**
* 运维单位ID(外键)
*/
private String operationId;
/**
* 电源类别(字典)
*/
private String powerCategory;
/**
* 电站类型(字典)
*/
private String powerStationType;
/**
* 发电方式(字典)
*/
private String powerGenerationMode;
/**
* 并网电压等级(字典)
*/
private String voltageLevel;
/**
* 总装机容量
*/
private Float sourceCapacity;
/**
* 并网日期
*/
private LocalDate connectionDate;
/**
* 能源消纳方式(字典)
*/
private String connectionMode;
/**
* 客户状态(字典)
*/
private String gcStat;
/**
* 供电变电站(外键)
*/
private String powerStationId;
/**
* 供电线路(外键)
*/
private String lineId;
/**
* 供电台区(外键)
*/
private String platformId;
/**
* 供电台区名称
*/
private String platformName;
/**
* 用户标签
*/
private String userTag;
/**
* 是否是上送国网监测点,0-否 1-是
*/
private Integer isUpToGrid;
/**
* 数据状态：0-删除；1-正常；
*/
private Integer status;
}

5
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerGenerationUserController.java
View File

@@ -13,6 +13,7 @@ import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.device.pms.pojo.vo.PowerGenerationUserVO;
import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.Api;
@@ -106,9 +107,9 @@ public class PmsPowerGenerationUserController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getPowerGenerationUserList")
@ApiOperation("获取发电用户列表")
public HttpResult<List<PowerGenerationUser>> getPowerGenerationUserList(@RequestBody PowerDistributionareaParam powerDistributionareaParam) {
public HttpResult<List<PowerGenerationUserVO>> getPowerGenerationUserList(@RequestBody PowerDistributionareaParam powerDistributionareaParam) {
String methodDescribe = getMethodDescribe("getPowerGenerationUserList");
List<PowerGenerationUser> result = iPowerGenerationUserService.getPowerGenerationUserList(powerDistributionareaParam);
List<PowerGenerationUserVO> result = iPowerGenerationUserService.getPowerGenerationUserList(powerDistributionareaParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

39
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/TerminalLogController.java
View File

@@ -1,9 +1,24 @@
package com.njcn.device.pms.controller.ledgerManger;
import org.springframework.web.bind.annotation.RequestMapping;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pms.pojo.param.PmsTerminalLogParam;
import com.njcn.device.pms.pojo.param.PmsTerminalParam;
import com.njcn.device.pms.pojo.po.GeneratrixWire;
import com.njcn.device.pms.pojo.po.TerminalLog;
import com.njcn.device.pms.service.majornetwork.ITerminalLogService;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController;
/**
@@ -16,7 +31,27 @@ import com.njcn.web.controller.BaseController;
*/
@RestController
@RequestMapping("/pms/terminalLog")
@RequiredArgsConstructor
@Api(tags = "台账-终端操作日志")
public class TerminalLogController extends BaseController {
private final ITerminalLogService iTerminalLogService;
/**
* 查询所有日志
* @author cdf
* @date 2023/2/27
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/page")
@ApiOperation("分页查询所有日志")
@ApiImplicitParam(name = "pmsTerminalLogParam", value = "基本查询体", required = true)
public HttpResult<Page<TerminalLog>> page(@RequestBody PmsTerminalLogParam pmsTerminalLogParam) {
String methodDescribe = getMethodDescribe("page");
Page<TerminalLog> result = iTerminalLogService.page(pmsTerminalLogParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

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

@@ -2,6 +2,11 @@ package com.njcn.device.pms.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.device.pms.pojo.vo.PowerClientVO;
import com.njcn.device.pms.pojo.vo.PowerGenerationUserVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,4 +18,7 @@ import com.njcn.device.pms.pojo.po.PowerGenerationUser;
*/
public interface PowerGenerationUserMapper extends BaseMapper<PowerGenerationUser> {
List<PowerGenerationUserVO> getPowerGenerationUserSelect(@Param("orgIds") List<String> orgIds);
}

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

@@ -2,7 +2,10 @@ package com.njcn.device.pms.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pms.pojo.param.PmsTerminalLogParam;
import com.njcn.device.pms.pojo.po.TerminalLog;
import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -14,4 +17,6 @@ import com.njcn.device.pms.pojo.po.TerminalLog;
*/
public interface TerminalLogMapper extends BaseMapper<TerminalLog> {
Page<TerminalLog> pageList(Page<TerminalLog> page,@Param("pmsTerminalLogParam") PmsTerminalLogParam pmsTerminalLogParam);
}

28
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsTerminalLogMapper.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.device.pms.mapper.majornetwork.TerminalLogMapper">
<select id="pageList" resultType="TerminalLog">
select
pms_terminal_log.id,
pms_terminal_log.operator_describe,
pms_terminal_log.type,
pms_terminal_log.create_time,
sys_user.name createBy
from pms_terminal_log pms_terminal_log
left join sys_user sys_user on pms_terminal_log.create_by = sys_user.id
where pms_terminal_log.status = 1
and sys_user.state = 1
and pms_terminal_log.create_time between #{pmsTerminalLogParam.searchBeginTime} and #{pmsTerminalLogParam.searchEndTime}
<if test="pmsTerminalLogParam.type!=null">
and pms_terminal_log.type = #{pmsTerminalLogParam.type}
</if>
<if test="pmsTerminalLogParam.searchValue!=null and pmsTerminalLogParam.searchValue!=''">
and pms_terminal_log.operator_describe like concat('%',#{pmsTerminalLogParam.searchValue},'%')
</if>
order by create_time desc
</select>
</mapper>

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

@@ -2,4 +2,27 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.device.pms.mapper.majornetwork.PowerGenerationUserMapper">
<select id="getPowerGenerationUserSelect" resultType="com.njcn.device.pms.pojo.vo.PowerGenerationUserVO">
select
pms_power_generation_user.id,
pms_power_generation_user.name,
pms_power_generation_user.org_name,
pms_power_generation_user.org_id,
pms_power_distributionarea.id platformId,
pms_power_distributionarea.name platformName
from pms_power_generation_user pms_power_generation_user
left join pms_power_distributionarea pms_power_distributionarea on pms_power_generation_user.Platform_Id =
pms_power_distributionarea.id
where pms_power_generation_user.status = 1
and pms_power_distributionarea.status = 1
<if test="orgIds!=null and orgIds.size!=0">
and pms_power_generation_user.org_id in
<foreach collection="orgIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>

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

@@ -6,6 +6,7 @@ import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.device.pms.pojo.vo.PowerGenerationUserVO;
import com.njcn.web.pojo.param.BaseParam;
import java.util.List;
@@ -62,7 +63,7 @@ public interface IPowerGenerationUserService extends IService<PowerGenerationUse
* @date 2022/10/25
* @return boolean
*/
List<PowerGenerationUser> getPowerGenerationUserList(PowerDistributionareaParam powerDistributionareaParam);
List<PowerGenerationUserVO> getPowerGenerationUserList(PowerDistributionareaParam powerDistributionareaParam);
/**
* 分页查询发电用户列表

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

@@ -1,7 +1,9 @@
package com.njcn.device.pms.service.majornetwork;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pms.pojo.param.PmsTerminalLogParam;
import com.njcn.device.pms.pojo.po.TerminalLog;
/**
@@ -14,4 +16,11 @@ import com.njcn.device.pms.pojo.po.TerminalLog;
*/
public interface ITerminalLogService extends IService<TerminalLog> {
/**
* 分页查询日志
* @author cdf
* @date 2023/2/27
*/
Page<TerminalLog> page(PmsTerminalLogParam pmsTerminalLogParam);
}

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

@@ -356,11 +356,6 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
throw new BusinessException(PmsDeviceResponseEnum.VOLTAGE_EMPTY);
}
monitor.setOperationName(dept.getName());
monitor.setOperationName(deptOp.getName());
monitor.setGeneratrixWireName(generatrix.getName());
}

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

@@ -13,6 +13,7 @@ import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerClient;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.device.pms.pojo.vo.PowerGenerationUserVO;
import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.user.api.DeptFeignClient;
@@ -23,6 +24,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -79,15 +81,13 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationU
}
@Override
public List<PowerGenerationUser> getPowerGenerationUserList(PowerDistributionareaParam powerDistributionareaParam) {
public List<PowerGenerationUserVO> getPowerGenerationUserList(PowerDistributionareaParam powerDistributionareaParam) {
LambdaQueryWrapper<PowerGenerationUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
List<String> deptIds =new ArrayList<>();
if(StrUtil.isNotBlank(powerDistributionareaParam.getOrgId())){
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerDistributionareaParam.getOrgId()).getData();
lambdaQueryWrapper.in(PowerGenerationUser::getOrgId,deptIds).eq(PowerGenerationUser::getStatus,DataStateEnum.ENABLE.getCode());
deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerDistributionareaParam.getOrgId()).getData();
}
lambdaQueryWrapper.select(PowerGenerationUser::getName,PowerGenerationUser::getId,PowerGenerationUser::getOrgId,PowerGenerationUser::getOrgName);
lambdaQueryWrapper.orderByDesc(PowerGenerationUser::getCreateTime).eq(PowerGenerationUser::getStatus, DataStateEnum.ENABLE.getCode());
return this.list(lambdaQueryWrapper);
return this.baseMapper.getPowerGenerationUserSelect(deptIds);
}
@Override

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

@@ -1,11 +1,19 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.device.pms.mapper.majornetwork.TerminalLogMapper;
import com.njcn.device.pms.pojo.param.PmsTerminalLogParam;
import com.njcn.device.pms.pojo.po.TerminalLog;
import com.njcn.device.pms.service.majornetwork.ITerminalLogService;
import com.njcn.web.factory.PageFactory;
import org.springframework.stereotype.Service;
import java.util.Objects;
/**
* <p>
* 服务实现类
@@ -17,4 +25,8 @@ import org.springframework.stereotype.Service;
@Service
public class TerminalLogServiceImpl extends ServiceImpl<TerminalLogMapper, TerminalLog> implements ITerminalLogService {
@Override
public Page<TerminalLog> page(PmsTerminalLogParam pmsTerminalLogParam) {
return this.baseMapper.pageList(new Page<>(PageFactory.getPageNum(pmsTerminalLogParam),PageFactory.getPageSize(pmsTerminalLogParam)),pmsTerminalLogParam);
}
}