Commit a7a56bb1 authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ff5081bc
...@@ -85,5 +85,13 @@ public interface SysOrganizationViewMapper { ...@@ -85,5 +85,13 @@ public interface SysOrganizationViewMapper {
*/ */
List<SysOrganizationView> selectChildLineList(SysOrganizationView record); List<SysOrganizationView> selectChildLineList(SysOrganizationView record);
/**
* 选择组织列表
*
* @param record 记录
* @return {@link List }<{@link SysOrganizationView }>
*/
List<SysOrganizationView> selectOrgList(SysOrganizationView record);
SysOrganizationView selectOrgProvince(SysOrganizationView record); SysOrganizationView selectOrgProvince(SysOrganizationView record);
} }
package pps.core.system.service; package pps.core.system.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -444,7 +445,8 @@ public class SysOrganizationService { ...@@ -444,7 +445,8 @@ public class SysOrganizationService {
public XListResult<DynamicQuerySysOrganizationOutput> queryOrgAndLineList(XContext context, DynamicQuerySysOrganizationInput input) { public XListResult<DynamicQuerySysOrganizationOutput> queryOrgAndLineList(XContext context, DynamicQuerySysOrganizationInput input) {
SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class); SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
SysOrganizationView view = new SysOrganizationView(); SysOrganizationView view = new SysOrganizationView();
if (StringUtils.isBlank(input.getId())) { List<SysOrganizationView> viewList;
if (CharSequenceUtil.isBlank(input.getId())) {
//如果条件都为空,则从登录信息获取条件 //如果条件都为空,则从登录信息获取条件
PpsUserSession session = context.getSession(PpsUserSession.class); PpsUserSession session = context.getSession(PpsUserSession.class);
if (UserConstant.ISSUPERADMIN_TRUE.equals(session.getIsSuperAdmin())) { if (UserConstant.ISSUPERADMIN_TRUE.equals(session.getIsSuperAdmin())) {
...@@ -452,11 +454,15 @@ public class SysOrganizationService { ...@@ -452,11 +454,15 @@ public class SysOrganizationService {
} else { } else {
view.setId(session.getOuId()); view.setId(session.getOuId());
} }
//单独查组织
if (CharSequenceUtil.isBlank(input.getOuName())) {
viewList = mapper.selectOrgList(view);
return XListResult.success(XCopyUtils.copyNewList(viewList, DynamicQuerySysOrganizationOutput.class));
}
} else { } else {
view.setId(input.getId()); view.setId(input.getId());
} }
List<SysOrganizationView> viewList; if (CharSequenceUtil.isNotBlank(input.getOuName())) {
if (StringUtils.isNotBlank(input.getOuName())) {
view.setId(null); view.setId(null);
view.setOuName(input.getOuName()); view.setOuName(input.getOuName());
viewList = mapper.selectLineList(view); viewList = mapper.selectLineList(view);
......
...@@ -640,4 +640,19 @@ ...@@ -640,4 +640,19 @@
sa.id = so.province sa.id = so.province
where so.id = #{id} where so.id = #{id}
</select> </select>
<select id="selectOrgList" parameterType="pps.core.system.entity.SysOrganizationView"
resultMap="ExtendResultMap">
SELECT ROW_NUMBER() OVER ( ORDER BY r.sort ) AS rn, o.id,
o.ou_name AS ou_name,
'' AS line_id,
'ORG' AS ou_level,
'' AS grid_type_key
FROM sys_organization o
LEFT JOIN sys_organization_rel r ON o.id = r.ou_id
WHERE o.id = #{id}
AND r.end_time >= NOW()
AND o.is_deleted = 1
ORDER BY r.sort
</select>
</mapper> </mapper>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment