Skip to content

张雷 / skboot-zhongye

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

水厂运营大屏接口开发

1 个父辈 c3ba1225
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 297 行增加 和 18 行删除
sk-module-biz/src/main/java/com/skua/modules/flow/service/FlowForThirdBusinessService.java → sk-base-common/src/main/java/com/skua/modules/flow/service/FlowForThirdBusinessService.java
1
2 package com.skua.modules.flow.service; 1 package com.skua.modules.flow.service;
3 2
4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.skua.modules.flow.core.entity.BladeFlow; 3 import com.skua.modules.flow.core.entity.BladeFlow;
6 import com.skua.modules.flow.core.entity.FlowAssemblyEntity;
7
8 import java.util.List; 4 import java.util.List;
9 import java.util.Map;
10 import java.util.Set;
11 5
12 /** 6 /**
13 * 流程业务类 7 * 流程业务类
...@@ -21,13 +15,27 @@ public interface FlowForThirdBusinessService { ...@@ -21,13 +15,27 @@ public interface FlowForThirdBusinessService {
21 * @param bladeFlow 流程类 15 * @param bladeFlow 流程类
22 * @return 16 * @return
23 */ 17 */
24 List<BladeFlow> selectClaimPage(BladeFlow bladeFlow, String userId, String roles); 18 List<BladeFlow> selectClaimList(BladeFlow bladeFlow, String userId, String roles);
25 19
26 /** 20 /**
27 * 流程待办列表 21 * 流程待办列表
28 * @param bladeFlow 流程类 22 * @param bladeFlow 流程类
29 * @return 23 * @return
30 */ 24 */
31 List<BladeFlow> selectTodoPage(BladeFlow bladeFlow, String userId); 25 List<BladeFlow> selectTodoList(BladeFlow bladeFlow, String userId);
26
27 /**
28 * 流程已发列表
29 * @param bladeFlow 流程类
30 * @return
31 */
32 List<BladeFlow> selectSendList(BladeFlow bladeFlow, String userId);
33
34 /**
35 * 流程办结列表
36 * @param bladeFlow 流程类
37 * @return
38 */
39 List<BladeFlow> selectDoneList(BladeFlow bladeFlow, String userId);
32 40
33 } 41 }
......
sk-module-biz/src/main/java/com/skua/modules/process/controller/ProcessStatisticsController.java
...@@ -189,7 +189,7 @@ public class ProcessStatisticsController { ...@@ -189,7 +189,7 @@ public class ProcessStatisticsController {
189 List<String> roleList = sysBaseAPI.getRolesByUserId(sysUser.getId()); 189 List<String> roleList = sysBaseAPI.getRolesByUserId(sysUser.getId());
190 String roles = roleList.stream().map(s -> s.trim()).collect(Collectors.joining(",")); 190 String roles = roleList.stream().map(s -> s.trim()).collect(Collectors.joining(","));
191 if(roleList.size() > 0){ 191 if(roleList.size() > 0){
192 claimList = flowForThirdBusinessService.selectClaimPage(bladeFlow, sysUser.getId(), roles); 192 claimList = flowForThirdBusinessService.selectClaimList(bladeFlow, sysUser.getId(), roles);
193 for (BladeFlow claim : claimList) { 193 for (BladeFlow claim : claimList) {
194 ThirdProcessVO claimVO = new ThirdProcessVO(); 194 ThirdProcessVO claimVO = new ThirdProcessVO();
195 claimVO.setMsgid(claim.getTaskId()); 195 claimVO.setMsgid(claim.getTaskId());
...@@ -204,7 +204,7 @@ public class ProcessStatisticsController { ...@@ -204,7 +204,7 @@ public class ProcessStatisticsController {
204 list.add(claimVO); 204 list.add(claimVO);
205 } 205 }
206 } 206 }
207 todoList = flowForThirdBusinessService.selectTodoPage(bladeFlow, sysUser.getId()); 207 todoList = flowForThirdBusinessService.selectTodoList(bladeFlow, sysUser.getId());
208 for (BladeFlow todo : todoList) { 208 for (BladeFlow todo : todoList) {
209 ThirdProcessVO todoVO = new ThirdProcessVO(); 209 ThirdProcessVO todoVO = new ThirdProcessVO();
210 todoVO.setMsgid(todo.getTaskId()); 210 todoVO.setMsgid(todo.getTaskId());
......
sk-module-biz/src/main/java/com/skua/modules/remotecontrol/controller/SysMonitorLocationController.java
...@@ -197,7 +197,7 @@ public class SysMonitorLocationController { ...@@ -197,7 +197,7 @@ public class SysMonitorLocationController {
197 String sExpress = bean.getMonitorStop(); 197 String sExpress = bean.getMonitorStop();
198 str.append(getFields(sExpress)).append(","); 198 str.append(getFields(sExpress)).append(",");
199 } 199 }
200 str.append(bean.getMonitorId()).append(","); 200 str.append(bean.getMonitorId()).append(",");
201 } 201 }
202 } 202 }
203 //查询点信息 203 //查询点信息
...@@ -516,7 +516,7 @@ public class SysMonitorLocationController { ...@@ -516,7 +516,7 @@ public class SysMonitorLocationController {
516 Map<String, Object> map = new HashMap<>(); 516 Map<String, Object> map = new HashMap<>();
517 // Map<String,Object> dataMap = sysMonitorLocationService.getLocationDataList(monitorLocationVO.getDepartId(),monitorLocationVO.getStructId()); 517 // Map<String,Object> dataMap = sysMonitorLocationService.getLocationDataList(monitorLocationVO.getDepartId(),monitorLocationVO.getStructId());
518 List<MonitorLocationVO> list = sysMonitorLocationService.getLoctionList(monitorLocationVO.getDepartId(), monitorLocationVO.getPictureId()); 518 List<MonitorLocationVO> list = sysMonitorLocationService.getLoctionList(monitorLocationVO.getDepartId(), monitorLocationVO.getPictureId());
519 if (list.size() > 0) { 519 if(list!=null&&list.size() > 0){
520 map = getLoctionGroup(list, true); 520 map = getLoctionGroup(list, true);
521 } 521 }
522 result.setSuccess(true); 522 result.setSuccess(true);
...@@ -673,11 +673,11 @@ public class SysMonitorLocationController { ...@@ -673,11 +673,11 @@ public class SysMonitorLocationController {
673 } 673 }
674 674
675 } 675 }
676 676
677 //保存设备台账信息 677 //保存设备台账信息
678 JSONArray materialArray = jsonObject.getJSONArray("materialData"); 678 JSONArray materialArray = jsonObject.getJSONArray("materialData");
679 679
680 680
681 delLoctionCache(null,null); 681 delLoctionCache(null,null);
682 682
683 result.success("添加成功！"); 683 result.success("添加成功！");
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/FactoryOperateCenterController.java
...@@ -3,8 +3,7 @@ package com.skua.modules.dataAnalysis.controller; ...@@ -3,8 +3,7 @@ package com.skua.modules.dataAnalysis.controller;
3 import com.skua.core.api.vo.Result; 3 import com.skua.core.api.vo.Result;
4 import com.skua.modules.dataAnalysis.service.IFactoryCenterService; 4 import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
5 import com.skua.modules.dataAnalysis.service.IFactoryOperateCenterService; 5 import com.skua.modules.dataAnalysis.service.IFactoryOperateCenterService;
6 import com.skua.modules.dataAnalysis.vo.StatisticsParam; 6 import com.skua.modules.dataAnalysis.vo.*;
7 import com.skua.modules.dataAnalysis.vo.WaterQualityMonitoringDetailVO;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
10 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
...@@ -36,4 +35,64 @@ public class FactoryOperateCenterController { ...@@ -36,4 +35,64 @@ public class FactoryOperateCenterController {
36 return result; 35 return result;
37 } 36 }
38 37
38 @ApiOperation(value="厂区报表统计数据", notes="厂区报表统计数据")
39 @GetMapping(value = "/report")
40 public Result<Map<String,Object>> getReportData(String departId,String month) {
41 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
42 Map<String,Object> map = factoryOperateCenterService.getReportData(departId,month);
43 result.setSuccess(true);
44 result.setResult(map);
45 return result;
46 }
47
48 @ApiOperation(value="厂区设备报警信息", notes="厂区设备报警信息")
49 @GetMapping(value = "/alarm")
50 public Result<List<EquipAlarmVO>> getEquipAlarm(String departId, String month) {
51 Result<List<EquipAlarmVO>> result = new Result<List<EquipAlarmVO>>();
52 List<EquipAlarmVO> list = factoryOperateCenterService.getEquipAlarm(departId,month);
53 result.setSuccess(true);
54 result.setResult(list);
55 return result;
56 }
57
58 @ApiOperation(value="厂区设备预警数据", notes="厂区设备预警数据")
59 @GetMapping(value = "/equip/warn")
60 public Result<List<EquipWarnVO>> getEquipWarn(String departId, String month) {
61 Result<List<EquipWarnVO>> result = new Result<List<EquipWarnVO>>();
62 List<EquipWarnVO> list = factoryOperateCenterService.getEquipWarn(departId,month);
63 result.setSuccess(true);
64 result.setResult(list);
65 return result;
66 }
67
68 @ApiOperation(value="厂区设备运行时间", notes="厂区设备运行时间")
69 @GetMapping(value = "/equip/runtime")
70 public Result<List<EquipRunTimeVO>> getEquipRunTime(String departId, String month) {
71 Result<List<EquipRunTimeVO>> result = new Result<List<EquipRunTimeVO>>();
72 List<EquipRunTimeVO> list = factoryOperateCenterService.getEquipRunTime(departId,month);
73 result.setSuccess(true);
74 result.setResult(list);
75 return result;
76 }
77
78 @ApiOperation(value="厂区报表档案到期提醒", notes="厂区报表档案到期提醒")
79 @GetMapping(value = "/archives/warn")
80 public Result<List<ArchivesWarnVO>> getArchivesWarn(String departId,String month) {
81 Result<List<ArchivesWarnVO>> result = new Result<List<ArchivesWarnVO>>();
82 List<ArchivesWarnVO> list = factoryOperateCenterService.getArchivesWarn(departId);
83 result.setSuccess(true);
84 result.setResult(list);
85 return result;
86 }
87
88 @ApiOperation(value="厂区工单完成情况", notes="厂区工单完成情况")
89 @GetMapping(value = "/flow")
90 public Result<Map<String,Object>> getFlowData(String departId,String month) {
91 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
92 Map<String,Object> map = factoryOperateCenterService.getFlowData(departId,month);
93 result.setSuccess(true);
94 result.setResult(map);
95 return result;
96 }
97
39 } 98 }
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/FactoryOperateCenterMapper.java
1 package com.skua.modules.dataAnalysis.mapper; 1 package com.skua.modules.dataAnalysis.mapper;
2 2
3 import com.skua.modules.dataAnalysis.vo.ArchivesWarnVO;
4 import com.skua.modules.dataAnalysis.vo.EquipAlarmVO;
5 import com.skua.modules.dataAnalysis.vo.EquipRunTimeVO;
6 import com.skua.modules.dataAnalysis.vo.EquipWarnVO;
3 import org.apache.ibatis.annotations.Param; 7 import org.apache.ibatis.annotations.Param;
4 8
5 import java.util.List; 9 import java.util.List;
...@@ -10,4 +14,13 @@ public interface FactoryOperateCenterMapper { ...@@ -10,4 +14,13 @@ public interface FactoryOperateCenterMapper {
10 Map<String, Object> getData(@Param("month") String month, @Param("departId") String departId, 14 Map<String, Object> getData(@Param("month") String month, @Param("departId") String departId,
11 @Param("view3a24") String view3a24, @Param("view2119") String view2119); 15 @Param("view3a24") String view3a24, @Param("view2119") String view2119);
12 16
17 List<EquipAlarmVO> getEquipAlarm(@Param("departId") String departId, @Param("month") String month);
18
19 List<EquipWarnVO> getEquipWarn(@Param("departId") String departId, @Param("month") String month);
20
21 List<EquipRunTimeVO> getEquipRunTime(@Param("departId") String departId, @Param("month") String month);
22
23 List<ArchivesWarnVO> getArchivesWarn(@Param("departId") String departId);
24
25 List<Map<String, Object>> getFlowData(@Param("departId") String departId, @Param("month") String month);
13 } 26 }
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryOperateCenterMapper.xml
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.dataAnalysis.mapper.FactoryCenterMapper"> 3 <mapper namespace="com.skua.modules.dataAnalysis.mapper.FactoryOperateCenterMapper">
4 <select id="getData" resultType="java.util.HashMap"> 4 <select id="getData" resultType="java.util.HashMap">
5 SELECT 5 SELECT
6 ROUND(SUM( v3.DLHJ )/10000,2) AS yzdl, 6 ROUND(SUM( v3.DLHJ )/10000,2) AS yzdl,
...@@ -15,6 +15,109 @@ ...@@ -15,6 +15,109 @@
15 ${view3a24} v3 15 ${view3a24} v3
16 LEFT JOIN (select v.CSL,v.time from ${view2119} v where LEFT ( v.time, 7 ) = #{month} and v.depart_id = #{departId}) v2 ON v2.time = v3.time 16 LEFT JOIN (select v.CSL,v.time from ${view2119} v where LEFT ( v.time, 7 ) = #{month} and v.depart_id = #{departId}) v2 ON v2.time = v3.time
17 where LEFT ( v3.time, 7 ) = #{month} 17 where LEFT ( v3.time, 7 ) = #{month}
18 and v3.depart_id = #{departId} 18 and v3.depart_id in
19 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
20 #{item}
21 </foreach>
22 </select>
23
24 <select id="getEquipAlarm" resultType="com.skua.modules.dataAnalysis.vo.EquipAlarmVO">
25 SELECT
26 a.alarm_content AS content,
27 a.record_time AS date_time,
28 a.alarm_rule_level_name AS level,
29 a.alarm_rule_level_name AS type
30 FROM
31 alarm_record_history a
32 WHERE
33 a.depart_id in
34 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
35 #{item}
36 </foreach>
37 AND a.record_time LIKE CONCAT(#{month},'%')
38 AND a.alarm_rule_type IN ( 'B001B001', 'B001B002', 'B001B003', 'B001B004' )
39 ORDER BY
40 a.record_time
41 </select>
42
43 <select id="getEquipWarn" resultType="com.skua.modules.dataAnalysis.vo.EquipWarnVO">
44 SELECT
45 e.equipment_name AS equip_name,
46 '报废提醒' AS equip_type,
47 e.scrap_date AS over_time
48 FROM
49 equipment_info e
50 WHERE
51 e.depart_id in
52 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
53 #{item}
54 </foreach>
55 AND e.scrap_date != ''
56 AND LEFT(e.scrap_date,11) &lt; DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 3 MONTH), '%Y-%m-%d')
57 </select>
58
59 <select id="getEquipRunTime" resultType="com.skua.modules.dataAnalysis.vo.EquipRunTimeVO">
60 SELECT
61 e.equipment_name AS equip_name,
62 c.des AS equip_type,
63 m.id AS run_time
64 FROM
65 sys_monitor_metric_info m
66 LEFT JOIN equipment_info e ON m.equipment_code = e.id
67 LEFT JOIN equipment_category c ON e.equipment_type = c.id
68 WHERE
69 m.depart_id in
70 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
71 #{item}
72 </foreach>
73 AND m.metric_type = 1
74 AND m.equipment_code IS NOT NULL
75 </select>
76
77 <select id="getArchivesWarn" resultType="com.skua.modules.dataAnalysis.vo.ArchivesWarnVO">
78 SELECT
79 CONCAT( u.user_name, '人员合同' ) AS archives_name,
80 '人员合同' AS archives_type,
81 u.contract_enddate AS over_time
82 FROM
83 sys_factory_user_info u
84 WHERE
85 u.depart_id in
86 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
87 #{item}
88 </foreach>
89 AND LEFT ( u.contract_enddate, 11 ) &lt; DATE_FORMAT( DATE_SUB( CURDATE( ), INTERVAL - 3 MONTH ), '%Y-%m-%d' )
90 UNION ALL
91 SELECT
92 CONCAT( u.user_name, d.certifies_name ) AS archives_name,
93 '证件证书' AS archives_type,
94 d.end_time AS over_time
95 FROM
96 sys_factory_user_data d
97 LEFT JOIN sys_factory_user_info u ON d.base_id = u.id
98 WHERE
99 u.depart_id in
100 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
101 #{item}
102 </foreach>
103 AND LEFT ( d.end_time, 11 ) &lt; DATE_FORMAT( DATE_SUB( CURDATE( ), INTERVAL - 3 MONTH ), '%Y-%m-%d' )
104 </select>
105
106 <select id="getFlowData" resultType="java.util.HashMap">
107 SELECT
108 a.REV_ AS status,
109 COUNT(a.ASSIGNEE_) AS count
110 FROM
111 act_ru_task a
112 LEFT JOIN sys_user u ON a.ASSIGNEE_ = CONCAT( 'taskUser_', u.id )
113 LEFT JOIN sys_user_depart d ON u.id = d.user_id
114 WHERE
115 a.ASSIGNEE_ IS NOT NULL
116 AND d.dep_id in
117 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
118 #{item}
119 </foreach>
120 AND CREATE_TIME_ LIKE CONCAT(#{month},'%')
121 GROUP BY a.REV_
19 </select> 122 </select>
20 </mapper> 123 </mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/IFactoryOperateCenterService.java
1 package com.skua.modules.dataAnalysis.service; 1 package com.skua.modules.dataAnalysis.service;
2 2
3 import com.skua.modules.dataAnalysis.vo.ArchivesWarnVO;
4 import com.skua.modules.dataAnalysis.vo.EquipAlarmVO;
5 import com.skua.modules.dataAnalysis.vo.EquipRunTimeVO;
6 import com.skua.modules.dataAnalysis.vo.EquipWarnVO;
7
8 import java.util.List;
3 import java.util.Map; 9 import java.util.Map;
4 10
5 public interface IFactoryOperateCenterService { 11 public interface IFactoryOperateCenterService {
6 12
7 Map<String, Object> getData(String departId,String month); 13 Map<String, Object> getData(String departId,String month);
8 14
15 Map<String, Object> getReportData(String departId, String month);
16
17 List<EquipAlarmVO> getEquipAlarm(String departId, String month);
18
19 List<EquipWarnVO> getEquipWarn(String departId, String month);
20
21 List<EquipRunTimeVO> getEquipRunTime(String departId, String month);
22
23 List<ArchivesWarnVO> getArchivesWarn(String departId);
24
25 Map<String, Object> getFlowData(String departId, String month);
9 } 26 }
10 27
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/ArchivesWarnVO.java 0 → 100644
1 package com.skua.modules.dataAnalysis.vo;
2
3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data;
5
6
7 @Data
8 public class ArchivesWarnVO {
9
10 @ApiModelProperty(value = "档案名称")
11 private String archivesName;
12
13 @ApiModelProperty(value = "档案类型")
14 private String archivesType;
15
16 @ApiModelProperty(value = "到期时间")
17 private String overTime;
18
19 }
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/EquipAlarmVO.java 0 → 100644
1 package com.skua.modules.dataAnalysis.vo;
2
3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data;
5
6
7 @Data
8 public class EquipAlarmVO {
9
10 @ApiModelProperty(value = "内容")
11 private String content;
12
13 @ApiModelProperty(value = "时间")
14 private String dateTime;
15
16 @ApiModelProperty(value = "级别")
17 private String level;
18
19 @ApiModelProperty(value = "类型")
20 private String type;
21
22 }
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/EquipRunTimeVO.java 0 → 100644
1 package com.skua.modules.dataAnalysis.vo;
2
3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data;
5
6
7 @Data
8 public class EquipRunTimeVO {
9
10 @ApiModelProperty(value = "设备名称")
11 private String equipName;
12
13 @ApiModelProperty(value = "设备类型")
14 private String equipType;
15
16 @ApiModelProperty(value = "运行时间")
17 private String runTime;
18
19 }
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/EquipWarnVO.java 0 → 100644
1 package com.skua.modules.dataAnalysis.vo;
2
3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data;
5
6
7 @Data
8 public class EquipWarnVO {
9
10 @ApiModelProperty(value = "设备名称")
11 private String equipName;
12
13 @ApiModelProperty(value = "设备类型")
14 private String equipType;
15
16 @ApiModelProperty(value = "逾期时间")
17 private String overTime;
18
19 }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!