Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
74354a37 由 康伟
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 4c25f6fd 9f853064
内嵌 并排
正在显示 23 个修改的文件 包含 784 行增加 和 116 行删除
sk-module-biz/src/main/java/com/skua/modules/algorithm/controller/SysCommandCentreController.java
......@@ -7,10 +7,7 @@ import com.skua.modules.algorithm.service.ICommandCentreService;
import com.skua.modules.algorithm.vo.*;
import com.skua.modules.guest.util.DateUtil;
import com.skua.modules.report.entity.FReportItemv;
import com.skua.modules.report.vo.DepartLoadRateVO;
import com.skua.modules.report.vo.FRportlCommandCenterVO;
import com.skua.modules.report.vo.ReportDateTrendVO;
import com.skua.modules.report.vo.ReportItemvParam;
import com.skua.modules.report.vo.*;
import com.skua.modules.system.service.ISysConfigService;
import com.skua.modules.system.service.ISysFactoryInfoService;
import com.skua.tool.util.DigitalUtils;
......@@ -24,6 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDate;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.*;
/**
......@@ -469,4 +469,101 @@ public class SysCommandCentreController {
commandCentreResultVO.setDayData( dayData );
return commandCentreResultVO;
}*/
@AutoLog(value = "指挥中心-费用趋势")
@ApiOperation(value="指挥中心-费用趋势", notes="指挥中心-费用趋势")
@GetMapping(value = "/statisticsByFy")
public Result<StackedAreaChartDataVO> statisticsByFy(ReportItemvParam reportItemvParam) {
//费用
List<ReportDateTrendVO> fyMapList = commandCentreService.getFyData(reportItemvParam);
String reitId = sysConfigService.queryValueByKey("REIT_ID_CSL");
//水集合
reportItemvParam.setReitId( reitId );
List<ReportDateTrendVO> waterMapList = commandCentreService.getClslData(reportItemvParam);
List<String > dateList = new ArrayList<>();//日期数据
List<String> fyList = new ArrayList<>();//电能数据数据；
List<String> waterList = new ArrayList<>();// 水集合
List<String> dateTimeList = getMonthsBetween(reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
Map<String,String > electricityMap = new HashMap<String,String >();//电能数据数据；
Map<String,String > waterMap = new HashMap<String,String >();//水
if(fyMapList != null){
for( ReportDateTrendVO reportDateTrendVO : fyMapList){
electricityMap.put(reportDateTrendVO.getDate(),reportDateTrendVO.getValue() );
}
}
if(waterMapList != null){
for( ReportDateTrendVO reportDateTrendVO : waterMapList){
waterMap.put(reportDateTrendVO.getDate(),reportDateTrendVO.getValue() );
}
}
String electricity = null; String water = null;
for(String dateTime : dateTimeList){
electricity = electricityMap.get(dateTime ) ;
water = waterMap.get(dateTime ) ;
if(electricity == null) electricity = "0";
if(water == null ){
water = "0";
}
fyList.add( electricity ) ; waterList.add(water) ;
dateList.add(dateTime) ;
}
StackedAreaChartDataVO stackedAreaChartDataVO = new StackedAreaChartDataVO();
stackedAreaChartDataVO.setElectricityList(fyList);//费用集合
stackedAreaChartDataVO.setWaterList(waterList);//水集合
stackedAreaChartDataVO.setDateList(dateList);//日期集合
stackedAreaChartDataVO.setXAxis(dateList);
List<String> yaXisList = new ArrayList<String>();
yaXisList.addAll(fyList) ;//费用
yaXisList.addAll( waterList) ;//水
stackedAreaChartDataVO.setYAxis( yaXisList );
Result<StackedAreaChartDataVO> result = new Result<>();
result.setSuccess(true);
result.setResult(stackedAreaChartDataVO);
return result;
}
/**
* 获取时间之间的月份
* @param start
* @param end
* @return
*/
public static List<String> getMonthsBetween(String start, String end) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 解析日期
LocalDate startDate = LocalDate.parse(start, formatter);
LocalDate endDate = LocalDate.parse(end, formatter);
List<String> months = new ArrayList<>();
// 获取起始和结束月份
YearMonth startMonth = YearMonth.from(startDate);
YearMonth endMonth = YearMonth.from(endDate);
// 遍历月份并添加到列表
YearMonth currentMonth = startMonth;
while (!currentMonth.isAfter(endMonth)) {
months.add(currentMonth.toString()); // 格式化为 yyyy-MM
currentMonth = currentMonth.plusMonths(1);
}
return months;
}
@AutoLog(value = "指挥中心-药剂趋势")
@ApiOperation(value="指挥中心-药剂趋势", notes="指挥中心-药剂趋势")
@GetMapping(value = "/statisticsByYjqs")
public Result<DepartDrugResult> statisticsByYjqs(String month) {
DepartDrugResult departDrugResult = commandCentreService.getYhTotal(month);
Result<DepartDrugResult> result = new Result<>();
result.setSuccess(true);
result.setResult(departDrugResult);
return result;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/service/ICommandCentreService.java
package com.skua.modules.algorithm.service;
import com.skua.modules.report.entity.FReportItemv;
import com.skua.modules.report.vo.DepartLoadRateVO;
import com.skua.modules.report.vo.FRportlCommandCenterVO;
import com.skua.modules.report.vo.ReportDateTrendVO;
import com.skua.modules.report.vo.ReportItemvParam;
import com.skua.modules.report.vo.*;
import java.util.List;
import java.util.Map;
......@@ -64,4 +61,25 @@ public interface ICommandCentreService {
* @return
*/
public FRportlCommandCenterVO getReportItemvDayDataByReitId( ReportItemvParam reportItemvParam);
/**
* 查询费用
* @param reportItemvParam
* @return
*/
public List<ReportDateTrendVO> getFyData(ReportItemvParam reportItemvParam);
/**
* 查询月度水量
* @param reportItemvParam
* @return
*/
List<ReportDateTrendVO> getClslData(ReportItemvParam reportItemvParam);
/**
* 获取药剂
* @param month
* @return
*/
DepartDrugResult getYhTotal(String month);
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/service/impl/CommandCentreServiceImpl.java
package com.skua.modules.algorithm.service.impl;
import com.skua.common.report.ReportViewUtil;
import com.skua.modules.algorithm.service.ICommandCentreService;
import com.skua.modules.report.entity.FReportItem;
import com.skua.modules.report.entity.FReportItemv;
import com.skua.modules.report.mapper.FReportItemMapper;
import com.skua.modules.report.vo.DepartLoadRateVO;
import com.skua.modules.report.vo.*;
import com.skua.modules.report.mapper.FReportItemvMapper;
import com.skua.modules.report.vo.FRportlCommandCenterVO;
import com.skua.modules.report.vo.ReportDateTrendVO;
import com.skua.modules.report.vo.ReportItemvParam;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -22,7 +23,7 @@ import java.util.List;
* @version V0.1, 2024年9月3日
*/
@Service
public class CommandCentreServiceImpl implements ICommandCentreService {
public class CommandCentreServiceImpl implements ICommandCentreService {
@Resource
private FReportItemvMapper fReportItemvMapper;
......@@ -74,7 +75,6 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
public List<ReportDateTrendVO> getReportItemvByReitIdAndDate7Day(ReportItemvParam reportItemvParam){
List<ReportDateTrendVO> dataList = null;
dataList = fReportItemvMapper.getReportItemvByReitIdAndDate7Day(reportItemvParam);
return dataList;
}
......@@ -104,6 +104,63 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
return fRportlCommandCenterVO;
}
@Override
public List<ReportDateTrendVO> getFyData(ReportItemvParam reportItemvParam) {
List<ReportDateTrendVO> dataList = null;
dataList = fReportItemvMapper.getFyData(reportItemvParam);
return dataList;
}
@Override
public List<ReportDateTrendVO> getClslData(ReportItemvParam reportItemvParam) {
List<ReportDateTrendVO> dataList = null;
dataList = fReportItemvMapper.getClslData(reportItemvParam);
return dataList;
}
@Override
public DepartDrugResult getYhTotal(String month) {
// String monthTb = getTbMonth(month);//同比时间
// String monthHb = getHbMonth(month);//环比时间
// String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";
// String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";
// String departId = "1519193830953553920,1519200041706954752,1816759403152666624,1818214145808531456,1818214519948836864," +
// " 1818214642204409856,1818214704200417280,1818214745841467392,1818214781186867200,1818214830096646144,1818214870622011392," +
// " 1818214905388597248,1818214961122508800,1818215007217909760,1818215052952600576,1818215093192753152,1818215141427249152," +
// " 1818215178001580032,1818215228744269824,1818215268359471104,1818215307165171712,1818215363477897216,1818215411217465344";
// String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, month);
// String dataViewName2119tb = ReportViewUtil.buildViewLike(view2119,"CSL", departId, monthTb);
// String dataViewName2119hb = ReportViewUtil.buildViewLike(view2119,"CSL", departId, monthHb);
//
// String field3a24 = "PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
// "YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
// String dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,field3a24, departId, month);
// String dataViewName3a24tb = ReportViewUtil.buildViewLike(view3a24,field3a24, departId, monthTb);
// String dataViewName3a24hb = ReportViewUtil.buildViewLike(view3a24,field3a24, departId, monthHb);
DepartDrugResult departDrugResult = new DepartDrugResult();
departDrugResult.setZyh("0");
departDrugResult.setZyhHb("0");
departDrugResult.setZyhTb("0");
DepartDrugDataVO departDrugDataVO1 = new DepartDrugDataVO();
departDrugDataVO1.setDepartId("1519193830953553920");
departDrugDataVO1.setDepartName("杨村镇污水处理厂");
departDrugDataVO1.setYjdh("0");
departDrugDataVO1.setYjdhHb("0");
departDrugDataVO1.setYjdhTb("0");
DepartDrugDataVO departDrugDataVO2 = new DepartDrugDataVO();
departDrugDataVO2.setDepartId("1519200041706954752");
departDrugDataVO2.setDepartName("秦栏镇污水处理厂");
departDrugDataVO2.setYjdh("0");
departDrugDataVO2.setYjdhHb("0");
departDrugDataVO2.setYjdhTb("0");
List<DepartDrugDataVO> drugList = new ArrayList<>();
// drugList = fReportItemvMapper.getYhList(month,monthTb,monthHb);
drugList.add(departDrugDataVO1);
drugList.add(departDrugDataVO2);
departDrugResult.setDrugList(drugList);
return departDrugResult;
}
/***
* 根据String itemCode, String reportId 查询reitId字段
* @param reportItemvParam
......@@ -135,4 +192,27 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
return reitId;
}*/
/**
* 同比
* @param month
* @return
*/
public static String getTbMonth(String month) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
YearMonth yearMonth = YearMonth.parse(month, formatter);
YearMonth sameMonthLastYear = yearMonth.minusYears(1);
return sameMonthLastYear.format(formatter); // 同比
}
/**
* 环比
* @param month
* @return
*/
public static String getHbMonth(String month) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
YearMonth yearMonth = YearMonth.parse(month, formatter);
YearMonth previousMonth = yearMonth.minusMonths(1);
return previousMonth.format(formatter); // 环比
}
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EventMapController.java
......@@ -5,6 +5,9 @@ import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.modules.emergency.entity.EmergencyRiskEvent;
import com.skua.modules.emergency.service.IEmergencyRiskEventService;
import com.skua.modules.emergency.vo.DangerDatabaseResult;
import com.skua.modules.emergency.vo.MapDatabaseResult;
import com.skua.modules.emergency.vo.RiskDatabaseResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -29,14 +32,54 @@ public class EventMapController {
@AutoLog(value = "安全隐患事件数量")
@ApiOperation(value="安全隐患事件数量", notes="安全隐患事件数量")
@GetMapping(value = "/getCount")
public Result<Map<String,Object>> getHandleCount(EmergencyRiskEvent emergencyRiskEvent){
public Result<Map<String,Object>> getHandleCount(String year){
Result<Map<String,Object>> result = new Result<>();
Map<String,Object> map = emergencyRiskEventService.getCount(emergencyRiskEvent);
Map<String,Object> map = emergencyRiskEventService.getCount(year);
result.setSuccess(true);
result.setResult(map);
return result;
}
/**
* 风险库统计
*/
@AutoLog(value = "风险库统计")
@ApiOperation(value="风险库统计", notes="风险库统计")
@GetMapping(value = "/getRiskList")
public Result<List<RiskDatabaseResult>> getRiskList(String year){
Result<List<RiskDatabaseResult>> result = new Result<>();
List<RiskDatabaseResult> list = emergencyRiskEventService.getRiskList(year);
result.setSuccess(true);
result.setResult(list);
return result;
}
/**
* 隐患排查巡检统计
*/
@AutoLog(value = "隐患排查巡检统计")
@ApiOperation(value="隐患排查巡检统计", notes="隐患排查巡检统计")
@GetMapping(value = "/getDangerList")
public Result<List<DangerDatabaseResult>> getDangerList(String year){
Result<List<DangerDatabaseResult>> result = new Result<>();
List<DangerDatabaseResult> list = emergencyRiskEventService.getDangerList(year);
result.setSuccess(true);
result.setResult(list);
return result;
}
/**
* 地图隐患排查巡检统计
*/
@AutoLog(value = "地图隐患排查巡检统计")
@ApiOperation(value="地图隐患排查巡检统计", notes="地图隐患排查巡检统计")
@GetMapping(value = "/getMapData")
public Result<List<MapDatabaseResult>> getMapData(String year){
Result<List<MapDatabaseResult>> result = new Result<>();
List<MapDatabaseResult> list = emergencyRiskEventService.getMapData(year);
result.setSuccess(true);
result.setResult(list);
return result;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/mapper/EmergencyRiskEventMapper.java
......@@ -2,6 +2,9 @@ package com.skua.modules.emergency.mapper;
import java.util.List;
import com.skua.modules.emergency.vo.DangerDatabaseResult;
import com.skua.modules.emergency.vo.MapDatabaseResult;
import com.skua.modules.emergency.vo.RiskDatabaseResult;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.emergency.entity.EmergencyRiskEvent;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......@@ -11,4 +14,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface EmergencyRiskEventMapper extends BaseMapper<EmergencyRiskEvent> {
List<RiskDatabaseResult> getRiskList(@Param("year") String year);
List<DangerDatabaseResult> getDangerList(@Param("year") String year);
List<MapDatabaseResult> getMapData(@Param("year") String year);
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/mapper/xml/EmergencyRiskEventMapper.xml
......@@ -2,4 +2,40 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.emergency.mapper.EmergencyRiskEventMapper">
</mapper>
\ No newline at end of file
<select id="getRiskList" resultType="com.skua.modules.emergency.vo.RiskDatabaseResult">
SELECT
d.id AS depart_id,
0 AS fxk_count,
0 AS yhpc_num,
0 AS yhpcsj_num
FROM
sys_depart d
WHERE
d.depart_type = 1
</select>
<select id="getDangerList" resultType="com.skua.modules.emergency.vo.DangerDatabaseResult">
SELECT
d.id AS depart_id,
NULL AS danger_date,
NULL AS danger_location,
NULL AS is_fault
FROM
sys_depart d
WHERE
d.depart_type = 1
</select>
<select id="getMapData" resultType="com.skua.modules.emergency.vo.MapDatabaseResult">
SELECT
d.id AS depart_id,
f.pro_longitude AS longitude,
f.pro_latitude AS latitude
FROM
sys_depart d
LEFT JOIN sys_factory_info f ON f.depart_id = d.id
WHERE
d.depart_type = 1
</select>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/emergency/service/IEmergencyRiskEventService.java
......@@ -4,7 +4,11 @@ import com.skua.modules.emergency.dto.EmergencyRiskEventAddDTO;
import com.skua.modules.emergency.dto.EmergencyRiskEventHandleDto;
import com.skua.modules.emergency.entity.EmergencyRiskEvent;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.emergency.vo.DangerDatabaseResult;
import com.skua.modules.emergency.vo.MapDatabaseResult;
import com.skua.modules.emergency.vo.RiskDatabaseResult;
import java.util.List;
import java.util.Map;
/**
......@@ -26,8 +30,27 @@ public interface IEmergencyRiskEventService extends IService<EmergencyRiskEvent>
/**
* 安全隐患事件数量统计
* @param emergencyRiskEvent
* @param year
* @return
*/
Map<String, Object> getCount(String year);
/**
* 风险库统计
* @return
*/
List<RiskDatabaseResult> getRiskList(String year);
/**
* 隐患排查巡检统计
* @return
*/
List<DangerDatabaseResult> getDangerList(String year);
/**
* 地图隐患排查数量
* @param year
* @return
*/
Map<String, Object> getCount(EmergencyRiskEvent emergencyRiskEvent);
List<MapDatabaseResult> getMapData(String year);
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/service/impl/EmergencyRiskEventServiceImpl.java
......@@ -11,6 +11,9 @@ import com.skua.modules.emergency.entity.EmergencyRiskEvent;
import com.skua.modules.emergency.enums.DicEmergencyRiskEventHandleResultEnums;
import com.skua.modules.emergency.mapper.EmergencyRiskEventMapper;
import com.skua.modules.emergency.service.IEmergencyRiskEventService;
import com.skua.modules.emergency.vo.DangerDatabaseResult;
import com.skua.modules.emergency.vo.MapDatabaseResult;
import com.skua.modules.emergency.vo.RiskDatabaseResult;
import com.skua.modules.flow.business.service.FlowBusinessService;
import com.skua.modules.flow.business.service.IFlowService;
import com.skua.modules.flow.core.constant.ProcessConstant;
......@@ -42,6 +45,8 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
private IFlowService flowService;
@Autowired
private FlowBusinessService flowBusinessService;
@Autowired
private EmergencyRiskEventMapper emergencyRiskEventMapper;
@Override
@Transactional(rollbackFor = Exception.class)
......@@ -93,15 +98,40 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
}
@Override
public Map<String, Object> getCount(EmergencyRiskEvent emergencyRiskEvent) {
public Map<String, Object> getCount(String year) {
Map<String, Object> map = new HashMap<>();
map.put("total","9");
map.put("yes","5");
map.put("no","4");
Map<String, Object> aqyhMap = new HashMap<>();
aqyhMap.put("total","9");
aqyhMap.put("yes","5");
aqyhMap.put("no","4");
map.put("aqyh",aqyhMap);
Map<String, Object> fxkMap = new HashMap<>();
fxkMap.put("total","9");
fxkMap.put("share","5");
map.put("fxk",fxkMap);
map.put("yhpcyj","6");
return map;
}
@Override
public List<RiskDatabaseResult> getRiskList(String year) {
List<RiskDatabaseResult> list = emergencyRiskEventMapper.getRiskList(year);
return list;
}
@Override
public List<DangerDatabaseResult> getDangerList(String year) {
List<DangerDatabaseResult> list = emergencyRiskEventMapper.getDangerList(year);
return list;
}
@Override
public List<MapDatabaseResult> getMapData(String year) {
List<MapDatabaseResult> list = emergencyRiskEventMapper.getMapData(year);
return list;
}
@Override
public List<FlowProcessFormFieldInfoVO> buildCustomData(String s, List<FlowProcessFormFieldInfoVO> list) {
for (FlowProcessFormFieldInfoVO entity : list) {
if ("reportUser".equals(entity.getFieldCode())) {
......
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/DangerDatabaseResult.java 0 → 100644
package com.skua.modules.emergency.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 风险库对象
* @author 11389
*/
@Data
public class DangerDatabaseResult {
/**厂站ID*/
@ApiModelProperty(value = "厂站ID")
private String departId;
/**最近风险时间*/
@ApiModelProperty(value = "最近风险时间")
private String dangerDate;
/**最近风险点*/
@ApiModelProperty(value = "最近风险点")
private String dangerLocation;
/**隐患排查事件数量*/
@ApiModelProperty(value = "隐患排查事件数量")
private String isFault;
}
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/MapDatabaseResult.java 0 → 100644
package com.skua.modules.emergency.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* 风险库对象
* @author 11389
*/
@Data
public class MapDatabaseResult {
/**厂站ID*/
@ApiModelProperty(value = "厂站ID")
private String departId;
/**经度*/
@ApiModelProperty(value = "经度")
private String longitude;
/**纬度*/
@ApiModelProperty(value = "纬度")
private String latitude;
/**隐患排查事件*/
@ApiModelProperty(value = "隐患排查事件")
private List<Map<String,Object>> yhList;
}
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/RiskDatabaseResult.java 0 → 100644
package com.skua.modules.emergency.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 风险库对象
* @author 11389
*/
@Data
public class RiskDatabaseResult {
/**厂站ID*/
@ApiModelProperty(value = "厂站ID")
private String departId;
/**风险库数量*/
@ApiModelProperty(value = "风险库数量")
private Integer fxkCount;
/**隐患排查数量*/
@ApiModelProperty(value = "隐患排查数量")
private Integer yhpcNum;
/**隐患排查事件数量*/
@ApiModelProperty(value = "隐患排查事件数量")
private Integer yhpcsjNum;
}
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/FCustomReportDatasetMapper.java
......@@ -81,6 +81,7 @@ public interface FCustomReportDatasetMapper extends BaseMapper<FCustomReportData
*/
void removeByReportId(@Param(value="reportId")String reportId,@Param(value="dataSetId")String dataSetId);
List<Map<String, Object>> getDataFromHY(@Param(value="tbYear")String tbYear, @Param(value="year")String year,
@Param(value="departId")String departId);
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
package com.skua.modules.custom.service.impl;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.context.SpringContextUtils;
import com.skua.modules.custom.entity.FCustomReportDataset;
import com.skua.modules.custom.mapper.FCustomReportDatasetMapper;
import com.skua.modules.custom.service.IFCustomReportDatasetService;
......@@ -14,6 +15,7 @@ import java.time.temporal.WeekFields;
import java.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
......@@ -67,7 +69,88 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
public List<Map<String, Object>> getDataFromHY(String dataTime, String departId) {
List<Map<String, Object>> valueMapList = new ArrayList<>();
String tbYear = String.valueOf(Integer.parseInt(dataTime) - 1);
valueMapList = mapper.getDataFromHY(tbYear, dataTime, departId);
String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";
String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";
String view4411 = "4411ed3d78634bcdcd700f6e33724025";
String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, dataTime);
String dataViewName2119tb = ReportViewUtil.buildViewLike(view2119,"CSL", departId, tbYear);
String field3a24 = "DLHJ,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
String dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,field3a24, departId, dataTime);
String dataViewName3a24tb = ReportViewUtil.buildViewLike(view3a24,field3a24, departId, tbYear);
String field4411 = "yslwcbl,ysjsldyqntqyy,qntqsfsl,ysfsl,sfsldbbhl,sldyyqyy,dhgyqntqyy,yyf,yhgyqntqyy,dhcmbzyy,yhcyqyy";
String dataViewName4411 = ReportViewUtil.buildViewLike(view4411,field4411, departId, dataTime);
String dataViewName4411tb = ReportViewUtil.buildViewLike(view4411,"qntqsfsl", departId, tbYear);
//主库数据源
JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
String sql = "select " +
" v1.depart_id,left(v1.time,7) time, " +
" sum(v1.CSL)/10000 ysjsl, " +
" ifnull(tb.clsl_tb,0) tqysjsl, " +
" round(100*(sum(v1.CSL)/10000-ifnull(tb.clsl_tb,0))/ifnull(tb.clsl_tb,sum(v1.CSL)/10000),2) as sjsldbbhl, " +
" v6.ysjsldyqntqyy, " +
" ifnull(v7.qntqsfsl,0) as qntqsfsl, " +
" v6.ysfsl,v6.sfsldbbhl, " +
" rtc.target_water as ndslmb, " +
" v6.yslwcbl, " +
" v6.sldyyqyy, " +
" v4.dlhj as ydh,ifnull(v5.dlhj,0) qntqdh, " +
" round(100*(v4.dlhj-ifnull(v5.dlhj,0))/ifnull(v5.dlhj,v4.dlhj),2) as dhdbbhl, " +
" v6.dhgyqntqyy, " +
" v4.yjhl as yyh, " +
" v6.yyf,ifnull(v5.yjhl,0) qntqyh, " +
" round(100*(v4.yjhl-ifnull(v5.yjhl,0))/ifnull(v5.yjhl,v4.yjhl),2) as yhdbbhl, " +
" v6.yhgyqntqyy, " +
" rtc.target_power as bndhmb, " +
" y.dlhj_year as bnsjdh, " +
" v6.dhcmbzyy, " +
" rtc.target_drug as bnyhmb, " +
" y.yjhl_year as bnsjyh, " +
" v6.yhcyqyy " +
" from "+dataViewName2119+" v1 " +
" left join ( " +
" select right(left(v2119.time,7),2) month_tb,sum(v2119.CSL)/10000 clsl_tb " +
" from "+dataViewName2119tb+" v2119 " +
" where v2119.time like CONCAT('"+tbYear+"','%') and v2119.depart_id = '"+departId+"' GROUP BY left(v2119.time,7) " +
" ) tb on tb.month_tb = right(left(v1.time,7),2) " +
" left join (select * from report_target_config where depart_id = '"+departId+"' and target_year = '"+dataTime+"') rtc on rtc.depart_id = v1.depart_id " +
" left join ( " +
" select right(left(time,7),2) month_tb, " +
" SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) + " +
" SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) + " +
" SUM( FESO4Y ) + SUM( H2O2 )) yjhl " +
" from "+dataViewName3a24+" v3 " +
" where v3.depart_id = '"+departId+"' and v3.time like CONCAT('"+dataTime+"','%') GROUP BY left(time,7) " +
" ) v4 on v4.month_tb = right(left(v1.time,7),2) " +
" left join ( " +
" select right(left(time,7),2) month_tb, " +
" SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) + " +
" SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) + " +
" SUM( FESO4Y ) + SUM( H2O2 )) yjhl " +
" from "+dataViewName3a24tb+" v3 " +
" where v3.depart_id = '"+departId+"' and v3.time like CONCAT('"+tbYear+"','%') GROUP BY left(time,7) " +
" ) v5 on v5.month_tb = right(left(v1.time,7),2) " +
" left join ( " +
" select v4411.time,v4411.yslwcbl,v4411.ysjsldyqntqyy,v4411.qntqsfsl,v4411.ysfsl,v4411.sfsldbbhl,v4411.sldyyqyy," +
" v4411.dhgyqntqyy,v4411.yyf,v4411.yhgyqntqyy,v4411.dhcmbzyy,v4411.yhcyqyy " +
" from "+dataViewName4411+" v4411 " +
" where v4411.depart_id = '"+departId+"' and v4411.time like CONCAT('"+dataTime+"','%')) v6 on right(left(v6.time,7),2)=right(left(v1.time,7),2) " +
" left join ( " +
" select v3a24.depart_id,SUM(v3a24.DLHJ) dlhj_year,(SUM( v3a24.PAMRJ ) + SUM( v3a24.SCLPAMZ ) + SUM( v3a24.SCLPAMF ) + " +
" SUM( v3a24.NACLO ) + SUM( v3a24.PACGT ) + SUM( v3a24.PACYT ) + " +
" SUM( v3a24.PFS ) + SUM( v3a24.FHTY ) + SUM( v3a24.RYXNJ ) + SUM( v3a24.YWL ) + SUM( v3a24.GXCLJ ) + SUM( v3a24.CH3COONA ) + " +
" SUM( v3a24.HXT ) + SUM( v3a24.FECL3 ) + SUM( v3a24.SH ) + " +
" SUM( v3a24.CH3COOH ) + SUM( v3a24.FESO4G ) + SUM( v3a24.FESO4Y ) + SUM( v3a24.H2O2 )) yjhl_year " +
" from "+dataViewName3a24+" v3a24 " +
" where v3a24.depart_id = '"+departId+"' and v3a24.time like CONCAT('"+dataTime+"','%')) y on y.depart_id = v1.depart_id " +
" left join ( " +
" select right(left(v4411.time,7),2) time,v4411.qntqsfsl " +
" from "+dataViewName4411tb+" v4411 " +
" where v4411.depart_id = '"+departId+"' and v4411.time like CONCAT('"+tbYear+"','%')) v7 on right(left(v7.time,7),2) = right(left(v1.time,7),2) " +
" where v1.time like CONCAT('"+dataTime+"','%') and v1.depart_id = '"+departId+"' GROUP BY v1.depart_id,left(v1.time,7)";
valueMapList = masterDB.queryForList(sql);
if(valueMapList==null){
valueMapList = new ArrayList<>();
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/FactoryCenterMapper.java
......@@ -9,15 +9,24 @@ public interface FactoryCenterMapper {
List<Map<String, Object>> getWssltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
@Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
@Param("departId") String departId);
@Param("departId") String departId,
@Param("view2119") String view2119, @Param("view2119tb") String view2119tb);
List<Map<String, Object>> getHdltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
@Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
@Param("departId") String departId);
@Param("departId") String departId,
@Param("view3a24") String view3a24, @Param("view3a24tb") String view3a24tb,
@Param("view2119") String view2119, @Param("view2119tb") String view2119tb);
List<Map<String, Object>> getCnltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
@Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
@Param("departId") String departId);
@Param("departId") String departId,
@Param("view3a24") String view3a24, @Param("view3a24tb") String view3a24tb,
@Param("view2119") String view2119, @Param("view2119tb") String view2119tb);
Map<String, Object> getData(@Param("month") String month, @Param("departId") String departId);
List<Map<String, Object>> getYhtj(@Param("startDate") String startDate, @Param("endDate") String endDate,
@Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
@Param("departId") String departId);
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryCenterMapper.xml
......@@ -8,19 +8,19 @@
round( sum( v.CSL ) / 10000, 2 ) AS clsl,
ifnull(v2.clsl,0) as clsl_tb
FROM
view_2119 v
${view2119} v
left join (
SELECT
RIGHT( LEFT ( time, 7 ), 2 ) AS time,
round( sum( CSL ) / 10000, 2 ) AS clsl
RIGHT( LEFT ( v2119.time, 7 ), 2 ) AS time,
round( sum( v2119.CSL ) / 10000, 2 ) AS clsl
FROM
view_2119
${view2119tb} v2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDateTb}
AND time &lt;= #{endDateTb}
v2119.depart_id = #{departId}
AND v2119.time &gt;= #{startDateTb}
AND v2119.time &lt;= #{endDateTb}
GROUP BY
LEFT ( time, 7 )
LEFT ( v2119.time, 7 )
) v2 on RIGHT( LEFT ( v.time, 7 ), 2 ) = v2.time
WHERE v.depart_id = #{departId}
AND v.time &gt;= #{startDate}
......@@ -39,18 +39,18 @@
ROUND(pre.dsdh,2) as dsdh_tb,
LEFT(v3.time,7) as time
FROM
view_3a24 v3
${view3a24} v3
left join (
SELECT
SUM(CSL) as clsl,
LEFT(time,7) as time
SUM(v2119.CSL) as clsl,
LEFT(v2119.time,7) as time
FROM
view_2119
${view2119} v2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDate}
AND time &lt;= #{endDate}
GROUP BY LEFT ( time, 7 )
v2119.depart_id = #{departId}
AND v2119.time &gt;= #{startDate}
AND v2119.time &lt;= #{endDate}
GROUP BY LEFT ( v2119.time, 7 )
) v2 on LEFT(v3.time,7) = v2.time
left join (
SELECT
......@@ -59,18 +59,18 @@
round(SUM(v3.DLHJ)/ifnull(v2.clsl,0),2) as dsdh,
LEFT(v3.time,7) as time
FROM
view_3a24 v3
${view3a24tb} v3
left join (
SELECT
SUM(CSL) as clsl,
LEFT(time,7) as time
SUM(v2119.CSL) as clsl,
LEFT(v2119.time,7) as time
FROM
view_2119
${view2119tb} v2119
WHERE
depart_id = #{departId}
v2119.depart_id = #{departId}
AND time &gt;= #{startDateTb}
AND time &lt;= #{endDateTb}
GROUP BY LEFT ( time, 7 )
GROUP BY LEFT ( v2119.time, 7 )
) v2 on LEFT(v3.time,7) = v2.time
WHERE
v3.depart_id = #{departId}
......@@ -95,18 +95,18 @@
pre.wdscnl as wdscnl_tb,
LEFT(v3.time,7) as time
FROM
view_3a24 v3
${view3a24} v3
left join (
SELECT
SUM(CSL) as clsl,
LEFT(time,7) as time
SUM(v2119.CSL) as clsl,
LEFT(v2119.time,7) as time
FROM
view_2119
${view2119} v2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDate}
AND time &lt;= #{endDate}
GROUP BY LEFT ( time, 7 )
v2119.depart_id = #{departId}
AND v2119.time &gt;= #{startDate}
AND v2119.time &lt;= #{endDate}
GROUP BY LEFT ( v2119.time, 7 )
) v2 on LEFT(v3.time,7) = v2.time
left join (
SELECT
......@@ -115,18 +115,18 @@
round(SUM(v3.WNL)/(ifnull(v2.clsl,0)/10000),2) as wdscnl,
LEFT(v3.time,7) as time
FROM
view_3a24 v3
${view3a24tb} v3
left join (
SELECT
SUM(CSL) as clsl,
LEFT(time,7) as time
SUM(v2119.CSL) as clsl,
LEFT(v2119.time,7) as time
FROM
view_2119
${view2119tb} v2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDateTb}
AND time &lt;= #{endDateTb}
GROUP BY LEFT ( time, 7 )
v2119.depart_id = #{departId}
AND v2119.time &gt;= #{startDateTb}
AND v2119.time &lt;= #{endDateTb}
GROUP BY LEFT ( v2119.time, 7 )
) v2 on LEFT(v3.time,7) = v2.time
WHERE
v3.depart_id = #{departId}
......@@ -158,4 +158,37 @@
and v3.depart_id = #{departId}
</select>
<select id="getYhtj" resultType="java.util.HashMap">
SELECT
LEFT ( v.time, 7 ) AS time,
round(SUM( v.PAMRJ ) + SUM( v.SCLPAMZ ) + SUM( v.SCLPAMF ) + SUM( v.NACLO ) +
SUM( v.PACGT ) + SUM( v.PACYT ) + SUM( v.PFS ) + SUM( v.FHTY ) +
SUM( v.RYXNJ ) + SUM( v.YWL ) + SUM( v.GXCLJ ) + SUM( v.CH3COONA ) +
SUM( v.HXT ) + SUM( v.FECL3 ) + SUM( v.SH ) + SUM( v.CH3COOH ) + SUM( v.FESO4G ) +
SUM( v.FESO4Y ) + SUM( v.H2O2 ),2) as yh ,
ifnull(v2.yjhl,0) as yh_tb
FROM
view_3a24 v
left join (
SELECT
RIGHT( LEFT ( time, 7 ), 2 ) AS time,
round(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) +
SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) +
SUM( FESO4Y ) + SUM( H2O2 ),2) as yjhl
FROM
view_3a24
WHERE
depart_id = #{departId}
AND time &gt;= #{startDateTb}
AND time &lt;= #{endDateTb}
GROUP BY
LEFT ( time, 7 )
) v2 on RIGHT( LEFT ( v.time, 7 ), 2 ) = v2.time
WHERE v.depart_id = #{departId}
AND v.time &gt;= #{startDate}
AND v.time &lt;= #{endDate}
GROUP BY
LEFT ( v.time, 7 )
</select>
</mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/WaterCountAnalysisNewMapper.xml
......@@ -5,7 +5,7 @@
SELECT
DATE_FORMAT( v.time, '%Y-%m' ) time,
DATE_FORMAT( v.time, '%m' ) month,
round( abs( sum( ifnull( v.CSL, 0 ) ) ), 2 ) `value`
round( abs( sum( ifnull( v.CSL/10000, 0 ) ) ), 2 ) `value`
FROM
${dataViewName} v
WHERE
......@@ -31,34 +31,34 @@
sd.depart_name factoryName
FROM
(
SELECT
v.depart_id as depart_id,
round( abs( sum( ifnull(v.CSL,0) ) ), 2 ) `value`
FROM
${thisDataViewName} v
WHERE
v.time LIKE concat( #{time}, '%' )
AND v.depart_id in
<foreach item="item" index="index" collection="factoryIds.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY
v.depart_id
SELECT
v.depart_id as depart_id,
round( abs( sum( ifnull(v.CSL/10000,0) ) ), 2 ) `value`
FROM
${thisDataViewName} v
WHERE
v.time LIKE concat( #{time}, '%' )
AND v.depart_id in
<foreach item="item" index="index" collection="factoryIds.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY
v.depart_id
) a
LEFT JOIN (
SELECT
v.depart_id as factoryId,
round( abs( sum( ifnull(v.CSL,0) ) ), 2 ) `value`
FROM
${lastDataViewName} v
WHERE
v.time LIKE concat( #{yesTime}, '%' )
AND v.depart_id in
<foreach item="item" index="index" collection="factoryIds.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY
v.depart_id
SELECT
v.depart_id as factoryId,
round( abs( sum( ifnull(v.CSL/10000,0) ) ), 2 ) `value`
FROM
${lastDataViewName} v
WHERE
v.time LIKE concat( #{yesTime}, '%' )
AND v.depart_id in
<foreach item="item" index="index" collection="factoryIds.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY
v.depart_id
) b ON a.depart_id = b.factoryId
LEFT JOIN sys_depart sd ON sd.id = a.depart_id
LEFT JOIN sys_factory_info sfi ON sfi.depart_id = a.depart_id
......@@ -80,7 +80,7 @@
(
SELECT
v.depart_id as depart_id,
round( abs( sum( ifnull(v.CSL,0) ) ), 2 ) `value`
round( abs( sum( ifnull(v.CSL/10000,0) ) ), 2 ) `value`
FROM
${thisDataViewName} v
WHERE
......@@ -95,7 +95,7 @@
LEFT JOIN (
SELECT
v.depart_id as factoryId,
round( abs( sum( ifnull(v.CSL,0) ) ), 2 ) `value`
round( abs( sum( ifnull(v.CSL/10000,0) ) ), 2 ) `value`
FROM
${lastDataViewName} v
WHERE
......@@ -141,7 +141,7 @@
SELECT
DATE_FORMAT( v.time, '%Y-%m' ) time,
v.depart_id as factoryId,
round( abs( sum( ifnull(v.CSL,0) ) ), 2 ) `value`
round( abs( sum( ifnull(v.CSL/10000,0) ) ), 2 ) `value`
FROM
${dataViewName} v
WHERE
......@@ -159,7 +159,7 @@
SELECT
DATE_FORMAT( v.time, '%Y-%m' ) time,
v.depart_id factoryId,
round( abs( sum( ifnull(v.CSL,0) ) ), 2 ) `value`
round( abs( sum( ifnull(v.CSL/10000,0) ) ), 2 ) `value`
FROM
${dataViewName} v
WHERE
......@@ -185,9 +185,9 @@
FROM
sys_factory_info sfi
LEFT JOIN (
SELECT
v.depart_id as factoryId,'JSL' as metricdCode,sum(ifnull(v.CSL,0)) as value,left(v.time,7) as time,count( 1 ) count,
'm³' as metricUnit from ${dataViewName} v where left(v.time,7) = #{time} GROUP BY v.depart_id,left(v.time,7)
SELECT
v.depart_id as factoryId,'JSL' as metricdCode,sum(ifnull(v.CSL/10000,0)) as value,left(v.time,7) as time,count( 1 ) count,
'吨' as metricUnit from ${dataViewName} v where left(v.time,7) = #{time} GROUP BY v.depart_id,left(v.time,7)
) d ON sfi.depart_id = d.factoryId
LEFT JOIN sys_depart sd ON sd.id = sfi.depart_id
LEFT JOIN sys_area sa ON sa.id = sfi.pro_county
......@@ -204,7 +204,7 @@
v.depart_id AS factoryId,
d.depart_name AS factoryName,
round( 0, 2) AS zls,
round( SUM( ifnull(v.CSL,0) ), 2) AS clsl,
round( SUM( ifnull(v.CSL/10000,0) ), 2) AS clsl,
round( 0, 4 ) AS wdzls
FROM
${dataViewName} v
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
package com.skua.modules.dataAnalysis.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.service.IFactoryInfoService;
import com.skua.core.service.IPgQueryService;
......@@ -278,12 +279,19 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
@Override
public List<Map<String, Object>> getCnltj(StatisticsParam statisticsParam) {
String wnReport = "3a243d5715b9e1a3753c180872ca0df9";
String slReport = "2119ecbf53a1d2d0708258ff67cfd9e1";
List<Map<String, Object>> list = new ArrayList<>();
String startDate = statisticsParam.getStartDate();
String endDate = statisticsParam.getEndDate();
String startDateTb = "2023-01-01";
String endDateTb = "2023-09-31";
list = factoryCenterMapper.getCnltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
String view3a24 = ReportViewUtil.buildView(wnReport, "WNL", statisticsParam.getDepartId(), startDate,endDate);
String view3a24tb = ReportViewUtil.buildView(wnReport, "WNL", statisticsParam.getDepartId(), startDateTb,endDateTb);
String view2119 = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String view2119tb = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
list = factoryCenterMapper.getCnltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),
view3a24,view3a24tb,view2119,view2119tb);
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
for ( String month : monthList ) {
......@@ -301,12 +309,19 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
@Override
public List<Map<String, Object>> getHdltj(StatisticsParam statisticsParam) {
String wnReport = "3a243d5715b9e1a3753c180872ca0df9";
String slReport = "2119ecbf53a1d2d0708258ff67cfd9e1";
List<Map<String, Object>> list = new ArrayList<>();
String startDate = statisticsParam.getStartDate();
String endDate = statisticsParam.getEndDate();
String startDateTb = "2023-01-01";
String endDateTb = "2023-09-31";
list = factoryCenterMapper.getHdltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
String view3a24 = ReportViewUtil.buildView(wnReport, "DLHJ", statisticsParam.getDepartId(), startDate,endDate);
String view3a24tb = ReportViewUtil.buildView(wnReport, "DLHJ", statisticsParam.getDepartId(), startDateTb,endDateTb);
String view2119 = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String view2119tb = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
list = factoryCenterMapper.getHdltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),
view3a24,view3a24tb,view2119,view2119tb);
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
for ( String month : monthList ) {
......@@ -324,12 +339,15 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
@Override
public List<Map<String, Object>> getWssltj(StatisticsParam statisticsParam) {
String slReport = "2119ecbf53a1d2d0708258ff67cfd9e1";
List<Map<String, Object>> list = new ArrayList<>();
String startDate = statisticsParam.getStartDate();
String endDate = statisticsParam.getEndDate();
String startDateTb = "2023-01-01";
String endDateTb = "2023-09-31";
list = factoryCenterMapper.getWssltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
String view2119 = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String view2119tb = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
list = factoryCenterMapper.getWssltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),view2119,view2119tb);
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
for ( String month : monthList ) {
......@@ -348,13 +366,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
List<Map<String, Object>> list = new ArrayList<>();
String startDate = statisticsParam.getStartDate();
String endDate = statisticsParam.getEndDate();
List<String> monthList = getMonthsBetween(startDate,endDate);
for ( String month : monthList ) {
Map<String, Object> map = new HashMap<>();
map.put("time",month);
map.put("clyj","0");
map.put("tyyj","0");
list.add(map);
String startDateTb = "2023-01-01";
String endDateTb = "2023-09-31";
list = factoryCenterMapper.getYhtj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
for ( String month : monthList ) {
Map<String, Object> map = new HashMap<>();
map.put("time",month);
map.put("yh","0");
map.put("yh_tb","0");
list.add(map);
}
}
return list;
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/WaterCountAnalysisNewServiceImpl.java
......@@ -19,7 +19,7 @@ import java.util.Map;
@Service
public class WaterCountAnalysisNewServiceImpl implements WaterCountAnalysisNewService {
private static String REPOART_ID_SL = "9bffaf9187093d6e6a4390e8c56acca8";
private static String REPOART_ID_SL = "2119ecbf53a1d2d0708258ff67cfd9e1";
private static String FACTORYIDS = "1519193830953553920,1519200041706954752,1816759403152666624,1818214145808531456,1818214519948836864," +
" 1818214642204409856,1818214704200417280,1818214745841467392,1818214781186867200,1818214830096646144,1818214870622011392," +
" 1818214905388597248,1818214961122508800,1818215007217909760,1818215052952600576,1818215093192753152,1818215141427249152," +
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/FReportItemvMapper.java
package com.skua.modules.report.mapper;
import com.skua.modules.report.vo.DepartLoadRateVO;
import com.skua.modules.report.vo.FRportlCommandCenterVO;
import com.skua.modules.report.vo.ReportDateTrendVO;
import com.skua.modules.report.vo.ReportItemvParam;
import com.skua.modules.report.vo.*;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.report.entity.FReportItemv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......@@ -21,7 +18,7 @@ public interface FReportItemvMapper extends BaseMapper<FReportItemv> {
List<FReportItemv> getDataInfoByDataId(@Param("dataId") String dataId);
void editData(@Param("reitId") String reitId, @Param("dataId") String dataId,@Param("itemValue") String itemValue,
void editData(@Param("reitId") String reitId, @Param("dataId") String dataId,@Param("itemValue") String itemValue,
@Param("dataTime") String dataTime,@Param("departId") String departId,@Param("createTime") Date createTime);
List<FReportItemv> getBean(@Param("dataId") String dataId, @Param("reitId") String reitId);
......@@ -90,4 +87,27 @@ public interface FReportItemvMapper extends BaseMapper<FReportItemv> {
* @return
*/
public FRportlCommandCenterVO getReportItemvDayDataByReitId(ReportItemvParam reportItemvParam);
/**
* 查询费用
* @param reportItemvParam
* @return
*/
List<ReportDateTrendVO> getFyData(ReportItemvParam reportItemvParam);
/**
* 查询水量信息
* @param reportItemvParam
* @return
*/
List<ReportDateTrendVO> getClslData(ReportItemvParam reportItemvParam);
/**
* 药量信息
* @param month
* @param monthTb
* @param monthHb
* @return
*/
List<DepartDrugDataVO> getYhList(String month, String monthTb, String monthHb);
}
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/xml/FReportItemvMapper.xml
......@@ -135,4 +135,25 @@
from dual
</select>
<select id="getFyData" resultType="com.skua.modules.report.vo.ReportDateTrendVO">
SELECT
month AS date,
SUM( cost ) AS value
FROM
report_electric_cost
WHERE
month BETWEEN '2024-01' AND '2024-09'
GROUP BY month
</select>
<select id="getClslData" resultType="com.skua.modules.report.vo.ReportDateTrendVO">
SELECT sum(item_value) as 'value' , left(data_time,7) as 'date' FROM f_report_itemv
where reit_id=#{reitId} and data_time &gt;= #{startDate} and data_time &lt;= #{endDate}
group by left(data_time,7)
</select>
<select id="getYhList" resultType="com.skua.modules.report.vo.DepartDrugDataVO">
select * from sys_depart where depart_type = '1'
</select>
</mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/report/vo/DepartDrugDataVO.java 0 → 100644
package com.skua.modules.report.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 统计功能配置表
*/
@Data
@ApiModel(value="指挥中心--厂区药剂接受对象", description="指挥中心--厂区药剂接受对象")
public class DepartDrugDataVO implements Serializable{
@ApiModelProperty(value = "厂区ID")
private String departId;
@ApiModelProperty(value = "厂区名称")
private String departName;
@ApiModelProperty(value = "药剂单耗")
private String yjdh;
@ApiModelProperty(value = "药剂单耗同比")
private String yjdhTb;
@ApiModelProperty(value = "药剂单耗环比")
private String yjdhHb;
}
sk-module-datafill/src/main/java/com/skua/modules/report/vo/DepartDrugResult.java 0 → 100644
package com.skua.modules.report.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 统计功能配置表
*/
@Data
@ApiModel(value="指挥中心--厂区药剂接受对象", description="指挥中心--厂区药剂接受对象")
public class DepartDrugResult implements Serializable{
@ApiModelProperty(value = "总药耗")
private String zyh;
@ApiModelProperty(value = "总药耗同比")
private String zyhTb;
@ApiModelProperty(value = "总药耗环比")
private String zyhHb;
@ApiModelProperty(value = "厂区名称")
private List<DepartDrugDataVO> drugList;
}
sk-module-datafill/src/main/java/com/skua/modules/report/vo/DepartLoadRateVO.java
......@@ -14,6 +14,9 @@ import java.io.Serializable;
public class DepartLoadRateVO implements Serializable{
@ApiModelProperty(value = "项目公司")
private String departId;
@ApiModelProperty(value = "项目公司")
private String departName;
@ApiModelProperty(value = "运行负荷率")
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!