Skip to content

张雷 / skboot-zhongye

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

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

2 个父辈 db4efa4a 3cd805b1
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 121 行增加 和 22 行删除
sk-base-common/src/main/java/com/skua/common/constant/ReportConstant.java
......@@ -45,5 +45,7 @@ public interface ReportConstant {
//水质字段
public static final String fieldSz = "JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN,JSPH,JSSS,CSPH,CSSS";
//出水字段
public static final String field_2119_CS = "CSZL,CSCOD,CSAD,CSTN,CSPH";
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WaterAnalysisNewController.java
......@@ -3,6 +3,7 @@ package com.skua.modules.dataAnalysis.controller;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.modules.dataAnalysis.service.WaterAnalysisNewService;
import com.skua.modules.dataAnalysis.vo.WaterAnalysisVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -49,9 +50,9 @@ public class WaterAnalysisNewController {
@AutoLog(value = "查询达标率厂站列表")
@ApiOperation(value = "查询达标率厂站列表", notes = "查询达标率厂站列表")
@RequestMapping(value = "/queryFacListBySummary", method = RequestMethod.GET)
public Result<List<Map<String, Object>>> queryFacListBySummary(String time) {
Result<List<Map<String, Object>>> result = new Result<>();
List<Map<String, Object>> data = waterAnalysisNewService.queryFacListBySummary(time);
public Result< List<WaterAnalysisVO>> queryFacListBySummary(String time) {
Result< List<WaterAnalysisVO>> result = new Result<>();
List<WaterAnalysisVO> data = waterAnalysisNewService.queryFacListBySummary(time);
result.setResult(data);
result.setSuccess(true);
return result;
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/WaterAnalysisNewService.java
package com.skua.modules.dataAnalysis.service;
import com.skua.modules.dataAnalysis.vo.WaterAnalysisVO;
import java.util.List;
import java.util.Map;
......@@ -11,7 +12,7 @@ public interface WaterAnalysisNewService {
* @Param [time]
* @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
**/
List<Map<String, Object>> queryFacListBySummary(String time);
List<WaterAnalysisVO> queryFacListBySummary(String time);
/**
*
* @Description 查询出水指标超标次数
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryOperateCenterServiceImpl.java
......@@ -266,42 +266,42 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer
Map<String,Object> monthTbMap = masterDB.queryForMap("select "+ fieldSql+ " from " + dataViewName3a24MonthTb +" aaa " );
monthDataVOList.add( new YJMonthDataVO("PAC(液)","PACYT" ,"KG",ConvertUtils.getString(target.getTargetPacyt(),"0"),ConvertUtils.getString(monthMap.get("PACYT"),"0"),
monthDataVOList.add( new YJMonthDataVO("PAC(液)","PACYT" ,"kg",ConvertUtils.getString(target.getTargetPacyt(),"0"),ConvertUtils.getString(monthMap.get("PACYT"),"0"),
ConvertUtils.getString(monthHbMap.get("PACYT"),"0") ,ConvertUtils.getString(monthTbMap.get("PACYT") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("PAC(固)","PACGT" ,"KG",ConvertUtils.getString(target.getTargetPacgt(),"0"),ConvertUtils.getString(monthMap.get("PACGT"),"0"),
monthDataVOList.add( new YJMonthDataVO("PAC(固)","PACGT" ,"kg",ConvertUtils.getString(target.getTargetPacgt(),"0"),ConvertUtils.getString(monthMap.get("PACGT"),"0"),
ConvertUtils.getString(monthHbMap.get("PACGT"),"0") ,ConvertUtils.getString(monthTbMap.get("PACGT") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("NaClO","NACLO" ,"KG",ConvertUtils.getString(target.getTargetNaclo(),"0"),ConvertUtils.getString(monthMap.get("NACLO"),"0"),
monthDataVOList.add( new YJMonthDataVO("NaClO","NACLO" ,"kg",ConvertUtils.getString(target.getTargetNaclo(),"0"),ConvertUtils.getString(monthMap.get("NACLO"),"0"),
ConvertUtils.getString(monthHbMap.get("NACLO"),"0") ,ConvertUtils.getString(monthTbMap.get("NACLO") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("水处理PAM(-)","SCLPAMF" ,"KG",ConvertUtils.getString(target.getTargetSclpamf(),"0"),ConvertUtils.getString(monthMap.get("SCLPAMF"),"0"),
monthDataVOList.add( new YJMonthDataVO("水处理PAM(-)","SCLPAMF" ,"kg",ConvertUtils.getString(target.getTargetSclpamf(),"0"),ConvertUtils.getString(monthMap.get("SCLPAMF"),"0"),
ConvertUtils.getString(monthHbMap.get("SCLPAMF"),"0") ,ConvertUtils.getString(monthTbMap.get("SCLPAMF") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("污脱PAM乳剂","PAMRJ","KG" ,ConvertUtils.getString(target.getTargetPamrj(),"0"),ConvertUtils.getString(monthMap.get("PAMRJ"),"0"),
monthDataVOList.add( new YJMonthDataVO("污脱PAM乳剂","PAMRJ","kg" ,ConvertUtils.getString(target.getTargetPamrj(),"0"),ConvertUtils.getString(monthMap.get("PAMRJ"),"0"),
ConvertUtils.getString(monthHbMap.get("PAMRJ"),"0") ,ConvertUtils.getString(monthTbMap.get("PAMRJ") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("PFS","PFS" ,"KG",ConvertUtils.getString(target.getTargetPfs(),"0"),ConvertUtils.getString(monthMap.get("PFS"),"0"),
monthDataVOList.add( new YJMonthDataVO("PFS","PFS" ,"kg",ConvertUtils.getString(target.getTargetPfs(),"0"),ConvertUtils.getString(monthMap.get("PFS"),"0"),
ConvertUtils.getString(monthHbMap.get("PFS"),"0") ,ConvertUtils.getString(monthTbMap.get("PFS") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("复合铁盐","FHTY","KG" ,ConvertUtils.getString(target.getTargetFhty(),"0"),ConvertUtils.getString(monthMap.get("FHTY"),"0"),
monthDataVOList.add( new YJMonthDataVO("复合铁盐","FHTY","kg" ,ConvertUtils.getString(target.getTargetFhty(),"0"),ConvertUtils.getString(monthMap.get("FHTY"),"0"),
ConvertUtils.getString(monthHbMap.get("FHTY"),"0") ,ConvertUtils.getString(monthTbMap.get("FHTY") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("乳液絮凝剂","RYXNJ" ,"KG",ConvertUtils.getString(target.getTargetRyxnj(),"0"),ConvertUtils.getString(monthMap.get("RYXNJ"),"0"),
monthDataVOList.add( new YJMonthDataVO("乳液絮凝剂","RYXNJ" ,"kg",ConvertUtils.getString(target.getTargetRyxnj(),"0"),ConvertUtils.getString(monthMap.get("RYXNJ"),"0"),
ConvertUtils.getString(monthHbMap.get("RYXNJ"),"0") ,ConvertUtils.getString(monthTbMap.get("RYXNJ") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("益维磷","YWL" ,"KG",ConvertUtils.getString(target.getTargetYwl(),"0"),ConvertUtils.getString(monthMap.get("YWL"),"0"),
monthDataVOList.add( new YJMonthDataVO("益维磷","YWL" ,"kg",ConvertUtils.getString(target.getTargetYwl(),"0"),ConvertUtils.getString(monthMap.get("YWL"),"0"),
ConvertUtils.getString(monthHbMap.get("YWL"),"0") ,ConvertUtils.getString(monthTbMap.get("YWL") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("高效除磷剂","GXCLJ" ,"KG",ConvertUtils.getString(target.getTargetGxclj(),"0"),ConvertUtils.getString(monthMap.get("GXCLJ"),"0"),
monthDataVOList.add( new YJMonthDataVO("高效除磷剂","GXCLJ" ,"kg",ConvertUtils.getString(target.getTargetGxclj(),"0"),ConvertUtils.getString(monthMap.get("GXCLJ"),"0"),
ConvertUtils.getString(monthHbMap.get("GXCLJ"),"0") ,ConvertUtils.getString(monthTbMap.get("GXCLJ") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("CH3COONA","CH3COONA" ,"KG",ConvertUtils.getString(target.getTargetCh3coona(),"0"),ConvertUtils.getString(monthMap.get("CH3COONA"),"0"),
monthDataVOList.add( new YJMonthDataVO("CH3COONA","CH3COONA" ,"kg",ConvertUtils.getString(target.getTargetCh3coona(),"0"),ConvertUtils.getString(monthMap.get("CH3COONA"),"0"),
ConvertUtils.getString(monthHbMap.get("CH3COONA"),"0") ,ConvertUtils.getString(monthTbMap.get("CH3COONA") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("活性炭","HXT" ,"KG",ConvertUtils.getString(target.getTargetHxt(),"0"),ConvertUtils.getString(monthMap.get("HXT"),"0"),
monthDataVOList.add( new YJMonthDataVO("活性炭","HXT" ,"kg",ConvertUtils.getString(target.getTargetHxt(),"0"),ConvertUtils.getString(monthMap.get("HXT"),"0"),
ConvertUtils.getString(monthHbMap.get("HXT"),"0") ,ConvertUtils.getString(monthTbMap.get("HXT") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("FeCl3","FECL3" ,"KG",ConvertUtils.getString(target.getTargetFecl3(),"0"),ConvertUtils.getString(monthMap.get("FECL3"),"0"),
monthDataVOList.add( new YJMonthDataVO("FeCl3","FECL3" ,"kg",ConvertUtils.getString(target.getTargetFecl3(),"0"),ConvertUtils.getString(monthMap.get("FECL3"),"0"),
ConvertUtils.getString(monthHbMap.get("FECL3"),"0") ,ConvertUtils.getString(monthTbMap.get("FECL3") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("石灰","SH" ,"KG",ConvertUtils.getString(target.getTargetSh(),"0"),ConvertUtils.getString(monthMap.get("SH"),"0"),
monthDataVOList.add( new YJMonthDataVO("石灰","SH" ,"kg",ConvertUtils.getString(target.getTargetSh(),"0"),ConvertUtils.getString(monthMap.get("SH"),"0"),
ConvertUtils.getString(monthHbMap.get("SH"),"0") ,ConvertUtils.getString(monthTbMap.get("SH") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("CH3COOH","CH3COOH" ,"KG",ConvertUtils.getString(target.getTargetCh3cooh(),"0"),ConvertUtils.getString(monthMap.get("CH3COOH"),"0"),
monthDataVOList.add( new YJMonthDataVO("CH3COOH","CH3COOH" ,"kg",ConvertUtils.getString(target.getTargetCh3cooh(),"0"),ConvertUtils.getString(monthMap.get("CH3COOH"),"0"),
ConvertUtils.getString(monthHbMap.get("CH3COOH"),"0") ,ConvertUtils.getString(monthTbMap.get("CH3COOH") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("FeSO4固","FESO4G" ,"KG",ConvertUtils.getString(target.getTargetFeso4g(),"0"),ConvertUtils.getString(monthMap.get("FESO4G"),"0"),
monthDataVOList.add( new YJMonthDataVO("FeSO4固","FESO4G" ,"kg",ConvertUtils.getString(target.getTargetFeso4g(),"0"),ConvertUtils.getString(monthMap.get("FESO4G"),"0"),
ConvertUtils.getString(monthHbMap.get("FESO4G"),"0") ,ConvertUtils.getString(monthTbMap.get("FESO4G") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("FeSO4液","FESO4Y" ,"KG",ConvertUtils.getString(target.getTargetFeso4y(),"0"),ConvertUtils.getString(monthMap.get("FESO4Y"),"0"),
monthDataVOList.add( new YJMonthDataVO("FeSO4液","FESO4Y" ,"kg",ConvertUtils.getString(target.getTargetFeso4y(),"0"),ConvertUtils.getString(monthMap.get("FESO4Y"),"0"),
ConvertUtils.getString(monthHbMap.get("FESO4Y"),"0") ,ConvertUtils.getString(monthTbMap.get("FESO4Y") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("H2O2","H2O2","KG" ,ConvertUtils.getString(target.getTargetH2o2(),"0"),ConvertUtils.getString(monthMap.get("H2O2"),"0"),
monthDataVOList.add( new YJMonthDataVO("H2O2","H2O2","kg" ,ConvertUtils.getString(target.getTargetH2o2(),"0"),ConvertUtils.getString(monthMap.get("H2O2"),"0"),
ConvertUtils.getString(monthHbMap.get("H2O2"),"0") ,ConvertUtils.getString(monthTbMap.get("H2O2") ,"0") ) );
/*
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/AlarmParamStandardConfigVO.java 0 → 100644
package com.skua.modules.dataAnalysis.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @auther kangwei
* @create 2024-12-17-19:03
*/
@Data
@ApiModel(value="指标库分析对象", description="指标库分析对象")
public class AlarmParamStandardConfigVO {
@ApiModelProperty(value = "指标编号")
private String alarmLevelStandardId;
@ApiModelProperty(value = "总磷-最大值")
private String CSZL_MAX;
@ApiModelProperty(value = "总氮-最大值")
private String CSTN_MAX;
@ApiModelProperty(value = "氨氮-最大值")
private String CSAD_MAX;
@ApiModelProperty(value = "PH-最大值")
private String CSPH_MAX;
@ApiModelProperty(value = "COD-最大值")
private Integer CSCOD_MAX;
@ApiModelProperty(value = "总磷-最小值")
private String CSZL_MIN;
@ApiModelProperty(value = "总氮-最小值")
private String CSTN_MIN;
@ApiModelProperty(value = "氨氮-最小值")
private String CSAD_MIN;
@ApiModelProperty(value = "PH-最小值")
private String CSPH_MIN;
@ApiModelProperty(value = "COD-最小值")
private Integer CSCOD_MIN;
}
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterAnalysisVO.java 0 → 100644
package com.skua.modules.dataAnalysis.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang.StringUtils;
/**
* @auther kangwei
* @create 2024-12-17-18:29
*/
@Data
@ApiModel(value="水质分析对象", description="水质分析对象")
public class WaterAnalysisVO {
@ApiModelProperty(value = "部门编号")
private String factoryName;
@ApiModelProperty(value = "水厂编号")
private String departId;
@ApiModelProperty(value = "水厂编号")
private String factoryId;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "维度")
private String latitude;
@ApiModelProperty(value = "区域名称")
private String areaName;
@ApiModelProperty(value = "总天数")
private Integer totalDayNum;
@ApiModelProperty(value = "出水标准编号")
private String out_level;
@ApiModelProperty(value = "出水标准名称")
private String standard;
@ApiModelProperty(value = "百分比")
private String db;
@ApiModelProperty(value = "status")
private Integer status;
@ApiModelProperty(value = "备注")
private String remark;
public Integer getStatus() {
status = 1;
if(StringUtils.isNotEmpty(db)){
if(Double.parseDouble(db) < 90) status =-1;
if(Double.parseDouble(db) >= 90 && Double.parseDouble(db)<100) status = 0;
}
return status;
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!