Skip to content

张雷 / skboot-zhongye

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

增加星标厂，修改首页大屏接口

1 个父辈 e8c6c64f
内嵌 并排
正在显示 5 个修改的文件 包含 54 行增加 和 19 行删除
sk-module-biz/src/main/java/com/skua/modules/threedimensional/mapper/ScreenMapper.java
...@@ -26,5 +26,7 @@ public interface ScreenMapper { ...@@ -26,5 +26,7 @@ public interface ScreenMapper {
26 @Param("dataViewName3a24") String dataViewName3a24, @Param("dataViewName2119") String dataViewName2119); 26 @Param("dataViewName3a24") String dataViewName3a24, @Param("dataViewName2119") String dataViewName2119);
27 27
28 List<Map<String, Object>> getYhylqs(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("departIds") String departIds, 28 List<Map<String, Object>> getYhylqs(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("departIds") String departIds,
29 @Param("dataViewName3a24") String dataViewName3a24, @Param("dataViewName2119") String dataViewName2119); 29 @Param("dataViewName3a24") String dataViewName3a24, @Param("dataViewName2119") String dataViewName2119,
30 @Param("startMonth") String startMonth, @Param("endMonth") String endMonth,
31 @Param("dataViewName4411") String dataViewName4411);
30 } 32 }
......
sk-module-biz/src/main/java/com/skua/modules/threedimensional/mapper/xml/ScreenMapper.xml
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
57 <select id="getYhdlqs" resultType="java.util.HashMap"> 57 <select id="getYhdlqs" resultType="java.util.HashMap">
58 SELECT 58 SELECT
59 LEFT( v3.time, 7 ) time, 59 LEFT( v3.time, 7 ) time,
60 SUM( v3.DLHJ ) AS ydl, 60 ROUND(SUM( v3.DLHJ )/10000,2) AS ydl,
61 v2.clsl, 61 ROUND(v2.clsl/10000,2) AS clsl,
62 ROUND(SUM( v3.DLHJ )/v2.clsl,4) AS dsdh 62 ROUND(SUM( v3.DLHJ )/v2.clsl,4) AS dsdh
63 FROM 63 FROM
64 ${dataViewName3a24} v3 64 ${dataViewName3a24} v3
...@@ -83,15 +83,15 @@ ...@@ -83,15 +83,15 @@
83 <select id="getYhylqs" resultType="java.util.HashMap"> 83 <select id="getYhylqs" resultType="java.util.HashMap">
84 SELECT 84 SELECT
85 LEFT( v3.time, 7 ) time, 85 LEFT( v3.time, 7 ) time,
86 ROUND(SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+ 86 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
87 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+ 87 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
88 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+ 88 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
89 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+ 89 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
90 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+ 90 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
91 SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+ 91 SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
92 SUM( IFNULL( v3.CH3COOH, 0 ) )+SUM( IFNULL( v3.FESO4G, 0 ) )+SUM( IFNULL( v3.FESO4Y, 0 ) )+ 92 SUM( IFNULL( v3.CH3COOH, 0 ) )+SUM( IFNULL( v3.FESO4G, 0 ) )+SUM( IFNULL( v3.FESO4Y, 0 ) )+
93 SUM( IFNULL( v3.H2O2, 0 ) ),4) AS zyl, 93 SUM( IFNULL( v3.H2O2, 0 ) ))/10000,4) AS zyl,
94 ROUND(v2.clsl,2) AS clsl, 94 ROUND(v2.clsl/10000,2) AS clsl,
95 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+ 95 ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
96 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+ 96 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
97 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+ 97 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
...@@ -99,7 +99,9 @@ ...@@ -99,7 +99,9 @@
99 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+ 99 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
100 SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+ 100 SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
101 SUM( IFNULL( v3.CH3COOH, 0 ) )+SUM( IFNULL( v3.FESO4G, 0 ) )+SUM( IFNULL( v3.FESO4Y, 0 ) )+ 101 SUM( IFNULL( v3.CH3COOH, 0 ) )+SUM( IFNULL( v3.FESO4G, 0 ) )+SUM( IFNULL( v3.FESO4Y, 0 ) )+
102 SUM( IFNULL( v3.H2O2, 0 ) ))/v2.clsl,4) AS dsyh 102 SUM( IFNULL( v3.H2O2, 0 ) ))/v2.clsl,4) AS dsyh,
103 ROUND(v4.zyf/10000,2) AS zyf,
104 ROUND(v4.zyf/v2.clsl,2) AS dsyf
103 FROM 105 FROM
104 ${dataViewName3a24} v3 106 ${dataViewName3a24} v3
105 LEFT JOIN 107 LEFT JOIN
...@@ -112,6 +114,18 @@ ...@@ -112,6 +114,18 @@
112 </foreach> 114 </foreach>
113 GROUP BY LEFT(v2119.time, 7) ) v2 115 GROUP BY LEFT(v2119.time, 7) ) v2
114 ON v2.time = LEFT( v3.time, 7 ) 116 ON v2.time = LEFT( v3.time, 7 )
117 LEFT JOIN
118 ( SELECT
119 v4411.time,
120 ROUND(IFNULL(SUM(v4411.yyf),0),2) zyf
121 FROM ${dataViewName4411} v4411
122 WHERE v4411.time &gt;= #{startMonth} AND v4411.time &lt;= #{endMonth}
123 AND v4411.depart_id in
124 <foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")">
125 '${item}'
126 </foreach>
127 GROUP BY v4411.time ) v4
128 ON v4.time = LEFT( v3.time, 7 )
115 WHERE v3.time &gt;= #{startDate} AND v3.time &lt;= #{endDate} 129 WHERE v3.time &gt;= #{startDate} AND v3.time &lt;= #{endDate}
116 AND v3.depart_id in 130 AND v3.depart_id in
117 <foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")"> 131 <foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")">
......
sk-module-biz/src/main/java/com/skua/modules/threedimensional/service/impl/ScreenDataServiceImpl.java
...@@ -266,12 +266,16 @@ public class ScreenDataServiceImpl implements IScreenDataService { ...@@ -266,12 +266,16 @@ public class ScreenDataServiceImpl implements IScreenDataService {
266 List<Map<String, Object>> list = new ArrayList<>(); 266 List<Map<String, Object>> list = new ArrayList<>();
267 String startDate = statisticsParams.getStartDate(); 267 String startDate = statisticsParams.getStartDate();
268 String endDate = statisticsParams.getEndDate(); 268 String endDate = statisticsParams.getEndDate();
269 String startMonth = startDate.split("-")[0]+"-"+startDate.split("-")[1];
270 String endMonth = endDate.split("-")[0]+"-"+endDate.split("-")[1];
269 String departIds = statisticsParams.getDepartIds(); 271 String departIds = statisticsParams.getDepartIds();
270 Map<String, Object> valueMap = new HashMap<>(); 272 Map<String, Object> valueMap = new HashMap<>();
271 List<String> monthList = getMonthsBetween(startDate,endDate); 273 List<String> monthList = getMonthsBetween(startDate,endDate);
272 String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDate, endDate); 274 String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDate, endDate);
273 String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,ReportConstant.fieldClsl, departIds, startDate, endDate); 275 String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,ReportConstant.fieldClsl, departIds, startDate, endDate);
274 List<Map<String, Object>> dataList = screenMapper.getYhylqs(startDate,endDate,departIds,dataViewName3a24,dataViewName2119); 276 String dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411, "", departIds, startMonth, endMonth);
277 List<Map<String, Object>> dataList = screenMapper.getYhylqs(startDate,endDate,departIds,dataViewName3a24,dataViewName2119,
278 startMonth,endMonth,dataViewName4411);
275 if(dataList.size()>0){ 279 if(dataList.size()>0){
276 for (Map<String, Object> vMap : dataList) { 280 for (Map<String, Object> vMap : dataList) {
277 valueMap.put(vMap.get("time").toString(),vMap); 281 valueMap.put(vMap.get("time").toString(),vMap);
...@@ -284,10 +288,14 @@ public class ScreenDataServiceImpl implements IScreenDataService { ...@@ -284,10 +288,14 @@ public class ScreenDataServiceImpl implements IScreenDataService {
284 map.put("dsyh",dataValueMap.get("dsyh")); 288 map.put("dsyh",dataValueMap.get("dsyh"));
285 map.put("clsl",dataValueMap.get("clsl")); 289 map.put("clsl",dataValueMap.get("clsl"));
286 map.put("zyl",dataValueMap.get("zyl")); 290 map.put("zyl",dataValueMap.get("zyl"));
291 map.put("zyf",dataValueMap.get("zyf"));
292 map.put("dsyf",dataValueMap.get("dsyf"));
287 }else{ 293 }else{
288 map.put("dsyh",""); 294 map.put("dsyh","");
289 map.put("clsl",""); 295 map.put("clsl","");
290 map.put("zyl",""); 296 map.put("zyl","");
297 map.put("zyf","");
298 map.put("dsyf","");
291 } 299 }
292 list.add(map); 300 list.add(map);
293 } 301 }
...@@ -298,6 +306,8 @@ public class ScreenDataServiceImpl implements IScreenDataService { ...@@ -298,6 +306,8 @@ public class ScreenDataServiceImpl implements IScreenDataService {
298 map.put("dsyh",""); 306 map.put("dsyh","");
299 map.put("clsl",""); 307 map.put("clsl","");
300 map.put("zyl",""); 308 map.put("zyl","");
309 map.put("zyf","");
310 map.put("dsyf","");
301 list.add(map); 311 list.add(map);
302 } 312 }
303 } 313 }
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/controller/web/InspectionUserWorkingGroupController.java
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.skua.core.api.vo.Result; 6 import com.skua.core.api.vo.Result;
7 import com.skua.core.context.BaseContextHandler;
7 import com.skua.modules.inspection.service.IInspectionUserWorkingGroupService; 8 import com.skua.modules.inspection.service.IInspectionUserWorkingGroupService;
8 import com.skua.modules.inspection.vo.InspectionUserWorkingGroupVO; 9 import com.skua.modules.inspection.vo.InspectionUserWorkingGroupVO;
9 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
...@@ -77,6 +78,8 @@ public class InspectionUserWorkingGroupController { ...@@ -77,6 +78,8 @@ public class InspectionUserWorkingGroupController {
77 } 78 }
78 if (StringUtils.isNotBlank(departId)){ 79 if (StringUtils.isNotBlank(departId)){
79 queryWrapper.eq("iwg.depart_id",departId); 80 queryWrapper.eq("iwg.depart_id",departId);
81 }else{
82 queryWrapper.in("iwg.depart_id", BaseContextHandler.getDeparts().split(","));
80 } 83 }
81 if (StringUtils.isNotBlank(moduleType)){ 84 if (StringUtils.isNotBlank(moduleType)){
82 queryWrapper.eq("iwg.module_type",moduleType); 85 queryWrapper.eq("iwg.module_type",moduleType);
......
sk-module-system/src/main/java/com/skua/modules/system/entity/SysFactoryInfo.java
...@@ -126,13 +126,13 @@ public class SysFactoryInfo { ...@@ -126,13 +126,13 @@ public class SysFactoryInfo {
126 //@Excel(name = "厂区图片", width = 15) 126 //@Excel(name = "厂区图片", width = 15)
127 @ApiModelProperty(value = "厂区图片") 127 @ApiModelProperty(value = "厂区图片")
128 private String proImgs; 128 private String proImgs;
129 129
130 @ApiModelProperty(value = "厂区视频【多个】") 130 @ApiModelProperty(value = "厂区视频【多个】")
131 private String proVideos; 131 private String proVideos;
132 132
133 @ApiModelProperty(value = "厂站工艺主图") 133 @ApiModelProperty(value = "厂站工艺主图")
134 private String proMonitorMainImg; 134 private String proMonitorMainImg;
135 135
136 /** 136 /**
137 * 创建人员 137 * 创建人员
138 */ 138 */
...@@ -177,6 +177,12 @@ public class SysFactoryInfo { ...@@ -177,6 +177,12 @@ public class SysFactoryInfo {
177 */ 177 */
178 @ApiModelProperty(value = "水厂类型") 178 @ApiModelProperty(value = "水厂类型")
179 private String factoryType; 179 private String factoryType;
180
181 @Excel(name = "星标厂区", width = 15)
182 @ApiModelProperty(value = "星标厂区")
183 @Dict(dicCode = "factoryStar")
184 private String factoryStar;
185
180 /** 186 /**
181 * 邮编 187 * 邮编
182 */ 188 */
...@@ -208,7 +214,7 @@ public class SysFactoryInfo { ...@@ -208,7 +214,7 @@ public class SysFactoryInfo {
208 */ 214 */
209 @ApiModelProperty(value = "执行出水标准") 215 @ApiModelProperty(value = "执行出水标准")
210 private String outLevel; 216 private String outLevel;
211 217
212 @ApiModelProperty(value = "执行进水标准") 218 @ApiModelProperty(value = "执行进水标准")
213 private String inLevel; 219 private String inLevel;
214 /** 220 /**
...@@ -307,7 +313,7 @@ public class SysFactoryInfo { ...@@ -307,7 +313,7 @@ public class SysFactoryInfo {
307 @TableField(exist = false) 313 @TableField(exist = false)
308 @ApiModelProperty(value = "纳管级别") 314 @ApiModelProperty(value = "纳管级别")
309 private List<WaterQualityInLevel> waterQualityInLevels; 315 private List<WaterQualityInLevel> waterQualityInLevels;
310 316
311 @ApiModelProperty(value = "排放标准") 317 @ApiModelProperty(value = "排放标准")
312 @Dict(dictTable = "alarm_level_standard_config",dicCode = "alarm_standard_level_code",dicText = "alarm_standard_level_name") 318 @Dict(dictTable = "alarm_level_standard_config",dicCode = "alarm_standard_level_code",dicText = "alarm_standard_level_name")
313 private String effluentStandard; 319 private String effluentStandard;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!