Skip to content

张雷 / skboot-zhongye

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

危险作业人流程修改

1 个父辈 aea41295
内嵌 并排
正在显示 11 个修改的文件 包含 46 行增加 和 18 行删除
sk-base-common/src/main/java/com/skua/modules/alarmtmp/mapper/AlarmCustomRuleConfigMapper.java
...@@ -16,12 +16,13 @@ import com.skua.modules.alarmtmp.vo.AlarmCustomRuleConfigVO; ...@@ -16,12 +16,13 @@ import com.skua.modules.alarmtmp.vo.AlarmCustomRuleConfigVO;
16 */ 16 */
17 public interface AlarmCustomRuleConfigMapper extends BaseMapper<AlarmCustomRuleConfig> { 17 public interface AlarmCustomRuleConfigMapper extends BaseMapper<AlarmCustomRuleConfig> {
18 18
19 @Select("SELECT\r\n" + 19 @Select("SELECT " +
20 " a.*, b.alarm_rule_level_name,c.alarm_template_name,d.alarm_index_show_tag \r\n" + 20 " a.*, b.alarm_rule_level_name,c.alarm_template_name,d.alarm_index_show_tag " +
21 "FROM\r\n" + 21 "FROM " +
22 " alarm_custom_rule_config a\r\n" + 22 " alarm_custom_rule_config a\r\n" +
23 "LEFT JOIN alarm_rule_level_config b ON a.id = b.alarm_rule_id " + 23 "LEFT JOIN alarm_rule_level_config b ON a.id = b.alarm_rule_id " +
24 "LEFT JOIN alarm_rule_level_config_template c ON (b.alarm_rule_level_name = c.alarm_template_level_name and b.sort=c.sort and b.template_type = c.alarm_template_type) " + 24 "LEFT JOIN alarm_rule_level_config_template c ON (b.alarm_rule_level_name = c.alarm_template_level_name " +
25 " and b.sort=c.sort and b.template_type = c.alarm_template_type and b.depart_id = c.depart_id) " +
25 "LEFT JOIN alarm_custom_rule_repository d ON a.alarm_rule_repository_id = d.id " + 26 "LEFT JOIN alarm_custom_rule_repository d ON a.alarm_rule_repository_id = d.id " +
26 "${ew.customSqlSegment}") 27 "${ew.customSqlSegment}")
27 IPage<AlarmCustomRuleConfigVO> getPage(Page<AlarmCustomRuleConfigVO> page,@Param(Constants.WRAPPER)QueryWrapper<AlarmCustomRuleConfigVO> queryWrapper); 28 IPage<AlarmCustomRuleConfigVO> getPage(Page<AlarmCustomRuleConfigVO> page,@Param(Constants.WRAPPER)QueryWrapper<AlarmCustomRuleConfigVO> queryWrapper);
......
sk-base-common/src/main/java/com/skua/modules/alarmtmp/service/impl/AlarmCustomRuleConfigServiceImpl.java
...@@ -34,8 +34,8 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul ...@@ -34,8 +34,8 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul
34 @Autowired 34 @Autowired
35 private IAlarmRuleLevelConfigTemplateService alarmRuleLevelConfigTemplateService; 35 private IAlarmRuleLevelConfigTemplateService alarmRuleLevelConfigTemplateService;
36 @Autowired 36 @Autowired
37 private AlarmRuleLevelConfigService alarmRuleLevelConfigService; 37 private AlarmRuleLevelConfigService alarmRuleLevelConfigService;
38 38
39 @Override 39 @Override
40 public boolean save(AlarmCustomRuleConfigVO alarmCustomRuleConfigVO) { 40 public boolean save(AlarmCustomRuleConfigVO alarmCustomRuleConfigVO) {
41 AlarmCustomRuleConfig alarmCustomRuleConfig = new AlarmCustomRuleConfig(); 41 AlarmCustomRuleConfig alarmCustomRuleConfig = new AlarmCustomRuleConfig();
...@@ -97,11 +97,13 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul ...@@ -97,11 +97,13 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul
97 String destLevelName = tempAlarmRuleLevelConfig.getAlarmRuleLevelName();//报警级别名称 97 String destLevelName = tempAlarmRuleLevelConfig.getAlarmRuleLevelName();//报警级别名称
98 int destLevelSort = tempAlarmRuleLevelConfig.getSort();//报警级别排序 98 int destLevelSort = tempAlarmRuleLevelConfig.getSort();//报警级别排序
99 String templateType = tempAlarmRuleLevelConfig.getTemplateType();//报警模板类型 99 String templateType = tempAlarmRuleLevelConfig.getTemplateType();//报警模板类型
100 String departId = tempAlarmRuleLevelConfig.getDepartId();//所属厂区
100 //通过报警级别名称+报警级别排序，确定报警模板 101 //通过报警级别名称+报警级别排序，确定报警模板
101 QueryWrapper<AlarmRuleLevelConfigTemplate> alarmRuleLevelConfigTemplateQueryWrapper = new QueryWrapper<AlarmRuleLevelConfigTemplate>(); 102 QueryWrapper<AlarmRuleLevelConfigTemplate> alarmRuleLevelConfigTemplateQueryWrapper = new QueryWrapper<AlarmRuleLevelConfigTemplate>();
102 alarmRuleLevelConfigTemplateQueryWrapper.eq("alarm_template_level_name", destLevelName); 103 alarmRuleLevelConfigTemplateQueryWrapper.eq("alarm_template_level_name", destLevelName);
103 alarmRuleLevelConfigTemplateQueryWrapper.eq("alarm_template_type", templateType); 104 alarmRuleLevelConfigTemplateQueryWrapper.eq("alarm_template_type", templateType);
104 alarmRuleLevelConfigTemplateQueryWrapper.eq("sort", destLevelSort); 105 alarmRuleLevelConfigTemplateQueryWrapper.eq("sort", destLevelSort);
106 alarmRuleLevelConfigTemplateQueryWrapper.eq("depart_id", departId);
105 AlarmRuleLevelConfigTemplate alarmRuleLevelConfigTemplate = alarmRuleLevelConfigTemplateService.getOne(alarmRuleLevelConfigTemplateQueryWrapper); 107 AlarmRuleLevelConfigTemplate alarmRuleLevelConfigTemplate = alarmRuleLevelConfigTemplateService.getOne(alarmRuleLevelConfigTemplateQueryWrapper);
106 if(alarmRuleLevelConfigTemplate!=null&&!alarmRuleLevelConfigTemplate.getAlarmTemplateName().equals(alarmTemplateName)) { 108 if(alarmRuleLevelConfigTemplate!=null&&!alarmRuleLevelConfigTemplate.getAlarmTemplateName().equals(alarmTemplateName)) {
107 if(StringUtils.isNotBlank(alarmCustomRuleConfigVO.getId())) { 109 if(StringUtils.isNotBlank(alarmCustomRuleConfigVO.getId())) {
...@@ -120,6 +122,7 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul ...@@ -120,6 +122,7 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul
120 AlarmRuleLevelConfigTemplate template = alarmRuleLevelConfigTemplateList.get(0); 122 AlarmRuleLevelConfigTemplate template = alarmRuleLevelConfigTemplateList.get(0);
121 //构造报警级别对象集合 123 //构造报警级别对象集合
122 AlarmRuleLevelConfig alarmRuleLevelConfig = new AlarmRuleLevelConfig(); 124 AlarmRuleLevelConfig alarmRuleLevelConfig = new AlarmRuleLevelConfig();
125 alarmRuleLevelConfig.setDepartId(template.getDepartId());
123 alarmRuleLevelConfig.setAlarmRuleId(id); 126 alarmRuleLevelConfig.setAlarmRuleId(id);
124 alarmRuleLevelConfig.setAlarmRuleLevelName(template.getAlarmTemplateLevelName()); 127 alarmRuleLevelConfig.setAlarmRuleLevelName(template.getAlarmTemplateLevelName());
125 alarmRuleLevelConfig.setIsSendSms(template.getIsSendSms()); 128 alarmRuleLevelConfig.setIsSendSms(template.getIsSendSms());
...@@ -147,6 +150,7 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul ...@@ -147,6 +150,7 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul
147 AlarmRuleLevelConfigTemplate template = alarmRuleLevelConfigTemplateList.get(0); 150 AlarmRuleLevelConfigTemplate template = alarmRuleLevelConfigTemplateList.get(0);
148 //构造报警级别对象集合 151 //构造报警级别对象集合
149 AlarmRuleLevelConfig alarmRuleLevelConfig = new AlarmRuleLevelConfig(); 152 AlarmRuleLevelConfig alarmRuleLevelConfig = new AlarmRuleLevelConfig();
153 alarmRuleLevelConfig.setDepartId(template.getDepartId());
150 alarmRuleLevelConfig.setAlarmRuleId(id); 154 alarmRuleLevelConfig.setAlarmRuleId(id);
151 alarmRuleLevelConfig.setAlarmRuleLevelName(template.getAlarmTemplateLevelName()); 155 alarmRuleLevelConfig.setAlarmRuleLevelName(template.getAlarmTemplateLevelName());
152 alarmRuleLevelConfig.setIsSendSms(template.getIsSendSms()); 156 alarmRuleLevelConfig.setIsSendSms(template.getIsSendSms());
...@@ -165,7 +169,7 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul ...@@ -165,7 +169,7 @@ public class AlarmCustomRuleConfigServiceImpl extends ServiceImpl<AlarmCustomRul
165 } catch (Exception e) { 169 } catch (Exception e) {
166 e.printStackTrace(); 170 e.printStackTrace();
167 return false; 171 return false;
168 } 172 }
169 return true; 173 return true;
170 } 174 }
171 @Override 175 @Override
......
sk-module-alarm/src/main/java/com/skua/modules/controller/web/AlarmCustomRuleConfigController.java
...@@ -96,6 +96,9 @@ public class AlarmCustomRuleConfigController { ...@@ -96,6 +96,9 @@ public class AlarmCustomRuleConfigController {
96 if(StringUtils.isNotEmpty(alarmCustomRuleConfigVO.getAlarmRuleName())) { 96 if(StringUtils.isNotEmpty(alarmCustomRuleConfigVO.getAlarmRuleName())) {
97 queryWrapper.eq("a.alarm_rule_name", alarmCustomRuleConfigVO.getAlarmRuleName()); 97 queryWrapper.eq("a.alarm_rule_name", alarmCustomRuleConfigVO.getAlarmRuleName());
98 } 98 }
99 if(StringUtils.isNotEmpty(alarmCustomRuleConfigVO.getDepartId())) {
100 queryWrapper.eq("a.depart_id", alarmCustomRuleConfigVO.getDepartId());
101 }
99 IPage<AlarmCustomRuleConfigVO> pageList = alarmCustomRuleConfigService.getPage(page, queryWrapper); 102 IPage<AlarmCustomRuleConfigVO> pageList = alarmCustomRuleConfigService.getPage(page, queryWrapper);
100 result.setSuccess(true); 103 result.setSuccess(true);
101 result.setResult(pageList); 104 result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/DangerousOperationController.java
...@@ -225,7 +225,7 @@ public class DangerousOperationController { ...@@ -225,7 +225,7 @@ public class DangerousOperationController {
225 return Result.ok("删除成功!"); 225 return Result.ok("删除成功!");
226 } 226 }
227 227
228 // 228 //指派作业任务给某人
229 @PostMapping(value = "/complete-task-choose-user-pass") 229 @PostMapping(value = "/complete-task-choose-user-pass")
230 public Result<?> completeTaskChooseUserPass(@RequestBody DangerousOperation dangerousOperation) throws Exception { 230 public Result<?> completeTaskChooseUserPass(@RequestBody DangerousOperation dangerousOperation) throws Exception {
231 Result<?> result = new Result(); 231 Result<?> result = new Result();
...@@ -237,7 +237,7 @@ public class DangerousOperationController { ...@@ -237,7 +237,7 @@ public class DangerousOperationController {
237 Map<String, Object> mapVariable = new HashMap<String,Object>(); 237 Map<String, Object> mapVariable = new HashMap<String,Object>();
238 mapVariable.put("dangerDeal", "taskUser_"+dangerousOperation.getOperationUser()); 238 mapVariable.put("dangerDeal", "taskUser_"+dangerousOperation.getOperationUser());
239 flowService.configureVariables(executionId, mapVariable); 239 flowService.configureVariables(executionId, mapVariable);
240 //动态设置流程接修人 240 //动态设置流程接收人
241 flowBusinessService.completeTask(ProcessConstant.PASS_KEY, dangerousOperation.getFlow()); 241 flowBusinessService.completeTask(ProcessConstant.PASS_KEY, dangerousOperation.getFlow());
242 result.success("成功"); 242 result.success("成功");
243 return result; 243 return result;
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EventMapController.java
1 package com.skua.modules.emergency.controller; 1 package com.skua.modules.emergency.controller;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.skua.core.api.vo.Result; 3 import com.skua.core.api.vo.Result;
5 import com.skua.core.aspect.annotation.AutoLog; 4 import com.skua.core.aspect.annotation.AutoLog;
6 import com.skua.modules.emergency.entity.EmergencyRiskEvent;
7 import com.skua.modules.emergency.service.IEmergencyRiskEventService; 5 import com.skua.modules.emergency.service.IEmergencyRiskEventService;
8 import com.skua.modules.emergency.vo.DangerDatabaseResult; 6 import com.skua.modules.emergency.vo.DangerDatabaseResult;
9 import com.skua.modules.emergency.vo.MapDatabaseResult; 7 import com.skua.modules.emergency.vo.MapDatabaseResult;
......
sk-module-biz/src/main/java/com/skua/modules/emergency/entity/DangerousOperation.java
...@@ -32,6 +32,7 @@ public class DangerousOperation extends FlowEntity { ...@@ -32,6 +32,7 @@ public class DangerousOperation extends FlowEntity {
32 /**作业类型*/ 32 /**作业类型*/
33 @Excel(name = "作业类型", width = 15) 33 @Excel(name = "作业类型", width = 15)
34 @ApiModelProperty(value = "作业类型") 34 @ApiModelProperty(value = "作业类型")
35 @Dict(dicCode = "dangerous_work_type")
35 private String operationType; 36 private String operationType;
36 /**作业名称*/ 37 /**作业名称*/
37 @Excel(name = "作业名称", width = 15) 38 @Excel(name = "作业名称", width = 15)
...@@ -44,6 +45,7 @@ public class DangerousOperation extends FlowEntity { ...@@ -44,6 +45,7 @@ public class DangerousOperation extends FlowEntity {
44 /**作业地点（构筑物）*/ 45 /**作业地点（构筑物）*/
45 @Excel(name = "作业地点（构筑物）", width = 15) 46 @Excel(name = "作业地点（构筑物）", width = 15)
46 @ApiModelProperty(value = "作业地点（构筑物）") 47 @ApiModelProperty(value = "作业地点（构筑物）")
48 @Dict(dictTable = "sys_struct_dict", dicCode="id", dicText = "struct_name")
47 private String operationLocation; 49 private String operationLocation;
48 /**申请时间*/ 50 /**申请时间*/
49 @Excel(name = "申请时间", width = 15) 51 @Excel(name = "申请时间", width = 15)
...@@ -64,6 +66,7 @@ public class DangerousOperation extends FlowEntity { ...@@ -64,6 +66,7 @@ public class DangerousOperation extends FlowEntity {
64 /**作业人员类型*/ 66 /**作业人员类型*/
65 @Excel(name = "作业人员类型", width = 15) 67 @Excel(name = "作业人员类型", width = 15)
66 @ApiModelProperty(value = "作业人员类型") 68 @ApiModelProperty(value = "作业人员类型")
69 @Dict(dicCode = "operationUser_type")
67 private String operationUserType; 70 private String operationUserType;
68 /**作业人员*/ 71 /**作业人员*/
69 @Excel(name = "作业人员", width = 15) 72 @Excel(name = "作业人员", width = 15)
...@@ -89,6 +92,7 @@ public class DangerousOperation extends FlowEntity { ...@@ -89,6 +92,7 @@ public class DangerousOperation extends FlowEntity {
89 /**作业状态*/ 92 /**作业状态*/
90 @Excel(name = "作业状态", width = 15) 93 @Excel(name = "作业状态", width = 15)
91 @ApiModelProperty(value = "作业状态") 94 @ApiModelProperty(value = "作业状态")
95 @Dict(dicCode = "operation_status")
92 private String operationStatus; 96 private String operationStatus;
93 /**所属厂站*/ 97 /**所属厂站*/
94 @Excel(name = "所属厂站", width = 15) 98 @Excel(name = "所属厂站", width = 15)
......
sk-module-biz/src/main/java/com/skua/modules/emergency/mapper/xml/EmergencyRiskEventMapper.xml
...@@ -5,18 +5,25 @@ ...@@ -5,18 +5,25 @@
5 <select id="getRiskList" resultType="com.skua.modules.emergency.vo.RiskDatabaseResult"> 5 <select id="getRiskList" resultType="com.skua.modules.emergency.vo.RiskDatabaseResult">
6 SELECT 6 SELECT
7 d.id AS depart_id, 7 d.id AS depart_id,
8 0 AS fxk_count, 8 d.depart_name AS depart_name,
9 0 AS yhpc_num, 9 ifnull( dl.fxk_count, 0 ) AS fxk_count,
10 0 AS yhpcsj_num 10 ifnull( di.yhpc_count, 0 ) AS yhpc_count,
11 ifnull( aq.aqyh_count, 0 ) AS aqyh_count
11 FROM 12 FROM
12 sys_depart d 13 sys_depart d
14 LEFT JOIN ( SELECT depart_id, count( id ) fxk_count FROM danger_level_manage WHERE create_time LIKE CONCAT(#{year},'%') GROUP BY depart_id ) dl ON dl.depart_id = d.id
15 LEFT JOIN ( SELECT depart_id, count( id ) yhpc_count FROM danger_inspection_record WHERE create_time LIKE CONCAT(#{year},'%') GROUP BY depart_id ) di ON di.depart_id = d.id
16 LEFT JOIN ( SELECT depart_id, count( id ) aqyh_count FROM ajh_rectification_info WHERE create_time LIKE CONCAT(#{year},'%') GROUP BY depart_id ) aq ON aq.depart_id = d.id
13 WHERE 17 WHERE
14 d.depart_type = 1 18 d.depart_type = 1
19 ORDER BY
20 dl.fxk_count DESC
15 </select> 21 </select>
16 22
17 <select id="getDangerList" resultType="com.skua.modules.emergency.vo.DangerDatabaseResult"> 23 <select id="getDangerList" resultType="com.skua.modules.emergency.vo.DangerDatabaseResult">
18 SELECT 24 SELECT
19 d.id AS depart_id, 25 d.id AS depart_id,
26 d.depart_name AS depart_name,
20 NULL AS danger_date, 27 NULL AS danger_date,
21 NULL AS danger_location, 28 NULL AS danger_location,
22 NULL AS is_fault 29 NULL AS is_fault
...@@ -29,6 +36,7 @@ ...@@ -29,6 +36,7 @@
29 <select id="getMapData" resultType="com.skua.modules.emergency.vo.MapDatabaseResult"> 36 <select id="getMapData" resultType="com.skua.modules.emergency.vo.MapDatabaseResult">
30 SELECT 37 SELECT
31 d.id AS depart_id, 38 d.id AS depart_id,
39 d.depart_name AS depart_name,
32 f.pro_longitude AS longitude, 40 f.pro_longitude AS longitude,
33 f.pro_latitude AS latitude 41 f.pro_latitude AS latitude
34 FROM 42 FROM
......
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/DangerDatabaseResult.java
...@@ -13,6 +13,9 @@ public class DangerDatabaseResult { ...@@ -13,6 +13,9 @@ public class DangerDatabaseResult {
13 /**厂站ID*/ 13 /**厂站ID*/
14 @ApiModelProperty(value = "厂站ID") 14 @ApiModelProperty(value = "厂站ID")
15 private String departId; 15 private String departId;
16 /**厂站名称*/
17 @ApiModelProperty(value = "厂站名称")
18 private String departName;
16 /**最近风险时间*/ 19 /**最近风险时间*/
17 @ApiModelProperty(value = "最近风险时间") 20 @ApiModelProperty(value = "最近风险时间")
18 private String dangerDate; 21 private String dangerDate;
......
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/MapDatabaseResult.java
...@@ -16,6 +16,9 @@ public class MapDatabaseResult { ...@@ -16,6 +16,9 @@ public class MapDatabaseResult {
16 /**厂站ID*/ 16 /**厂站ID*/
17 @ApiModelProperty(value = "厂站ID") 17 @ApiModelProperty(value = "厂站ID")
18 private String departId; 18 private String departId;
19 /**厂站名称*/
20 @ApiModelProperty(value = "厂站名称")
21 private String departName;
19 /**经度*/ 22 /**经度*/
20 @ApiModelProperty(value = "经度") 23 @ApiModelProperty(value = "经度")
21 private String longitude; 24 private String longitude;
......
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/RiskDatabaseResult.java
...@@ -13,14 +13,17 @@ public class RiskDatabaseResult { ...@@ -13,14 +13,17 @@ public class RiskDatabaseResult {
13 /**厂站ID*/ 13 /**厂站ID*/
14 @ApiModelProperty(value = "厂站ID") 14 @ApiModelProperty(value = "厂站ID")
15 private String departId; 15 private String departId;
16 /**厂站名称*/
17 @ApiModelProperty(value = "厂站名称")
18 private String departName;
16 /**风险库数量*/ 19 /**风险库数量*/
17 @ApiModelProperty(value = "风险库数量") 20 @ApiModelProperty(value = "风险库数量")
18 private Integer fxkCount; 21 private Integer fxkCount;
19 /**隐患排查数量*/ 22 /**隐患排查数量*/
20 @ApiModelProperty(value = "隐患排查数量") 23 @ApiModelProperty(value = "隐患排查数量")
21 private Integer yhpcNum; 24 private Integer yhpcCount;
22 /**隐患排查事件数量*/ 25 /**隐患排查事件数量*/
23 @ApiModelProperty(value = "隐患排查事件数量") 26 @ApiModelProperty(value = "隐患排查事件数量")
24 private Integer yhpcsjNum; 27 private Integer aqyhCount;
25 28
26 } 29 }
......
sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
...@@ -120,7 +120,8 @@ public class ShiroConfig { ...@@ -120,7 +120,8 @@ public class ShiroConfig {
120 filterChainDefinitionMap.put("/example/**","anon"); 120 filterChainDefinitionMap.put("/example/**","anon");
121 //基础配置接口过滤 121 //基础配置接口过滤
122 filterChainDefinitionMap.put("/system/sysBaseConfig/getSysBaseConfig","anon"); 122 filterChainDefinitionMap.put("/system/sysBaseConfig/getSysBaseConfig","anon");
123 123 //安全环保地图
124 filterChainDefinitionMap.put("/safetyEnviron/map/**","anon");
124 // 统计查询 125 // 统计查询
125 filterChainDefinitionMap.put("/statisticsQuery/**","anon"); 126 filterChainDefinitionMap.put("/statisticsQuery/**","anon");
126 127
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!