水质监控功能开发

@@ -308,7 +308,7 @@ public class MaterialINController {
             }
 			result.setResult(materialIN);
 			result.setSuccess(true);
-		}*/
+		}
 		return result;
 	}
 

@@ -35,6 +35,10 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>sk-base-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>sk-module-system</artifactId>
+        </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

@@ -31,6 +31,7 @@
     <orderEntry type="module" module-name="sk-base-common" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
     <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
+    <orderEntry type="module" module-name="sk-module-system" />
     <orderEntry type="library" name="Maven: com.kingtroldata:core:2.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" />

@@ -9,6 +9,7 @@ import com.skua.modules.dataAnalysis.vo.WaterQualityMonitoringDetailVO;
 import com.skua.modules.dataAnalysis.vo.WaterQualityMonitoringVO;
 import com.skua.modules.dataAnalysis.vo.WaterQualityParams;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -186,18 +187,32 @@ public class FactoryCenterController {
 
     @ApiOperation(value="水质监控实时数据查询", notes="水质监控实时数据查询")
     @GetMapping(value = "/queryMonitoringData")
-    public Result<List<WaterQualityMonitoringDetailVO>> queryMonitoringData(WaterQualityParams waterQualityParams) {
-        Result<List<WaterQualityMonitoringDetailVO>> result = new Result<List<WaterQualityMonitoringDetailVO>>();
+    public Result<WaterQualityMonitoringVO> queryMonitoringData(WaterQualityParams waterQualityParams) {
+        Result<WaterQualityMonitoringVO> result = new Result<WaterQualityMonitoringVO>();
+        int all = 0;//全部
+        int abnormal = 0;//异常
         List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
-        String departIds = waterQualityParams.getDepartId();
+        WaterQualityMonitoringVO res = new WaterQualityMonitoringVO();
+        String departIds = "";
         if(waterQualityParams.getDepartId()!=null){
             departIds = commonSqlService.getChildFactorys(waterQualityParams.getDepartId());
         }else{
             departIds = commonSqlService.getChildFactorys(BaseContextHandler.getRealDepartId());
         }
         list = factoryCenterService.queryMonitoringData(departIds,waterQualityParams.getParmType());
+        res.setList(list);
+        all = list.size();
+        res.setAll(String.valueOf(all));
+        for (WaterQualityMonitoringDetailVO vo:list) {
+            if("1".equals(vo.getCodAbnormal())||"1".equals(vo.getNh3Abnormal())||
+                    "1".equals(vo.getTnAbnormal())||"1".equals(vo.getTpAbnormal())||"1".equals(vo.getPhAbnormal())){
+                abnormal++;
+            }
+        }
+        res.setNormal(String.valueOf(all-abnormal));
+        res.setAbnormal(String.valueOf(abnormal));
         result.setSuccess(true);
-        result.setResult(list);
+        result.setResult(res);
         return result;
     }
 }

@@ -15,92 +15,77 @@ public class WaterQualityMonitoringDetailVO {
 
 	@ApiModelProperty(value = "进出水类型")
 	private Integer num;
-	/**
-	 * 	进出水类型
-	 */
+
 	@ApiModelProperty(value = "进出水类型")
 	private String parmType;
-    /**
-     * 厂id
-     */
+
+	@ApiModelProperty(value = "上级ID")
+	private String parentId;
+
+	@ApiModelProperty(value = "上级名称")
+	private String parentName;
+
 	@ApiModelProperty(value = "厂id")
     private String departId;
-    /**
-     * 厂站名称
-     */
+
 	@ApiModelProperty(value = "厂站名称")
     private String departName;
-	@ApiModelProperty(value = "厂区排序")
-	private int departOrder;
-
-	@ApiModelProperty(value = "厂区负责人")
-    private String proPerson;
+//	@ApiModelProperty(value = "厂区排序")
+//	private int departOrder;
+//
+//	@ApiModelProperty(value = "厂区负责人")
+//    private String proPerson;
+//
+//	@ApiModelProperty(value = "厂区负责人电话")
+//    private String proPhone;
 
-	@ApiModelProperty(value = "厂区负责人电话")
-    private String proPhone;
-    /**
-     * 监测时间
-     */
 	@ApiModelProperty(value = "监测时间")
     private String monitorTime;
-    /**
-     * 流量
-     */
-	@ApiModelProperty(value = "流量")
-    private String flowVal;
-	private String flowUpper;
-	private String flowLower;
-	private String flowAbnormal;
-    /**
-     * cod
-     */
+
+//	@ApiModelProperty(value = "流量")
+//  private String flowVal;
+//	private String flowUpper;
+//	private String flowLower;
+//	private String flowAbnormal;
+
 	@ApiModelProperty(value = "cod")
     private String codVal;
 	private String codUpper;
 	private String codLower;
 	private String codAbnormal;
-	private String codWarnMessage;//预警
-    /**
-     * 氨氮
-     */
+//	private String codWarnMessage;//预警
+
 	@ApiModelProperty(value = "氨氮")
     private String nh3Val;
 	private String nh3Upper;
 	private String nh3Lower;
 	private String nh3Abnormal;
-	private String nh3WarnMessage;
-    /**
-     * 总磷
-     */
+//	private String nh3WarnMessage;
+
 	@ApiModelProperty(value = "总磷")
     private String tpVal;
 	private String tpUpper;
 	private String tpLower;
 	private String tpAbnormal;
-	private String tpWarnMessage;
-    /**
-     * 总氮
-     */
+//	private String tpWarnMessage;
+
 	@ApiModelProperty(value = "总氮")
     private String tnVal;
 	private String tnUpper;
 	private String tnLower;
 	private String tnAbnormal;
-	private String tnWarnMessage;
-    /**
-     * 温度
-     */
-	@ApiModelProperty(value = "温度")
-    private String temperatureVal;
-	private String temperatureWarnMessage;
-    /**
-     * ph
-     */
+//	private String tnWarnMessage;
+
+//	@ApiModelProperty(value = "温度")
+//    private String temperatureVal;
+//	private String temperatureWarnMessage;
+
 	@ApiModelProperty(value = "ph")
     private String phVal;
 	private String phUpper;
 	private String phLower;
 	private String phAbnormal;
+//	private String phWarnMessage;
 
 	@ApiModelProperty(value = "浊度")
 	private String zdVal;
@@ -110,55 +95,40 @@ public class WaterQualityMonitoringDetailVO {
 	@ApiModelProperty(value = "累计流量")
 	private String ljllVal;
 
+//	@ApiModelProperty(value = "摄像头")
+//    private String cameraVal;
+//
+//	@ApiModelProperty(value = "出水标准")
+//	private String outLevel;
+//
+//	//是否水质正常
+//	private String isHaveNormal;
+//
+//	//是否水质超标
+//	private String isHaveAbnormal;
+//
+//	//超标指标个数
+//	private int abnormalCount;
+//
+//	//指标未配置
+//	private int notConfiguredCount;
+//
+//	//厂站指标没有配置标记
+//	private String isNotHaveConfigured;
+//
+//	//是否含有0值
+//	private String isHaveZero;
+//
+//	//是否脱机
+//	private String isHaveOffline;
+//
+//	//是否预警
+//	private String isHaveWarn;
+//
+//	//预警个数
+//	private int abWarnCount;
+//
+//	//离线数量
+//	private int offLineCount;
 
-
-    /**
-     * 摄像头
-     */
-	@ApiModelProperty(value = "摄像头")
-    private String cameraVal;
-	/**
-	 * 出水标准
-	 */
-	@ApiModelProperty(value = "出水标准")
-	private String outLevel;
-
-	/**
-	 * 是否水质正常
-	 */
-	private String isHaveNormal;
-	/**
-	 * 是否水质超标
-	 */
-	private String isHaveAbnormal;
-	/**
-	 * 超标指标个数
-	 */
-	private int abnormalCount;
-	/**
-	 * 指标未配置
-	 */
-	private int notConfiguredCount;
-	/**
-	 * 厂站指标没有配置标记
-	 */
-	private String isNotHaveConfigured;
-	/**
-	 * 是否含有0值
-	 */
-	private String isHaveZero;
-	/**
-	 * 是否脱机
-	 */
-	private String isHaveOffline;
-	/**
-	 * 是否预警
-	 */
-	private String isHaveWarn;
-	/**
-	 * 	预警个数
-	 */
-	private int abWarnCount;
-
-	private int offLineCount;
 }

@@ -11,16 +11,16 @@ import java.util.List;
 public class WaterQualityMonitoringVO {
 	@ApiModelProperty(value = "总数")
 	private String all;//全部
-	@ApiModelProperty(value = "在线")
+	@ApiModelProperty(value = "正常")
 	private String normal;//正常
 	@ApiModelProperty(value = "异常")
 	private String abnormal;//异常
-	@ApiModelProperty(value = "脱机")
-	private String offline;//脱机
-	@ApiModelProperty(value = "零值")
-	private String zeroVal;//零值
-	@ApiModelProperty(value = "预警")
-	private String warnVal;//零值
+//	@ApiModelProperty(value = "脱机")
+//	private String offline;//脱机
+//	@ApiModelProperty(value = "零值")
+//	private String zeroVal;//零值
+//	@ApiModelProperty(value = "预警")
+//	private String warnVal;//零值
 	@ApiModelProperty(value = "水质监控明细")
 	private List<WaterQualityMonitoringDetailVO> list;//明细
 }