Merge remote-tracking branch 'origin/master'

@@ -388,7 +388,7 @@ public class AjhMeetingSendController {
 		queryWrapper.orderByDesc("send_status");
 		//Step.2 AutoPoi 导出Excel
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-		List<AjhMeetingSend> pageList = ajhMeetingSendService.list(queryWrapper);
+		List<AjhMeetingSend> pageList = ajhMeetingSendService.getList(queryWrapper);
 		//导出文件名称
 		mv.addObject(NormalExcelConstants.FILE_NAME, "会议记录列表");
 		mv.addObject(NormalExcelConstants.CLASS, AjhMeetingSend.class);

@@ -33,4 +33,10 @@ public interface AjhMeetingSendMapper extends BaseMapper<AjhMeetingSend> {
             " LEFT JOIN ( SELECT count( id ) count, meets_id FROM ajh_meeting_receipt GROUP BY meets_id ) r ON r.meets_id = id " +
             " LEFT JOIN ( SELECT count( id ) count, meets_id FROM ajh_meeting_attend GROUP BY meets_id ) a ON a.meets_id = id ${ew.customSqlSegment}")
     List<AjhMeetingSend> getListByWrapper(Page page,@Param("ew") QueryWrapper<AjhMeetingSend> queryWrapper);
+
+    @Select("SELECT *,IFNULL( r.count, 0 ) AS invite_num,IFNULL( a.count, 0 ) AS partic_num " +
+            " FROM ajh_meeting_send " +
+            " LEFT JOIN ( SELECT count( id ) count, meets_id FROM ajh_meeting_receipt GROUP BY meets_id ) r ON r.meets_id = id " +
+            " LEFT JOIN ( SELECT count( id ) count, meets_id FROM ajh_meeting_attend GROUP BY meets_id ) a ON a.meets_id = id ${ew.customSqlSegment}")
+    List<AjhMeetingSend> getList(@Param("ew") QueryWrapper<AjhMeetingSend> queryWrapper);
 }

@@ -9,6 +9,7 @@ import com.skua.modules.ajh.vo.AjhMeetingVO;
 import org.springframework.scheduling.annotation.Async;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 会议记录
@@ -35,4 +36,6 @@ public interface IAjhMeetingSendService extends IService<AjhMeetingSend> {
     public  AjhMeetingSend queryByMeetId(String meetId);
 
     IPage<AjhMeetingSend> queryPage(Page<AjhMeetingSend> page, QueryWrapper<AjhMeetingSend> queryWrapper);
+
+    List<AjhMeetingSend> getList(QueryWrapper<AjhMeetingSend> queryWrapper);
 }

@@ -180,4 +180,10 @@ public class AjhMeetingSendServiceImpl extends ServiceImpl<AjhMeetingSendMapper,
         page.setRecords(list);
         return page;
     }
+
+    @Override
+    public List<AjhMeetingSend> getList(QueryWrapper<AjhMeetingSend> queryWrapper) {
+        List<AjhMeetingSend> list = ajhMeetingSendMapper.getList(queryWrapper);
+        return list;
+    }
 }

 package com.skua.modules.dataAnalysis.controller;
 
 import com.skua.core.api.vo.Result;
+import com.skua.core.context.BaseContextHandler;
+import com.skua.modules.common.service.ICommonSqlService;
 import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
 import com.skua.modules.dataAnalysis.vo.StatisticsParam;
 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.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +16,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,12 +29,14 @@ public class FactoryCenterController {
 
     @Autowired
     private IFactoryCenterService factoryCenterService;
+    @Autowired
+    private ICommonSqlService commonSqlService;
 
     @ApiOperation(value="厂区驾驶舱实时数据查询", notes="厂区驾驶舱实时数据查询")
     @GetMapping(value = "/getRealTimeData")
     public Result<List<WaterQualityMonitoringDetailVO>> getRealTimeData(String departId) {
         Result<List<WaterQualityMonitoringDetailVO>> result = new Result<List<WaterQualityMonitoringDetailVO>>();
-        List<WaterQualityMonitoringDetailVO> list = factoryCenterService.queryMonitoringData(departId);
+        List<WaterQualityMonitoringDetailVO> list = factoryCenterService.queryMonitoringData(departId,null);
         result.setSuccess(true);
         result.setResult(list);
         return result;
@@ -177,4 +183,21 @@ public class FactoryCenterController {
         result.setResult(map);
         return result;
     }
+
+    @ApiOperation(value="水质监控实时数据查询", notes="水质监控实时数据查询")
+    @GetMapping(value = "/queryMonitoringData")
+    public Result<List<WaterQualityMonitoringDetailVO>> queryMonitoringData(WaterQualityParams waterQualityParams) {
+        Result<List<WaterQualityMonitoringDetailVO>> result = new Result<List<WaterQualityMonitoringDetailVO>>();
+        List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
+        String departIds = waterQualityParams.getDepartId();
+        if(waterQualityParams.getDepartId()!=null){
+            departIds = commonSqlService.getChildFactorys(waterQualityParams.getDepartId());
+        }else{
+            departIds = commonSqlService.getChildFactorys(BaseContextHandler.getRealDepartId());
+        }
+        list = factoryCenterService.queryMonitoringData(departIds,waterQualityParams.getParmType());
+        result.setSuccess(true);
+        result.setResult(list);
+        return result;
+    }
 }

@@ -13,7 +13,7 @@ public interface IFactoryCenterService {
      * @param departId
      * @return
      */
-    List<WaterQualityMonitoringDetailVO> queryMonitoringData(String departId);
+    List<WaterQualityMonitoringDetailVO> queryMonitoringData(String departId,String parmType);
 
     Map<String, Object> getData(String departId,String month);
 

+package com.skua.modules.dataAnalysis.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 水质监控参数对象
+ */
+@Data
+@ApiModel(value="水质监控参数对象", description="水质监控参数对象")
+public class WaterQualityParams {
+
+    //所属机构
+	@ApiModelProperty(value = "所属机构")
+    private String departId;
+
+    //进出水类型
+    @ApiModelProperty(value = "进出水类型")
+    private String parmType;
+
+}