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

1.解决监测点超标问题

Browse Source 
2.解决监测点终端md3加密显示
3.解决全景技术监督问题数量问题
This commit is contained in:
wr
2024-11-25 12:09:48 +08:00
parent 92ddbd34a8
commit ca32a4e3c6
8 changed files with 154 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/TempLineRunTestWarningMapper.xml
View File

@@ -13,13 +13,21 @@
INNER JOIN supervision_temp_line_run_test b ON a.id = b.id
INNER JOIN supervision_temp_line_run_test_warning c ON c.line_run_id = b.id
<where>
c.create_time BETWEEN #{param.startTime} AND #{param.endTime}
(c.create_time BETWEEN #{param.startTime} AND #{param.endTime}
<if test="orgIds != null and orgIds.size() > 0">
AND a.org_id IN
AND a.org_id IN
<foreach collection="orgIds" item="orgId" separator="," open="(" close=")">
#{orgId}
</foreach>
</if>)
or (c.deal_State = 0
<if test="orgIds != null and orgIds.size() > 0">
AND a.org_id IN
<foreach collection="orgIds" item="orgId" separator="," open="(" close=")">
#{orgId}
</foreach>
</if>
)
</where>
</select>
</mapper>

64
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
View File

@@ -7,7 +7,9 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import com.njcn.supervision.enums.FlowStatusEnum;
import com.njcn.supervision.mapper.device.TempLineRunTestWarningMapper;
import com.njcn.supervision.pojo.po.device.LineWarning;
import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
@@ -47,7 +49,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
@Override
public GridDiagramVO.Info getSupervisionData(StatisticsBizBaseParam param) {
List<String> deptIds = deptFeignClient.getDepSonIdByDeptId(param.getId()).getData();
List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(param.getId()).getData();
return supervisionDetailsAdd(null, deptIds, param);
}
@@ -96,18 +98,30 @@ public class GridDiagramServiceImpl implements GridDiagramService {
);
//用户投诉问题(添加出来就是有问题的)
List<SupervisionUserComplaintPO> userComplaintList = userComplaintPOService.list(new LambdaQueryWrapper<SupervisionUserComplaintPO>()
.in(SupervisionUserComplaintPO::getDutyOrgId, deptIds)
.eq(SupervisionUserComplaintPO::getState, 1)
.ge(StrUtil.isNotBlank(param.getStartTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())))
.le(StrUtil.isNotBlank(param.getEndTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime())))
.and(x->x .in(SupervisionUserComplaintPO::getDutyOrgId, deptIds)
.eq(SupervisionUserComplaintPO::getState, DataStateEnum.ENABLE.getCode())
.ge(StrUtil.isNotBlank(param.getStartTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())))
.le(StrUtil.isNotBlank(param.getEndTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))))
.or(x->x.eq(SupervisionUserComplaintPO::getDealState,0)
.eq(SupervisionUserComplaintPO::getState, DataStateEnum.ENABLE.getCode())
)
);
//计划问题(有问题的单子)
List<SurveyTest> surveyTestList = surveyTestService.list(new LambdaQueryWrapper<SurveyTest>()
.in(SurveyTest::getDeptId, deptIds)
.eq(SurveyTest::getState, 1)
.eq(SurveyTest::getProblemFlag, 1)
.ge(StrUtil.isNotBlank(param.getStartTime()), SurveyTest::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())))
.le(StrUtil.isNotBlank(param.getEndTime()), SurveyTest::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime())))
.and(x->x.in(SurveyTest::getDeptId, deptIds)
.eq(SurveyTest::getState, DataStateEnum.ENABLE.getCode())
.eq(SurveyTest::getStatus, FlowStatusEnum.APPROVE.getCode())
.eq(SurveyTest::getProblemFlag, 1)
.ge(StrUtil.isNotBlank(param.getStartTime()), SurveyTest::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())))
.le(StrUtil.isNotBlank(param.getEndTime()), SurveyTest::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))))
.or(x->x.eq(SurveyTest::getDealState,0)
.in(SurveyTest::getDeptId, deptIds)
.eq(SurveyTest::getState, DataStateEnum.ENABLE.getCode())
.eq(SurveyTest::getStatus, FlowStatusEnum.APPROVE.getCode())
.eq(SurveyTest::getProblemFlag, 1)
)
);
//试运行问题单子
List<String> runWarningsIds = warningsMapper.selectWarningsIds(deptIds, param);
@@ -201,19 +215,31 @@ public class GridDiagramServiceImpl implements GridDiagramService {
gridDiagramVO.setOnLineNum(lineWarningList.size());
//用户投诉问题(添加出来就是有问题的)
List<SupervisionUserComplaintPO> userComplaintList = userComplaintPOService.list(new LambdaQueryWrapper<SupervisionUserComplaintPO>()
.in(SupervisionUserComplaintPO::getDutyOrgId, ids)
.eq(SupervisionUserComplaintPO::getState, 1)
.ge(StrUtil.isNotBlank(baseParam.getStartTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getStartTime())))
.le(StrUtil.isNotBlank(baseParam.getEndTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.endOfDay(DateUtil.parse(baseParam.getEndTime())))
.and(x->x.in(SupervisionUserComplaintPO::getDutyOrgId, ids)
.eq(SupervisionUserComplaintPO::getState, 1)
.ge(StrUtil.isNotBlank(baseParam.getStartTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getStartTime())))
.le(StrUtil.isNotBlank(baseParam.getEndTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.endOfDay(DateUtil.parse(baseParam.getEndTime()))))
.or(x->x.eq(SupervisionUserComplaintPO::getDealState,0)
.in(SupervisionUserComplaintPO::getDutyOrgId, ids)
.eq(SupervisionUserComplaintPO::getState, 1)
)
);
gridDiagramVO.setUserNum(userComplaintList.size());
//计划问题(有问题的单子)
List<SurveyTest> surveyTestList = surveyTestService.list(new LambdaQueryWrapper<SurveyTest>()
.in(SurveyTest::getDeptId, ids)
.eq(SurveyTest::getState, 1)
.eq(SurveyTest::getProblemFlag, 1)
.ge(StrUtil.isNotBlank(baseParam.getStartTime()), SurveyTest::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getStartTime())))
.le(StrUtil.isNotBlank(baseParam.getEndTime()), SurveyTest::getCreateTime, DateUtil.endOfDay(DateUtil.parse(baseParam.getEndTime())))
.and(x->x.in(SurveyTest::getDeptId, ids)
.eq(SurveyTest::getState, DataStateEnum.ENABLE.getCode())
.eq(SurveyTest::getStatus, FlowStatusEnum.APPROVE.getCode())
.eq(SurveyTest::getProblemFlag, 1)
.ge(StrUtil.isNotBlank(baseParam.getStartTime()), SurveyTest::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getStartTime())))
.le(StrUtil.isNotBlank(baseParam.getEndTime()), SurveyTest::getCreateTime, DateUtil.endOfDay(DateUtil.parse(baseParam.getEndTime()))))
.or(x->x.eq(SurveyTest::getDealState,0)
.in(SurveyTest::getDeptId, ids)
.eq(SurveyTest::getState, DataStateEnum.ENABLE.getCode())
.eq(SurveyTest::getStatus, FlowStatusEnum.APPROVE.getCode())
.eq(SurveyTest::getProblemFlag, 1)
)
);
gridDiagramVO.setSurveyNum(surveyTestList.size());