Skip to content

张雷 / skboot-zhongye

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

厂级驾驶舱问题修改

1 个父辈 d44b4fdf
内嵌 并排
正在显示 5 个修改的文件 包含 37 行增加 和 22 行删除
sk-module-biz/src/main/resources/application-dev.yml
...@@ -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://113.249.91.27:3306/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
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
...@@ -120,9 +120,11 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa ...@@ -120,9 +120,11 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
120 " left join (select * from report_target_config where depart_id = '"+departId+"' and target_year = '"+dataTime+"') rtc on rtc.depart_id = v1.depart_id " + 120 " left join (select * from report_target_config where depart_id = '"+departId+"' and target_year = '"+dataTime+"') rtc on rtc.depart_id = v1.depart_id " +
121 " left join ( " + 121 " left join ( " +
122 " select right(left(time,7),2) month_tb, " + 122 " select right(left(time,7),2) month_tb, " +
123 " SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) + " + 123 " SUM(DLHJ) dlhj,(SUM( IFNULL(PAMRJ,0) ) + SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + " +
124 " SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) + " + 124 " SUM( IFNULL(PACGT,0) ) + SUM( IFNULL(PACYT,0) ) + SUM( IFNULL(PFS,0) ) + SUM( IFNULL(FHTY,0) ) + " +
125 " SUM( FESO4Y ) + SUM( H2O2 )) yjhl " + 125 " SUM( IFNULL(RYXNJ,0) ) + SUM( IFNULL(YWL,0) ) + SUM( IFNULL(GXCLJ,0) ) + SUM( IFNULL(CH3COONA,0) ) + SUM( IFNULL(HXT,0) ) + " +
126 " SUM( IFNULL(FECL3,0) ) + SUM( IFNULL(SH,0) ) + SUM( IFNULL(CH3COOH,0) ) + SUM( IFNULL(FESO4G,0) ) + " +
127 " SUM( IFNULL(FESO4Y,0) ) + SUM( IFNULL(H2O2,0) )) yjhl " +
126 " from "+dataViewName3a24+" v3 " + 128 " from "+dataViewName3a24+" v3 " +
127 " where v3.depart_id = '"+departId+"' and v3.time like CONCAT('"+dataTime+"','%') GROUP BY left(time,7) " + 129 " where v3.depart_id = '"+departId+"' and v3.time like CONCAT('"+dataTime+"','%') GROUP BY left(time,7) " +
128 " ) v4 on v4.month_tb = right(left(v1.time,7),2) " + 130 " ) v4 on v4.month_tb = right(left(v1.time,7),2) " +
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/FactoryCenterMapper.java
...@@ -28,5 +28,6 @@ public interface FactoryCenterMapper { ...@@ -28,5 +28,6 @@ public interface FactoryCenterMapper {
28 28
29 List<Map<String, Object>> getYhtj(@Param("startDate") String startDate, @Param("endDate") String endDate, 29 List<Map<String, Object>> getYhtj(@Param("startDate") String startDate, @Param("endDate") String endDate,
30 @Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb, 30 @Param("startDateTb") String startDateTb, @Param("endDateTb") String endDateTb,
31 @Param("departId") String departId); 31 @Param("departId") String departId,
32 @Param("view3a24") String view3a24, @Param("view3a24tb") String view3a24tb);
32 } 33 }
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryCenterMapper.xml
...@@ -161,28 +161,30 @@ ...@@ -161,28 +161,30 @@
161 <select id="getYhtj" resultType="java.util.HashMap"> 161 <select id="getYhtj" resultType="java.util.HashMap">
162 SELECT 162 SELECT
163 LEFT ( v.time, 7 ) AS time, 163 LEFT ( v.time, 7 ) AS time,
164 round(SUM( v.PAMRJ ) + SUM( v.SCLPAMZ ) + SUM( v.SCLPAMF ) + SUM( v.NACLO ) + 164 round(SUM( IFNULL(v.PAMRJ,0) ) + SUM( IFNULL(v.SCLPAMZ,0) ) + SUM( IFNULL(v.SCLPAMF,0) ) + SUM( IFNULL(v.NACLO,0) ) +
165 SUM( v.PACGT ) + SUM( v.PACYT ) + SUM( v.PFS ) + SUM( v.FHTY ) + 165 SUM( IFNULL(v.PACGT,0) ) + SUM( IFNULL(v.PACYT,0) ) + SUM( IFNULL(v.PFS,0) ) + SUM( IFNULL(v.FHTY,0) ) +
166 SUM( v.RYXNJ ) + SUM( v.YWL ) + SUM( v.GXCLJ ) + SUM( v.CH3COONA ) + 166 SUM( IFNULL(v.RYXNJ,0) ) + SUM( IFNULL(v.YWL,0) ) + SUM( IFNULL(v.GXCLJ,0) ) + SUM( IFNULL(v.CH3COONA,0) ) +
167 SUM( v.HXT ) + SUM( v.FECL3 ) + SUM( v.SH ) + SUM( v.CH3COOH ) + SUM( v.FESO4G ) + 167 SUM( IFNULL(v.HXT,0) ) + SUM( IFNULL(v.FECL3,0) ) + SUM( IFNULL(v.SH,0) ) + SUM( IFNULL(v.CH3COOH,0) ) +
168 SUM( v.FESO4Y ) + SUM( v.H2O2 ),2) as yh , 168 SUM( IFNULL(v.FESO4G,0) ) + SUM( IFNULL(v.FESO4Y,0) ) + SUM( IFNULL(v.H2O2,0) ),2) as yh ,
169 ifnull(v2.yjhl,0) as yh_tb 169 ifnull(v2.yjhl,0) as yh_tb
170 FROM 170 FROM
171 view_3a24 v 171 ${view3a24} v
172 left join ( 172 left join (
173 SELECT 173 SELECT
174 RIGHT( LEFT ( time, 7 ), 2 ) AS time, 174 RIGHT( LEFT ( v3.time, 7 ), 2 ) AS time,
175 round(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) + 175 round(SUM( v3.PAMRJ ) + SUM( v3.SCLPAMZ ) + SUM( v3.SCLPAMF ) + SUM( v3.NACLO ) +
176 SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) + 176 SUM( v3.PACGT ) + SUM( v3.PACYT ) + SUM( v3.PFS ) + SUM( v3.FHTY ) +
177 SUM( FESO4Y ) + SUM( H2O2 ),2) as yjhl 177 SUM( v3.RYXNJ ) + SUM( v3.YWL ) + SUM( v3.GXCLJ ) + SUM( v3.CH3COONA ) + SUM( v3.HXT ) +
178 SUM( v3.FECL3 ) + SUM( v3.SH ) + SUM( v3.CH3COOH ) + SUM( v3.FESO4G ) +
179 SUM( v3.FESO4Y ) + SUM( v3.H2O2 ),2) as yjhl
178 FROM 180 FROM
179 view_3a24 181 ${view3a24tb} v3
180 WHERE 182 WHERE
181 depart_id = #{departId} 183 v3.depart_id = #{departId}
182 AND time &gt;= #{startDateTb} 184 AND v3.time &gt;= #{startDateTb}
183 AND time &lt;= #{endDateTb} 185 AND v3.time &lt;= #{endDateTb}
184 GROUP BY 186 GROUP BY
185 LEFT ( time, 7 ) 187 LEFT ( v3.time, 7 )
186 ) v2 on RIGHT( LEFT ( v.time, 7 ), 2 ) = v2.time 188 ) v2 on RIGHT( LEFT ( v.time, 7 ), 2 ) = v2.time
187 WHERE v.depart_id = #{departId} 189 WHERE v.depart_id = #{departId}
188 AND v.time &gt;= #{startDate} 190 AND v.time &gt;= #{startDate}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
...@@ -344,7 +344,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -344,7 +344,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
344 String startDate = statisticsParam.getStartDate(); 344 String startDate = statisticsParam.getStartDate();
345 String endDate = statisticsParam.getEndDate(); 345 String endDate = statisticsParam.getEndDate();
346 String startDateTb = "2023-01-01"; 346 String startDateTb = "2023-01-01";
347 String endDateTb = "2023-09-31"; 347 String endDateTb = "2023-12-31";
348 String view2119 = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDate,endDate); 348 String view2119 = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDate,endDate);
349 String view2119tb = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb); 349 String view2119tb = ReportViewUtil.buildView(slReport, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
350 list = factoryCenterMapper.getWssltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),view2119,view2119tb); 350 list = factoryCenterMapper.getWssltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),view2119,view2119tb);
...@@ -363,12 +363,16 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -363,12 +363,16 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
363 363
364 @Override 364 @Override
365 public List<Map<String, Object>> getYhtj(StatisticsParam statisticsParam) { 365 public List<Map<String, Object>> getYhtj(StatisticsParam statisticsParam) {
366 String yjReport = "3a243d5715b9e1a3753c180872ca0df9";
366 List<Map<String, Object>> list = new ArrayList<>(); 367 List<Map<String, Object>> list = new ArrayList<>();
367 String startDate = statisticsParam.getStartDate(); 368 String startDate = statisticsParam.getStartDate();
368 String endDate = statisticsParam.getEndDate(); 369 String endDate = statisticsParam.getEndDate();
369 String startDateTb = "2023-01-01"; 370 String startDateTb = "2023-01-01";
370 String endDateTb = "2023-09-31"; 371 String endDateTb = "2023-12-31";
371 list = factoryCenterMapper.getYhtj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId()); 372 String yjField = "PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ,YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
373 String view3a24 = ReportViewUtil.buildView(yjReport, yjField, statisticsParam.getDepartId(), startDate,endDate);
374 String view3a24tb = ReportViewUtil.buildView(yjReport, yjField, statisticsParam.getDepartId(), startDateTb,endDateTb);
375 list = factoryCenterMapper.getYhtj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),view3a24,view3a24tb);
372 if(list.size() == 0){ 376 if(list.size() == 0){
373 List<String> monthList = getMonthsBetween(startDate,endDate); 377 List<String> monthList = getMonthsBetween(startDate,endDate);
374 for ( String month : monthList ) { 378 for ( String month : monthList ) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!