Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
4ca8a4da 由 kangwei
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 2db4e31d 1a4fc839
内嵌 并排
正在显示 11 个修改的文件 包含 59 行增加 和 35 行删除
sk-module-alarm/src/main/java/com/skua/modules/quartz/DeviceStatusJob.java
......@@ -285,6 +285,7 @@ public class DeviceStatusJob implements Job {
AlarmRecordHistory alarmRecordHistory = new AlarmRecordHistory();
alarmRecordHistory.setAlarmParamCode(plc);
alarmRecordHistory.setAlarmRuleType("B001B005");
alarmRecordHistory.setAlarmRuleTypeTreepath("B001,B001B005");
alarmRecordHistory.setAlarmParamType(paramType);
alarmRecordHistory.setActualAvgValue("断线");
alarmRecordHistory.setDelFlag(1);
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/controller/SysCommandCentreController.java
......@@ -5,6 +5,7 @@ import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.common.service.ICommonSqlService;
import com.skua.modules.custom.service.IFCustomReportDatasetService;
import com.skua.modules.dataAnalysis.service.ICommandCentreService;
import com.skua.modules.algorithm.service.impl.ReportItemvService;
......@@ -12,7 +13,6 @@ import com.skua.modules.algorithm.vo.DepartLoadRateResultVO;
import com.skua.modules.algorithm.vo.StackedAreaChartDataVO;
import com.skua.modules.algorithm.vo.WaterTreatmentVO;
import com.skua.modules.common.vo.DateVO;
import com.skua.modules.equipment.vo.EquipmentRepairAnalysisVO;
import com.skua.modules.guest.util.DateUtil;
import com.skua.modules.report.vo.DepartDrugResult;
import com.skua.modules.report.vo.FRportlCommandCenterVO;
......@@ -56,7 +56,8 @@ public class SysCommandCentreController {
private ReportItemvService reportItemvService;
@Autowired
private IFCustomReportDatasetService reportDatasetService;
@Autowired
private ICommonSqlService commonSqlService;
/**
* 分页列表查询
......@@ -71,12 +72,12 @@ public class SysCommandCentreController {
DateVO dateVO = new DateVO(reportItemvParam.getStartDate());
String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
//本月数据
String monthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
//环比 上月数据
String lastMonthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
String lastMonthCSL = reportItemvService.getSumCSL(departIds, dateVO.getLastMonthStartTime(), dateVO.getLastMonthEndTime());
//同比 去年数据
String lastYearCSL = reportItemvService.getSumCSL(departIds, dateVO.getLastYearMonthStartTime(), dateVO.getLastYearMonthEndTime());
......@@ -84,11 +85,11 @@ public class SysCommandCentreController {
long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
//月对象数据 value, valueTb, valueHb
FRportlCommandCenterVO monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.divide(monthCSL,10000),JSUtils.divide(lastMonthCSL,10000),JSUtils.divide(lastYearCSL,10000));
FRportlCommandCenterVO monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.divide(monthCSL,10000),JSUtils.divide(lastYearCSL,10000),JSUtils.divide(lastMonthCSL,10000));
//日处理对象
FRportlCommandCenterVO avgDayDataVO = new FRportlCommandCenterVO("日均处理水量",JSUtils.divide(monthCSL,nowDifferDay*10000),JSUtils.divide(lastMonthCSL,lastMonthDifferDay*10000),JSUtils.divide(lastYearCSL,lastYearDifferDay*10000));
fReportItemvList.add( monthDataVO);
fReportItemvList.add( avgDayDataVO );
FRportlCommandCenterVO avgDayDataVO = new FRportlCommandCenterVO("日均处理水量",JSUtils.divide(monthCSL,nowDifferDay*10000),JSUtils.divide(lastYearCSL,lastYearDifferDay*10000),JSUtils.divide(lastMonthCSL,lastMonthDifferDay*10000));
fReportItemvList.add(monthDataVO);
fReportItemvList.add(avgDayDataVO);
//年数据统计：
String total = factoryInfoService.querySumProScale( JSUtils.quoteEach(departIds,",") );
......@@ -109,7 +110,7 @@ public class SysCommandCentreController {
Result<DepartLoadRateResultVO > result = new Result<>();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
Integer loadRateType = reportItemvParam.getLoadRateType();
if(loadRateType == null ) loadRateType = 1;
......@@ -127,7 +128,7 @@ public class SysCommandCentreController {
Result<List<WaterTreatmentVO>> result = new Result<>();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
List<WaterTreatmentVO> waterTrendVOList = commandCentreService.statisticsCLSLXQ(reportItemvParam.getStartDate(),reportItemvParam.getEndDate(), departIds);
result.setResult(waterTrendVOList );
......@@ -142,7 +143,7 @@ public class SysCommandCentreController {
Result<List<FRportlCommandCenterVO>> result = new Result();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByCement(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList );
......@@ -156,7 +157,7 @@ public class SysCommandCentreController {
Result<List<ReportItemVO>> result = new Result();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
List<ReportItemVO> dataList = reportItemvService.statisticsByCementList(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList );
......@@ -198,7 +199,7 @@ public class SysCommandCentreController {
Result<List<FRportlCommandCenterVO>> result = new Result();
String departId = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departId = reportItemvParam.getDepartIds();
departId = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByElectricity(departId,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList );
......@@ -226,7 +227,7 @@ public class SysCommandCentreController {
Result<List<ReportItemVO>> result = new Result();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
List<ReportItemVO> dataList = reportItemvService.statisticsByElectricityList(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList );
......@@ -243,7 +244,7 @@ public class SysCommandCentreController {
List<String> consumeList = new ArrayList<>();//电耗集合
String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
List<ReportDateTrendVO> dlhjDateList = reportItemvService.getDayDateFieldList(ReportConstant.view3a24, "DLHJ", departIds, reportItemvParam.getStartDate(), reportItemvParam.getEndDate());
List<ReportDateTrendVO> cslDateList = reportItemvService.getDayDateFieldList(ReportConstant.view2119, "CSL", departIds, reportItemvParam.getStartDate(), reportItemvParam.getEndDate());
......@@ -312,7 +313,7 @@ public class SysCommandCentreController {
reportItemvParam.setEndDate( DateUtils.formatDate(endDate ,"YYYY-MM"));
String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
departIds = commonSqlService.getChildFactorys(reportItemvParam.getDepartIds());
}
reportItemvParam.setDepartIds( JSUtils.quoteEach(departIds,","));
List<ReportDateTrendVO> fyDataList = commandCentreService.getFyData(reportItemvParam);
......@@ -363,14 +364,11 @@ public class SysCommandCentreController {
@AutoLog(value = "指挥中心-药剂趋势")
@ApiOperation(value="指挥中心-药剂趋势", notes="指挥中心-药剂趋势")
@GetMapping(value = "/statisticsByYjqs")
public Result<DepartDrugResult> statisticsByYjqs(@RequestParam(name = "month", required = true)String month) {
// DateVO dateVO = new DateVO(month);
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
/* if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
departIds = reportItemvParam.getDepartIds();
}*/
DepartDrugResult departDrugResult = commandCentreService.getYhTotal(departIds,month);
public Result<DepartDrugResult> statisticsByYjqs(@RequestParam(name = "month", required = true) String month,
@RequestParam(name = "departIds", required = true) String departIds) {
// String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
String departId = commonSqlService.getChildFactorys(departIds);
DepartDrugResult departDrugResult = commandCentreService.getYhTotal(departId,month);
Result<DepartDrugResult> result = new Result<>();
result.setSuccess(true);
result.setResult(departDrugResult);
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/service/impl/CommandCentreServiceImpl.java
......@@ -60,7 +60,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
List<DepartDrugDataVO> drugList = null;
drugList = fReportItemvMapper.getYhList(month,monthTb,monthHb,
dataViewName2119,dataViewName2119tb,dataViewName2119hb,
dataViewName3a24,dataViewName3a24tb,dataViewName3a24hb);
dataViewName3a24,dataViewName3a24tb,dataViewName3a24hb,departIds);
departDrugResult.setDrugList(drugList);
return departDrugResult;
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java
......@@ -23,6 +23,10 @@ public class MaterialINVO extends MaterialIN {
@ApiModelProperty(value = "税额")
private String taxAmount;
@ApiModelProperty(value = "药剂入口编号")
private String materialInId;
@ApiModelProperty(value = "权限厂站编号集合")
private String departIds;
......
sk-module-biz/src/main/java/com/skua/modules/statistics/service/impl/ReportTargetStatisticsServiceImpl.java
......@@ -60,7 +60,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti
sql += " left join( select aaa.depart_id, round(ifnull(sum(aaa.CSL)/10000,0),2) 'CSL' from " + dataViewName2119_month+"aaa group by aaa.depart_id ) ddd on ddd.depart_id = d.id ";
sql += " where d.depart_type = 1 ";
if(StringUtils.isNotEmpty(departIds)){
sql += " and d.id in ("+departIds+") ";
sql += " and d.id in ("+JSUtils.quoteEach(departIds,",")+") ";
}
sql += "order by ccc.CSL desc ";
List<ReportTargetStatisticsVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetStatisticsVO.class));
......@@ -94,7 +94,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti
sql += " left join ( select aaa.depart_id , round(ifnull(avg(aaa.yyh),0),2) yyh ,round(ifnull(avg(aaa.ydh),0),2) ydh from "+dataViewName4411_month+" aaa group by aaa.depart_id )bbb on bbb.depart_id = d.id";
sql += " where d.depart_type = 1 ";
if(StringUtils.isNotEmpty(departIds)){
sql += " and d.id in ("+departIds+") ";
sql += " and d.id in ("+JSUtils.quoteEach(departIds,",")+") ";
}
List<ReportTargetEnergyVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetEnergyVO.class));
return dataList;
......@@ -140,7 +140,7 @@ public class ReportTargetStatisticsServiceImpl implements IReportTargetStatisti
sql += " left join( select aaa.depart_id, round(ifnull(sum(aaa.ysjsf)/10000,0),2) 'ysjsf' from " + dataViewName4411_month+"aaa group by aaa.depart_id ) ddd on ddd.depart_id = d.id ";
sql += " where d.depart_type = 1 ";
if(StringUtils.isNotEmpty(departIds)){
sql += " and d.id in ("+departIds+") ";
sql += " and d.id in ("+JSUtils.quoteEach(departIds,",")+") ";
}
List<ReportTargetStatisticsVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetStatisticsVO.class));
return dataList;
......
sk-module-biz/src/main/java/com/skua/modules/statistics/vo/ReportTargetStatisticsVO.java
package com.skua.modules.statistics.vo;
import cn.jiguang.common.utils.StringUtils;
import com.skua.core.aspect.annotation.Dict;
import com.skua.tool.util.JSUtils;
import io.swagger.annotations.ApiModel;
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/FReportItemvMapper.java
......@@ -52,7 +52,8 @@ public interface FReportItemvMapper extends BaseMapper<FReportItemv> {
List<DepartDrugDataVO> getYhList(@Param("month") String month, @Param("monthTb") String monthTb, @Param("monthHb") String monthHb,
@Param("dataViewName2119") String dataViewName2119, @Param("dataViewName2119tb") String dataViewName2119tb,
@Param("dataViewName2119hb") String dataViewName2119hb, @Param("dataViewName3a24") String dataViewName3a24,
@Param("dataViewName3a24tb") String dataViewName3a24tb, @Param("dataViewName3a24hb") String dataViewName3a24hb);
@Param("dataViewName3a24tb") String dataViewName3a24tb, @Param("dataViewName3a24hb") String dataViewName3a24hb,
@Param("departIds") String departIds);
DepartDrugResult getYhData(@Param("month") String month, @Param("monthTb") String monthTb, @Param("monthHb") String monthHb,
@Param("dataViewName3a24") String dataViewName3a24,@Param("dataViewName3a24tb") String dataViewName3a24tb,
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/xml/FReportItemvMapper.xml
......@@ -162,6 +162,10 @@
) dhhb ON dhhb.depart_id = d.id
WHERE
d.depart_type = '1'
and d.id in
<foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")">
'${item}'
</foreach>
ORDER BY dh.yjdh desc,d.depart_order
</select>
<select id="getYhData" resultType="com.skua.modules.report.vo.DepartDrugResult">
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/ReportElectricCostServiceImpl.java
......@@ -3,6 +3,7 @@ package com.skua.modules.report.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.core.context.BaseContextHandler;
import com.skua.modules.common.service.ICommonSqlService;
import com.skua.modules.report.entity.ReportElectricCost;
import com.skua.modules.report.mapper.ReportElectricCostMapper;
import com.skua.modules.report.service.IReportElectricCostService;
......@@ -24,15 +25,17 @@ public class ReportElectricCostServiceImpl extends ServiceImpl<ReportElectricCos
@Resource
private ReportElectricCostMapper reportElectricCostMapper;
@Autowired
private ICommonSqlService commonSqlService;
//月度电费报表-分页列表查询
@Override
public IPage<ReportElectricCost> getPage(Page<ReportElectricCost> page, ReportElectricCost reportElectricCost) {
if(StringUtils.isEmpty(reportElectricCost.getDepartId())){
reportElectricCost.setDepartId(BaseContextHandler.getDeparts());
}else{
String departIds = commonSqlService.getChildFactorys(reportElectricCost.getDepartId());
reportElectricCost.setDepartId(departIds);
}
// if(reportElectricCost.getMonth()!=null){
// queryWrapper.like("month",reportElectricCost.getMonth());
// }
List<ReportElectricCost> list = new ArrayList<>();
list = reportElectricCostMapper.getPage(reportElectricCost);
page.setRecords(list);
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionAbnormalItemsTrendVO.java
......@@ -34,4 +34,16 @@ public class InspectionAbnormalItemsTrendVO {
private Integer notCheckedItemsCount;
@ApiModelProperty(value = "异常项数量")
private Integer abnormalItemsCount;
public Integer getNotCheckedItemsCount() {
if (totalCount != null && checkedItemsCount != null) {
if (totalCount - checkedItemsCount < 0) {
return checkedItemsCount - totalCount;
} else {
return totalCount - checkedItemsCount;
}
} else {
return 0;
}
}
}
......
sk-module-system/src/main/java/com/skua/modules/system/service/impl/SysDepartServiceImpl.java
......@@ -100,9 +100,9 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
listResult.addAll(jtList);
}
}
if (!StringUtils.isBlank(departType)) {
listResult = filterDepartList(listResult);
}
// if (!StringUtils.isBlank(departType)) {
// listResult = filterDepartList(listResult);
// }
return listResult;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!