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 { ...@@ -45,5 +45,7 @@ public interface ReportConstant {
45 45
46 //水质字段 46 //水质字段
47 public static final String fieldSz = "JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN,JSPH,JSSS,CSPH,CSSS"; 47 public static final String fieldSz = "JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN,JSPH,JSSS,CSPH,CSSS";
48 //出水字段
49 public static final String field_2119_CS = "CSZL,CSCOD,CSAD,CSTN,CSPH";
48 50
49 } 51 }
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WaterAnalysisNewController.java
...@@ -3,6 +3,7 @@ package com.skua.modules.dataAnalysis.controller; ...@@ -3,6 +3,7 @@ package com.skua.modules.dataAnalysis.controller;
3 import com.skua.core.api.vo.Result; 3 import com.skua.core.api.vo.Result;
4 import com.skua.core.aspect.annotation.AutoLog; 4 import com.skua.core.aspect.annotation.AutoLog;
5 import com.skua.modules.dataAnalysis.service.WaterAnalysisNewService; 5 import com.skua.modules.dataAnalysis.service.WaterAnalysisNewService;
6 import com.skua.modules.dataAnalysis.vo.WaterAnalysisVO;
6 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
7 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
8 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
...@@ -49,9 +50,9 @@ public class WaterAnalysisNewController { ...@@ -49,9 +50,9 @@ public class WaterAnalysisNewController {
49 @AutoLog(value = "查询达标率厂站列表") 50 @AutoLog(value = "查询达标率厂站列表")
50 @ApiOperation(value = "查询达标率厂站列表", notes = "查询达标率厂站列表") 51 @ApiOperation(value = "查询达标率厂站列表", notes = "查询达标率厂站列表")
51 @RequestMapping(value = "/queryFacListBySummary", method = RequestMethod.GET) 52 @RequestMapping(value = "/queryFacListBySummary", method = RequestMethod.GET)
52 public Result<List<Map<String, Object>>> queryFacListBySummary(String time) { 53 public Result< List<WaterAnalysisVO>> queryFacListBySummary(String time) {
53 Result<List<Map<String, Object>>> result = new Result<>(); 54 Result< List<WaterAnalysisVO>> result = new Result<>();
54 List<Map<String, Object>> data = waterAnalysisNewService.queryFacListBySummary(time); 55 List<WaterAnalysisVO> data = waterAnalysisNewService.queryFacListBySummary(time);
55 result.setResult(data); 56 result.setResult(data);
56 result.setSuccess(true); 57 result.setSuccess(true);
57 return result; 58 return result;
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/WaterAnalysisNewService.java
1 package com.skua.modules.dataAnalysis.service; 1 package com.skua.modules.dataAnalysis.service;
2 2
3 import com.skua.modules.dataAnalysis.vo.WaterAnalysisVO;
3 import java.util.List; 4 import java.util.List;
4 import java.util.Map; 5 import java.util.Map;
5 6
...@@ -11,7 +12,7 @@ public interface WaterAnalysisNewService { ...@@ -11,7 +12,7 @@ public interface WaterAnalysisNewService {
11 * @Param [time] 12 * @Param [time]
12 * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>> 13 * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
13 **/ 14 **/
14 List<Map<String, Object>> queryFacListBySummary(String time); 15 List<WaterAnalysisVO> queryFacListBySummary(String time);
15 /** 16 /**
16 * 17 *
17 * @Description 查询出水指标超标次数 18 * @Description 查询出水指标超标次数
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryOperateCenterServiceImpl.java
...@@ -266,42 +266,42 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer ...@@ -266,42 +266,42 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer
266 Map<String,Object> monthTbMap = masterDB.queryForMap("select "+ fieldSql+ " from " + dataViewName3a24MonthTb +" aaa " ); 266 Map<String,Object> monthTbMap = masterDB.queryForMap("select "+ fieldSql+ " from " + dataViewName3a24MonthTb +" aaa " );
267 267
268 268
269 monthDataVOList.add( new YJMonthDataVO("PAC(液)","PACYT" ,"KG",ConvertUtils.getString(target.getTargetPacyt(),"0"),ConvertUtils.getString(monthMap.get("PACYT"),"0"), 269 monthDataVOList.add( new YJMonthDataVO("PAC(液)","PACYT" ,"kg",ConvertUtils.getString(target.getTargetPacyt(),"0"),ConvertUtils.getString(monthMap.get("PACYT"),"0"),
270 ConvertUtils.getString(monthHbMap.get("PACYT"),"0") ,ConvertUtils.getString(monthTbMap.get("PACYT") ,"0") ) ); 270 ConvertUtils.getString(monthHbMap.get("PACYT"),"0") ,ConvertUtils.getString(monthTbMap.get("PACYT") ,"0") ) );
271 monthDataVOList.add( new YJMonthDataVO("PAC(固)","PACGT" ,"KG",ConvertUtils.getString(target.getTargetPacgt(),"0"),ConvertUtils.getString(monthMap.get("PACGT"),"0"), 271 monthDataVOList.add( new YJMonthDataVO("PAC(固)","PACGT" ,"kg",ConvertUtils.getString(target.getTargetPacgt(),"0"),ConvertUtils.getString(monthMap.get("PACGT"),"0"),
272 ConvertUtils.getString(monthHbMap.get("PACGT"),"0") ,ConvertUtils.getString(monthTbMap.get("PACGT") ,"0") ) ); 272 ConvertUtils.getString(monthHbMap.get("PACGT"),"0") ,ConvertUtils.getString(monthTbMap.get("PACGT") ,"0") ) );
273 monthDataVOList.add( new YJMonthDataVO("NaClO","NACLO" ,"KG",ConvertUtils.getString(target.getTargetNaclo(),"0"),ConvertUtils.getString(monthMap.get("NACLO"),"0"), 273 monthDataVOList.add( new YJMonthDataVO("NaClO","NACLO" ,"kg",ConvertUtils.getString(target.getTargetNaclo(),"0"),ConvertUtils.getString(monthMap.get("NACLO"),"0"),
274 ConvertUtils.getString(monthHbMap.get("NACLO"),"0") ,ConvertUtils.getString(monthTbMap.get("NACLO") ,"0") ) ); 274 ConvertUtils.getString(monthHbMap.get("NACLO"),"0") ,ConvertUtils.getString(monthTbMap.get("NACLO") ,"0") ) );
275 monthDataVOList.add( new YJMonthDataVO("水处理PAM(-)","SCLPAMF" ,"KG",ConvertUtils.getString(target.getTargetSclpamf(),"0"),ConvertUtils.getString(monthMap.get("SCLPAMF"),"0"), 275 monthDataVOList.add( new YJMonthDataVO("水处理PAM(-)","SCLPAMF" ,"kg",ConvertUtils.getString(target.getTargetSclpamf(),"0"),ConvertUtils.getString(monthMap.get("SCLPAMF"),"0"),
276 ConvertUtils.getString(monthHbMap.get("SCLPAMF"),"0") ,ConvertUtils.getString(monthTbMap.get("SCLPAMF") ,"0") ) ); 276 ConvertUtils.getString(monthHbMap.get("SCLPAMF"),"0") ,ConvertUtils.getString(monthTbMap.get("SCLPAMF") ,"0") ) );
277 277
278 monthDataVOList.add( new YJMonthDataVO("污脱PAM乳剂","PAMRJ","KG" ,ConvertUtils.getString(target.getTargetPamrj(),"0"),ConvertUtils.getString(monthMap.get("PAMRJ"),"0"), 278 monthDataVOList.add( new YJMonthDataVO("污脱PAM乳剂","PAMRJ","kg" ,ConvertUtils.getString(target.getTargetPamrj(),"0"),ConvertUtils.getString(monthMap.get("PAMRJ"),"0"),
279 ConvertUtils.getString(monthHbMap.get("PAMRJ"),"0") ,ConvertUtils.getString(monthTbMap.get("PAMRJ") ,"0") ) ); 279 ConvertUtils.getString(monthHbMap.get("PAMRJ"),"0") ,ConvertUtils.getString(monthTbMap.get("PAMRJ") ,"0") ) );
280 monthDataVOList.add( new YJMonthDataVO("PFS","PFS" ,"KG",ConvertUtils.getString(target.getTargetPfs(),"0"),ConvertUtils.getString(monthMap.get("PFS"),"0"), 280 monthDataVOList.add( new YJMonthDataVO("PFS","PFS" ,"kg",ConvertUtils.getString(target.getTargetPfs(),"0"),ConvertUtils.getString(monthMap.get("PFS"),"0"),
281 ConvertUtils.getString(monthHbMap.get("PFS"),"0") ,ConvertUtils.getString(monthTbMap.get("PFS") ,"0") ) ); 281 ConvertUtils.getString(monthHbMap.get("PFS"),"0") ,ConvertUtils.getString(monthTbMap.get("PFS") ,"0") ) );
282 monthDataVOList.add( new YJMonthDataVO("复合铁盐","FHTY","KG" ,ConvertUtils.getString(target.getTargetFhty(),"0"),ConvertUtils.getString(monthMap.get("FHTY"),"0"), 282 monthDataVOList.add( new YJMonthDataVO("复合铁盐","FHTY","kg" ,ConvertUtils.getString(target.getTargetFhty(),"0"),ConvertUtils.getString(monthMap.get("FHTY"),"0"),
283 ConvertUtils.getString(monthHbMap.get("FHTY"),"0") ,ConvertUtils.getString(monthTbMap.get("FHTY") ,"0") ) ); 283 ConvertUtils.getString(monthHbMap.get("FHTY"),"0") ,ConvertUtils.getString(monthTbMap.get("FHTY") ,"0") ) );
284 monthDataVOList.add( new YJMonthDataVO("乳液絮凝剂","RYXNJ" ,"KG",ConvertUtils.getString(target.getTargetRyxnj(),"0"),ConvertUtils.getString(monthMap.get("RYXNJ"),"0"), 284 monthDataVOList.add( new YJMonthDataVO("乳液絮凝剂","RYXNJ" ,"kg",ConvertUtils.getString(target.getTargetRyxnj(),"0"),ConvertUtils.getString(monthMap.get("RYXNJ"),"0"),
285 ConvertUtils.getString(monthHbMap.get("RYXNJ"),"0") ,ConvertUtils.getString(monthTbMap.get("RYXNJ") ,"0") ) ); 285 ConvertUtils.getString(monthHbMap.get("RYXNJ"),"0") ,ConvertUtils.getString(monthTbMap.get("RYXNJ") ,"0") ) );
286 monthDataVOList.add( new YJMonthDataVO("益维磷","YWL" ,"KG",ConvertUtils.getString(target.getTargetYwl(),"0"),ConvertUtils.getString(monthMap.get("YWL"),"0"), 286 monthDataVOList.add( new YJMonthDataVO("益维磷","YWL" ,"kg",ConvertUtils.getString(target.getTargetYwl(),"0"),ConvertUtils.getString(monthMap.get("YWL"),"0"),
287 ConvertUtils.getString(monthHbMap.get("YWL"),"0") ,ConvertUtils.getString(monthTbMap.get("YWL") ,"0") ) ); 287 ConvertUtils.getString(monthHbMap.get("YWL"),"0") ,ConvertUtils.getString(monthTbMap.get("YWL") ,"0") ) );
288 monthDataVOList.add( new YJMonthDataVO("高效除磷剂","GXCLJ" ,"KG",ConvertUtils.getString(target.getTargetGxclj(),"0"),ConvertUtils.getString(monthMap.get("GXCLJ"),"0"), 288 monthDataVOList.add( new YJMonthDataVO("高效除磷剂","GXCLJ" ,"kg",ConvertUtils.getString(target.getTargetGxclj(),"0"),ConvertUtils.getString(monthMap.get("GXCLJ"),"0"),
289 ConvertUtils.getString(monthHbMap.get("GXCLJ"),"0") ,ConvertUtils.getString(monthTbMap.get("GXCLJ") ,"0") ) ); 289 ConvertUtils.getString(monthHbMap.get("GXCLJ"),"0") ,ConvertUtils.getString(monthTbMap.get("GXCLJ") ,"0") ) );
290 monthDataVOList.add( new YJMonthDataVO("CH3COONA","CH3COONA" ,"KG",ConvertUtils.getString(target.getTargetCh3coona(),"0"),ConvertUtils.getString(monthMap.get("CH3COONA"),"0"), 290 monthDataVOList.add( new YJMonthDataVO("CH3COONA","CH3COONA" ,"kg",ConvertUtils.getString(target.getTargetCh3coona(),"0"),ConvertUtils.getString(monthMap.get("CH3COONA"),"0"),
291 ConvertUtils.getString(monthHbMap.get("CH3COONA"),"0") ,ConvertUtils.getString(monthTbMap.get("CH3COONA") ,"0") ) ); 291 ConvertUtils.getString(monthHbMap.get("CH3COONA"),"0") ,ConvertUtils.getString(monthTbMap.get("CH3COONA") ,"0") ) );
292 monthDataVOList.add( new YJMonthDataVO("活性炭","HXT" ,"KG",ConvertUtils.getString(target.getTargetHxt(),"0"),ConvertUtils.getString(monthMap.get("HXT"),"0"), 292 monthDataVOList.add( new YJMonthDataVO("活性炭","HXT" ,"kg",ConvertUtils.getString(target.getTargetHxt(),"0"),ConvertUtils.getString(monthMap.get("HXT"),"0"),
293 ConvertUtils.getString(monthHbMap.get("HXT"),"0") ,ConvertUtils.getString(monthTbMap.get("HXT") ,"0") ) ); 293 ConvertUtils.getString(monthHbMap.get("HXT"),"0") ,ConvertUtils.getString(monthTbMap.get("HXT") ,"0") ) );
294 monthDataVOList.add( new YJMonthDataVO("FeCl3","FECL3" ,"KG",ConvertUtils.getString(target.getTargetFecl3(),"0"),ConvertUtils.getString(monthMap.get("FECL3"),"0"), 294 monthDataVOList.add( new YJMonthDataVO("FeCl3","FECL3" ,"kg",ConvertUtils.getString(target.getTargetFecl3(),"0"),ConvertUtils.getString(monthMap.get("FECL3"),"0"),
295 ConvertUtils.getString(monthHbMap.get("FECL3"),"0") ,ConvertUtils.getString(monthTbMap.get("FECL3") ,"0") ) ); 295 ConvertUtils.getString(monthHbMap.get("FECL3"),"0") ,ConvertUtils.getString(monthTbMap.get("FECL3") ,"0") ) );
296 monthDataVOList.add( new YJMonthDataVO("石灰","SH" ,"KG",ConvertUtils.getString(target.getTargetSh(),"0"),ConvertUtils.getString(monthMap.get("SH"),"0"), 296 monthDataVOList.add( new YJMonthDataVO("石灰","SH" ,"kg",ConvertUtils.getString(target.getTargetSh(),"0"),ConvertUtils.getString(monthMap.get("SH"),"0"),
297 ConvertUtils.getString(monthHbMap.get("SH"),"0") ,ConvertUtils.getString(monthTbMap.get("SH") ,"0") ) ); 297 ConvertUtils.getString(monthHbMap.get("SH"),"0") ,ConvertUtils.getString(monthTbMap.get("SH") ,"0") ) );
298 monthDataVOList.add( new YJMonthDataVO("CH3COOH","CH3COOH" ,"KG",ConvertUtils.getString(target.getTargetCh3cooh(),"0"),ConvertUtils.getString(monthMap.get("CH3COOH"),"0"), 298 monthDataVOList.add( new YJMonthDataVO("CH3COOH","CH3COOH" ,"kg",ConvertUtils.getString(target.getTargetCh3cooh(),"0"),ConvertUtils.getString(monthMap.get("CH3COOH"),"0"),
299 ConvertUtils.getString(monthHbMap.get("CH3COOH"),"0") ,ConvertUtils.getString(monthTbMap.get("CH3COOH") ,"0") ) ); 299 ConvertUtils.getString(monthHbMap.get("CH3COOH"),"0") ,ConvertUtils.getString(monthTbMap.get("CH3COOH") ,"0") ) );
300 monthDataVOList.add( new YJMonthDataVO("FeSO4固","FESO4G" ,"KG",ConvertUtils.getString(target.getTargetFeso4g(),"0"),ConvertUtils.getString(monthMap.get("FESO4G"),"0"), 300 monthDataVOList.add( new YJMonthDataVO("FeSO4固","FESO4G" ,"kg",ConvertUtils.getString(target.getTargetFeso4g(),"0"),ConvertUtils.getString(monthMap.get("FESO4G"),"0"),
301 ConvertUtils.getString(monthHbMap.get("FESO4G"),"0") ,ConvertUtils.getString(monthTbMap.get("FESO4G") ,"0") ) ); 301 ConvertUtils.getString(monthHbMap.get("FESO4G"),"0") ,ConvertUtils.getString(monthTbMap.get("FESO4G") ,"0") ) );
302 monthDataVOList.add( new YJMonthDataVO("FeSO4液","FESO4Y" ,"KG",ConvertUtils.getString(target.getTargetFeso4y(),"0"),ConvertUtils.getString(monthMap.get("FESO4Y"),"0"), 302 monthDataVOList.add( new YJMonthDataVO("FeSO4液","FESO4Y" ,"kg",ConvertUtils.getString(target.getTargetFeso4y(),"0"),ConvertUtils.getString(monthMap.get("FESO4Y"),"0"),
303 ConvertUtils.getString(monthHbMap.get("FESO4Y"),"0") ,ConvertUtils.getString(monthTbMap.get("FESO4Y") ,"0") ) ); 303 ConvertUtils.getString(monthHbMap.get("FESO4Y"),"0") ,ConvertUtils.getString(monthTbMap.get("FESO4Y") ,"0") ) );
304 monthDataVOList.add( new YJMonthDataVO("H2O2","H2O2","KG" ,ConvertUtils.getString(target.getTargetH2o2(),"0"),ConvertUtils.getString(monthMap.get("H2O2"),"0"), 304 monthDataVOList.add( new YJMonthDataVO("H2O2","H2O2","kg" ,ConvertUtils.getString(target.getTargetH2o2(),"0"),ConvertUtils.getString(monthMap.get("H2O2"),"0"),
305 ConvertUtils.getString(monthHbMap.get("H2O2"),"0") ,ConvertUtils.getString(monthTbMap.get("H2O2") ,"0") ) ); 305 ConvertUtils.getString(monthHbMap.get("H2O2"),"0") ,ConvertUtils.getString(monthTbMap.get("H2O2") ,"0") ) );
306 306
307 /* 307 /*
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/AlarmParamStandardConfigVO.java 0 → 100644
1 package com.skua.modules.dataAnalysis.vo;
2
3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty;
5 import lombok.Data;
6
7 /**
8 * @auther kangwei
9 * @create 2024-12-17-19:03
10 */
11 @Data
12 @ApiModel(value="指标库分析对象", description="指标库分析对象")
13 public class AlarmParamStandardConfigVO {
14
15 @ApiModelProperty(value = "指标编号")
16 private String alarmLevelStandardId;
17 @ApiModelProperty(value = "总磷-最大值")
18 private String CSZL_MAX;
19 @ApiModelProperty(value = "总氮-最大值")
20 private String CSTN_MAX;
21 @ApiModelProperty(value = "氨氮-最大值")
22 private String CSAD_MAX;
23 @ApiModelProperty(value = "PH-最大值")
24 private String CSPH_MAX;
25 @ApiModelProperty(value = "COD-最大值")
26 private Integer CSCOD_MAX;
27
28
29 @ApiModelProperty(value = "总磷-最小值")
30 private String CSZL_MIN;
31 @ApiModelProperty(value = "总氮-最小值")
32 private String CSTN_MIN;
33 @ApiModelProperty(value = "氨氮-最小值")
34 private String CSAD_MIN;
35 @ApiModelProperty(value = "PH-最小值")
36 private String CSPH_MIN;
37 @ApiModelProperty(value = "COD-最小值")
38 private Integer CSCOD_MIN;
39 }
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterAnalysisVO.java 0 → 100644
1 package com.skua.modules.dataAnalysis.vo;
2
3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty;
5 import lombok.Data;
6 import org.apache.commons.lang.StringUtils;
7
8 /**
9 * @auther kangwei
10 * @create 2024-12-17-18:29
11 */
12 @Data
13 @ApiModel(value="水质分析对象", description="水质分析对象")
14 public class WaterAnalysisVO {
15 @ApiModelProperty(value = "部门编号")
16 private String factoryName;
17 @ApiModelProperty(value = "水厂编号")
18 private String departId;
19 @ApiModelProperty(value = "水厂编号")
20 private String factoryId;
21 @ApiModelProperty(value = "经度")
22 private String longitude;
23 @ApiModelProperty(value = "维度")
24 private String latitude;
25 @ApiModelProperty(value = "区域名称")
26 private String areaName;
27
28
29 @ApiModelProperty(value = "总天数")
30 private Integer totalDayNum;
31
32 @ApiModelProperty(value = "出水标准编号")
33 private String out_level;
34
35 @ApiModelProperty(value = "出水标准名称")
36 private String standard;
37
38 @ApiModelProperty(value = "百分比")
39 private String db;
40
41 @ApiModelProperty(value = "status")
42 private Integer status;
43 @ApiModelProperty(value = "备注")
44 private String remark;
45
46
47 public Integer getStatus() {
48 status = 1;
49 if(StringUtils.isNotEmpty(db)){
50 if(Double.parseDouble(db) < 90) status =-1;
51 if(Double.parseDouble(db) >= 90 && Double.parseDouble(db)<100) status = 0;
52 }
53 return status;
54 }
55 }
56
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!