Skip to content

张雷 / skboot-zhongye

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

厂区驾驶舱接口开发

1 个父辈 041dcd38
内嵌 并排
正在显示 7 个修改的文件 包含 304 行增加 和 48 行删除
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EmergencyRiskEventController.java
......@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Api(tags="应急风险事件")
@RestController("webEmergencyRiskEventController")
@RestController
@RequestMapping("/web/emergency/emergencyRiskEvent")
public class EmergencyRiskEventController {
@Autowired
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EventMapController.java 0 → 100644
package com.skua.modules.emergency.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.modules.emergency.entity.EmergencyRiskEvent;
import com.skua.modules.emergency.service.IEmergencyRiskEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
/**
* 安全环保地图接口
*/
@Slf4j
@Api(tags="安全环保地图")
@RestController
@RequestMapping("/safetyEnviron/map")
public class EventMapController {
@Autowired
private IEmergencyRiskEventService emergencyRiskEventService;
/**
* 安全隐患事件数量
*/
@AutoLog(value = "安全隐患事件数量")
@ApiOperation(value="安全隐患事件数量", notes="安全隐患事件数量")
@GetMapping(value = "/getCount")
public Result<Map<String,Object>> getHandleCount(EmergencyRiskEvent emergencyRiskEvent){
Result<Map<String,Object>> result = new Result<>();
Map<String,Object> map = emergencyRiskEventService.getCount(emergencyRiskEvent);
result.setSuccess(true);
result.setResult(map);
return result;
}
}
sk-module-biz/src/main/java/com/skua/modules/emergency/service/IEmergencyRiskEventService.java
......@@ -25,14 +25,9 @@ public interface IEmergencyRiskEventService extends IService<EmergencyRiskEvent>
void handle(EmergencyRiskEventHandleDto dto);
/**
* <pre>
* 运营总览，应急事件已/未处理数量
* </pre>
* @param startTime
* @param endTime
* @param handleType【1未处理/3已处理】
* @author Li Yuanyuan，2023/7/3 14:09
* @Description: TODO(这里描述这个方法的需求变更情况)
* 安全隐患事件数量统计
* @param emergencyRiskEvent
* @return
*/
Map<String,Object> getNoHandleWorkOrderInfo(String startTime, String endTime, String handleType);
Map<String, Object> getCount(EmergencyRiskEvent emergencyRiskEvent);
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/service/impl/EmergencyRiskEventServiceImpl.java
......@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -92,19 +93,12 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
}
@Override
public Map<String, Object> getNoHandleWorkOrderInfo(String startTime, String endTime, String handleType) {
QueryWrapper queryWrapper = new QueryWrapper();
if(StringUtils.isEmpty(startTime)){
//默认开始时间当年第一天
//结束时间未今天
endTime = DateUtils.getTodayOrMonthDate("day")+" 23:59:59";
startTime = endTime.substring(0,4)+"-01-01 00:00:00";
}
queryWrapper.select("count(*) AS num ");
queryWrapper.eq("handle_result",handleType);
queryWrapper.ge("report_date",startTime);
queryWrapper.le("report_date",endTime);
return getMap(queryWrapper);
public Map<String, Object> getCount(EmergencyRiskEvent emergencyRiskEvent) {
Map<String, Object> map = new HashMap<>();
map.put("total","9");
map.put("yes","5");
map.put("no","4");
return map;
}
@Override
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/FactoryCenterMapper.java
package com.skua.modules.dataAnalysis.mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface FactoryCenterMapper {
List<Map<String, Object>> getWssltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
@Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
@Param("departId") String departId);
List<Map<String, Object>> getHdltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
@Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
@Param("departId") String departId);
List<Map<String, Object>> getCnltj(@Param("startDate") String startDate, @Param("endDate") String endDate,
@Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
@Param("departId") String departId);
Map<String, Object> getData(@Param("month") String month, @Param("departId") String departId);
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryCenterMapper.xml
......@@ -2,4 +2,160 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.dataAnalysis.mapper.FactoryCenterMapper">
<select id="getWssltj" resultType="java.util.HashMap">
SELECT
LEFT ( v.time, 7 ) AS time,
round( sum( v.CSL ) / 10000, 2 ) AS clsl,
ifnull(v2.clsl,0) as clsl_tb
FROM
view_2119 v
left join (
SELECT
RIGHT( LEFT ( time, 7 ), 2 ) AS time,
round( sum( CSL ) / 10000, 2 ) AS clsl
FROM
view_2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDateTb}
AND time &lt;= #{endDateTb}
GROUP BY
LEFT ( time, 7 )
) v2 on RIGHT( LEFT ( v.time, 7 ), 2 ) = v2.time
WHERE v.depart_id = #{departId}
AND v.time &gt;= #{startDate}
AND v.time &lt;= #{endDate}
GROUP BY
LEFT ( v.time, 7 )
</select>
<select id="getHdltj" resultType="java.util.HashMap">
SELECT
ROUND(SUM(v3.DLHJ)/10000,2) as hdl,
ROUND(ifnull(v2.clsl,0),2) as clsl,
ROUND(SUM(v3.DLHJ)/ifnull(v2.clsl,0),2) as dsdh,
ROUND(pre.hdl/10000,2) as hdl_tb,
ROUND(pre.clsl,2) as clsl_tb,
ROUND(pre.dsdh,2) as dsdh_tb,
LEFT(v3.time,7) as time
FROM
view_3a24 v3
left join (
SELECT
SUM(CSL) as clsl,
LEFT(time,7) as time
FROM
view_2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDate}
AND time &lt;= #{endDate}
GROUP BY LEFT ( time, 7 )
) v2 on LEFT(v3.time,7) = v2.time
left join (
SELECT
SUM(v3.DLHJ) as hdl,
ifnull(v2.clsl,0) as clsl,
round(SUM(v3.DLHJ)/ifnull(v2.clsl,0),2) as dsdh,
LEFT(v3.time,7) as time
FROM
view_3a24 v3
left join (
SELECT
SUM(CSL) as clsl,
LEFT(time,7) as time
FROM
view_2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDateTb}
AND time &lt;= #{endDateTb}
GROUP BY LEFT ( time, 7 )
) v2 on LEFT(v3.time,7) = v2.time
WHERE
v3.depart_id = #{departId}
AND v3.time &gt;= #{startDateTb}
AND v3.time &lt;= #{endDateTb}
GROUP BY LEFT ( v3.time, 7 )
) pre on right(pre.time,2) = right(LEFT(v3.time,7),2)
WHERE
v3.depart_id = #{departId}
AND v3.time &gt;= #{startDate}
AND v3.time &lt;= #{endDate}
GROUP BY LEFT ( v3.time, 7 )
</select>
<select id="getCnltj" resultType="java.util.HashMap">
SELECT
SUM(v3.WNL) as cnl,
ifnull(v2.clsl,0) as clsl,
round(SUM(v3.WNL)/(ifnull(v2.clsl,0)/10000),2) as wdscnl,
pre.cnl as cnl_tb,
pre.clsl as clsl_tb,
pre.wdscnl as wdscnl_tb,
LEFT(v3.time,7) as time
FROM
view_3a24 v3
left join (
SELECT
SUM(CSL) as clsl,
LEFT(time,7) as time
FROM
view_2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDate}
AND time &lt;= #{endDate}
GROUP BY LEFT ( time, 7 )
) v2 on LEFT(v3.time,7) = v2.time
left join (
SELECT
SUM(v3.WNL) as cnl,
ifnull(v2.clsl,0) as clsl,
round(SUM(v3.WNL)/(ifnull(v2.clsl,0)/10000),2) as wdscnl,
LEFT(v3.time,7) as time
FROM
view_3a24 v3
left join (
SELECT
SUM(CSL) as clsl,
LEFT(time,7) as time
FROM
view_2119
WHERE
depart_id = #{departId}
AND time &gt;= #{startDateTb}
AND time &lt;= #{endDateTb}
GROUP BY LEFT ( time, 7 )
) v2 on LEFT(v3.time,7) = v2.time
WHERE
v3.depart_id = #{departId}
AND v3.time &gt;= #{startDateTb}
AND v3.time &lt;= #{endDateTb}
GROUP BY LEFT ( v3.time, 7 )
) pre on right(pre.time,2) = right(LEFT(v3.time,7),2)
WHERE
v3.depart_id = #{departId}
AND v3.time &gt;= #{startDate}
AND v3.time &lt;= #{endDate}
GROUP BY LEFT ( v3.time, 7 )
</select>
<select id="getData" resultType="java.util.HashMap">
SELECT
ROUND(SUM( v3.DLHJ )/10000,2) AS yzdl,
ROUND(AVG( v3.DLHJ )/10000,2) AS rjdl,
ROUND(SUM( v3.WNL ),2) AS yzcnl,
ROUND(SUM( v2.CSL )/10000,2) AS yclsl,
ROUND(SUM( v3.DLHJ )/SUM( v2.CSL ),2) as dsdh,
ROUND(AVG( v2.CSL )/10000,2) AS rjclsl,
ROUND(SUM( v3.WNL )/(SUM( v2.CSL )/10000),2) as wdscnl,
LEFT ( v3.time, 7 ) AS time
FROM
view_3a24 v3
LEFT JOIN (select CSL,time from view_2119 where LEFT ( time, 7 ) = #{month} and depart_id = #{departId}) v2 ON v2.time = v3.time
where LEFT ( v3.time, 7 ) = #{month}
and v3.depart_id = #{departId}
</select>
</mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
......@@ -188,48 +188,84 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
@Override
public Map<String, Object> getData(String departId,String month) {
Map<String, Object> map = new HashMap<>();
String monthTb = "2023-06";
String monthHb = "2024-05";
Map<String, Object> valueMap = factoryCenterMapper.getData(month, departId);
Map<String, Object> hbValueMap = factoryCenterMapper.getData(monthHb, departId);
Map<String, Object> tbValueMap = factoryCenterMapper.getData(monthTb, departId);
map.put("yclsl",new HashMap<>());
Map<String, Object> yclslMap = new HashMap<>();
yclslMap.put("value","0");
yclslMap.put("valueTb","0");
yclslMap.put("unit","吨");
yclslMap.put("valueHb","0");
yclslMap.put("unit","万吨");
map.put("rjclsl",new HashMap<>());
Map<String, Object> rjclslMap = new HashMap<>();
rjclslMap.put("value","0");
rjclslMap.put("unit","吨");
rjclslMap.put("valueTb","0");
rjclslMap.put("valueHb","0");
rjclslMap.put("unit","万吨");
map.put("yzdl",new HashMap<>());
Map<String, Object> yzdlMap = new HashMap<>();
yzdlMap.put("value","0");
yzdlMap.put("unit","Kw.h");
yzdlMap.put("valueTb","0");
yzdlMap.put("valueHb","0");
yzdlMap.put("unit","万Kw.h");
map.put("dsdh",new HashMap<>());
Map<String, Object> dsdhMap = new HashMap<>();
dsdhMap.put("value","0");
dsdhMap.put("unit","Kw.h/吨水");
dsdhMap.put("valueTb","-");
dsdhMap.put("valueHb","0");
map.put("yzcnl",new HashMap<>());
Map<String, Object> yzcnlMap = new HashMap<>();
yzcnlMap.put("value","0");
yzcnlMap.put("unit","吨");
yzcnlMap.put("valueTb","-");
yzcnlMap.put("valueHb","0");
map.put("wdscnl",new HashMap<>());
Map<String, Object> wdscnlMap = new HashMap<>();
wdscnlMap.put("value","0");
wdscnlMap.put("unit","吨/万吨");
wdscnlMap.put("valueTb","-");
wdscnlMap.put("valueHb","0");
map.put("rjdl",new HashMap<>());
Map<String, Object> rjdlMap = new HashMap<>();
rjdlMap.put("value","0");
rjdlMap.put("unit","Kw.h");
rjdlMap.put("valueTb","-");
rjdlMap.put("valueHb","0");
rjdlMap.put("unit","万Kw.h");
if(valueMap != null){
yclslMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yclsl")) ? valueMap.get("yclsl").toString() : "-");//月总处理水量
rjclslMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("rjclsl")) ? valueMap.get("rjclsl").toString() : "-");//日均处理水量
yzdlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yzdl")) ? valueMap.get("yzdl").toString() : "-");//月总电量
dsdhMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("dsdh")) ? valueMap.get("dsdh").toString() : "-");//吨水电耗
yzcnlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yzcnl")) ? valueMap.get("yzcnl").toString() : "-");//月总产泥量
wdscnlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("wdscnl")) ? valueMap.get("wdscnl").toString() : "-");//万吨水产泥量
rjdlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("rjdl")) ? valueMap.get("rjdl").toString() : "-");//日均电量
}else{
yclslMap.put("value","-");//月总处理水量
rjclslMap.put("value","-");//日均处理水量
yzdlMap.put("value","-");//月总电量
dsdhMap.put("value","-");//吨水电耗
yzcnlMap.put("value","-");//月总产泥量
wdscnlMap.put("value","-");//万吨水产泥量
rjdlMap.put("value","-");//日均电量
}
if(hbValueMap != null){
yclslMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yclsl")) ? hbValueMap.get("yclsl").toString() : "-");//月总处理水量
rjclslMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("rjclsl")) ? hbValueMap.get("rjclsl").toString() : "-");//日均处理水量
yzdlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yzdl")) ? hbValueMap.get("yzdl").toString() : "-");//月总电量
dsdhMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("dsdh")) ? hbValueMap.get("dsdh").toString() : "-");//吨水电耗
yzcnlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yzcnl")) ? hbValueMap.get("yzcnl").toString() : "-");//月总产泥量
wdscnlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("wdscnl")) ? hbValueMap.get("wdscnl").toString() : "-");//万吨水产泥量
rjdlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("rjdl")) ? hbValueMap.get("rjdl").toString() : "-");//日均电量
}else{
yclslMap.put("valueHb","-");//月总处理水量
rjclslMap.put("valueHb","-");//日均处理水量
yzdlMap.put("valueHb","-");//月总电量
dsdhMap.put("valueHb","-");//吨水电耗
yzcnlMap.put("valueHb","-");//月总产泥量
wdscnlMap.put("valueHb","-");//万吨水产泥量
rjdlMap.put("valueHb","-");//日均电量
}
if(tbValueMap != null){
yclslMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yclsl")) ? tbValueMap.get("yclsl").toString() : "-");//月总处理水量
rjclslMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("rjclsl")) ? tbValueMap.get("rjclsl").toString() : "-");//日均处理水量
yzdlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yzdl")) ? tbValueMap.get("yzdl").toString() : "-");//月总电量
dsdhMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("dsdh")) ? tbValueMap.get("dsdh").toString() : "-");//吨水电耗
yzcnlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yzcnl")) ? tbValueMap.get("yzcnl").toString() : "-");//月总产泥量
wdscnlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("wdscnl")) ? tbValueMap.get("wdscnl").toString() : "-");//万吨水产泥量
rjdlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("rjdl")) ? tbValueMap.get("rjdl").toString() : "-");//日均电量
}else{
yclslMap.put("valueTb","-");//月总处理水量
rjclslMap.put("valueTb","-");//日均处理水量
yzdlMap.put("valueTb","-");//月总电量
dsdhMap.put("valueTb","-");//吨水电耗
yzcnlMap.put("valueTb","-");//月总产泥量
wdscnlMap.put("valueTb","-");//万吨水产泥量
rjdlMap.put("valueTb","-");//日均电量
}
//汇总
map.put("yclsl", yclslMap);
map.put("rjclsl", rjclslMap);
map.put("yzdl", yzdlMap);
......@@ -245,6 +281,10 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
List<Map<String, Object>> list = new ArrayList<>();
String startDate = statisticsParam.getStartDate();
String endDate = statisticsParam.getEndDate();
String startDateTb = "2023-01-01";
String endDateTb = "2023-09-31";
list = factoryCenterMapper.getCnltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
for ( String month : monthList ) {
Map<String, Object> map = new HashMap<>();
......@@ -255,6 +295,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
map.put("wdscnl_tb","0");
list.add(map);
}
}
return list;
}
......@@ -263,6 +304,10 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
List<Map<String, Object>> list = new ArrayList<>();
String startDate = statisticsParam.getStartDate();
String endDate = statisticsParam.getEndDate();
String startDateTb = "2023-01-01";
String endDateTb = "2023-09-31";
list = factoryCenterMapper.getHdltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
for ( String month : monthList ) {
Map<String, Object> map = new HashMap<>();
......@@ -273,6 +318,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
map.put("dsdh_tb","0");
list.add(map);
}
}
return list;
}
......@@ -281,6 +327,10 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
List<Map<String, Object>> list = new ArrayList<>();
String startDate = statisticsParam.getStartDate();
String endDate = statisticsParam.getEndDate();
String startDateTb = "2023-01-01";
String endDateTb = "2023-09-31";
list = factoryCenterMapper.getWssltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId());
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
for ( String month : monthList ) {
Map<String, Object> map = new HashMap<>();
......@@ -289,6 +339,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
map.put("clsl_tb","0");
list.add(map);
}
}
return list;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!