Skip to content

张雷 / skboot-zhongye

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

水质监控功能开发

1 个父辈 610c0bb5
内嵌 并排
正在显示 8 个修改的文件 包含 225 行增加 和 38 行删除
sk-base-common/src/main/java/com/skua/modules/common/mapper/CommonSqlMapper.java
...@@ -62,4 +62,6 @@ public interface CommonSqlMapper { ...@@ -62,4 +62,6 @@ public interface CommonSqlMapper {
62 String getChildDepartByUserId(@Param(value="userId") String userId); 62 String getChildDepartByUserId(@Param(value="userId") String userId);
63 63
64 List<DepartVO> getChildDepartList(@Param(value="departId") String departId); 64 List<DepartVO> getChildDepartList(@Param(value="departId") String departId);
65
66 String getChildFactorysNotInNF(@Param(value="departId") String departId,@Param(value="notInParentId") String notInParentId);
65 } 67 }
......
sk-base-common/src/main/java/com/skua/modules/common/mapper/xml/CommonSqlMapper.xml
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
70 '${item}' 70 '${item}'
71 </foreach> 71 </foreach>
72 ) 72 )
73 OR parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN
74 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
75 '${item}'
76 </foreach>
77 ) )
73 </select> 78 </select>
74 79
75 <select id="getChildFactorys" resultType="java.lang.String"> 80 <select id="getChildFactorys" resultType="java.lang.String">
...@@ -92,7 +97,13 @@ ...@@ -92,7 +97,13 @@
92 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")"> 97 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
93 '${item}' 98 '${item}'
94 </foreach> 99 </foreach>
95 )) 100 )
101 OR parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN
102 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
103 '${item}'
104 </foreach>
105 ) )
106 )
96 </select> 107 </select>
97 108
98 <select id="getChildDeparts" resultType="java.lang.String"> 109 <select id="getChildDeparts" resultType="java.lang.String">
...@@ -114,6 +125,11 @@ ...@@ -114,6 +125,11 @@
114 '${item}' 125 '${item}'
115 </foreach> 126 </foreach>
116 ) 127 )
128 OR parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN
129 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
130 '${item}'
131 </foreach>
132 ) )
117 </select> 133 </select>
118 134
119 <select id="getChildDepartByUserId" resultType="java.lang.String"> 135 <select id="getChildDepartByUserId" resultType="java.lang.String">
...@@ -143,6 +159,42 @@ ...@@ -143,6 +159,42 @@
143 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")"> 159 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
144 '${item}' 160 '${item}'
145 </foreach> 161 </foreach>
146 )) 162 )
163 OR parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN
164 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
165 '${item}'
166 </foreach>
167 ) )
168 )
169 </select>
170
171 <select id="getChildFactorysNotInNF" resultType="java.lang.String">
172 SELECT
173 GROUP_CONCAT( id SEPARATOR ',' ) AS depart_ids
174 FROM
175 sys_depart
176 WHERE
177 depart_type = '1'
178 AND parent_id != #{notInParentId}
179 AND (
180 parent_id IN
181 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
182 '${item}'
183 </foreach>
184 OR id IN
185 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
186 '${item}'
187 </foreach>
188 OR parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN
189 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
190 '${item}'
191 </foreach>
192 )
193 OR parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN
194 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
195 '${item}'
196 </foreach>
197 ) )
198 )
147 </select> 199 </select>
148 </mapper> 200 </mapper>
......
sk-base-common/src/main/java/com/skua/modules/common/service/ICommonSqlService.java
...@@ -50,5 +50,7 @@ public interface ICommonSqlService { ...@@ -50,5 +50,7 @@ public interface ICommonSqlService {
50 50
51 String getChildFactorys(String departId); 51 String getChildFactorys(String departId);
52 52
53 String getChildFactorysNotInNF(String departId);
54
53 List<DepartVO> getChildDepartList(String departId); 55 List<DepartVO> getChildDepartList(String departId);
54 } 56 }
......
sk-base-common/src/main/java/com/skua/modules/common/service/impl/CommonSqlServiceImpl.java
...@@ -98,6 +98,12 @@ public class CommonSqlServiceImpl implements ICommonSqlService { ...@@ -98,6 +98,12 @@ public class CommonSqlServiceImpl implements ICommonSqlService {
98 } 98 }
99 99
100 @Override 100 @Override
101 public String getChildFactorysNotInNF(String departId) {
102 String notInParentId = "1818215543140909056";
103 return commonSqlMapper.getChildFactorysNotInNF(departId,notInParentId);
104 }
105
106 @Override
101 public List<DepartVO> getChildDepartList(String departId) { 107 public List<DepartVO> getChildDepartList(String departId) {
102 List<DepartVO> list = commonSqlMapper.getChildDepartList(departId); 108 List<DepartVO> list = commonSqlMapper.getChildDepartList(departId);
103 return list; 109 return list;
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/FactoryCenterController.java
...@@ -190,30 +190,86 @@ public class FactoryCenterController { ...@@ -190,30 +190,86 @@ public class FactoryCenterController {
190 @GetMapping(value = "/queryMonitoringData") 190 @GetMapping(value = "/queryMonitoringData")
191 public Result<WaterQualityMonitoringVO> queryMonitoringData(WaterQualityParams waterQualityParams) { 191 public Result<WaterQualityMonitoringVO> queryMonitoringData(WaterQualityParams waterQualityParams) {
192 Result<WaterQualityMonitoringVO> result = new Result<WaterQualityMonitoringVO>(); 192 Result<WaterQualityMonitoringVO> result = new Result<WaterQualityMonitoringVO>();
193 int all = 0;//全部
194 int abnormal = 0;//异常
195 List<WaterQualityMonitoringDetailVO> list = new ArrayList<>(); 193 List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
196 WaterQualityMonitoringVO res = new WaterQualityMonitoringVO(); 194 WaterQualityMonitoringVO res = new WaterQualityMonitoringVO();
197 String departIds = ""; 195 String departIds = "";
198 if(ConvertUtils.isNotEmpty(waterQualityParams.getDepartId())){ 196 if(ConvertUtils.isNotEmpty(waterQualityParams.getDepartId())){
199 departIds = commonSqlService.getChildFactorys(waterQualityParams.getDepartId()); 197 departIds = commonSqlService.getChildFactorysNotInNF(waterQualityParams.getDepartId());
200 }else{ 198 }else{
201 departIds = commonSqlService.getChildFactorys(BaseContextHandler.getRealDepartId()); 199 departIds = commonSqlService.getChildFactorysNotInNF(BaseContextHandler.getRealDepartId());
202 } 200 }
203 list = factoryCenterService.queryMonitoringData(departIds,waterQualityParams.getParmType()); 201 list = factoryCenterService.queryMonitoringData(departIds,waterQualityParams.getParmType());
204 res.setList(list); 202 res = updateFactoryStatusCount(res,list,waterQualityParams.getDataType());
205 all = list.size(); 203 result.setSuccess(true);
206 res.setAll(String.valueOf(all)); 204 result.setResult(res);
205 return result;
206 }
207
208 /**
209 * 统计水厂数量
210 * @param waterQualityMonitoringVO
211 * @param list
212 * @return
213 */
214 private WaterQualityMonitoringVO updateFactoryStatusCount(WaterQualityMonitoringVO waterQualityMonitoringVO,
215 List<WaterQualityMonitoringDetailVO> list,String dataType) {
216 List<WaterQualityMonitoringDetailVO> resultList = new ArrayList<>();
217 List<WaterQualityMonitoringDetailVO> restList = new ArrayList<>();
218 Map<String,String> alarmMap = new HashMap<>();
219 Map<String,String> allMap = new HashMap<>();
220 Map<String,String> offMap = new HashMap<>();
221 int all = 0;//全部
222 int abnormal = 0;//异常
223 int off = 0;//离线
207 for (WaterQualityMonitoringDetailVO vo:list) { 224 for (WaterQualityMonitoringDetailVO vo:list) {
225 if(ConvertUtils.isNotEmpty(dataType)){
226 //all/access/online/normal/abnormal
227 if("all".equals(dataType)){
228 restList.add(vo);
229 }else if("online".equals(dataType)){
230 if(!"离线".equals(vo.getCodAbnormal())||!"离线".equals(vo.getNh3Abnormal())||!"离线".equals(vo.getFlowAbnormal())||
231 !"离线".equals(vo.getTnAbnormal())||!"离线".equals(vo.getTpAbnormal())||!"离线".equals(vo.getPhAbnormal())){
232 restList.add(vo);
233 }
234 }else if("normal".equals(dataType)){
235 if("0".equals(vo.getCodAbnormal())&&"0".equals(vo.getNh3Abnormal())&&
236 "0".equals(vo.getTnAbnormal())&&"0".equals(vo.getTpAbnormal())&&"0".equals(vo.getPhAbnormal())){
237 restList.add(vo);
238 }
239 }else if("abnormal".equals(dataType)){
208 if("1".equals(vo.getCodAbnormal())||"1".equals(vo.getNh3Abnormal())|| 240 if("1".equals(vo.getCodAbnormal())||"1".equals(vo.getNh3Abnormal())||
209 "1".equals(vo.getTnAbnormal())||"1".equals(vo.getTpAbnormal())||"1".equals(vo.getPhAbnormal())){ 241 "1".equals(vo.getTnAbnormal())||"1".equals(vo.getTpAbnormal())||"1".equals(vo.getPhAbnormal())){
210 abnormal++; 242 restList.add(vo);
211 } 243 }
244 }else{
245 restList.add(vo);
212 } 246 }
213 res.setNormal(String.valueOf(all-abnormal)); 247 }else{
214 res.setAbnormal(String.valueOf(abnormal)); 248 restList.add(vo);
215 result.setSuccess(true);
216 result.setResult(res);
217 return result;
218 } 249 }
250 resultList.add(vo);
251 allMap.put(vo.getDepartId(),"1");
252 if("1".equals(vo.getCodAbnormal())||"1".equals(vo.getNh3Abnormal())||
253 "1".equals(vo.getTnAbnormal())||"1".equals(vo.getTpAbnormal())||"1".equals(vo.getPhAbnormal())){
254 alarmMap.put(vo.getDepartId(),"1");
255 }
256 if("离线".equals(vo.getCodAbnormal())&&"离线".equals(vo.getNh3Abnormal())&&"离线".equals(vo.getFlowAbnormal())&&
257 "离线".equals(vo.getTnAbnormal())&&"离线".equals(vo.getTpAbnormal())&&"离线".equals(vo.getPhAbnormal())){
258 offMap.put(vo.getDepartId(),"1");
259 }
260 }
261 all = allMap.size();
262 abnormal = alarmMap.size();
263 off = offMap.size();
264 waterQualityMonitoringVO.setAll(String.valueOf(all));
265 waterQualityMonitoringVO.setNormal(String.valueOf(all-abnormal));
266 waterQualityMonitoringVO.setAbnormal(String.valueOf(abnormal));
267 waterQualityMonitoringVO.setAccess(String.valueOf(all));
268 waterQualityMonitoringVO.setOnline(String.valueOf(all-off));
269 waterQualityMonitoringVO.setOff(String.valueOf(off));
270 waterQualityMonitoringVO.setList(restList);
271 return waterQualityMonitoringVO;
272 }
273
274
219 } 275 }
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
...@@ -309,34 +309,103 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -309,34 +309,103 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
309 309
310 private WaterQualityMonitoringDetailVO updateDataStatus(WaterQualityMonitoringDetailVO waterQualityMonitoringDetailVO) { 310 private WaterQualityMonitoringDetailVO updateDataStatus(WaterQualityMonitoringDetailVO waterQualityMonitoringDetailVO) {
311 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getCodUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getCodLower())){ 311 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getCodUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getCodLower())){
312 if(Double.parseDouble(waterQualityMonitoringDetailVO.getCodVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getCodUpper())|| 312 if("no".equals(waterQualityMonitoringDetailVO.getCodVal())){
313 Double.parseDouble(waterQualityMonitoringDetailVO.getCodVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getCodLower())){ 313 waterQualityMonitoringDetailVO.setCodAbnormal("未接入");
314 waterQualityMonitoringDetailVO.setCodVal(null);
315 }else if("off".equals(waterQualityMonitoringDetailVO.getCodVal())){
316 waterQualityMonitoringDetailVO.setCodAbnormal("离线");
317 waterQualityMonitoringDetailVO.setCodVal(null);
318 }else{
319 if(Double.parseDouble(waterQualityMonitoringDetailVO.getCodVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getCodUpper())){
320 waterQualityMonitoringDetailVO.setCodAbnormal("1");
321 waterQualityMonitoringDetailVO.setCodMessage("超过上限："+waterQualityMonitoringDetailVO.getCodUpper()+"(mg/L)");
322 }
323 if(Double.parseDouble(waterQualityMonitoringDetailVO.getCodVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getCodLower())){
314 waterQualityMonitoringDetailVO.setCodAbnormal("1"); 324 waterQualityMonitoringDetailVO.setCodAbnormal("1");
325 waterQualityMonitoringDetailVO.setCodMessage("低于下限："+waterQualityMonitoringDetailVO.getCodLower()+"(mg/L)");
326 }
315 } 327 }
316 } 328 }
317 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getNh3Upper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getNh3Lower())){ 329 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getNh3Upper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getNh3Lower())){
318 if(Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Val()) > Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Upper())|| 330 if("no".equals(waterQualityMonitoringDetailVO.getNh3Val())){
319 Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Val()) < Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Lower())){ 331 waterQualityMonitoringDetailVO.setNh3Abnormal("未接入");
332 waterQualityMonitoringDetailVO.setNh3Val(null);
333 }else if("off".equals(waterQualityMonitoringDetailVO.getNh3Val())){
334 waterQualityMonitoringDetailVO.setNh3Abnormal("离线");
335 waterQualityMonitoringDetailVO.setNh3Val(null);
336 }else{
337 if(Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Val()) > Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Upper())){
320 waterQualityMonitoringDetailVO.setNh3Abnormal("1"); 338 waterQualityMonitoringDetailVO.setNh3Abnormal("1");
339 waterQualityMonitoringDetailVO.setNh3Message("超过上限："+waterQualityMonitoringDetailVO.getNh3Upper()+"(mg/L)");
340 }
341 if(Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Val()) < Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Lower())){
342 waterQualityMonitoringDetailVO.setNh3Abnormal("1");
343 waterQualityMonitoringDetailVO.setNh3Message("低于下限："+waterQualityMonitoringDetailVO.getNh3Lower()+"(mg/L)");
344 }
321 } 345 }
322 } 346 }
323 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTnUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTnLower())){ 347 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTnUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTnLower())){
324 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTnVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getTnUpper())|| 348 if("no".equals(waterQualityMonitoringDetailVO.getTnVal())){
325 Double.parseDouble(waterQualityMonitoringDetailVO.getTnVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getTnLower())){ 349 waterQualityMonitoringDetailVO.setTnAbnormal("未接入");
350 waterQualityMonitoringDetailVO.setTnVal(null);
351 }else if("off".equals(waterQualityMonitoringDetailVO.getTnVal())){
352 waterQualityMonitoringDetailVO.setTnAbnormal("离线");
353 waterQualityMonitoringDetailVO.setTnVal(null);
354 }else{
355 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTnVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getTnUpper())){
356 waterQualityMonitoringDetailVO.setTnAbnormal("1");
357 waterQualityMonitoringDetailVO.setTnMessage("超过上限："+waterQualityMonitoringDetailVO.getTnUpper()+"(mg/L)");
358 }
359 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTnVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getTnLower())){
326 waterQualityMonitoringDetailVO.setTnAbnormal("1"); 360 waterQualityMonitoringDetailVO.setTnAbnormal("1");
361 waterQualityMonitoringDetailVO.setTnMessage("低于下限："+waterQualityMonitoringDetailVO.getTnLower()+"(mg/L)");
362 }
327 } 363 }
328 } 364 }
329 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTpUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTpLower())){ 365 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTpUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTpLower())){
330 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTpVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getTpUpper())|| 366 if("no".equals(waterQualityMonitoringDetailVO.getTpVal())){
331 Double.parseDouble(waterQualityMonitoringDetailVO.getTpVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getTpLower())){ 367 waterQualityMonitoringDetailVO.setTpAbnormal("未接入");
368 waterQualityMonitoringDetailVO.setTpVal(null);
369 }else if("off".equals(waterQualityMonitoringDetailVO.getTpVal())){
370 waterQualityMonitoringDetailVO.setTpAbnormal("离线");
371 waterQualityMonitoringDetailVO.setTpVal(null);
372 }else{
373 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTpVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getTpUpper())){
374 waterQualityMonitoringDetailVO.setTpAbnormal("1");
375 waterQualityMonitoringDetailVO.setTpMessage("超过上限："+waterQualityMonitoringDetailVO.getTpUpper()+"(mg/L)");
376 }
377 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTpVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getTpLower())){
332 waterQualityMonitoringDetailVO.setTpAbnormal("1"); 378 waterQualityMonitoringDetailVO.setTpAbnormal("1");
379 waterQualityMonitoringDetailVO.setTpMessage("低于下限："+waterQualityMonitoringDetailVO.getTpLower()+"(mg/L)");
380 }
333 } 381 }
334 } 382 }
335 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getPhUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getPhLower())){ 383 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getPhUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getPhLower())){
336 if(Double.parseDouble(waterQualityMonitoringDetailVO.getPhVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getPhUpper())|| 384 if("no".equals(waterQualityMonitoringDetailVO.getPhVal())){
337 Double.parseDouble(waterQualityMonitoringDetailVO.getPhVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getPhLower())){ 385 waterQualityMonitoringDetailVO.setPhAbnormal("未接入");
386 waterQualityMonitoringDetailVO.setPhVal(null);
387 }else if("off".equals(waterQualityMonitoringDetailVO.getPhVal())){
388 waterQualityMonitoringDetailVO.setPhAbnormal("离线");
389 waterQualityMonitoringDetailVO.setPhVal(null);
390 }else{
391 if(Double.parseDouble(waterQualityMonitoringDetailVO.getPhVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getPhUpper())){
338 waterQualityMonitoringDetailVO.setPhAbnormal("1"); 392 waterQualityMonitoringDetailVO.setPhAbnormal("1");
393 waterQualityMonitoringDetailVO.setPhMessage("超过上限："+waterQualityMonitoringDetailVO.getPhUpper());
339 } 394 }
395 if(Double.parseDouble(waterQualityMonitoringDetailVO.getPhVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getPhLower())){
396 waterQualityMonitoringDetailVO.setPhAbnormal("1");
397 waterQualityMonitoringDetailVO.setPhMessage("低于下限："+waterQualityMonitoringDetailVO.getPhLower());
398 }
399 }
400 }
401 if("no".equals(waterQualityMonitoringDetailVO.getFlowVal())){
402 waterQualityMonitoringDetailVO.setFlowAbnormal("未接入");
403 waterQualityMonitoringDetailVO.setFlowVal(null);
404 }else if("off".equals(waterQualityMonitoringDetailVO.getFlowVal())){
405 waterQualityMonitoringDetailVO.setFlowAbnormal("离线");
406 waterQualityMonitoringDetailVO.setFlowVal(null);
407 }else{
408 waterQualityMonitoringDetailVO.setFlowAbnormal("0");
340 } 409 }
341 return waterQualityMonitoringDetailVO; 410 return waterQualityMonitoringDetailVO;
342 } 411 }
...@@ -354,10 +423,10 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -354,10 +423,10 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
354 if(dataMap.get(monitorTagMap.get(tag+"-"+depart).toString())!=null){ 423 if(dataMap.get(monitorTagMap.get(tag+"-"+depart).toString())!=null){
355 return dataMap.get(monitorTagMap.get(tag+"-"+depart).toString()).toString(); 424 return dataMap.get(monitorTagMap.get(tag+"-"+depart).toString()).toString();
356 }else{ 425 }else{
357 return "0"; 426 return "off";
358 } 427 }
359 }else{ 428 }else{
360 return "0"; 429 return "no";
361 } 430 }
362 } 431 }
363 432
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterQualityMonitoringDetailVO.java
...@@ -53,28 +53,28 @@ public class WaterQualityMonitoringDetailVO { ...@@ -53,28 +53,28 @@ public class WaterQualityMonitoringDetailVO {
53 private String codUpper; 53 private String codUpper;
54 private String codLower; 54 private String codLower;
55 private String codAbnormal; 55 private String codAbnormal;
56 // private String codWarnMessage;//预警 56 private String codMessage;//预警
57 57
58 @ApiModelProperty(value = "氨氮") 58 @ApiModelProperty(value = "氨氮")
59 private String nh3Val; 59 private String nh3Val;
60 private String nh3Upper; 60 private String nh3Upper;
61 private String nh3Lower; 61 private String nh3Lower;
62 private String nh3Abnormal; 62 private String nh3Abnormal;
63 // private String nh3WarnMessage; 63 private String nh3Message;
64 64
65 @ApiModelProperty(value = "总磷") 65 @ApiModelProperty(value = "总磷")
66 private String tpVal; 66 private String tpVal;
67 private String tpUpper; 67 private String tpUpper;
68 private String tpLower; 68 private String tpLower;
69 private String tpAbnormal; 69 private String tpAbnormal;
70 // private String tpWarnMessage; 70 private String tpMessage;
71 71
72 @ApiModelProperty(value = "总氮") 72 @ApiModelProperty(value = "总氮")
73 private String tnVal; 73 private String tnVal;
74 private String tnUpper; 74 private String tnUpper;
75 private String tnLower; 75 private String tnLower;
76 private String tnAbnormal; 76 private String tnAbnormal;
77 // private String tnWarnMessage; 77 private String tnMessage;
78 78
79 // @ApiModelProperty(value = "温度") 79 // @ApiModelProperty(value = "温度")
80 // private String temperatureVal; 80 // private String temperatureVal;
...@@ -85,7 +85,7 @@ public class WaterQualityMonitoringDetailVO { ...@@ -85,7 +85,7 @@ public class WaterQualityMonitoringDetailVO {
85 private String phUpper; 85 private String phUpper;
86 private String phLower; 86 private String phLower;
87 private String phAbnormal; 87 private String phAbnormal;
88 // private String phWarnMessage; 88 private String phMessage;
89 89
90 @ApiModelProperty(value = "浊度") 90 @ApiModelProperty(value = "浊度")
91 private String zdVal; 91 private String zdVal;
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterQualityMonitoringVO.java
...@@ -15,12 +15,12 @@ public class WaterQualityMonitoringVO { ...@@ -15,12 +15,12 @@ public class WaterQualityMonitoringVO {
15 private String normal;//正常 15 private String normal;//正常
16 @ApiModelProperty(value = "异常") 16 @ApiModelProperty(value = "异常")
17 private String abnormal;//异常 17 private String abnormal;//异常
18 // @ApiModelProperty(value = "脱机") 18 @ApiModelProperty(value = "接入")
19 // private String offline;//脱机 19 private String access;//接入
20 // @ApiModelProperty(value = "零值") 20 @ApiModelProperty(value = "在线")
21 // private String zeroVal;//零值 21 private String online;//在线
22 // @ApiModelProperty(value = "预警") 22 @ApiModelProperty(value = "离线")
23 // private String warnVal;//零值 23 private String off;//离线
24 @ApiModelProperty(value = "水质监控明细") 24 @ApiModelProperty(value = "水质监控明细")
25 private List<WaterQualityMonitoringDetailVO> list;//明细 25 private List<WaterQualityMonitoringDetailVO> list;//明细
26 } 26 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!