Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
9ea753d4 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 e0c9026f 43b9054b
内嵌 并排
正在显示 6 个修改的文件 包含 135 行增加 和 15 行删除
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
......@@ -514,6 +514,8 @@ public class EquipmentController {
String energyLevel = equipmentDTO.getEquipmentInfo().getEnergyLevel();//能耗等级
//Integer isSpecial = equipmentDTO.getEquipmentInfo().getIsSpecial();
String isMeterage = equipmentDTO.getEquipmentInfo().getIsMeterage();//是否计量设备
String orderFiled = equipmentDTO.getOrderFiled();
boolean orderType = equipmentDTO.isOrderType();
List<String> equipmentLevelList = null;
Base base = BaseFactory.JOIN().select(EquipmentAsset.class).select(EquipmentInfo.class).select(EquipmentBrand.class).select(EquipmentCategory.class)
......@@ -540,8 +542,12 @@ public class EquipmentController {
.like(StringUtils.isNotEmpty(equipmentCode), "equipment_code", equipmentCode)
.eq(StringUtils.isNotEmpty(equipmentStatus), "equipment_status", equipmentStatus)
.like(StringUtils.isNotEmpty(installPosition), EquipmentInfo::getInstallPosition, installPosition)
.eq(StringUtils.isNotEmpty(equipmentDTO.getEquipmentInfo().getId()), "equipment_info.id", equipmentDTO.getEquipmentInfo().getId())
.orderBy(true,false,"equipment_info.create_time");
.eq(StringUtils.isNotEmpty(equipmentDTO.getEquipmentInfo().getId()), "equipment_info.id", equipmentDTO.getEquipmentInfo().getId());
if (StringUtils.isNotEmpty(orderFiled)) {
base.orderBy(true,orderType,"equipment_info." + orderFiled);
}else {
base.orderBy(true,false,"equipment_info.create_time");
}
Page<Map<String, Object>> mapPage = (Page<Map<String, Object>>) base.queryForPage(new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize()));
// 转义
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/dto/EquipmentDTO.java
......@@ -19,8 +19,9 @@ public class EquipmentDTO {
private EquipmentAsset equipmentAsset = new EquipmentAsset();
private EquipmentInfo equipmentInfo = new EquipmentInfo();
private List<EquipmentInfoExtParam> equipmentInfoExtParams = new ArrayList<EquipmentInfoExtParam>();
private Long pageNo = 1L;
private Long pageSize = 10L;
private String orderFiled;//排序字段
private boolean orderType;//排序类型,true:升序,false:降序
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/controller/web/InspectionAnalysisController.java
......@@ -158,7 +158,7 @@ public class InspectionAnalysisController {
@GetMapping("/getInspectionTaskIndicators")
public Result<InspectionTaskIndicatorsVO> getInspectionTaskIndicators(String startDate,String endDate){
Result<InspectionTaskIndicatorsVO> result = new Result<>();
InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = inspectionAnalysisService.getInspectionTaskIndicators(startDate,endDate);
InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = inspectionAnalysisService.getInspectionTaskIndicatorsNew(startDate,endDate);
result.setSuccess(true);
result.setResult(inspectionTaskIndicatorsVO);
return result;
......@@ -188,7 +188,7 @@ public class InspectionAnalysisController {
@GetMapping("/getInspectionTaskOverview")
public Result<InspectionTaskOverviewVO> getInspectionTaskOverview(String startDate, String endDate){
Result<InspectionTaskOverviewVO> result = new Result<>();
InspectionTaskOverviewVO inspectionTaskIndicatorVO = inspectionAnalysisService.getInspectionTaskOverview(startDate,endDate);
InspectionTaskOverviewVO inspectionTaskIndicatorVO = inspectionAnalysisService.getInspectionTaskOverviewNew(startDate,endDate);
result.setSuccess(true);
result.setResult(inspectionTaskIndicatorVO);
return result;
......@@ -221,7 +221,7 @@ public class InspectionAnalysisController {
@GetMapping("/getInspectionEquipIndicators")
public Result<InspectionEquipIndicatorsVO> getInspectionEquipIndicators(String startDate, String endDate){
Result<InspectionEquipIndicatorsVO> result = new Result<>();
InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = inspectionAnalysisService.getInspectionEquipIndicators(startDate,endDate);
InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = inspectionAnalysisService.getInspectionEquipIndicatorsNew(startDate,endDate);
result.setSuccess(true);
result.setResult(inspectionEquipIndicatorsVO);
return result;
......@@ -251,7 +251,7 @@ public class InspectionAnalysisController {
@GetMapping("/getInspectionEquipOverview")
public Result<InspectionEquipOverviewVO> getInspectionEquipOverview(String startDate, String endDate){
Result<InspectionEquipOverviewVO> result = new Result<>();
InspectionEquipOverviewVO inspectionEquipOverviewVO = inspectionAnalysisService.getInspectionEquipOverview(startDate,endDate);
InspectionEquipOverviewVO inspectionEquipOverviewVO = inspectionAnalysisService.getInspectionEquipOverviewNew(startDate,endDate);
result.setSuccess(true);
result.setResult(inspectionEquipOverviewVO);
return result;
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/mapper/InspectionPointFillGroupMapper.java
......@@ -26,9 +26,12 @@ public interface InspectionPointFillGroupMapper extends BaseMapper<InspectionPoi
"\tleft join inspection_fill_choice ifc on ifi.id = ifc.inspection_fill_id ${ew.customSqlSegment}")
List<InspectionPointFillGroupAndFillVO> getList(@Param(Constants.WRAPPER) QueryWrapper<InspectionPointFillGroupAndFillVO> inspectionPointFillGroupAndFillVOQueryWrapper);
@Select("select 'sys_struct_dict' node_type,id,'' parent_id,struct_name title from sys_struct_dict ssd where ssd.depart_id = #{departId}\n" +
"union all\n" +
"select 'equip_info' node_type,ei.id,ssd.id parent_id,ei.equipment_name title from equipment_info ei left join sys_struct_dict ssd on " +
" ei.structures = ssd.id where ssd.depart_id = #{departId}")
@Select("SELECT * FROM\t(\tSELECT 'sys_struct_dict' AS node_type,ssd.id,'' AS parent_id,ssd.struct_name AS title,ssd.sort_num,NULL AS equipment_name\n" +
"\tFROM sys_struct_dict ssd WHERE ssd.depart_id = #{departId}\n" +
"\tUNION ALL SELECT\n" +
"\t\t'equip_info' AS node_type,ei.id,ssd.id AS parent_id,ei.equipment_name AS title,ssd.sort_num,ei.equipment_name -- 用于排序\n" +
"\tFROM equipment_info ei LEFT JOIN sys_struct_dict ssd ON ei.structures = ssd.id \n" +
"\tWHERE ssd.depart_id = #{departId}\n" +
"\t) AS combined_result ORDER BY node_type DESC,sort_num,equipment_name;")
List<InspectionStructEquipVO> getSysStructDictAndEquipInfo(@Param("departId") String departId);
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/IInspectionAnalysisService.java
......@@ -20,7 +20,7 @@ public interface IInspectionAnalysisService {
* @return
*/
InspectionTaskIndicatorsVO getInspectionTaskIndicators(String startDate, String endDate);
InspectionTaskIndicatorsVO getInspectionTaskIndicatorsNew(String startDate, String endDate);
/***
* 巡检分析-巡检任务指标-详情
* @param departIds
......@@ -36,7 +36,7 @@ public interface IInspectionAnalysisService {
* @return
*/
InspectionEquipIndicatorsVO getInspectionEquipIndicators(String startDate, String endDate);
InspectionEquipIndicatorsVO getInspectionEquipIndicatorsNew(String startDate, String endDate);
/***
* 巡检分析-巡检设备指标--详情
* @param startDate
......@@ -52,6 +52,7 @@ public interface IInspectionAnalysisService {
* @return
*/
InspectionTaskOverviewVO getInspectionTaskOverview(String startDate, String endDate);
InspectionTaskOverviewVO getInspectionTaskOverviewNew(String startDate, String endDate);
/***
* 巡检分析-巡检任务概况
......@@ -69,6 +70,8 @@ public interface IInspectionAnalysisService {
*/
InspectionEquipOverviewVO getInspectionEquipOverview(String startDate, String endDate);
InspectionEquipOverviewVO getInspectionEquipOverviewNew(String startDate, String endDate);
/***
* 巡检分析-巡检设备概况-详情
* @param departIds
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/impl/InspectionAnalysisServiceImpl.java
......@@ -492,6 +492,30 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
}
public InspectionTaskIndicatorsVO getInspectionTaskIndicatorsNew(String startDate, String endDate){
InspectionTaskOverviewVO inspectionTaskOverviewVO = getInspectionTaskOverviewNew( startDate, endDate);
InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = new InspectionTaskIndicatorsVO();
//完成率
String completionRate = "0";
completionRate = numberFormat.format(inspectionTaskOverviewVO.getCheckedInspectionTaskCount() / (double) inspectionTaskOverviewVO.getTotalInspectionTaskCount() * 100);
//未检率
String unCompletionRate = "0";
unCompletionRate = numberFormat.format( inspectionTaskOverviewVO.getNotCheckedInspectionTaskCount()/ (double) inspectionTaskOverviewVO.getTotalInspectionTaskCount() * 100);
//异常率
String abnormalRate = "0";
abnormalRate = numberFormat.format(inspectionTaskOverviewVO.getAbnormalInspectionTaskCount() / (double) inspectionTaskOverviewVO.getCheckedInspectionTaskCount() * 100);
//异常项处理率
// String processedAbnormalRate = "0";
// if (abnormalItemsCount != 0) {
// processedAbnormalRate = numberFormat.format(processedAbnormalItemsCount / (double)abnormalItemsCount * 100);
// }
inspectionTaskIndicatorsVO.setCompletionRate(completionRate);
inspectionTaskIndicatorsVO.setUnCompletionRate(unCompletionRate);
inspectionTaskIndicatorsVO.setAbnormalRate(abnormalRate);
return inspectionTaskIndicatorsVO;
}
/***
* 巡检分析-巡检任务指标-详情
......@@ -503,6 +527,7 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
public List<InspectionEquipIndicatorsDetailVO> getInspectionTaskIndicatorsDetail(String departIds, String startDate, String endDate){
return inspectionAnalysisMapper.getInspectionEquipIndicatorsDetail(departIds, startDate, endDate);
}
/***
* 巡检分析-巡检设备指标
* @param startDate
......@@ -634,6 +659,37 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
return inspectionEquipIndicatorsVO;
}
public InspectionEquipIndicatorsVO getInspectionEquipIndicatorsNew(String startDate, String endDate) {
InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = new InspectionEquipIndicatorsVO();
InspectionEquipOverviewVO inspectionEquipOverviewNew = getInspectionEquipOverviewNew(startDate, endDate);
//完成率
String finishRate = "0";
finishRate = numberFormat.format( inspectionEquipOverviewNew.getCheckedInspectionEquipCount() / (double) inspectionEquipOverviewNew.getTotalInspectionEquipCount() * 100);
//覆盖率
String completionRate = "0";
completionRate = numberFormat.format( inspectionEquipOverviewNew.getCheckedInspectionEquipCount() / (double) inspectionEquipOverviewNew.getTotalInspectionEquipCount() * 100);
//未检率
String unCompletionRate = "0";
unCompletionRate = numberFormat.format(inspectionEquipOverviewNew.getNotCheckedInspectionEquipCount() / (double) inspectionEquipOverviewNew.getTotalInspectionEquipCount() * 100);
//异常率
String abnormalRate = "0";
abnormalRate = numberFormat.format( inspectionEquipOverviewNew.getAbnormalInspectionEquipCount() / (double) inspectionEquipOverviewNew.getCheckedInspectionEquipCount() * 100);
//异常项处理率
String processedAbnormalRate = "0";
/* if (abnormalItemsCount != 0) {
processedAbnormalRate = numberFormat.format(processedAbnormalItemsCount / (double) abnormalItemsCount * 100);
}*/
inspectionEquipIndicatorsVO.setFinishRate(finishRate);
inspectionEquipIndicatorsVO.setCompletionRate(completionRate);
inspectionEquipIndicatorsVO.setUnCompletionRate(unCompletionRate);
inspectionEquipIndicatorsVO.setAbnormalRate(abnormalRate);
inspectionEquipIndicatorsVO.setProcessedAbnormalRate(processedAbnormalRate);
return inspectionEquipIndicatorsVO;
}
/***
* 巡检分析-巡检设备指标--详情
* @param startDate
......@@ -757,6 +813,31 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
return inspectionTaskOverviewVO;
}
public InspectionTaskOverviewVO getInspectionTaskOverviewNew(String startDate, String endDate) {
String departIds = BaseContextHandler.getDeparts();
InspectionTaskOverviewVO inspectionTaskOverviewVO = new InspectionTaskOverviewVO();
String sql = "select count(1) 'totalInspectionTaskCount' , sum(CASE WHEN t.task_state = '1' THEN 1 ELSE 0 END) AS 'inProgressInspectionTaskCount' ,";
sql += " sum(CASE WHEN t.task_state = '2' THEN 1 ELSE 0 END) AS 'checkedInspectionTaskCount',sum(CASE WHEN t.task_state = '3' THEN 1 ELSE 0 END) AS 'notCheckedInspectionTaskCount' ";
sql += " from inspection_task t where 1=1 AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') >= '"+startDate+"' AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') <= '"+endDate+"' ";
sql += " and depart_id in ("+JSUtils.quoteEach(departIds,",")+")";
Map<String, Object> dataMap = commonSqlService.queryForMap(sql);
sql = " select count(cc.inspection_task_id) 'abnormalInspectionTaskCount' from ( ";
sql += " SELECT t.depart_id, itfc.inspection_task_id FROM inspection_task_fill_content itfc ,inspection_task t WHERE inspection_task_id =t.id and t.task_state IN ('2') ";
sql += " AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') >= '"+startDate+"' AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') <= '"+endDate+"' ";
sql += " and t.depart_id in ("+JSUtils.quoteEach(departIds,",")+")";
sql += " AND choice_state = '0' GROUP BY itfc.inspection_task_id ,t.depart_id) cc ";
Integer abnormalInspectionTaskCount = getJdbcTemplate().queryForObject(sql,Integer.class);
inspectionTaskOverviewVO.setTotalInspectionTaskCount( ConvertUtils.getInt(dataMap.get("totalInspectionTaskCount"),0));
inspectionTaskOverviewVO.setCheckedInspectionTaskCount( ConvertUtils.getInt(dataMap.get("checkedInspectionTaskCount"),0));
inspectionTaskOverviewVO.setNotCheckedInspectionTaskCount(ConvertUtils.getInt(dataMap.get("notCheckedInspectionTaskCount"),0));
inspectionTaskOverviewVO.setNormalInspectionTaskCount(ConvertUtils.getInt(dataMap.get("checkedInspectionTaskCount"),0) - ConvertUtils.getInt(abnormalInspectionTaskCount,0) );
inspectionTaskOverviewVO.setAbnormalInspectionTaskCount(abnormalInspectionTaskCount);
return inspectionTaskOverviewVO;
}
/***
* 巡检分析-巡检任务概况
......@@ -882,6 +963,27 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
}
public InspectionEquipOverviewVO getInspectionEquipOverviewNew(String startDate, String endDate){
String departIds = BaseContextHandler.getDeparts();
InspectionEquipOverviewVO inspectionEquipOverviewVO = new InspectionEquipOverviewVO();
String sql = getTotalInspectionEquipSql(departIds,startDate, endDate);
Integer totalInspectionEquipCount = getJdbcTemplate().queryForObject(sql,Integer.class);//应监测
sql = " SELECT count( DISTINCT aaa.equip_info_id) FROM inspection_task_fill_content isfc "+getCheckedInspectionEquipCommonSql(departIds,startDate,endDate,null);//已检测
Integer checkedInspectionEquipCount = getJdbcTemplate().queryForObject(sql,Integer.class);
sql = " SELECT count( DISTINCT aaa.equip_info_id) FROM inspection_task_fill_content isfc "+getCheckedInspectionEquipCommonSql(departIds,startDate,endDate,"0");//异常
Integer abnormalInspectionEquipCount = getJdbcTemplate().queryForObject(sql,Integer.class);
inspectionEquipOverviewVO.setTotalInspectionEquipCount(totalInspectionEquipCount);
inspectionEquipOverviewVO.setCheckedInspectionEquipCount(checkedInspectionEquipCount);
inspectionEquipOverviewVO.setNotCheckedInspectionEquipCount(totalInspectionEquipCount - checkedInspectionEquipCount);
inspectionEquipOverviewVO.setNormalInspectionEquipCount(checkedInspectionEquipCount - abnormalInspectionEquipCount);
inspectionEquipOverviewVO.setAbnormalInspectionEquipCount(abnormalInspectionEquipCount);
// inspectionEquipOverviewVO.setProcessedAbnormalRate(processedAbnormalRate);
return inspectionEquipOverviewVO;
}
/***
* 巡检分析-巡检设备概况-详情
* @param departIds
......@@ -890,7 +992,7 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
* @return
*/
public List<InspectionEquipIndicatorsDetailVO> getInspectionEquipOverviewDetail(String departIds, String startDate, String endDate){
// return inspectionAnalysisMapper.getInspectionEquipIndicatorsDetail( departIds, startDate, endDate);
// return inspectionAnalysisMapper.getInspectionEquipIndicatorsDetail( departIds, startDate, endDate);
//return null;
String sql = "select d.depart_name, d.id 'departId' , ifnull(kkk.total_count,0) 'totalInspectionEquipCount' , ifnull(kkk.yj_count,0) 'checkedInspectionEquipCount' ,ifnull(kkk.yc_count,0) 'abnormalInspectionEquipCount' ,(ifnull(kkk.yj_count,0) - ifnull(kkk.yc_count,0) ) 'normalInspectionEquipCount' , " +
" (ifnull(kkk.total_count,0) - ifnull(kkk.yj_count,0) ) 'notCheckedInspectionEquipCount' " +
......@@ -1060,6 +1162,12 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
//获取已检设备的id集合
private String getCheckedInspectionEquipIds(String departIds,String startDate,String endDate,String choice_state){
String sql = " SELECT aaa.equip_info_id FROM inspection_task_fill_content isfc ";
sql += " "+getCheckedInspectionEquipCommonSql(departIds,startDate,endDate,choice_state);
sql += " GROUP BY aaa.equip_info_id ";
return sql;
}
private String getCheckedInspectionEquipCommonSql(String departIds,String startDate,String endDate,String choice_state){
String sql = " ";
sql += " left join ( ";
sql += " SELECT equip_info_id ,inspection_point_fill_group_id ,inspection_fill_group_id ,inspection_task_id FROM inspection_task_point_fill_group ";
sql += " WHERE inspection_task_id IN ( select id FROM inspection_task WHERE inspection_cycle_start_date >= '"+startDate+" 00:00:00' AND inspection_cycle_start_date <= '"+endDate+" 23:59:59' AND task_state IN ('2','3') ";
......@@ -1073,7 +1181,6 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
if(StringUtils.isNotEmpty(choice_state)){
sql += " AND choice_state = '"+choice_state+"' ";
}
sql += " GROUP BY aaa.equip_info_id ";
return sql;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!