Merge remote-tracking branch 'origin/master'

hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmConstants.java

@@ -62,4 +62,6 @@ public interface AlarmConstants {
 	String  VIDEO_SCHEDULED_TASK= "VideoScheduledTask";
 
 	List<String> HZ3000_TYPES = Arrays.asList("0","1","2","3","4","5","6","7","8","9","10","11","12");
+
+	String SMS_MESSAGE_TEMPLATE_CODE = "aliyun-alert-push";
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/config/entity/AreaMapEntity.java

@@ -0,0 +1,26 @@
+package com.hnac.hzims.operational.config.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * @author ysj
+ */
+@ApiModel("区域地图配置实体类")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@TableName("hzims_area_map_config")
+public class AreaMapEntity extends TenantEntity {
+
+	@ApiModelProperty("区域机构ID")
+	private Long areaId;
+
+	@ApiModelProperty("地图编码")
+	private String mapCode;
+}

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmVideoBandingController.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -50,4 +51,11 @@ public class EmVideoBandingController extends BladeController {
         return R.status(emVideoBandingService.removeByEmCode(emCode));
     }
 
+    @DeleteMapping("/removeById")
+    @ApiOperation("根据ID删除绑定关系")
+    @ApiOperationSupport(order = 4)
+    public R removeById(@RequestParam @ApiParam(value = "绑定ID，按逗号分隔",required = true) String ids) {
+        return R.status(emVideoBandingService.removeByIds(Func.toLongList(",",ids)));
+    }
+
 }

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java

@@ -57,7 +57,7 @@ public class FdpQuestionServiceImpl implements IFdpQuestionService {
 					.stationName(stationEntity.getName())
 					.type(fdpStationType)
 					.stationDesc(Optional.ofNullable(stationDesc).orElse(""))
-					.tenantId("200000")
+					.tenantId(AuthUtil.getTenantId())
 				.build();
 			if(Func.isNotEmpty(infoReq.getType())) {
 				HttpResponse httpResponse = HttpRequest.post(fdpUrlConfiguration.getSubmitStationInfo())

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/DroolsAlarmService.java

@@ -10,7 +10,5 @@ import java.util.List;
  */
 public interface DroolsAlarmService {
 
-    String message();
-
     List<AlarmEntity> receiveMessage(String message);
 }

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/DroolsAlarmServiceImpl.java

@@ -3,11 +3,10 @@ package com.hnac.hzims.alarm.source.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.hnac.hzims.alarm.config.entity.AlarmEntity;
+import com.hnac.hzims.alarm.config.vo.ConditionAlarmVo;
+import com.hnac.hzims.alarm.show.service.AlarmService;
 import com.hnac.hzims.alarm.source.service.DroolsAlarmService;
 import com.hnac.hzims.alarm.source.service.MessageService;
-import com.hnac.hzims.alarm.show.service.AlarmService;
-import com.hnac.hzims.alarm.config.vo.ConditionAlarmVo;
-import com.hnac.hzims.equipment.feign.IEmInfoClient;
 import com.hnac.hzims.operational.station.entity.StationEntity;
 import com.hnac.hzims.operational.station.feign.IStationClient;
 import lombok.RequiredArgsConstructor;
@@ -39,21 +38,8 @@ public class DroolsAlarmServiceImpl implements DroolsAlarmService {
 
     private final RedisTemplate redisTemplate;
 
-    private final IEmInfoClient deviceClient;
-
     private final IStationClient stationClient;
 
-    public final static String device_cache_cofig_final = "hzims:equipment:emInfo:deviceCode.emInfoList";
-
-    /**
-     * 发送websocket消息
-     * @return
-     */
-    @Override
-    public String message() {
-        return "";
-    }
-
 
     /**
      * 转换接收服务推送消息

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java

@@ -1,11 +1,13 @@
 package com.hnac.hzims.alarm.source.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.hnac.hzims.alarm.config.constants.AlarmConstants;
 import com.hnac.hzims.alarm.config.service.AlarmConfigService;
 import com.hnac.hzims.alarm.config.entity.AlarmEntity;
 import com.hnac.hzims.alarm.source.service.MessageService;
 import com.hnac.hzims.message.MessageConstants;
 import com.hnac.hzims.message.dto.BusinessMessageDTO;
+import com.hnac.hzims.message.dto.SmsImmediatelyPushDTO;
 import com.hnac.hzims.message.dto.SmsPushDto;
 import com.hnac.hzims.message.dto.WxMessageDTO;
 import com.hnac.hzims.message.fegin.IMessageClient;
@@ -14,8 +16,10 @@ import com.hnac.hzims.operational.station.feign.IStationClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictCache;
 import org.springblade.system.feign.ISysClient;
@@ -61,23 +65,29 @@ public class MessageServiceImpl implements MessageService {
             return;
         }
         //通知站点项目经理这个角色
-        List<User> users = userClient.relationUserListByRoleAlias("200000", station.getData().getRefDept(), PROJECT_MANAGER).getData();
+        List<User> users = userClient.relationUserListByRoleAlias(station.getData().getTenantId(), station.getData().getRefDept(), PROJECT_MANAGER).getData();
         if(CollectionUtil.isEmpty(users)){
             return;
         }
-        List<String> phones = users.stream().map(User::getPhone).filter(phone -> !StringUtil.isEmpty(phone)).collect(Collectors.toList());
+        SmsImmediatelyPushDTO push = SmsImmediatelyPushDTO.builder()
-        if(CollectionUtil.isEmpty(phones)){
+                .deptId(entity.getCreateDept())
-            return;
+                .taskId(entity.getId())
-        }
+                .businessKey(MessageConstants.BusinessClassifyEnum.WARNING.getKey())
-        SmsPushDto sms = new SmsPushDto();
+                .businessClassify(MessageConstants.BusinessClassifyEnum.WARNING.getKey())
-        sms.setPhones(phones);
+                .content(entity.getAlarmContext())
-        Map<String, String> params = new HashMap<>();
+                .subject("告警短信通知")
-        params.put("projectName",entity.getStationName());
+                .tenantId(entity.getTenantId())
-        params.put("deviceName",entity.getDeviceCode());
+                .resourceCode(AlarmConstants.SMS_MESSAGE_TEMPLATE_CODE)
-        params.put("ruleDefName",entity.getAlarmContext());
+                .pusher(users.stream().map(o->o.getId().toString()).collect(Collectors.joining(",")))
-        params.put("ts", DateUtil.format(entity.getAlarmTime(),DateUtil.PATTERN_DATETIME));
+                .createUser(station.getData().getCreateUser())
-        sms.setParams(params);
+                .params(new HashMap<String,String>(){{
-        messageClient.sendSmsMessage(sms);
+                    put("projectName",entity.getStationName());
+                    put("deviceName",entity.getDeviceName());
+                    put("ruleDefName",entity.getAlarmContext());
+                    put("ts", DateUtil.format(entity.getAlarmTime(),DateUtil.PATTERN_DATETIME));
+                }})
+                .build();
+        messageClient.sendSmsImmediatelyMsg(push);
     }
 
     /**
@@ -102,7 +112,7 @@ public class MessageServiceImpl implements MessageService {
         message.setBusinessClassify("warning");
         message.setBusinessKey(MessageConstants.BusinessClassifyEnum.WARNING.getKey());
         message.setSubject(MessageConstants.BusinessClassifyEnum.WARNING.getDescription());
-        message.setTaskId(Long.valueOf(entity.getAlarmId()));
+        message.setTaskId(entity.getId());
         message.setTenantId("200000");
         message.setContent(entity.getAlarmContext());
         message.setDeptId(dept);
@@ -121,12 +131,12 @@ public class MessageServiceImpl implements MessageService {
      */
     @Override
     public void weChatMessage(AlarmEntity entity) {
-        R<StationEntity> stationByCode = stationClient.getStationByCode(entity.getStationId());
+        R<StationEntity> station = stationClient.getStationByCode(entity.getStationId());
-        if (!stationByCode.isSuccess() && ObjectUtils.isEmpty(stationByCode.getData())) {
+        if (!station.isSuccess() && ObjectUtils.isEmpty(station.getData())) {
             log.error("消息发送失败:站点code获取失败 : {}",entity);
             return;
         }
-        Long dept = stationByCode.getData().getCreateDept();
+        Long dept = station.getData().getCreateDept();
         // 获取站点用户
         R<List<User>> result = userClient.userListByDeptId(dept);
         if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) {
@@ -162,9 +172,8 @@ public class MessageServiceImpl implements MessageService {
         message.setUserIds(result.getData().stream().map(o->String.valueOf(o.getId())).distinct().collect(Collectors.joining(",")));
         // 创建用户
         message.setCreateUser(result.getData().get(0).getId());
-
         // 租户Id
-        message.setTenantId("200000");
+        message.setTenantId(station.getData().getTenantId());
         messageClient.sendWxMessage(message);
     }
 }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AbnormalAlarmMapper.java

@@ -1,14 +0,0 @@
-package com.hnac.hzims.scheduled.mapper.operation;
-
-import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity;
-import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
-
-import java.util.List;
-
-/**
- * @author ysj
- */
-public interface AbnormalAlarmMapper extends UserDataScopeBaseMapper<AbnormalAlarmEntity> {
-
-	List<String> abnormalAlarms();
-}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/AbnormalAlarmService.java

@@ -1,15 +0,0 @@
-package com.hnac.hzims.scheduled.service.operation.alarm;
-
-import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity;
-import org.springblade.core.mp.base.BaseService;
-
-import java.util.List;
-
-/**
- * 告警处理接口
- * @author ysj
- */
-public interface AbnormalAlarmService extends BaseService<AbnormalAlarmEntity> {
-
-    List<String> abnormalAlarms();
-}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/impl/AbnormalAlarmServiceImpl.java

@@ -1,33 +0,0 @@
-package com.hnac.hzims.scheduled.service.operation.alarm.impl;
-
-import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity;
-import com.hnac.hzims.scheduled.mapper.operation.AbnormalAlarmMapper;
-import com.hnac.hzims.scheduled.service.operation.alarm.AbnormalAlarmService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.tool.utils.CollectionUtil;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 告警实现类
- * @author ysj
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AbnormalAlarmServiceImpl extends BaseServiceImpl<AbnormalAlarmMapper, AbnormalAlarmEntity> implements AbnormalAlarmService {
-
-
-    @Override
-    public List<String> abnormalAlarms() {
-        List<String> alarmList = this.baseMapper.abnormalAlarms();
-        if(CollectionUtil.isEmpty(alarmList)){
-            return new ArrayList<>();
-        }
-        return alarmList;
-    }
-}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java

@@ -20,7 +20,6 @@ import com.hnac.hzims.operational.station.entity.StationAttributeEntity;
 import com.hnac.hzims.operational.station.entity.StationEntity;
 import com.hnac.hzims.scheduled.service.alarm.AlarmQueryService;
 import com.hnac.hzims.scheduled.service.equipment.WorkshopInfoService;
-import com.hnac.hzims.scheduled.service.operation.alarm.AbnormalAlarmService;
 import com.hnac.hzims.scheduled.service.operation.alarm.RecordService;
 import com.hnac.hzims.scheduled.service.operation.monitor.MonitorService;
 import com.hnac.hzims.scheduled.service.operation.station.StationAttrConfigService;
@@ -61,7 +60,6 @@ public class MonitorServiceImpl implements MonitorService {
     private final AlarmQueryService alarmQueryService;
     private final StationAttributeService attbtService;
     private final WorkshopInfoService workshopInfoService;
-    private final AbnormalAlarmService abnormalAlarmService;
     private final StationAttrConfigService attrConfigService;
     private final RedisTemplate redisTemplate;
     private final ISysClient sysClient;

hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AbnormalAlarmMapper.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hnac.hzims.scheduled.mapper.operation.AbnormalAlarmMapper">
-
-    <select id="abnormalAlarms" resultType="java.lang.String">
-        select distinct station_id from hzims_abnormal_alarm
-        where is_deleted = 0
-          and type in (13,14)
-          and `STATUS` = 0
-    </select>
-</mapper>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/AreaMapController.java

@@ -0,0 +1,21 @@
+package com.hnac.hzims.operational.config.controller;
+
+import com.hnac.hzims.operational.config.service.AreaMapService;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @author ysj
+ */
+@RestController
+@AllArgsConstructor
+@Api(value = "区域地图配置",tags = "区域地图配置")
+@RequestMapping("/areaMap")
+public class AreaMapController extends BladeController {
+
+    private AreaMapService areaMapService;
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/AreaMapMapper.java

@@ -0,0 +1,13 @@
+package com.hnac.hzims.operational.config.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzims.operational.config.entity.AreaMapEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface AreaMapMapper extends BaseMapper<AreaMapEntity> {
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/AreaMapMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.operational.config.mapper.AreaMapMapper">
+
+</mapper>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/AreaMapService.java

@@ -0,0 +1,12 @@
+package com.hnac.hzims.operational.config.service;
+
+
+import com.hnac.hzims.operational.config.entity.AreaMapEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface AreaMapService extends BaseService<AreaMapEntity> {
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/AreaMapServiceImpl.java

@@ -0,0 +1,18 @@
+package com.hnac.hzims.operational.config.service.impl;
+
+import com.hnac.hzims.operational.config.entity.AreaMapEntity;
+import com.hnac.hzims.operational.config.mapper.AreaMapMapper;
+import com.hnac.hzims.operational.config.service.AreaMapService;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author ysj
+ */
+@Service
+@RequiredArgsConstructor
+public class AreaMapServiceImpl extends BaseServiceImpl<AreaMapMapper, AreaMapEntity>  implements AreaMapService {
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java

@@ -48,7 +48,7 @@ public class OperMaintenanceMonitorServiceImpl implements IOperMaintenanceMonito
             LocalDate startDate = LocalDate.of(req.getYear(), req.getMonth(), 1);
             eq(OperMaintenancePlanEntity::getIsDeleted, 0L);
             ge(OperMaintenancePlanEntity::getDisposeTime, startDate);
-            lt(OperMaintenancePlanEntity::getDisposeTime, startDate.with(TemporalAdjusters.lastDayOfMonth()));
+            lt(OperMaintenancePlanEntity::getDisposeTime, startDate.plusMonths(1));
             eq(Func.isNotEmpty(req.getDeptId()), OperMaintenancePlanEntity::getCreateDept, req.getDeptId());
         }});