Skip to content

张雷 / skboot-zhongye

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

视频功能修改、文件上传大小修改、BUG修复

1 个父辈 22e8d044
内嵌 并排
正在显示 18 个修改的文件 包含 95 行增加 和 53 行删除
sk-module-biz/src/main/java/com/skua/modules/threedimensional/service/impl/JTDisplayScreenServiceImpl.java
......@@ -249,8 +249,10 @@ public class JTDisplayScreenServiceImpl implements IJTDisplayScreenService {
String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldDl+","+ ReportConstant.fieldWnl+","+ ReportConstant.fieldYj, departId, startTime,endTime,"sum");
System.out.println("dataViewName3a24 = "+dataViewName3a24);
StringBuffer sql2 = new StringBuffer("select aaa.WNL as 'tnl' ,round((aaa.DLHJ /"+waterQualityVO.getCsl()+"),2) 'dsdh' , ");
sql2.append(" round(((aaa.PAMZ + aaa.PAMF+ aaa.PAMRJ+ aaa.SCLPAMZ+ aaa.SCLPAMF+ aaa.NACLO+ aaa.PACGT+ aaa.PACYT+ aaa.FESO4G+ aaa.FESO4Y+ aaa.H2O2+ aaa.CH3COOH+ aaa.SH+ aaa.FECL3+ aaa.HXT+ aaa.PFS+ aaa.CH3COONA+ aaa.GXCLJ+ aaa.YWL+ aaa.RYXNJ+ aaa.FHTY)/ "+waterQualityVO.getCsl()+"),2) 'dsyh' from ");
sql2.append( " "+dataViewName3a24+" aaa ");
sql2.append(" round(((aaa.PAMZ + aaa.PAMF+ aaa.PAMRJ+ aaa.SCLPAMZ+ aaa.SCLPAMF+ aaa.NACLO+ aaa.PACGT+ aaa.PACYT+ " +
"aaa.FESO4G+ aaa.FESO4Y+ aaa.H2O2+ aaa.CH3COOH+ aaa.SH+ aaa.FECL3+ aaa.HXT+ aaa.PFS+ aaa.CH3COONA+ " +
"aaa.GXCLJ+ aaa.YWL+ aaa.RYXNJ+ aaa.FHTY)/ "+waterQualityVO.getCsl()+"),2) 'dsyh' from ");
sql2.append(" "+dataViewName3a24+" aaa ");
System.out.println("sql2 = "+sql2.toString());
waterQualityVOList = getJdbcTemplate().query( sql2.toString(), new BeanPropertyRowMapper<WaterQualityVO>(WaterQualityVO.class));
......
sk-module-biz/src/main/java/com/skua/modules/video/controller/VideoIntegrateController.java
......@@ -21,11 +21,13 @@ import org.springframework.web.bind.annotation.RestController;
@Api(tags="与三方视频对接")
@RestController
@RequestMapping("/sys/video")
@ConditionalOnProperty("skua.video.ip")
//@ConditionalOnProperty("skua.video.ip")
public class VideoIntegrateController {
@Value("${skua.video.ip:}")
private String ip;
@Value("${skua.video.lan:}")
private String lan;
@Value("${skua.video.port:}")
private String port;
@Value("${skua.video.appkey:}")
......@@ -43,12 +45,18 @@ public class VideoIntegrateController {
@AutoLog(value = "获取三方视频连接配置数据")
@ApiOperation(value="获取三方视频连接配置数据", notes="获取三方视频连接配置数据")
@GetMapping(value = "/getVideoIntegrateInfo")
public Result<VideoIntegrateVO> getVideoIntegrateInfo() {
public Result<VideoIntegrateVO> getVideoIntegrateInfo(String type) {
Result<VideoIntegrateVO> result = new Result<VideoIntegrateVO>();
VideoIntegrateVO vo = new VideoIntegrateVO();
vo.setIp(ip);vo.setPort(port);vo.setAppkey(appkey);vo.setSecretkey(secretkey);
if("web".equals(type)){
vo.setIp(ip);
}else{
vo.setIp(lan);
}
vo.setPort(port);vo.setAppkey(appkey);vo.setSecretkey(secretkey);
result.success("三方视频配置获取成功");
result.setResult(vo);
return result;
}
}
......
sk-module-biz/src/main/resources/application-dev.yml
......@@ -15,7 +15,7 @@ spring:
servlet:
multipart:
max-file-size: 500MB
max-request-size: 10MB
max-request-size: 100MB
## quartz定时任务,采用数据库方式
quartz:
properties:
......@@ -162,6 +162,7 @@ skua:
isRunTimeInterval: 3600
#视频对接相关配置,未使用，待完善
video:
lan: 113.249.91.27
ip: 113.249.91.27
port: 8667
appkey: 21656155
......
sk-module-biz/src/main/resources/application-prod.yml
......@@ -15,7 +15,7 @@ spring:
servlet:
multipart:
max-file-size: 500MB
max-request-size: 10MB
max-request-size: 100MB
## quartz定时任务,采用数据库方式
quartz:
properties:
......@@ -162,6 +162,7 @@ skua:
isRunTimeInterval: 3600
#视频对接相关配置,未使用，待完善
video:
lan: 20.0.99.6
ip: 113.249.91.27
port: 8667
appkey: 21656155
......
sk-module-biz/src/main/resources/application-test.yml
......@@ -14,8 +14,8 @@ management:
spring:
servlet:
multipart:
max-file-size: 50MB
max-request-size: 10MB
max-file-size: 500MB
max-request-size: 100MB
## quartz定时任务,采用数据库方式
quartz:
properties:
......@@ -93,6 +93,12 @@ spring:
username: root
password: jkauto@123
driver-class-name: com.mysql.jdbc.Driver
# 恩菲数据同步
nf-db:
url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false&connectTimeout=60000&socketTimeout=1800
username: root
password: jkauto@123
driver-class-name: com.mysql.jdbc.Driver
# 多数据源配置
pg-db:
url: jdbc:postgresql://113.249.91.27:10086/postgres?useUnicode=true&characterEncoding=UTF8
......@@ -156,6 +162,7 @@ skua:
isRunTimeInterval: 3600
#视频对接相关配置,未使用，待完善
video:
lan: 113.249.91.27
ip: 113.249.91.27
port: 8667
appkey: 21656155
......
sk-module-biz/src/main/resources/application.yml
spring:
profiles:
active: test
active: prod
# 信息安全
security:
csrf:
......
sk-module-biz/src/main/resources/static/video/dahua/dvr/module/demo.js
......@@ -19,7 +19,7 @@ $(function () {
//alert("模板解析事件");
$.ajax({
type : "GET",
url : "/skboot/v1/sys/video/getVideoIntegrateInfo",
url : "/skboot/sys/video/getVideoIntegrateInfo",
success : function(obj) {
var result = obj.result;
var ip = result.ip;
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
......@@ -142,17 +142,17 @@
left join (select * from report_target_config where depart_id = #{departId} and target_year = #{year}) rtc on rtc.depart_id = v1.depart_id
left join (
select right(left(time,7),2) month_tb,
SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) +
SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) +
SUM( FESO4Y ) + SUM( H2O2 )) yjhl
SUM(DLHJ) dlhj,(SUM( PAMZ ) + SUM( PAMF ) + SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) +
SUM( PFS ) + SUM( FHTY ) + SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) +
SUM( CH3COOH ) + SUM( FESO4G ) + SUM( FESO4Y ) + SUM( H2O2 )) yjhl
from view_3a24 v3
where v3.depart_id = #{departId} and v3.time like CONCAT(#{year},'%') GROUP BY left(time,7)
) v4 on v4.month_tb = right(left(v1.time,7),2)
left join (
select right(left(time,7),2) month_tb,
SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) +
SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) +
SUM( FESO4Y ) + SUM( H2O2 )) yjhl
SUM(DLHJ) dlhj,(SUM( PAMZ ) + SUM( PAMF ) + SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) +
SUM( PFS ) + SUM( FHTY ) + SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) +
SUM( CH3COOH ) + SUM( FESO4G ) + SUM( FESO4Y ) + SUM( H2O2 )) yjhl
from view_3a24 v3
where v3.depart_id = #{departId} and v3.time like CONCAT(#{tbYear},'%') GROUP BY left(time,7)
) v5 on v5.month_tb = right(left(v1.time,7),2)
......@@ -161,9 +161,9 @@
from view_4411
where depart_id = #{departId} and time like CONCAT(#{year},'%')) v6 on right(left(v6.time,7),2)=right(left(v1.time,7),2)
left join (
select depart_id,SUM(DLHJ) dlhj_year,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) +
SUM( PFS ) + SUM( FHTY ) + SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) +
SUM( CH3COOH ) + SUM( FESO4G ) + SUM( FESO4Y ) + SUM( H2O2 )) yjhl_year
select depart_id,SUM(DLHJ) dlhj_year,(SUM( PAMZ ) + SUM( PAMF ) + SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) +
SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) + SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) +
SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) + SUM( FESO4Y ) + SUM( H2O2 )) yjhl_year
from view_3a24
where depart_id = #{departId} and time like CONCAT(#{year},'%')) y on y.depart_id = v1.depart_id
left join (
......@@ -209,7 +209,8 @@
sys_depart d
LEFT JOIN (SELECT * FROM view_30a8 WHERE depart_id = #{departId} AND time = #{dataTime} AND zs = #{week}) v3 on v3.depart_id = d.id
LEFT JOIN (SELECT
SUM(IFNULL(v.DLHJ,0)) dlhj,(SUM( IFNULL(v.PAMRJ,0) ) + SUM( IFNULL(v.SCLPAMZ,0) ) +
SUM(IFNULL(v.DLHJ,0)) dlhj,(SUM( IFNULL(v.PAMZ,0) ) + SUM( IFNULL(v.PAMF,0) ) +
SUM( IFNULL(v.PAMRJ,0) ) + SUM( IFNULL(v.SCLPAMZ,0) ) +
SUM( IFNULL(v.SCLPAMF,0) ) + SUM( IFNULL(v.NACLO,0) ) + SUM( IFNULL(v.PACGT,0) ) +
SUM( IFNULL(v.PACYT,0) ) + SUM( IFNULL(v.PFS,0) ) + SUM( IFNULL(v.FHTY,0) ) +SUM( IFNULL(v.RYXNJ,0) ) +
SUM( IFNULL(v.YWL,0) ) + SUM( IFNULL(v.GXCLJ,0) ) + SUM( IFNULL(v.CH3COONA,0) ) + SUM( IFNULL(v.HXT,0) ) +
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
......@@ -131,7 +131,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
" left join (select * from report_target_config where depart_id = '"+departId+"' and target_year = '"+dataTime+"') rtc on rtc.depart_id = v1.depart_id " +
" left join ( " +
" select right(left(time,7),2) month_tb, " +
" SUM(DLHJ) dlhj,(SUM( IFNULL(PAMRJ,0) ) + SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + " +
" SUM(DLHJ) dlhj,(SUM( IFNULL(PAMZ,0) ) + SUM( IFNULL(PAMF,0) ) + SUM( IFNULL(PAMRJ,0) ) + " +
" SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + " +
" SUM( IFNULL(PACGT,0) ) + SUM( IFNULL(PACYT,0) ) + SUM( IFNULL(PFS,0) ) + SUM( IFNULL(FHTY,0) ) + " +
" SUM( IFNULL(RYXNJ,0) ) + SUM( IFNULL(YWL,0) ) + SUM( IFNULL(GXCLJ,0) ) + SUM( IFNULL(CH3COONA,0) ) + SUM( IFNULL(HXT,0) ) + " +
" SUM( IFNULL(FECL3,0) ) + SUM( IFNULL(SH,0) ) + SUM( IFNULL(CH3COOH,0) ) + SUM( IFNULL(FESO4G,0) ) + " +
......@@ -141,8 +142,11 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
" ) v4 on v4.month_tb = right(left(v1.time,7),2) " +
" left join ( " +
" select right(left(time,7),2) month_tb, " +
" SUM(DLHJ) dlhj,(SUM( IFNULL(PAMRJ,0) ) + SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + SUM( IFNULL(PACGT,0) ) + SUM( IFNULL(PACYT,0) ) + SUM( IFNULL(PFS,0) ) + SUM( IFNULL(FHTY,0) ) + " +
" SUM( IFNULL(RYXNJ,0) ) + SUM( IFNULL(YWL,0) ) + SUM( IFNULL(GXCLJ,0) ) + SUM( IFNULL(CH3COONA,0) ) + SUM( IFNULL(HXT,0) ) + SUM( IFNULL(FECL3,0) ) + SUM( IFNULL(SH,0) ) + SUM( IFNULL(CH3COOH,0) ) + SUM( IFNULL(FESO4G,0) ) + " +
" SUM(DLHJ) dlhj,(SUM( IFNULL(PAMZ,0) ) + SUM( IFNULL(PAMF,0) ) + SUM( IFNULL(PAMRJ,0) ) + " +
" SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + " +
" SUM( IFNULL(PACGT,0) ) + SUM( IFNULL(PACYT,0) ) + SUM( IFNULL(PFS,0) ) + SUM( IFNULL(FHTY,0) ) + " +
" SUM( IFNULL(RYXNJ,0) ) + SUM( IFNULL(YWL,0) ) + SUM( IFNULL(GXCLJ,0) ) + SUM( IFNULL(CH3COONA,0) ) + SUM( IFNULL(HXT,0) ) + " +
" SUM( IFNULL(FECL3,0) ) + SUM( IFNULL(SH,0) ) + SUM( IFNULL(CH3COOH,0) ) + SUM( IFNULL(FESO4G,0) ) + " +
" SUM( IFNULL(FESO4Y,0) ) + SUM( IFNULL(H2O2,0) )) yjhl " +
" from "+dataViewName3a24tb+" v3 " +
" where v3.depart_id = '"+departId+"' and v3.time like CONCAT('"+tbYear+"','%') GROUP BY left(time,7) " +
......@@ -153,8 +157,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
" from "+dataViewName4411+" v4411 " +
" where v4411.depart_id = '"+departId+"' and v4411.time like CONCAT('"+dataTime+"','%')) v6 on right(left(v6.time,7),2)=right(left(v1.time,7),2) " +
" left join ( " +
" select v3a24.depart_id,SUM(v3a24.DLHJ) dlhj_year,(SUM( v3a24.PAMRJ ) + SUM( v3a24.SCLPAMZ ) + SUM( v3a24.SCLPAMF ) + " +
" SUM( v3a24.NACLO ) + SUM( v3a24.PACGT ) + SUM( v3a24.PACYT ) + " +
" select v3a24.depart_id,SUM(v3a24.DLHJ) dlhj_year,(SUM( v3a24.PAMZ ) + SUM( v3a24.PAMF ) + SUM( v3a24.PAMRJ ) + " +
" SUM( v3a24.SCLPAMZ ) + SUM( v3a24.SCLPAMF ) + SUM( v3a24.NACLO ) + SUM( v3a24.PACGT ) + SUM( v3a24.PACYT ) + " +
" SUM( v3a24.PFS ) + SUM( v3a24.FHTY ) + SUM( v3a24.RYXNJ ) + SUM( v3a24.YWL ) + SUM( v3a24.GXCLJ ) + SUM( v3a24.CH3COONA ) + " +
" SUM( v3a24.HXT ) + SUM( v3a24.FECL3 ) + SUM( v3a24.SH ) + " +
" SUM( v3a24.CH3COOH ) + SUM( v3a24.FESO4G ) + SUM( v3a24.FESO4Y ) + SUM( v3a24.H2O2 )) yjhl_year " +
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryCenterMapper.xml
......@@ -214,22 +214,24 @@
<select id="getYhtj" resultType="java.util.HashMap">
SELECT
LEFT ( v.time, 7 ) AS time,
round(SUM( IFNULL(v.PAMRJ,0) ) + SUM( IFNULL(v.SCLPAMZ,0) ) + SUM( IFNULL(v.SCLPAMF,0) ) + SUM( IFNULL(v.NACLO,0) ) +
round((SUM( IFNULL(v.PAMZ,0) ) + SUM( IFNULL(v.PAMF,0) ) + SUM( IFNULL(v.PAMRJ,0) ) +
SUM( IFNULL(v.SCLPAMZ,0) ) + SUM( IFNULL(v.SCLPAMF,0) ) + SUM( IFNULL(v.NACLO,0) ) +
SUM( IFNULL(v.PACGT,0) ) + SUM( IFNULL(v.PACYT,0) ) + SUM( IFNULL(v.PFS,0) ) + SUM( IFNULL(v.FHTY,0) ) +
SUM( IFNULL(v.RYXNJ,0) ) + SUM( IFNULL(v.YWL,0) ) + SUM( IFNULL(v.GXCLJ,0) ) + SUM( IFNULL(v.CH3COONA,0) ) +
SUM( IFNULL(v.HXT,0) ) + SUM( IFNULL(v.FECL3,0) ) + SUM( IFNULL(v.SH,0) ) + SUM( IFNULL(v.CH3COOH,0) ) +
SUM( IFNULL(v.FESO4G,0) ) + SUM( IFNULL(v.FESO4Y,0) ) + SUM( IFNULL(v.H2O2,0) ),2) as yh ,
SUM( IFNULL(v.FESO4G,0) ) + SUM( IFNULL(v.FESO4Y,0) ) + SUM( IFNULL(v.H2O2,0) ))/1000,2) as yh ,
ifnull(v2.yjhl,0) as yh_tb
FROM
${view3a24} v
left join (
SELECT
RIGHT( LEFT ( v3.time, 7 ), 2 ) AS time,
round(SUM( IFNULL(v3.PAMRJ,0) ) + SUM( IFNULL(v3.SCLPAMZ,0) ) + SUM( IFNULL(v3.SCLPAMF,0) ) + SUM( IFNULL(v3.NACLO,0) ) +
round((SUM( IFNULL(v3.PAMZ,0) ) + SUM( IFNULL(v3.PAMF,0) ) + SUM( IFNULL(v3.PAMRJ,0) ) +
SUM( IFNULL(v3.SCLPAMZ,0) ) + SUM( IFNULL(v3.SCLPAMF,0) ) + SUM( IFNULL(v3.NACLO,0) ) +
SUM( IFNULL(v3.PACGT,0) ) + SUM( IFNULL(v3.PACYT,0) ) + SUM( IFNULL(v3.PFS,0) ) + SUM( IFNULL(v3.FHTY,0) ) +
SUM( IFNULL(v3.RYXNJ,0) ) + SUM( IFNULL(v3.YWL,0) ) + SUM( IFNULL(v3.GXCLJ,0) ) + SUM( IFNULL(v3.CH3COONA,0) ) + SUM( IFNULL(v3.HXT,0) ) +
SUM( IFNULL(v3.FECL3,0) ) + SUM( IFNULL(v3.SH,0) ) + SUM( IFNULL(v3.CH3COOH,0) ) + SUM( IFNULL(v3.FESO4G,0) ) +
SUM( IFNULL(v3.FESO4Y,0) ) + SUM( IFNULL(v3.H2O2,0) ),2) as yjhl
SUM( IFNULL(v3.RYXNJ,0) ) + SUM( IFNULL(v3.YWL,0) ) + SUM( IFNULL(v3.GXCLJ,0) ) + SUM( IFNULL(v3.CH3COONA,0) ) +
SUM( IFNULL(v3.HXT,0) ) + SUM( IFNULL(v3.FECL3,0) ) + SUM( IFNULL(v3.SH,0) ) + SUM( IFNULL(v3.CH3COOH,0) ) +
SUM( IFNULL(v3.FESO4G,0) ) + SUM( IFNULL(v3.FESO4Y,0) ) + SUM( IFNULL(v3.H2O2,0) ))/1000,2) as yjhl
FROM
${view3a24tb} v3
WHERE
......@@ -308,8 +310,8 @@
'${item}'
</foreach>
</if>) v2
left join (select ROUND(SUM(IFNULL(v.PAMRJ,0)+IFNULL(v.SCLPAMZ,0)+IFNULL(v.SCLPAMF,0)+IFNULL(v.NACLO,0)+IFNULL(v.PACGT,0)+IFNULL(v.PACYT,0)+
IFNULL(v.PFS,0)+IFNULL(v.FHTY,0)+IFNULL(v.RYXNJ,0)+IFNULL(v.YWL,0)+IFNULL(v.GXCLJ,0)+IFNULL(v.CH3COONA,0)+IFNULL(v.HXT,0)+IFNULL(v.FECL3,0)+
left join (select ROUND(SUM(IFNULL(v.PAMZ,0)+IFNULL(v.PAMF,0)+IFNULL(v.PAMRJ,0)+IFNULL(v.SCLPAMZ,0)+IFNULL(v.SCLPAMF,0)+IFNULL(v.NACLO,0)+IFNULL(v.PACGT,0)+
IFNULL(v.PACYT,0)+IFNULL(v.PFS,0)+IFNULL(v.FHTY,0)+IFNULL(v.RYXNJ,0)+IFNULL(v.YWL,0)+IFNULL(v.GXCLJ,0)+IFNULL(v.CH3COONA,0)+IFNULL(v.HXT,0)+IFNULL(v.FECL3,0)+
IFNULL(v.SH,0)+IFNULL(v.CH3COOH,0)+IFNULL(v.FESO4G,0)+IFNULL(v.FESO4Y,0)+IFNULL(v.H2O2,0)),2) AS zyh,ROUND(AVG(IFNULL(v.PAMRJ,0)+
IFNULL(v.SCLPAMZ,0)+IFNULL(v.SCLPAMF,0)+IFNULL(v.NACLO,0)+IFNULL(v.PACGT,0)+IFNULL(v.PACYT,0)+IFNULL(v.PFS,0)+IFNULL(v.FHTY,0)+
IFNULL(v.RYXNJ,0)+IFNULL(v.YWL,0)+IFNULL(v.GXCLJ,0)+IFNULL(v.CH3COONA,0)+IFNULL(v.HXT,0)+IFNULL(v.FECL3,0)+IFNULL(v.SH,0)+IFNULL(v.CH3COOH,0)+
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryOperateCenterMapper.xml
......@@ -138,8 +138,8 @@
v3.DLHJ,
v3.YJHJ
from ${view2119} v
LEFT JOIN (select ROUND(SUM(v.DLHJ),2) AS DLHJ,ROUND(SUM(IFNULL(v.PAMRJ,0)+
IFNULL(v.SCLPAMZ,0)+IFNULL(v.SCLPAMF,0)+IFNULL(v.NACLO,0)+IFNULL(v.PACGT,0)+
LEFT JOIN (select ROUND(SUM(v.DLHJ),2) AS DLHJ,ROUND(SUM(IFNULL(v.PAMZ,0)+IFNULL(v.PAMF,0)+
IFNULL(v.PAMRJ,0)+IFNULL(v.SCLPAMZ,0)+IFNULL(v.SCLPAMF,0)+IFNULL(v.NACLO,0)+IFNULL(v.PACGT,0)+
IFNULL(v.PACYT,0)+IFNULL(v.PFS,0)+IFNULL(v.FHTY,0)+IFNULL(v.RYXNJ,0)+IFNULL(v.YWL,0)+
IFNULL(v.GXCLJ,0)+IFNULL(v.CH3COONA,0)+IFNULL(v.HXT,0)+IFNULL(v.FECL3,0)+IFNULL(v.SH,0)+
IFNULL(v.CH3COOH,0)+IFNULL(v.FESO4G,0)+IFNULL(v.FESO4Y,0)+IFNULL(v.H2O2,0)),2) AS YJHJ,
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
......@@ -729,11 +729,14 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
if(maptb!=null){
zdhTb = Double.parseDouble(maptb.get("zdh").toString());
rjdhTb = Double.parseDouble(maptb.get("rjdh").toString());
dsdhTb = Double.parseDouble(maptb.get("dsdh").toString());
zdhTb = Double.parseDouble(df.format(100*(zdh - zdhTb)/zdhTb));
rjdhTb = Double.parseDouble(df.format(100*(rjdh - rjdhTb)/rjdhTb));
if(maptb.get("dsdh")!=null){
dsdhTb = Double.parseDouble(maptb.get("dsdh").toString());
dsdhTb = Double.parseDouble(df.format(100*(dsdh - dsdhTb)/dsdhTb));
}
}
resMap.put("zdh_tb", zdhTb);
resMap.put("rjdh_tb", rjdhTb);
resMap.put("dsdh_tb", dsdhTb);
......@@ -741,11 +744,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
if(maphb!=null){
zdhHb = Double.parseDouble(maphb.get("zdh").toString());
rjdhHb = Double.parseDouble(maphb.get("rjdh").toString());
dsdhHb = Double.parseDouble(maphb.get("dsdh").toString());
zdhHb = Double.parseDouble(df.format(100*(zdh - zdhHb)/zdhHb));
rjdhHb = Double.parseDouble(df.format(100*(rjdh - rjdhHb)/rjdhHb));
if(maphb.get("dsdh")!=null){
dsdhHb = Double.parseDouble(maphb.get("dsdh").toString());
dsdhHb = Double.parseDouble(df.format(100*(dsdh - dsdhHb)/dsdhHb));
}
}
resMap.put("zdh_hb", zdhHb);
resMap.put("rjdh_hb", rjdhHb);
resMap.put("dsdh_hb", dsdhHb);
......
sk-module-datafill/src/main/java/com/skua/modules/report/controller/ReportElectricCostController.java
......@@ -65,8 +65,7 @@ public class ReportElectricCostController {
@GetMapping(value = "/list")
public Result<IPage<ReportElectricCost>> queryPageList(ReportElectricCost reportElectricCost,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Result<IPage<ReportElectricCost>> result = new Result<IPage<ReportElectricCost>>();
Page<ReportElectricCost> page = new Page<ReportElectricCost>(pageNo, pageSize);
IPage<ReportElectricCost> pageList = reportElectricCostService.getPage(page, reportElectricCost);
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/xml/FReportItemvMapper.xml
......@@ -164,7 +164,8 @@
LEFT JOIN (
SELECT
v3.depart_id,
ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
......@@ -192,7 +193,8 @@
LEFT JOIN (
SELECT
v3.depart_id,
ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
......@@ -220,7 +222,8 @@
LEFT JOIN (
SELECT
v3.depart_id,
ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+SUM( IFNULL( v3.PFS, 0 ) )+
SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+
SUM( IFNULL( v3.CH3COONA, 0 ) )+SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
......@@ -257,7 +260,8 @@
(
SELECT
'zyh' type,
ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
......@@ -272,7 +276,8 @@
LEFT JOIN (
SELECT
'zyh' type,
ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
......@@ -287,7 +292,8 @@
LEFT JOIN (
SELECT
'zyh' type,
ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+SUM( IFNULL( v3.PFS, 0 ) )+
SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+
SUM( IFNULL( v3.CH3COONA, 0 ) )+SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/xml/ReportElectricCostMapper.xml
......@@ -5,7 +5,10 @@
<select id="getPage" resultType="com.skua.modules.report.entity.ReportElectricCost" parameterType="com.skua.modules.report.entity.ReportElectricCost">
select * from report_electric_cost where 1=1
<if test="reportElectricCost.departId!=null and reportElectricCost.departId!=''">
AND depart_id = #{reportElectricCost.departId}
AND depart_id in
<foreach item="item" index="index" collection="reportElectricCost.departId.split(',')" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
<if test="reportElectricCost.month!=null and reportElectricCost.month!=''">
AND month like CONCAT(#{reportElectricCost.month},'%')
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/ReportElectricCostServiceImpl.java
......@@ -2,6 +2,7 @@ package com.skua.modules.report.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.core.context.BaseContextHandler;
import com.skua.modules.report.entity.ReportElectricCost;
import com.skua.modules.report.mapper.ReportElectricCostMapper;
import com.skua.modules.report.service.IReportElectricCostService;
......@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
......@@ -19,14 +21,14 @@ import java.util.List;
@Service
public class ReportElectricCostServiceImpl extends ServiceImpl<ReportElectricCostMapper, ReportElectricCost> implements IReportElectricCostService {
@Autowired
@Resource
private ReportElectricCostMapper reportElectricCostMapper;
@Override
public IPage<ReportElectricCost> getPage(Page<ReportElectricCost> page, ReportElectricCost reportElectricCost) {
// if(reportElectricCost.getDepartId()!=null){
// queryWrapper.eq("depart_id",reportElectricCost.getDepartId());
// }
if(reportElectricCost.getDepartId()==null){
reportElectricCost.setDepartId(BaseContextHandler.getDeparts());
}
// if(reportElectricCost.getMonth()!=null){
// queryWrapper.like("month",reportElectricCost.getMonth());
// }
......
sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
......@@ -97,7 +97,7 @@ public class ShiroConfig {
//获取app下载地址
filterChainDefinitionMap.put("/app/appdownload/getAppDownLoad", "anon");
//视频对接获取视频三方配置接口，认证放开
filterChainDefinitionMap.put("/v1/sys/video/getVideoIntegrateInfo", "anon");
filterChainDefinitionMap.put("/sys/video/getVideoIntegrateInfo", "anon");
//三维系统对接设备台账档案请求权限放行
filterChainDefinitionMap.put("/sys/sysCustomField/listModel", "anon");
filterChainDefinitionMap.put("/sys/sysCustomField/listHead", "anon");
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/xml/SysUserMapper.xml
......@@ -68,7 +68,8 @@
<select id="queryDAR" parameterType="com.skua.modules.system.entity.SysUser" resultType="com.skua.modules.system.entity.SysUser">
select * from (select u.*,
group_concat(DISTINCT (select r.role_name from sys_role r where r.id = sur.role_id)) role_name,
group_concat(DISTINCT (select d.depart_name from sys_depart d where d.id = sud.dep_id)) depart_name
group_concat(DISTINCT (select d.depart_name from sys_depart d where d.id = sud.dep_id)) depart_name,
d.id as depart_id,sur.role_id
from sys_user u
left join sys_user_role sur on u.id = sur.user_id
left join sys_user_depart sud on u.id = sud.user_id
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!