Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
340dba81 由 康伟
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 5b06489c a809e057
内嵌 并排
正在显示 8 个修改的文件 包含 168 行增加 和 154 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
......@@ -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);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhMeetingSendMapper.java
......@@ -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);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/IAjhMeetingSendService.java
......@@ -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);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhMeetingSendServiceImpl.java
......@@ -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;
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/FactoryCenterController.java
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;
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/IFactoryCenterService.java
......@@ -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);
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
......@@ -45,19 +45,32 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
private static DecimalFormat df = new DecimalFormat("#.##");
@Override
public List<WaterQualityMonitoringDetailVO> queryMonitoringData(String departId) {
public List<WaterQualityMonitoringDetailVO> queryMonitoringData(String departId,String parmType) {
List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
Map<String, Object> monitorTagMap = new HashMap<String,Object>();
QueryWrapper<SysMonitorMetricInfo> qw = new QueryWrapper<>();
qw.in("metric_uid_tag", "JSTP,JSTN,JSPH,JSNH3N,JSCOD,CSTP,CSTN,CSPH,CSNH3N,CSCOD,CSLL,JSLL,CSLJLL,JSLJLL,CSSS,JSSS".split(",")); //CSLL 出水瞬时流量（） CSLJLL 出水流量累计JSLL（JSLJLL） JSSS 进水浊度 CSSS 出水浊度
qw.eq("depart_id", departId);
//CSLL 出水瞬时流量（） CSLJLL 出水流量累计JSLL（JSLJLL） JSSS 进水浊度 CSSS 出水浊度
String inTags = "JSTP,JSTN,JSPH,JSNH3N,JSCOD,JSLL,JSLJLL,JSSS";
String outTags = "CSTP,CSTN,CSPH,CSNH3N,CSCOD,CSLL,CSLJLL,CSSS";
String tags = inTags+","+outTags;
if(parmType != null){
if("in".equals(parmType)){
tags = inTags;
}else if("out".equals(parmType)){
tags = outTags;
}else{
tags = inTags+","+outTags;
}
}
qw.in("metric_uid_tag", tags.split(","));
qw.in("depart_id", departId.split(","));
qw.groupBy("depart_id","metric_uid_tag");
List<SysMonitorMetricInfo> monitorList = sysMonitorMetricInfoService.list(qw);
//获取实时指标
String fields = "";
for(SysMonitorMetricInfo monitorInfo : monitorList) {
fields = fields+","+monitorInfo.getId();
monitorTagMap.put(monitorInfo.getMetricUidTag(), monitorInfo.getId());
monitorTagMap.put(monitorInfo.getMetricUidTag()+"-"+monitorInfo.getDepartId(), monitorInfo.getId());
}
if(!StringUtils.isEmpty(fields)) {
fields = fields.substring(1);
......@@ -68,10 +81,47 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
if(pgDataList!=null&&pgDataList.size()>0) {
dataMap = pgDataList.get(0);
}
String[] departArray = departId.split(",");
int sort = 0;//序号
for(String depart : departArray) {
if(parmType != null){
if("in".equals(parmType)){
sort++;
list = putInWaterDataInList(sort,list,dataMap,monitorTagMap,depart);
}else if("out".equals(parmType)){
sort++;
list = putOutWaterDataInList(sort,list,dataMap,monitorTagMap,depart);
}else{
sort++;
list = putInWaterDataInList(sort,list,dataMap,monitorTagMap,depart);
sort++;
list = putOutWaterDataInList(sort,list,dataMap,monitorTagMap,depart);
}
}else{
sort++;
list = putInWaterDataInList(sort,list,dataMap,monitorTagMap,depart);
sort++;
list = putOutWaterDataInList(sort,list,dataMap,monitorTagMap,depart);
}
}
return list;
}
/**
* 进水数据
* @param sort
* @param list
* @param dataMap
* @param monitorTagMap
* @param depart
* @return
*/
private List<WaterQualityMonitoringDetailVO> putInWaterDataInList(int sort, List<WaterQualityMonitoringDetailVO> list,
Map<String, Object> dataMap, Map<String, Object> monitorTagMap, String depart) {
WaterQualityMonitoringDetailVO inVO = new WaterQualityMonitoringDetailVO();
inVO.setParmType("in");
inVO.setNum(1);
inVO.setDepartId(departId);
inVO.setNum(sort);
inVO.setDepartId(depart);
inVO.setCodUpper("150");
inVO.setCodLower("0");
inVO.setNh3Upper("35");
......@@ -82,84 +132,33 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
inVO.setTnLower("0");
inVO.setPhUpper("14");
inVO.setPhLower("0");
if(monitorTagMap.get("JSCOD")!=null){
if(dataMap.get(monitorTagMap.get("JSCOD").toString())!=null){
inVO.setCodVal(dataMap.get(monitorTagMap.get("JSCOD").toString()).toString());
}else{
inVO.setCodVal("0");
}
}else{
inVO.setCodVal("0");
}
if(monitorTagMap.get("JSNH3N")!=null){
if(dataMap.get(monitorTagMap.get("JSNH3N").toString())!=null){
inVO.setNh3Val(dataMap.get(monitorTagMap.get("JSNH3N").toString()).toString());
}else{
inVO.setNh3Val("0");
}
}else{
inVO.setNh3Val("0");
}
if(monitorTagMap.get("JSTP")!=null){
if(dataMap.get(monitorTagMap.get("JSTP").toString())!=null){
inVO.setTpVal(dataMap.get(monitorTagMap.get("JSTP").toString()).toString());
}else{
inVO.setTpVal("0");
}
}else{
inVO.setTpVal("0");
}
if(monitorTagMap.get("JSTN")!=null){
if(dataMap.get(monitorTagMap.get("JSTN").toString())!=null){
inVO.setTnVal(dataMap.get(monitorTagMap.get("JSTN").toString()).toString());
}else{
inVO.setTnVal("0");
}
}else{
inVO.setTnVal("0");
}
if(monitorTagMap.get("JSPH")!=null){
if(dataMap.get(monitorTagMap.get("JSPH").toString())!=null){
inVO.setPhVal(dataMap.get(monitorTagMap.get("JSPH").toString()).toString());
}else{
inVO.setPhVal("0");
}
}else{
inVO.setPhVal("0");
}
if(monitorTagMap.get("JSLL")!=null){
if(dataMap.get(monitorTagMap.get("JSLL").toString())!=null){
inVO.setSsllVal(dataMap.get(monitorTagMap.get("JSLL").toString()).toString());
}else{
inVO.setSsllVal("0");
}
}else{
inVO.setSsllVal("0");
}
if(monitorTagMap.get("JSLJLL")!=null){
if(dataMap.get(monitorTagMap.get("JSLJLL").toString())!=null){
inVO.setLjllVal(dataMap.get(monitorTagMap.get("JSLJLL").toString()).toString());
}else{
inVO.setLjllVal("0");
}
}else{
inVO.setLjllVal("0");
}
if(monitorTagMap.get("JSSS")!=null){
if(dataMap.get(monitorTagMap.get("JSSS").toString())!=null){
inVO.setZdVal(dataMap.get(monitorTagMap.get("JSSS").toString()).toString());
}else{
inVO.setZdVal("0");
}
}else{
inVO.setZdVal("0");
}
inVO.setCodVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSCOD"));
inVO.setNh3Val(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSNH3N"));
inVO.setTpVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSTP"));
inVO.setTnVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSTN"));
inVO.setPhVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSPH"));
inVO.setSsllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSLL"));
inVO.setLjllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSLJLL"));
inVO.setZdVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSSS"));
list.add(inVO);
return list;
}
/**
* 出水数据
* @param sort
* @param list
* @param dataMap
* @param monitorTagMap
* @param depart
* @return
*/
private List<WaterQualityMonitoringDetailVO> putOutWaterDataInList(int sort, List<WaterQualityMonitoringDetailVO> list,
Map<String, Object> dataMap, Map<String, Object> monitorTagMap, String depart) {
WaterQualityMonitoringDetailVO outVO = new WaterQualityMonitoringDetailVO();
outVO.setParmType("out");
outVO.setNum(2);
outVO.setDepartId(departId);
outVO.setNum(sort++);
outVO.setDepartId(depart);
outVO.setCodUpper("30");
outVO.setCodLower("0");
outVO.setNh3Upper("1.5");
......@@ -170,81 +169,36 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
outVO.setTnLower("0");
outVO.setPhUpper("9");
outVO.setPhLower("6");
if(monitorTagMap.get("CSCOD")!=null){
if(dataMap.get(monitorTagMap.get("CSCOD").toString())!=null){
outVO.setCodVal(dataMap.get(monitorTagMap.get("CSCOD").toString()).toString());
}else{
outVO.setCodVal("0");
}
}else{
outVO.setCodVal("0");
}
if(monitorTagMap.get("CSNH3N")!=null){
if(dataMap.get(monitorTagMap.get("CSNH3N").toString())!=null){
outVO.setNh3Val(dataMap.get(monitorTagMap.get("CSNH3N").toString()).toString());
}else{
outVO.setNh3Val("0");
}
}else{
outVO.setNh3Val("0");
}
if(monitorTagMap.get("CSTP")!=null){
if(dataMap.get(monitorTagMap.get("CSTP").toString())!=null){
outVO.setTpVal(dataMap.get(monitorTagMap.get("CSTP").toString()).toString());
}else{
outVO.setTpVal("0");
}
}else{
outVO.setTpVal("0");
}
if(monitorTagMap.get("CSTN")!=null){
if(dataMap.get(monitorTagMap.get("CSTN").toString())!=null){
outVO.setTnVal(dataMap.get(monitorTagMap.get("CSTN").toString()).toString());
}else{
outVO.setTnVal("0");
}
}else{
outVO.setTnVal("0");
}
if(monitorTagMap.get("CSPH")!=null){
if(dataMap.get(monitorTagMap.get("CSPH").toString())!=null){
outVO.setPhVal(dataMap.get(monitorTagMap.get("CSPH").toString()).toString());
}else{
outVO.setPhVal("0");
}
}else{
outVO.setPhVal("0");
}
outVO.setCodVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSCOD"));
outVO.setNh3Val(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSNH3N"));
outVO.setTpVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSTP"));
outVO.setTnVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSTN"));
outVO.setPhVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSPH"));
outVO.setSsllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSLL"));
outVO.setLjllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSLJLL"));
outVO.setZdVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSSS"));
list.add(outVO);
return list;
}
if(monitorTagMap.get("CSLL")!=null){
if(dataMap.get(monitorTagMap.get("CSLL").toString())!=null){
inVO.setSsllVal(dataMap.get(monitorTagMap.get("CSLL").toString()).toString());
}else{
inVO.setSsllVal("0");
}
}else{
inVO.setSsllVal("0");
}
if(monitorTagMap.get("CSLJLL")!=null){
if(dataMap.get(monitorTagMap.get("CSLJLL").toString())!=null){
inVO.setLjllVal(dataMap.get(monitorTagMap.get("CSLJLL").toString()).toString());
}else{
inVO.setLjllVal("0");
}
}else{
inVO.setLjllVal("0");
}
if(monitorTagMap.get("CSSS")!=null){
if(dataMap.get(monitorTagMap.get("CSSS").toString())!=null){
inVO.setZdVal(dataMap.get(monitorTagMap.get("CSSS").toString()).toString());
/**
* 获取数据值
* @param dataMap
* @param monitorTagMap
* @param depart
* @return
*/
private String getValueFromDataMap(Map<String, Object> dataMap, Map<String, Object> monitorTagMap,
String depart, String tag) {
if(monitorTagMap.get(tag+"-"+depart)!=null){
if(dataMap.get(monitorTagMap.get(tag+"-"+depart).toString())!=null){
return dataMap.get(monitorTagMap.get(tag+"-"+depart).toString()).toString();
}else{
inVO.setZdVal("0");
return "0";
}
}else{
inVO.setZdVal("0");
return "0";
}
list.add(outVO);
return list;
}
@Override
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterQualityParams.java 0 → 100644
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;
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!