Skip to content

张雷 / skboot-zhongye

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

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

2 个父辈 cea0dcb8 ef47983d
内嵌 并排
正在显示 7 个修改的文件 包含 44 行增加 和 26 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseContractController.java
......@@ -87,8 +87,10 @@ public class PurchaseContractController {
Result<List<ERPPurchaseContract>> result = new Result<List<ERPPurchaseContract>>();
QueryWrapper<ERPPurchaseContract> queryWrapper = new QueryWrapper<ERPPurchaseContract> (); // QueryGenerator.initQueryWrapper(ERPPurchaseContract, req.getParameterMap());
/* queryWrapper.like("departs", BaseContextHandler.getRealDepartId());*/
queryWrapper.orderByDesc("create_time");
// 需要添加条件判断
queryWrapper.like("departs",BaseContextHandler.getRealDepartId());
queryWrapper.orderByDesc("create_time");
List<ERPPurchaseContract> purchaseContractList = purchaseContractService.list( queryWrapper);
/*Set<ERPPurchaseContract> dataList = new HashSet<>();
......
sk-module-biz/src/main/java/com/skua/modules/threedimensional/controller/JTDisplayScreenController.java 0 → 100644
package com.skua.modules.threedimensional.controller;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@Api(tags = "对外展示集团大屏")
@RestController
@RequestMapping("/jtDisplayscreendata")
public class JTDisplayScreenController {
}
sk-module-datafill/src/main/java/com/skua/modules/report/vo/JnhbLargeScreenVO.java
......@@ -53,15 +53,15 @@ public class JnhbLargeScreenVO {
public void setHeadStatisticsValue(){
// wssjcll, wsfhl, dh, qy, xinshui, zhnyxhl, eyhtpfl, dsdh
////水处理量,系统负荷率,电耗,汽油,新水,综合能耗,C02,吨水
this.getHeadStatisticsList().add( getResultNumberVO( "wssjcll", this.getLargeScreenExpressionVO().getHead_wssjcll_expression() , this.getLargeScreenExpressionVO().getHead_wssjcll_expression_hb() , this.getLargeScreenExpressionVO().getHead_wssjcll_expression_tb()) );//污水处理量
this.getHeadStatisticsList().add( getResultNumberVO( "wsfhl",this.getLargeScreenExpressionVO().getHead_wsfhl_expression() , this.getLargeScreenExpressionVO().getHead_wsfhl_expression_hb() , this.getLargeScreenExpressionVO().getHead_wsfhl_expression_tb()) );//系统负荷率
this.getHeadStatisticsList().add( getResultNumberVO( "dh",this.getLargeScreenExpressionVO().getHead_dh_expression() , this.getLargeScreenExpressionVO().getHead_dh_expression_hb() , this.getLargeScreenExpressionVO().getHead_dh_expression_tb()) );//电耗
this.getHeadStatisticsList().add( getResultNumberVO( "qy",this.getLargeScreenExpressionVO().getHead_qy_expression() , this.getLargeScreenExpressionVO().getHead_qy_expression_hb() , this.getLargeScreenExpressionVO().getHead_qy_expression_tb()) );//汽油
this.getHeadStatisticsList().add( getResultNumberVO( "xinshui",this.getLargeScreenExpressionVO().getHead_xssyl_expression() , this.getLargeScreenExpressionVO().getHead_xssyl_expression_hb() , this.getLargeScreenExpressionVO().getHead_xssyl_expression_tb()) );//薪水
this.getHeadStatisticsList().add( getResultNumberVO( "zhnyxhl",this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression() , this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression_hb() , this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression_tb()) );//综合能耗
this.getHeadStatisticsList().add( getResultNumberVO( "eyhtpfl",this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression() , this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression_hb() , this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression_tb()) );//C02
this.getHeadStatisticsList().add( getResultNumberVO( "dsdh",this.getLargeScreenExpressionVO().getHead_dsdh_expression() , this.getLargeScreenExpressionVO().getHead_dsdh_expression_hb() , this.getLargeScreenExpressionVO().getHead_dsdh_expression_tb()) );//吨水电耗
////污水处理量,系统负荷率,电耗,汽油,新水,综合能耗,C02,吨水
this.getHeadStatisticsList().add( getResultNumberVO( "污水处理量","wssjcll","万吨", this.getLargeScreenExpressionVO().getHead_wssjcll_expression() , this.getLargeScreenExpressionVO().getHead_wssjcll_expression_hb() , this.getLargeScreenExpressionVO().getHead_wssjcll_expression_tb()) );//污水处理量
this.getHeadStatisticsList().add( getResultNumberVO( "系统负荷率","wsfhl", "%",this.getLargeScreenExpressionVO().getHead_wsfhl_expression() , this.getLargeScreenExpressionVO().getHead_wsfhl_expression_hb() , this.getLargeScreenExpressionVO().getHead_wsfhl_expression_tb()) );//系统负荷率
this.getHeadStatisticsList().add( getResultNumberVO( "电耗","dh","万千瓦时",this.getLargeScreenExpressionVO().getHead_dh_expression() , this.getLargeScreenExpressionVO().getHead_dh_expression_hb() , this.getLargeScreenExpressionVO().getHead_dh_expression_tb()) );//电耗
this.getHeadStatisticsList().add( getResultNumberVO( "汽油","qy","吨",this.getLargeScreenExpressionVO().getHead_qy_expression() , this.getLargeScreenExpressionVO().getHead_qy_expression_hb() , this.getLargeScreenExpressionVO().getHead_qy_expression_tb()) );//汽油
this.getHeadStatisticsList().add( getResultNumberVO( "新水使用量","xinshui", "吨" ,this.getLargeScreenExpressionVO().getHead_xssyl_expression() , this.getLargeScreenExpressionVO().getHead_xssyl_expression_hb() , this.getLargeScreenExpressionVO().getHead_xssyl_expression_tb()) );//薪水
this.getHeadStatisticsList().add( getResultNumberVO( "综合能耗消费量","zhnyxhl","吨标准煤",this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression() , this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression_hb() , this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression_tb()) );//综合能耗
this.getHeadStatisticsList().add( getResultNumberVO( "二氧化碳排放量","eyhtpfl","吨CO2当量",this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression() , this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression_hb() , this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression_tb()) );//C02
this.getHeadStatisticsList().add( getResultNumberVO( "吨水电耗","dsdh","千瓦时/吨",this.getLargeScreenExpressionVO().getHead_dsdh_expression() , this.getLargeScreenExpressionVO().getHead_dsdh_expression_hb() , this.getLargeScreenExpressionVO().getHead_dsdh_expression_tb()) );//吨水电耗
}
......@@ -69,17 +69,18 @@ public class JnhbLargeScreenVO {
* 设置：消减统计记录
*/
public void setReduceStatistics(){
this.getReduceStatisticsList().add( getResultNumberVO( "cod",this.getLargeScreenExpressionVO().getReduce_statistics_cod() , this.getLargeScreenExpressionVO().getReduce_statistics_cod_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_cod_tb()) );//吨水电耗
this.getReduceStatisticsList().add( getResultNumberVO( "NH3-N",this.getLargeScreenExpressionVO().getReduce_statistics_nh3n() , this.getLargeScreenExpressionVO().getReduce_statistics_nh3n_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_nh3n_tb()) );//吨水电耗
this.getReduceStatisticsList().add( getResultNumberVO( "TP",this.getLargeScreenExpressionVO().getReduce_statistics_tp() , this.getLargeScreenExpressionVO().getReduce_statistics_tp_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_tp_tb()) );//吨水电耗
this.getReduceStatisticsList().add( getResultNumberVO( "TN",this.getLargeScreenExpressionVO().getReduce_statistics_tn() , this.getLargeScreenExpressionVO().getReduce_statistics_tn_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_tn_tb()) );//吨水电耗
this.getReduceStatisticsList().add( getResultNumberVO( "cod","cod","",this.getLargeScreenExpressionVO().getReduce_statistics_cod() , this.getLargeScreenExpressionVO().getReduce_statistics_cod_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_cod_tb()) );//吨水电耗
this.getReduceStatisticsList().add( getResultNumberVO( "NH3-N","NH3-N","",this.getLargeScreenExpressionVO().getReduce_statistics_nh3n() , this.getLargeScreenExpressionVO().getReduce_statistics_nh3n_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_nh3n_tb()) );//吨水电耗
this.getReduceStatisticsList().add( getResultNumberVO( "TP","TP","",this.getLargeScreenExpressionVO().getReduce_statistics_tp() , this.getLargeScreenExpressionVO().getReduce_statistics_tp_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_tp_tb()) );//吨水电耗
this.getReduceStatisticsList().add( getResultNumberVO( "TN","TN","",this.getLargeScreenExpressionVO().getReduce_statistics_tn() , this.getLargeScreenExpressionVO().getReduce_statistics_tn_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_tn_tb()) );//吨水电耗
}
private ResultNumberVO getResultNumberVO(String name , String valueExpression ,String valueHbExpression,String valueTbExpression){
private ResultNumberVO getResultNumberVO(String name ,String code ,String unit ,String valueExpression ,String valueHbExpression,String valueTbExpression){
ResultNumberVO head_wssjcll = new ResultNumberVO();//污水处理量
//head_wssjcll.setName( name);
head_wssjcll.setName( name);
head_wssjcll.setUnit( unit );
head_wssjcll.setValue( JSUtils.executeExpression(valueExpression , "0") );
head_wssjcll.setValueHb( JSUtils.executeExpression( valueHbExpression , "0") );
head_wssjcll.setValueTb(JSUtils.executeExpression( valueTbExpression , "0") );
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/PowerConsumptionAnalysisController.java
......@@ -26,8 +26,8 @@ public class PowerConsumptionAnalysisController {
private IPowerConsumptionAnalysisService powerConsumptionAnalysisService;
@AutoLog(value = "数据展示")
@ApiOperation(value = "数据展示", notes = "数据展示")
@AutoLog(value = "数据展示(电耗分析)")
@ApiOperation(value = "数据展示(电耗分析)", notes = "数据展示(电耗分析)")
@RequestMapping(value = "/data/display", method = RequestMethod.GET)
public Result<Map<String, Object>> dataDisplay(AnysisParamsVO anysisParamsVO) {
Result<Map<String, Object>> result = new Result<>();
......@@ -37,7 +37,7 @@ public class PowerConsumptionAnalysisController {
return result;
}
@AutoLog(value = "电耗趋势")
@AutoLog(value = "总电耗趋势")
@ApiOperation(value = "电耗趋势", notes = "电耗趋势")
@RequestMapping(value = "/power/consumption/trend", method = RequestMethod.GET)
public Result<Map<String, Object>> powerConsumptionTrend(AnysisParamsVO anysisParamsVO) {
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/ComprehensiveSupervisionMapper.xml
......@@ -29,7 +29,7 @@
<select id="selectDhByMonths" resultType="com.skua.modules.equipment.dto.AlarmDto">
select sum(item_value) as v,DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a
left join f_report_item b on b.id=a.reit_id
where b.item_code='dhkwh64bc'
where b.item_code='DLHJ'
and a.depart_id = #{factoryId}
<if test="list!=null and list.size>0">
and DATE_FORMAT(data_time, '%Y-%m') in
......@@ -42,14 +42,15 @@
<select id="selectAllDh" resultType="com.skua.modules.equipment.dto.AlarmDto">
select sum(item_value) as v, DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a
left join f_report_item b on b.id=a.reit_id
where b.item_code = 'dhkwh64bc'
where b.item_code = 'DLHJ'
and a.depart_id = #{factoryId}
group by DATE_FORMAT(data_time, '%Y-%m')
</select>
<!-- dhkwh64bc-->
<select id="selectDhByStartAndEnd" resultType="com.skua.modules.equipment.dto.AlarmDto">
select sum(item_value) as v,DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a
left join f_report_item b on b.id=a.reit_id
where b.item_code='dhkwh64bc'
where b.item_code='DLHJ'
and a.depart_id = #{factoryId}
<if test="startTime!=null">
and DATE_FORMAT(data_time, '%Y-%m')>=#{startTime}
......@@ -62,7 +63,7 @@
<select id="selectDhByYear" resultType="com.skua.modules.equipment.dto.AlarmDto">
select sum(item_value) as v from f_report_itemv a
left join f_report_item b on b.id=a.reit_id
where b.item_code='dhkwh64bc' and SUBSTRING(data_time,1,4)='2022'
where b.item_code='DLHJ' and SUBSTRING(data_time,1,4)='2022'
</select>
<select id="selectDataIdsByMonth" resultType="java.lang.String">
SELECT DISTINCT data_id FROM `f_report_itemv` where SUBSTRING(data_time,1,7)=#{month}
......
sk-module-equipment/src/main/java/com/skua/modules/supplies/dto/EquipmentAllotAddDTO.java
package com.skua.modules.supplies.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.skua.modules.equipment.entity.EquipmentOut;
import com.skua.modules.equipment.entity.EquipmentOutChild;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.Valid;
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
......@@ -125,6 +125,8 @@ public class MybatisInterceptor implements Interceptor {
if(anonymous != null ){
return invocation.proceed();
}
System.out.println("sqlId = "+sqlId);
//这些方法不涉及权限
if ("com.skua.modules.system.mapper.SysDepartMapper.getDepartTreeByJt".equalsIgnoreCase(sqlId)
|| "com.skua.modules.system.mapper.SysDepartMapper.getDepartTree".equalsIgnoreCase(sqlId)
......@@ -146,6 +148,8 @@ public class MybatisInterceptor implements Interceptor {
|| "com.skua.modules.erp.mapper.PurchasePlanItemMapper.queryListByPlanId".equals(sqlId) //采购计划
|| "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryListByContractId".equals(sqlId) //采购合同
|| "com.skua.modules.erp.mapper.DistributMaterialMapper.queryListByContractId".equals(sqlId) //采购-分销合同
|| "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.selectList".equals(sqlId) //采购合同
|| "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectList".equals(sqlId) //物料
) {
log.debug("************************------sqlId------**************************" + sqlId);
return invocation.proceed();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!