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 { ...@@ -249,8 +249,10 @@ public class JTDisplayScreenServiceImpl implements IJTDisplayScreenService {
249 String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldDl+","+ ReportConstant.fieldWnl+","+ ReportConstant.fieldYj, departId, startTime,endTime,"sum"); 249 String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldDl+","+ ReportConstant.fieldWnl+","+ ReportConstant.fieldYj, departId, startTime,endTime,"sum");
250 System.out.println("dataViewName3a24 = "+dataViewName3a24); 250 System.out.println("dataViewName3a24 = "+dataViewName3a24);
251 StringBuffer sql2 = new StringBuffer("select aaa.WNL as 'tnl' ,round((aaa.DLHJ /"+waterQualityVO.getCsl()+"),2) 'dsdh' , "); 251 StringBuffer sql2 = new StringBuffer("select aaa.WNL as 'tnl' ,round((aaa.DLHJ /"+waterQualityVO.getCsl()+"),2) 'dsdh' , ");
252 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 "); 252 sql2.append(" round(((aaa.PAMZ + aaa.PAMF+ aaa.PAMRJ+ aaa.SCLPAMZ+ aaa.SCLPAMF+ aaa.NACLO+ aaa.PACGT+ aaa.PACYT+ " +
253 sql2.append( " "+dataViewName3a24+" aaa "); 253 "aaa.FESO4G+ aaa.FESO4Y+ aaa.H2O2+ aaa.CH3COOH+ aaa.SH+ aaa.FECL3+ aaa.HXT+ aaa.PFS+ aaa.CH3COONA+ " +
254 "aaa.GXCLJ+ aaa.YWL+ aaa.RYXNJ+ aaa.FHTY)/ "+waterQualityVO.getCsl()+"),2) 'dsyh' from ");
255 sql2.append(" "+dataViewName3a24+" aaa ");
254 256
255 System.out.println("sql2 = "+sql2.toString()); 257 System.out.println("sql2 = "+sql2.toString());
256 waterQualityVOList = getJdbcTemplate().query( sql2.toString(), new BeanPropertyRowMapper<WaterQualityVO>(WaterQualityVO.class)); 258 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; ...@@ -21,11 +21,13 @@ import org.springframework.web.bind.annotation.RestController;
21 @Api(tags="与三方视频对接") 21 @Api(tags="与三方视频对接")
22 @RestController 22 @RestController
23 @RequestMapping("/sys/video") 23 @RequestMapping("/sys/video")
24 @ConditionalOnProperty("skua.video.ip") 24 //@ConditionalOnProperty("skua.video.ip")
25 public class VideoIntegrateController { 25 public class VideoIntegrateController {
26 26
27 @Value("${skua.video.ip:}") 27 @Value("${skua.video.ip:}")
28 private String ip; 28 private String ip;
29 @Value("${skua.video.lan:}")
30 private String lan;
29 @Value("${skua.video.port:}") 31 @Value("${skua.video.port:}")
30 private String port; 32 private String port;
31 @Value("${skua.video.appkey:}") 33 @Value("${skua.video.appkey:}")
...@@ -43,12 +45,18 @@ public class VideoIntegrateController { ...@@ -43,12 +45,18 @@ public class VideoIntegrateController {
43 @AutoLog(value = "获取三方视频连接配置数据") 45 @AutoLog(value = "获取三方视频连接配置数据")
44 @ApiOperation(value="获取三方视频连接配置数据", notes="获取三方视频连接配置数据") 46 @ApiOperation(value="获取三方视频连接配置数据", notes="获取三方视频连接配置数据")
45 @GetMapping(value = "/getVideoIntegrateInfo") 47 @GetMapping(value = "/getVideoIntegrateInfo")
46 public Result<VideoIntegrateVO> getVideoIntegrateInfo() { 48 public Result<VideoIntegrateVO> getVideoIntegrateInfo(String type) {
47 Result<VideoIntegrateVO> result = new Result<VideoIntegrateVO>(); 49 Result<VideoIntegrateVO> result = new Result<VideoIntegrateVO>();
48 VideoIntegrateVO vo = new VideoIntegrateVO(); 50 VideoIntegrateVO vo = new VideoIntegrateVO();
49 vo.setIp(ip);vo.setPort(port);vo.setAppkey(appkey);vo.setSecretkey(secretkey); 51 if("web".equals(type)){
52 vo.setIp(ip);
53 }else{
54 vo.setIp(lan);
55 }
56 vo.setPort(port);vo.setAppkey(appkey);vo.setSecretkey(secretkey);
50 result.success("三方视频配置获取成功"); 57 result.success("三方视频配置获取成功");
51 result.setResult(vo); 58 result.setResult(vo);
52 return result; 59 return result;
53 } 60 }
61
54 } 62 }
......
sk-module-biz/src/main/resources/application-dev.yml
...@@ -15,7 +15,7 @@ spring: ...@@ -15,7 +15,7 @@ spring:
15 servlet: 15 servlet:
16 multipart: 16 multipart:
17 max-file-size: 500MB 17 max-file-size: 500MB
18 max-request-size: 10MB 18 max-request-size: 100MB
19 ## quartz定时任务,采用数据库方式 19 ## quartz定时任务,采用数据库方式
20 quartz: 20 quartz:
21 properties: 21 properties:
...@@ -162,6 +162,7 @@ skua: ...@@ -162,6 +162,7 @@ skua:
162 isRunTimeInterval: 3600 162 isRunTimeInterval: 3600
163 #视频对接相关配置,未使用，待完善 163 #视频对接相关配置,未使用，待完善
164 video: 164 video:
165 lan: 113.249.91.27
165 ip: 113.249.91.27 166 ip: 113.249.91.27
166 port: 8667 167 port: 8667
167 appkey: 21656155 168 appkey: 21656155
......
sk-module-biz/src/main/resources/application-prod.yml
...@@ -15,7 +15,7 @@ spring: ...@@ -15,7 +15,7 @@ spring:
15 servlet: 15 servlet:
16 multipart: 16 multipart:
17 max-file-size: 500MB 17 max-file-size: 500MB
18 max-request-size: 10MB 18 max-request-size: 100MB
19 ## quartz定时任务,采用数据库方式 19 ## quartz定时任务,采用数据库方式
20 quartz: 20 quartz:
21 properties: 21 properties:
...@@ -162,6 +162,7 @@ skua: ...@@ -162,6 +162,7 @@ skua:
162 isRunTimeInterval: 3600 162 isRunTimeInterval: 3600
163 #视频对接相关配置,未使用，待完善 163 #视频对接相关配置,未使用，待完善
164 video: 164 video:
165 lan: 20.0.99.6
165 ip: 113.249.91.27 166 ip: 113.249.91.27
166 port: 8667 167 port: 8667
167 appkey: 21656155 168 appkey: 21656155
......
sk-module-biz/src/main/resources/application-test.yml
...@@ -14,8 +14,8 @@ management: ...@@ -14,8 +14,8 @@ management:
14 spring: 14 spring:
15 servlet: 15 servlet:
16 multipart: 16 multipart:
17 max-file-size: 50MB 17 max-file-size: 500MB
18 max-request-size: 10MB 18 max-request-size: 100MB
19 ## quartz定时任务,采用数据库方式 19 ## quartz定时任务,采用数据库方式
20 quartz: 20 quartz:
21 properties: 21 properties:
...@@ -93,6 +93,12 @@ spring: ...@@ -93,6 +93,12 @@ spring:
93 username: root 93 username: root
94 password: jkauto@123 94 password: jkauto@123
95 driver-class-name: com.mysql.jdbc.Driver 95 driver-class-name: com.mysql.jdbc.Driver
96 # 恩菲数据同步
97 nf-db:
98 url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false&connectTimeout=60000&socketTimeout=1800
99 username: root
100 password: jkauto@123
101 driver-class-name: com.mysql.jdbc.Driver
96 # 多数据源配置 102 # 多数据源配置
97 pg-db: 103 pg-db:
98 url: jdbc:postgresql://113.249.91.27:10086/postgres?useUnicode=true&characterEncoding=UTF8 104 url: jdbc:postgresql://113.249.91.27:10086/postgres?useUnicode=true&characterEncoding=UTF8
...@@ -156,6 +162,7 @@ skua: ...@@ -156,6 +162,7 @@ skua:
156 isRunTimeInterval: 3600 162 isRunTimeInterval: 3600
157 #视频对接相关配置,未使用，待完善 163 #视频对接相关配置,未使用，待完善
158 video: 164 video:
165 lan: 113.249.91.27
159 ip: 113.249.91.27 166 ip: 113.249.91.27
160 port: 8667 167 port: 8667
161 appkey: 21656155 168 appkey: 21656155
......
sk-module-biz/src/main/resources/application.yml
1 spring: 1 spring:
2 profiles: 2 profiles:
3 active: test 3 active: prod
4 # 信息安全 4 # 信息安全
5 security: 5 security:
6 csrf: 6 csrf:
......
sk-module-biz/src/main/resources/static/video/dahua/dvr/module/demo.js
...@@ -19,7 +19,7 @@ $(function () { ...@@ -19,7 +19,7 @@ $(function () {
19 //alert("模板解析事件"); 19 //alert("模板解析事件");
20 $.ajax({ 20 $.ajax({
21 type : "GET", 21 type : "GET",
22 url : "/skboot/v1/sys/video/getVideoIntegrateInfo", 22 url : "/skboot/sys/video/getVideoIntegrateInfo",
23 success : function(obj) { 23 success : function(obj) {
24 var result = obj.result; 24 var result = obj.result;
25 var ip = result.ip; 25 var ip = result.ip;
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
...@@ -142,17 +142,17 @@ ...@@ -142,17 +142,17 @@
142 left join (select * from report_target_config where depart_id = #{departId} and target_year = #{year}) rtc on rtc.depart_id = v1.depart_id 142 left join (select * from report_target_config where depart_id = #{departId} and target_year = #{year}) rtc on rtc.depart_id = v1.depart_id
143 left join ( 143 left join (
144 select right(left(time,7),2) month_tb, 144 select right(left(time,7),2) month_tb,
145 SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) + 145 SUM(DLHJ) dlhj,(SUM( PAMZ ) + SUM( PAMF ) + SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) +
146 SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) + 146 SUM( PFS ) + SUM( FHTY ) + SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) +
147 SUM( FESO4Y ) + SUM( H2O2 )) yjhl 147 SUM( CH3COOH ) + SUM( FESO4G ) + SUM( FESO4Y ) + SUM( H2O2 )) yjhl
148 from view_3a24 v3 148 from view_3a24 v3
149 where v3.depart_id = #{departId} and v3.time like CONCAT(#{year},'%') GROUP BY left(time,7) 149 where v3.depart_id = #{departId} and v3.time like CONCAT(#{year},'%') GROUP BY left(time,7)
150 ) v4 on v4.month_tb = right(left(v1.time,7),2) 150 ) v4 on v4.month_tb = right(left(v1.time,7),2)
151 left join ( 151 left join (
152 select right(left(time,7),2) month_tb, 152 select right(left(time,7),2) month_tb,
153 SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) + 153 SUM(DLHJ) dlhj,(SUM( PAMZ ) + SUM( PAMF ) + SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) +
154 SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) + 154 SUM( PFS ) + SUM( FHTY ) + SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) +
155 SUM( FESO4Y ) + SUM( H2O2 )) yjhl 155 SUM( CH3COOH ) + SUM( FESO4G ) + SUM( FESO4Y ) + SUM( H2O2 )) yjhl
156 from view_3a24 v3 156 from view_3a24 v3
157 where v3.depart_id = #{departId} and v3.time like CONCAT(#{tbYear},'%') GROUP BY left(time,7) 157 where v3.depart_id = #{departId} and v3.time like CONCAT(#{tbYear},'%') GROUP BY left(time,7)
158 ) v5 on v5.month_tb = right(left(v1.time,7),2) 158 ) v5 on v5.month_tb = right(left(v1.time,7),2)
...@@ -161,9 +161,9 @@ ...@@ -161,9 +161,9 @@
161 from view_4411 161 from view_4411
162 where depart_id = #{departId} and time like CONCAT(#{year},'%')) v6 on right(left(v6.time,7),2)=right(left(v1.time,7),2) 162 where depart_id = #{departId} and time like CONCAT(#{year},'%')) v6 on right(left(v6.time,7),2)=right(left(v1.time,7),2)
163 left join ( 163 left join (
164 select depart_id,SUM(DLHJ) dlhj_year,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + 164 select depart_id,SUM(DLHJ) dlhj_year,(SUM( PAMZ ) + SUM( PAMF ) + SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) +
165 SUM( PFS ) + SUM( FHTY ) + SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + 165 SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) + SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) +
166 SUM( CH3COOH ) + SUM( FESO4G ) + SUM( FESO4Y ) + SUM( H2O2 )) yjhl_year 166 SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) + SUM( FESO4Y ) + SUM( H2O2 )) yjhl_year
167 from view_3a24 167 from view_3a24
168 where depart_id = #{departId} and time like CONCAT(#{year},'%')) y on y.depart_id = v1.depart_id 168 where depart_id = #{departId} and time like CONCAT(#{year},'%')) y on y.depart_id = v1.depart_id
169 left join ( 169 left join (
...@@ -209,7 +209,8 @@ ...@@ -209,7 +209,8 @@
209 sys_depart d 209 sys_depart d
210 LEFT JOIN (SELECT * FROM view_30a8 WHERE depart_id = #{departId} AND time = #{dataTime} AND zs = #{week}) v3 on v3.depart_id = d.id 210 LEFT JOIN (SELECT * FROM view_30a8 WHERE depart_id = #{departId} AND time = #{dataTime} AND zs = #{week}) v3 on v3.depart_id = d.id
211 LEFT JOIN (SELECT 211 LEFT JOIN (SELECT
212 SUM(IFNULL(v.DLHJ,0)) dlhj,(SUM( IFNULL(v.PAMRJ,0) ) + SUM( IFNULL(v.SCLPAMZ,0) ) + 212 SUM(IFNULL(v.DLHJ,0)) dlhj,(SUM( IFNULL(v.PAMZ,0) ) + SUM( IFNULL(v.PAMF,0) ) +
213 SUM( IFNULL(v.PAMRJ,0) ) + SUM( IFNULL(v.SCLPAMZ,0) ) +
213 SUM( IFNULL(v.SCLPAMF,0) ) + SUM( IFNULL(v.NACLO,0) ) + SUM( IFNULL(v.PACGT,0) ) + 214 SUM( IFNULL(v.SCLPAMF,0) ) + SUM( IFNULL(v.NACLO,0) ) + SUM( IFNULL(v.PACGT,0) ) +
214 SUM( IFNULL(v.PACYT,0) ) + SUM( IFNULL(v.PFS,0) ) + SUM( IFNULL(v.FHTY,0) ) +SUM( IFNULL(v.RYXNJ,0) ) + 215 SUM( IFNULL(v.PACYT,0) ) + SUM( IFNULL(v.PFS,0) ) + SUM( IFNULL(v.FHTY,0) ) +SUM( IFNULL(v.RYXNJ,0) ) +
215 SUM( IFNULL(v.YWL,0) ) + SUM( IFNULL(v.GXCLJ,0) ) + SUM( IFNULL(v.CH3COONA,0) ) + SUM( IFNULL(v.HXT,0) ) + 216 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 ...@@ -131,7 +131,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
131 " left join (select * from report_target_config where depart_id = '"+departId+"' and target_year = '"+dataTime+"') rtc on rtc.depart_id = v1.depart_id " + 131 " left join (select * from report_target_config where depart_id = '"+departId+"' and target_year = '"+dataTime+"') rtc on rtc.depart_id = v1.depart_id " +
132 " left join ( " + 132 " left join ( " +
133 " select right(left(time,7),2) month_tb, " + 133 " select right(left(time,7),2) month_tb, " +
134 " SUM(DLHJ) dlhj,(SUM( IFNULL(PAMRJ,0) ) + SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + " + 134 " SUM(DLHJ) dlhj,(SUM( IFNULL(PAMZ,0) ) + SUM( IFNULL(PAMF,0) ) + SUM( IFNULL(PAMRJ,0) ) + " +
135 " SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + " +
135 " SUM( IFNULL(PACGT,0) ) + SUM( IFNULL(PACYT,0) ) + SUM( IFNULL(PFS,0) ) + SUM( IFNULL(FHTY,0) ) + " + 136 " SUM( IFNULL(PACGT,0) ) + SUM( IFNULL(PACYT,0) ) + SUM( IFNULL(PFS,0) ) + SUM( IFNULL(FHTY,0) ) + " +
136 " SUM( IFNULL(RYXNJ,0) ) + SUM( IFNULL(YWL,0) ) + SUM( IFNULL(GXCLJ,0) ) + SUM( IFNULL(CH3COONA,0) ) + SUM( IFNULL(HXT,0) ) + " + 137 " SUM( IFNULL(RYXNJ,0) ) + SUM( IFNULL(YWL,0) ) + SUM( IFNULL(GXCLJ,0) ) + SUM( IFNULL(CH3COONA,0) ) + SUM( IFNULL(HXT,0) ) + " +
137 " SUM( IFNULL(FECL3,0) ) + SUM( IFNULL(SH,0) ) + SUM( IFNULL(CH3COOH,0) ) + SUM( IFNULL(FESO4G,0) ) + " + 138 " 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 ...@@ -141,8 +142,11 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
141 " ) v4 on v4.month_tb = right(left(v1.time,7),2) " + 142 " ) v4 on v4.month_tb = right(left(v1.time,7),2) " +
142 " left join ( " + 143 " left join ( " +
143 " select right(left(time,7),2) month_tb, " + 144 " select right(left(time,7),2) month_tb, " +
144 " 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) ) + " + 145 " SUM(DLHJ) dlhj,(SUM( IFNULL(PAMZ,0) ) + SUM( IFNULL(PAMF,0) ) + SUM( IFNULL(PAMRJ,0) ) + " +
145 " 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) ) + " + 146 " SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + " +
147 " SUM( IFNULL(PACGT,0) ) + SUM( IFNULL(PACYT,0) ) + SUM( IFNULL(PFS,0) ) + SUM( IFNULL(FHTY,0) ) + " +
148 " SUM( IFNULL(RYXNJ,0) ) + SUM( IFNULL(YWL,0) ) + SUM( IFNULL(GXCLJ,0) ) + SUM( IFNULL(CH3COONA,0) ) + SUM( IFNULL(HXT,0) ) + " +
149 " SUM( IFNULL(FECL3,0) ) + SUM( IFNULL(SH,0) ) + SUM( IFNULL(CH3COOH,0) ) + SUM( IFNULL(FESO4G,0) ) + " +
146 " SUM( IFNULL(FESO4Y,0) ) + SUM( IFNULL(H2O2,0) )) yjhl " + 150 " SUM( IFNULL(FESO4Y,0) ) + SUM( IFNULL(H2O2,0) )) yjhl " +
147 " from "+dataViewName3a24tb+" v3 " + 151 " from "+dataViewName3a24tb+" v3 " +
148 " where v3.depart_id = '"+departId+"' and v3.time like CONCAT('"+tbYear+"','%') GROUP BY left(time,7) " + 152 " 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 ...@@ -153,8 +157,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
153 " from "+dataViewName4411+" v4411 " + 157 " from "+dataViewName4411+" v4411 " +
154 " 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) " + 158 " 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) " +
155 " left join ( " + 159 " left join ( " +
156 " select v3a24.depart_id,SUM(v3a24.DLHJ) dlhj_year,(SUM( v3a24.PAMRJ ) + SUM( v3a24.SCLPAMZ ) + SUM( v3a24.SCLPAMF ) + " + 160 " select v3a24.depart_id,SUM(v3a24.DLHJ) dlhj_year,(SUM( v3a24.PAMZ ) + SUM( v3a24.PAMF ) + SUM( v3a24.PAMRJ ) + " +
157 " SUM( v3a24.NACLO ) + SUM( v3a24.PACGT ) + SUM( v3a24.PACYT ) + " + 161 " SUM( v3a24.SCLPAMZ ) + SUM( v3a24.SCLPAMF ) + SUM( v3a24.NACLO ) + SUM( v3a24.PACGT ) + SUM( v3a24.PACYT ) + " +
158 " SUM( v3a24.PFS ) + SUM( v3a24.FHTY ) + SUM( v3a24.RYXNJ ) + SUM( v3a24.YWL ) + SUM( v3a24.GXCLJ ) + SUM( v3a24.CH3COONA ) + " + 162 " SUM( v3a24.PFS ) + SUM( v3a24.FHTY ) + SUM( v3a24.RYXNJ ) + SUM( v3a24.YWL ) + SUM( v3a24.GXCLJ ) + SUM( v3a24.CH3COONA ) + " +
159 " SUM( v3a24.HXT ) + SUM( v3a24.FECL3 ) + SUM( v3a24.SH ) + " + 163 " SUM( v3a24.HXT ) + SUM( v3a24.FECL3 ) + SUM( v3a24.SH ) + " +
160 " SUM( v3a24.CH3COOH ) + SUM( v3a24.FESO4G ) + SUM( v3a24.FESO4Y ) + SUM( v3a24.H2O2 )) yjhl_year " + 164 " 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 @@ ...@@ -214,22 +214,24 @@
214 <select id="getYhtj" resultType="java.util.HashMap"> 214 <select id="getYhtj" resultType="java.util.HashMap">
215 SELECT 215 SELECT
216 LEFT ( v.time, 7 ) AS time, 216 LEFT ( v.time, 7 ) AS time,
217 round(SUM( IFNULL(v.PAMRJ,0) ) + SUM( IFNULL(v.SCLPAMZ,0) ) + SUM( IFNULL(v.SCLPAMF,0) ) + SUM( IFNULL(v.NACLO,0) ) + 217 round((SUM( IFNULL(v.PAMZ,0) ) + SUM( IFNULL(v.PAMF,0) ) + SUM( IFNULL(v.PAMRJ,0) ) +
218 SUM( IFNULL(v.SCLPAMZ,0) ) + SUM( IFNULL(v.SCLPAMF,0) ) + SUM( IFNULL(v.NACLO,0) ) +
218 SUM( IFNULL(v.PACGT,0) ) + SUM( IFNULL(v.PACYT,0) ) + SUM( IFNULL(v.PFS,0) ) + SUM( IFNULL(v.FHTY,0) ) + 219 SUM( IFNULL(v.PACGT,0) ) + SUM( IFNULL(v.PACYT,0) ) + SUM( IFNULL(v.PFS,0) ) + SUM( IFNULL(v.FHTY,0) ) +
219 SUM( IFNULL(v.RYXNJ,0) ) + SUM( IFNULL(v.YWL,0) ) + SUM( IFNULL(v.GXCLJ,0) ) + SUM( IFNULL(v.CH3COONA,0) ) + 220 SUM( IFNULL(v.RYXNJ,0) ) + SUM( IFNULL(v.YWL,0) ) + SUM( IFNULL(v.GXCLJ,0) ) + SUM( IFNULL(v.CH3COONA,0) ) +
220 SUM( IFNULL(v.HXT,0) ) + SUM( IFNULL(v.FECL3,0) ) + SUM( IFNULL(v.SH,0) ) + SUM( IFNULL(v.CH3COOH,0) ) + 221 SUM( IFNULL(v.HXT,0) ) + SUM( IFNULL(v.FECL3,0) ) + SUM( IFNULL(v.SH,0) ) + SUM( IFNULL(v.CH3COOH,0) ) +
221 SUM( IFNULL(v.FESO4G,0) ) + SUM( IFNULL(v.FESO4Y,0) ) + SUM( IFNULL(v.H2O2,0) ),2) as yh , 222 SUM( IFNULL(v.FESO4G,0) ) + SUM( IFNULL(v.FESO4Y,0) ) + SUM( IFNULL(v.H2O2,0) ))/1000,2) as yh ,
222 ifnull(v2.yjhl,0) as yh_tb 223 ifnull(v2.yjhl,0) as yh_tb
223 FROM 224 FROM
224 ${view3a24} v 225 ${view3a24} v
225 left join ( 226 left join (
226 SELECT 227 SELECT
227 RIGHT( LEFT ( v3.time, 7 ), 2 ) AS time, 228 RIGHT( LEFT ( v3.time, 7 ), 2 ) AS time,
228 round(SUM( IFNULL(v3.PAMRJ,0) ) + SUM( IFNULL(v3.SCLPAMZ,0) ) + SUM( IFNULL(v3.SCLPAMF,0) ) + SUM( IFNULL(v3.NACLO,0) ) + 229 round((SUM( IFNULL(v3.PAMZ,0) ) + SUM( IFNULL(v3.PAMF,0) ) + SUM( IFNULL(v3.PAMRJ,0) ) +
230 SUM( IFNULL(v3.SCLPAMZ,0) ) + SUM( IFNULL(v3.SCLPAMF,0) ) + SUM( IFNULL(v3.NACLO,0) ) +
229 SUM( IFNULL(v3.PACGT,0) ) + SUM( IFNULL(v3.PACYT,0) ) + SUM( IFNULL(v3.PFS,0) ) + SUM( IFNULL(v3.FHTY,0) ) + 231 SUM( IFNULL(v3.PACGT,0) ) + SUM( IFNULL(v3.PACYT,0) ) + SUM( IFNULL(v3.PFS,0) ) + SUM( IFNULL(v3.FHTY,0) ) +
230 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) ) + 232 SUM( IFNULL(v3.RYXNJ,0) ) + SUM( IFNULL(v3.YWL,0) ) + SUM( IFNULL(v3.GXCLJ,0) ) + SUM( IFNULL(v3.CH3COONA,0) ) +
231 SUM( IFNULL(v3.FECL3,0) ) + SUM( IFNULL(v3.SH,0) ) + SUM( IFNULL(v3.CH3COOH,0) ) + SUM( IFNULL(v3.FESO4G,0) ) + 233 SUM( IFNULL(v3.HXT,0) ) + SUM( IFNULL(v3.FECL3,0) ) + SUM( IFNULL(v3.SH,0) ) + SUM( IFNULL(v3.CH3COOH,0) ) +
232 SUM( IFNULL(v3.FESO4Y,0) ) + SUM( IFNULL(v3.H2O2,0) ),2) as yjhl 234 SUM( IFNULL(v3.FESO4G,0) ) + SUM( IFNULL(v3.FESO4Y,0) ) + SUM( IFNULL(v3.H2O2,0) ))/1000,2) as yjhl
233 FROM 235 FROM
234 ${view3a24tb} v3 236 ${view3a24tb} v3
235 WHERE 237 WHERE
...@@ -308,8 +310,8 @@ ...@@ -308,8 +310,8 @@
308 '${item}' 310 '${item}'
309 </foreach> 311 </foreach>
310 </if>) v2 312 </if>) v2
311 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)+ 313 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)+
312 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)+ 314 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)+
313 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)+ 315 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)+
314 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)+ 316 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)+
315 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)+ 317 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 @@ ...@@ -138,8 +138,8 @@
138 v3.DLHJ, 138 v3.DLHJ,
139 v3.YJHJ 139 v3.YJHJ
140 from ${view2119} v 140 from ${view2119} v
141 LEFT JOIN (select ROUND(SUM(v.DLHJ),2) AS DLHJ,ROUND(SUM(IFNULL(v.PAMRJ,0)+ 141 LEFT JOIN (select ROUND(SUM(v.DLHJ),2) AS DLHJ,ROUND(SUM(IFNULL(v.PAMZ,0)+IFNULL(v.PAMF,0)+
142 IFNULL(v.SCLPAMZ,0)+IFNULL(v.SCLPAMF,0)+IFNULL(v.NACLO,0)+IFNULL(v.PACGT,0)+ 142 IFNULL(v.PAMRJ,0)+IFNULL(v.SCLPAMZ,0)+IFNULL(v.SCLPAMF,0)+IFNULL(v.NACLO,0)+IFNULL(v.PACGT,0)+
143 IFNULL(v.PACYT,0)+IFNULL(v.PFS,0)+IFNULL(v.FHTY,0)+IFNULL(v.RYXNJ,0)+IFNULL(v.YWL,0)+ 143 IFNULL(v.PACYT,0)+IFNULL(v.PFS,0)+IFNULL(v.FHTY,0)+IFNULL(v.RYXNJ,0)+IFNULL(v.YWL,0)+
144 IFNULL(v.GXCLJ,0)+IFNULL(v.CH3COONA,0)+IFNULL(v.HXT,0)+IFNULL(v.FECL3,0)+IFNULL(v.SH,0)+ 144 IFNULL(v.GXCLJ,0)+IFNULL(v.CH3COONA,0)+IFNULL(v.HXT,0)+IFNULL(v.FECL3,0)+IFNULL(v.SH,0)+
145 IFNULL(v.CH3COOH,0)+IFNULL(v.FESO4G,0)+IFNULL(v.FESO4Y,0)+IFNULL(v.H2O2,0)),2) AS YJHJ, 145 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 { ...@@ -729,11 +729,14 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
729 if(maptb!=null){ 729 if(maptb!=null){
730 zdhTb = Double.parseDouble(maptb.get("zdh").toString()); 730 zdhTb = Double.parseDouble(maptb.get("zdh").toString());
731 rjdhTb = Double.parseDouble(maptb.get("rjdh").toString()); 731 rjdhTb = Double.parseDouble(maptb.get("rjdh").toString());
732 dsdhTb = Double.parseDouble(maptb.get("dsdh").toString()); 732
733 zdhTb = Double.parseDouble(df.format(100*(zdh - zdhTb)/zdhTb)); 733 zdhTb = Double.parseDouble(df.format(100*(zdh - zdhTb)/zdhTb));
734 rjdhTb = Double.parseDouble(df.format(100*(rjdh - rjdhTb)/rjdhTb)); 734 rjdhTb = Double.parseDouble(df.format(100*(rjdh - rjdhTb)/rjdhTb));
735 if(maptb.get("dsdh")!=null){
736 dsdhTb = Double.parseDouble(maptb.get("dsdh").toString());
735 dsdhTb = Double.parseDouble(df.format(100*(dsdh - dsdhTb)/dsdhTb)); 737 dsdhTb = Double.parseDouble(df.format(100*(dsdh - dsdhTb)/dsdhTb));
736 } 738 }
739 }
737 resMap.put("zdh_tb", zdhTb); 740 resMap.put("zdh_tb", zdhTb);
738 resMap.put("rjdh_tb", rjdhTb); 741 resMap.put("rjdh_tb", rjdhTb);
739 resMap.put("dsdh_tb", dsdhTb); 742 resMap.put("dsdh_tb", dsdhTb);
...@@ -741,11 +744,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -741,11 +744,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
741 if(maphb!=null){ 744 if(maphb!=null){
742 zdhHb = Double.parseDouble(maphb.get("zdh").toString()); 745 zdhHb = Double.parseDouble(maphb.get("zdh").toString());
743 rjdhHb = Double.parseDouble(maphb.get("rjdh").toString()); 746 rjdhHb = Double.parseDouble(maphb.get("rjdh").toString());
744 dsdhHb = Double.parseDouble(maphb.get("dsdh").toString());
745 zdhHb = Double.parseDouble(df.format(100*(zdh - zdhHb)/zdhHb)); 747 zdhHb = Double.parseDouble(df.format(100*(zdh - zdhHb)/zdhHb));
746 rjdhHb = Double.parseDouble(df.format(100*(rjdh - rjdhHb)/rjdhHb)); 748 rjdhHb = Double.parseDouble(df.format(100*(rjdh - rjdhHb)/rjdhHb));
749 if(maphb.get("dsdh")!=null){
750 dsdhHb = Double.parseDouble(maphb.get("dsdh").toString());
747 dsdhHb = Double.parseDouble(df.format(100*(dsdh - dsdhHb)/dsdhHb)); 751 dsdhHb = Double.parseDouble(df.format(100*(dsdh - dsdhHb)/dsdhHb));
748 } 752 }
753 }
749 resMap.put("zdh_hb", zdhHb); 754 resMap.put("zdh_hb", zdhHb);
750 resMap.put("rjdh_hb", rjdhHb); 755 resMap.put("rjdh_hb", rjdhHb);
751 resMap.put("dsdh_hb", dsdhHb); 756 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 { ...@@ -65,8 +65,7 @@ public class ReportElectricCostController {
65 @GetMapping(value = "/list") 65 @GetMapping(value = "/list")
66 public Result<IPage<ReportElectricCost>> queryPageList(ReportElectricCost reportElectricCost, 66 public Result<IPage<ReportElectricCost>> queryPageList(ReportElectricCost reportElectricCost,
67 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 67 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
68 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 68 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
69 HttpServletRequest req) {
70 Result<IPage<ReportElectricCost>> result = new Result<IPage<ReportElectricCost>>(); 69 Result<IPage<ReportElectricCost>> result = new Result<IPage<ReportElectricCost>>();
71 Page<ReportElectricCost> page = new Page<ReportElectricCost>(pageNo, pageSize); 70 Page<ReportElectricCost> page = new Page<ReportElectricCost>(pageNo, pageSize);
72 IPage<ReportElectricCost> pageList = reportElectricCostService.getPage(page, reportElectricCost); 71 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 @@ ...@@ -164,7 +164,8 @@
164 LEFT JOIN ( 164 LEFT JOIN (
165 SELECT 165 SELECT
166 v3.depart_id, 166 v3.depart_id,
167 ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+ 167 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
168 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
168 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+ 169 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
169 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+ 170 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
170 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+ 171 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
...@@ -192,7 +193,8 @@ ...@@ -192,7 +193,8 @@
192 LEFT JOIN ( 193 LEFT JOIN (
193 SELECT 194 SELECT
194 v3.depart_id, 195 v3.depart_id,
195 ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+ 196 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
197 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
196 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+ 198 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
197 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+ 199 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
198 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+ 200 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
...@@ -220,7 +222,8 @@ ...@@ -220,7 +222,8 @@
220 LEFT JOIN ( 222 LEFT JOIN (
221 SELECT 223 SELECT
222 v3.depart_id, 224 v3.depart_id,
223 ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+ 225 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
226 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
224 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+SUM( IFNULL( v3.PFS, 0 ) )+ 227 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+SUM( IFNULL( v3.PFS, 0 ) )+
225 SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+ 228 SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+
226 SUM( IFNULL( v3.CH3COONA, 0 ) )+SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+ 229 SUM( IFNULL( v3.CH3COONA, 0 ) )+SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
...@@ -257,7 +260,8 @@ ...@@ -257,7 +260,8 @@
257 ( 260 (
258 SELECT 261 SELECT
259 'zyh' type, 262 'zyh' type,
260 ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+ 263 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
264 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
261 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+ 265 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
262 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+ 266 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
263 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+ 267 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
...@@ -272,7 +276,8 @@ ...@@ -272,7 +276,8 @@
272 LEFT JOIN ( 276 LEFT JOIN (
273 SELECT 277 SELECT
274 'zyh' type, 278 'zyh' type,
275 ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+ 279 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
280 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
276 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+ 281 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
277 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+ 282 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
278 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+ 283 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
...@@ -287,7 +292,8 @@ ...@@ -287,7 +292,8 @@
287 LEFT JOIN ( 292 LEFT JOIN (
288 SELECT 293 SELECT
289 'zyh' type, 294 'zyh' type,
290 ROUND((SUM( IFNULL( v3.PAMRJ, 0 ) )+SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+ 295 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
296 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
291 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+SUM( IFNULL( v3.PFS, 0 ) )+ 297 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+SUM( IFNULL( v3.PFS, 0 ) )+
292 SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+ 298 SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+
293 SUM( IFNULL( v3.CH3COONA, 0 ) )+SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+ 299 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 @@ ...@@ -5,7 +5,10 @@
5 <select id="getPage" resultType="com.skua.modules.report.entity.ReportElectricCost" parameterType="com.skua.modules.report.entity.ReportElectricCost"> 5 <select id="getPage" resultType="com.skua.modules.report.entity.ReportElectricCost" parameterType="com.skua.modules.report.entity.ReportElectricCost">
6 select * from report_electric_cost where 1=1 6 select * from report_electric_cost where 1=1
7 <if test="reportElectricCost.departId!=null and reportElectricCost.departId!=''"> 7 <if test="reportElectricCost.departId!=null and reportElectricCost.departId!=''">
8 AND depart_id = #{reportElectricCost.departId} 8 AND depart_id in
9 <foreach item="item" index="index" collection="reportElectricCost.departId.split(',')" open="(" separator="," close=")">
10 '${item}'
11 </foreach>
9 </if> 12 </if>
10 <if test="reportElectricCost.month!=null and reportElectricCost.month!=''"> 13 <if test="reportElectricCost.month!=null and reportElectricCost.month!=''">
11 AND month like CONCAT(#{reportElectricCost.month},'%') 14 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; ...@@ -2,6 +2,7 @@ package com.skua.modules.report.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage; 3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.skua.core.context.BaseContextHandler;
5 import com.skua.modules.report.entity.ReportElectricCost; 6 import com.skua.modules.report.entity.ReportElectricCost;
6 import com.skua.modules.report.mapper.ReportElectricCostMapper; 7 import com.skua.modules.report.mapper.ReportElectricCostMapper;
7 import com.skua.modules.report.service.IReportElectricCostService; 8 import com.skua.modules.report.service.IReportElectricCostService;
...@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service; ...@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service;
10 11
11 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 12 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
12 13
14 import javax.annotation.Resource;
13 import java.util.ArrayList; 15 import java.util.ArrayList;
14 import java.util.List; 16 import java.util.List;
15 17
...@@ -19,14 +21,14 @@ import java.util.List; ...@@ -19,14 +21,14 @@ import java.util.List;
19 @Service 21 @Service
20 public class ReportElectricCostServiceImpl extends ServiceImpl<ReportElectricCostMapper, ReportElectricCost> implements IReportElectricCostService { 22 public class ReportElectricCostServiceImpl extends ServiceImpl<ReportElectricCostMapper, ReportElectricCost> implements IReportElectricCostService {
21 23
22 @Autowired 24 @Resource
23 private ReportElectricCostMapper reportElectricCostMapper; 25 private ReportElectricCostMapper reportElectricCostMapper;
24 26
25 @Override 27 @Override
26 public IPage<ReportElectricCost> getPage(Page<ReportElectricCost> page, ReportElectricCost reportElectricCost) { 28 public IPage<ReportElectricCost> getPage(Page<ReportElectricCost> page, ReportElectricCost reportElectricCost) {
27 // if(reportElectricCost.getDepartId()!=null){ 29 if(reportElectricCost.getDepartId()==null){
28 // queryWrapper.eq("depart_id",reportElectricCost.getDepartId()); 30 reportElectricCost.setDepartId(BaseContextHandler.getDeparts());
29 // } 31 }
30 // if(reportElectricCost.getMonth()!=null){ 32 // if(reportElectricCost.getMonth()!=null){
31 // queryWrapper.like("month",reportElectricCost.getMonth()); 33 // queryWrapper.like("month",reportElectricCost.getMonth());
32 // } 34 // }
......
sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
...@@ -97,7 +97,7 @@ public class ShiroConfig { ...@@ -97,7 +97,7 @@ public class ShiroConfig {
97 //获取app下载地址 97 //获取app下载地址
98 filterChainDefinitionMap.put("/app/appdownload/getAppDownLoad", "anon"); 98 filterChainDefinitionMap.put("/app/appdownload/getAppDownLoad", "anon");
99 //视频对接获取视频三方配置接口，认证放开 99 //视频对接获取视频三方配置接口，认证放开
100 filterChainDefinitionMap.put("/v1/sys/video/getVideoIntegrateInfo", "anon"); 100 filterChainDefinitionMap.put("/sys/video/getVideoIntegrateInfo", "anon");
101 //三维系统对接设备台账档案请求权限放行 101 //三维系统对接设备台账档案请求权限放行
102 filterChainDefinitionMap.put("/sys/sysCustomField/listModel", "anon"); 102 filterChainDefinitionMap.put("/sys/sysCustomField/listModel", "anon");
103 filterChainDefinitionMap.put("/sys/sysCustomField/listHead", "anon"); 103 filterChainDefinitionMap.put("/sys/sysCustomField/listHead", "anon");
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/xml/SysUserMapper.xml
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
68 <select id="queryDAR" parameterType="com.skua.modules.system.entity.SysUser" resultType="com.skua.modules.system.entity.SysUser"> 68 <select id="queryDAR" parameterType="com.skua.modules.system.entity.SysUser" resultType="com.skua.modules.system.entity.SysUser">
69 select * from (select u.*, 69 select * from (select u.*,
70 group_concat(DISTINCT (select r.role_name from sys_role r where r.id = sur.role_id)) role_name, 70 group_concat(DISTINCT (select r.role_name from sys_role r where r.id = sur.role_id)) role_name,
71 group_concat(DISTINCT (select d.depart_name from sys_depart d where d.id = sud.dep_id)) depart_name 71 group_concat(DISTINCT (select d.depart_name from sys_depart d where d.id = sud.dep_id)) depart_name,
72 d.id as depart_id,sur.role_id
72 from sys_user u 73 from sys_user u
73 left join sys_user_role sur on u.id = sur.user_id 74 left join sys_user_role sur on u.id = sur.user_id
74 left join sys_user_depart sud on u.id = sud.user_id 75 left join sys_user_depart sud on u.id = sud.user_id
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!