修改bug

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/ChannelConfigMapper.java

@@ -1,44 +0,0 @@
-package cc.iotkit.data.model;
-
-import cc.iotkit.common.utils.JsonUtils;
-import cc.iotkit.model.notify.ChannelConfig;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
-
-import java.util.Objects;
-
-/**
- * @Author: 石恒
- * @Date: 2023/5/11 21:02
- * @Description:
- */
-@Mapper(componentModel = "spring")
-public interface ChannelConfigMapper {
-
-    @Mappings({
-            @Mapping(target = "param", expression = "java(stingToParam(vo.getParam()))")
-    })
-    ChannelConfig toDto(TbChannelConfig vo);
-
-    @Mappings({
-            @Mapping(target = "param", expression = "java(paramToSting(dto.getParam()))")
-    })
-    TbChannelConfig toVo(ChannelConfig dto);
-
-    default String paramToSting(ChannelConfig.ChannelParam param) {
-        if (Objects.isNull(param)) {
-            return null;
-        }
-        return JsonUtils.toJsonString(param);
-
-    }
-
-    default ChannelConfig.ChannelParam stingToParam(String param) {
-        if (Objects.isNull(param)) {
-            return null;
-        }
-        return JsonUtils.parse(param, ChannelConfig.ChannelParam.class);
-
-    }
-}

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/AlertController.java

@@ -12,6 +12,8 @@ package cc.iotkit.manager.controller;
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.api.Request;
+import cc.iotkit.common.satoken.utils.AuthUtil;
+import cc.iotkit.common.satoken.utils.LoginHelper;
 import cc.iotkit.manager.service.AlertService;
 import cc.iotkit.model.alert.AlertConfig;
 import cc.iotkit.model.alert.AlertRecord;
@@ -26,6 +28,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 @Api(tags = {"告警中心"})
 @Slf4j
@@ -62,6 +67,8 @@ public class AlertController {
     @SaCheckPermission("iot:alertConfig:query")
     @PostMapping("/selectAlertConfigPage")
     public Paging<AlertConfig> selectAlertConfigPage(@RequestBody @Validated PageRequest<AlertConfig> request) {
+        request.getData().setTenantId(LoginHelper.getTenantId());
+        request.getData().setUid(AuthUtil.getUserId());
         return alertService.selectAlertConfigPage(request);
     }
 
@@ -70,6 +77,8 @@ public class AlertController {
     @SaCheckPermission("iot:alert:query")
     @PostMapping("/selectAlertRecordPage")
     public Paging<AlertRecord> selectAlertRecordPage(@RequestBody @Validated PageRequest<AlertRecord> request) {
+        request.getData().setTenantId(LoginHelper.getTenantId());
+        request.getData().setUid(AuthUtil.getUserId());
         return alertService.selectAlertRecordPage(request);
     }
 

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/NotifyController.java

@@ -3,6 +3,8 @@ package cc.iotkit.manager.controller;
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.api.Request;
+import cc.iotkit.common.satoken.utils.AuthUtil;
+import cc.iotkit.common.satoken.utils.LoginHelper;
 import cc.iotkit.common.validate.EditGroup;
 import cc.iotkit.common.validate.QueryGroup;
 import cc.iotkit.manager.dto.bo.channel.ChannelConfigBo;
@@ -25,7 +27,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * author: 石恒
@@ -52,6 +56,11 @@ public class NotifyController {
     @SaCheckPermission("iot:channel:query")
     @PostMapping("/channel/config/getList")
     public Paging<ChannelConfigVo> getChannelConfigList(@RequestBody @Validated(QueryGroup.class) PageRequest<ChannelConfigBo> request) {
+        request.getData().setTenantId(LoginHelper.getTenantId());
+        request.getData().setUid(AuthUtil.getUserId());
+        Map<String,String> sortMap = new HashMap<>();
+        sortMap.put("createAt","desc");
+        request.setSortMap(sortMap);
         return notifyService.getChannelConfigList(request);
     }
 
@@ -66,6 +75,8 @@ public class NotifyController {
     @SaCheckPermission("iot:channel:add")
     @PostMapping("/channel/config/add")
     public ChannelConfig addChannelConfig(@RequestBody @Validated(EditGroup.class) Request<ChannelConfig> request) {
+        request.getData().setTenantId(LoginHelper.getTenantId());
+        request.getData().setUid(AuthUtil.getUserId());
         return notifyService.addChannelConfig(request.getData());
     }
 
@@ -94,6 +105,11 @@ public class NotifyController {
     @SaCheckPermission("iot:channel:query")
     @PostMapping("/channel/template/getList")
     public Paging<ChannelTemplateVo> getChannelTemplateList(@RequestBody @Validated(QueryGroup.class) PageRequest<ChannelTemplateBo> request) {
+        request.getData().setTenantId(LoginHelper.getTenantId());
+        request.getData().setUid(AuthUtil.getUserId());
+        Map<String,String> sortMap = new HashMap<>();
+        sortMap.put("createAt","desc");
+        request.setSortMap(sortMap);
         return notifyService.getChannelTemplateList(request);
     }
 
@@ -101,6 +117,8 @@ public class NotifyController {
     @SaCheckPermission("iot:channel:add")
     @PostMapping("/channel/template/add")
     public ChannelTemplate addChannelTemplate(@RequestBody @Validated(EditGroup.class) Request<ChannelTemplateBo> request) {
+        request.getData().setTenantId(LoginHelper.getTenantId());
+        request.getData().setUid(AuthUtil.getUserId());
         return notifyService.addChannelTemplate(request.getData());
     }
 

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/channel/ChannelConfigBo.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @ApiModel(value = "ChannelConfigBo")
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = ChannelConfig.class, reverseConvertGenerate = false)
+@AutoMapper(target = ChannelConfig.class)
 public class ChannelConfigBo extends BaseDto  {
 
 	private static final long serialVersionUID = -1L;
@@ -28,10 +28,18 @@ public class ChannelConfigBo extends BaseDto  {
 	private String title;
 
 	@ApiModelProperty(value="通道配置参数")
-	@AutoMapping(target = "param", expression = "java(cc.iotkit.common.utils.JsonUtils.parse(source.getParam(), ChannelConfig.ChannelParam.class))")
 	private String param;
 
 	@ApiModelProperty(value="创建时间")
 	private Long createAt;
 
+	@ApiModelProperty(value="租户编号")
+	private String tenantId;
+
+	/**
+	 * 配置所属用户
+	 */
+	@ApiModelProperty(value="配置所属用户")
+	private String uid;
+
     }

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/channel/ChannelTemplateBo.java

@@ -21,6 +21,8 @@ public class ChannelTemplateBo extends BaseDto {
     @ExcelProperty(value = "通道模板id")
     private Long id;
 
+
+
     @ApiModelProperty(value="通道配置id")
     @ExcelProperty(value = "通道配置id")
     private Long channelConfigId;
@@ -36,4 +38,13 @@ public class ChannelTemplateBo extends BaseDto {
     @ApiModelProperty(value="创建时间")
     @ExcelProperty(value = "创建时间")
     private Long createAt;
+
+    @ApiModelProperty(value="租户编号")
+    private String tenantId;
+
+    /**
+     * 配置所属用户
+     */
+    @ApiModelProperty(value="配置所属用户")
+    private String uid;
 }

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ruleinfo/RuleInfoBo.java

@@ -24,6 +24,12 @@ public class RuleInfoBo extends BaseDto {
     @ApiModelProperty(value = "id")
     private String id;
 
+    /**
+     * 租户编号
+     */
+    @ApiModelProperty(value = "租户编号")
+    private String tenantId;
+
     @ApiModelProperty(value = "动作")
     private List<RuleAction> actions;
 

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/channel/ChannelConfigVo.java

@@ -34,8 +34,6 @@ public class ChannelConfigVo implements Serializable {
 
     @ApiModelProperty(value="通道配置参数")
     @ExcelProperty(value = "通道配置参数")
-    @ReverseAutoMapping(target = "param", expression = "java(cc.iotkit.common.utils.JsonUtils.toJsonString(source.getParam()))")
-    @AutoMapping(target = "param", expression = "java(cc.iotkit.common.utils.JsonUtils.parse(source.getParam(), ChannelConfig.ChannelParam.class))")
     private String param;
 
     @ApiModelProperty(value="创建时间")

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/AlertService.java

@@ -12,10 +12,14 @@ package cc.iotkit.manager.service;
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.api.Request;
+import cc.iotkit.common.satoken.utils.AuthUtil;
+import cc.iotkit.common.satoken.utils.LoginHelper;
 import cc.iotkit.data.manager.IAlertConfigData;
 import cc.iotkit.data.manager.IAlertRecordData;
+import cc.iotkit.manager.dto.vo.ruleinfo.RuleInfoVo;
 import cc.iotkit.model.alert.AlertConfig;
 import cc.iotkit.model.alert.AlertRecord;
+import cc.iotkit.model.rule.RuleInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +34,8 @@ public class AlertService {
     private IAlertRecordData alertRecordData;
 
     public AlertConfig createAlertConfig(AlertConfig alertConfig) {
+        alertConfig.setTenantId(LoginHelper.getTenantId());
+        alertConfig.setUid(AuthUtil.getUserId());
         return alertConfigData.save(alertConfig);
     }
 
@@ -46,6 +52,6 @@ public class AlertService {
     }
 
     public Paging<AlertRecord> selectAlertRecordPage(PageRequest<AlertRecord> request) {
-        return alertRecordData.selectAlertConfigPage(request);
+        return alertRecordData.selectAlertRecordPage(request);
     }
 }

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/NotifyService.java

@@ -17,11 +17,13 @@ import cc.iotkit.model.notify.ChannelConfig;
 import cc.iotkit.model.notify.ChannelTemplate;
 import cc.iotkit.model.notify.NotifyMessage;
 import cc.iotkit.model.rule.TaskInfo;
+import cc.iotkit.model.system.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * author: 石恒
@@ -57,7 +59,8 @@ public class NotifyService {
     }
 
     public ChannelConfig addChannelConfig(ChannelConfig channelConfig) {
-        return iChannelConfigData.save(channelConfig);
+        channelConfig.setCreateAt(System.currentTimeMillis());
+        return iChannelConfigData.saveChannelConfig(channelConfig);
     }
 
     public ChannelConfig getChannelConfigById(Long id) {
@@ -78,6 +81,9 @@ public class NotifyService {
     }
 
     public ChannelTemplate addChannelTemplate(ChannelTemplateBo channelTemplate) {
+        if(Objects.isNull(channelTemplate.getId())){
+            channelTemplate.setCreateAt(System.currentTimeMillis());
+        }
         return iChannelTemplateData.save(channelTemplate.to(ChannelTemplate.class));
     }
 

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/RuleEngineServiceImpl.java

@@ -77,15 +77,15 @@ public class RuleEngineServiceImpl implements IRuleEngineService {
 //        String type = data.getType();
 //        Integer page = request.getPageNum();
 //        Integer size = request.getPageSize();
-        if (AuthUtil.isAdmin()) {
-            return ruleInfoData.findAll(request.to(RuleInfo.class)).to(RuleInfoVo.class);
-//            return MapstructUtils.convert(ruleInfoData.findByType(type, page, size), RuleInfoVo.class);
-        } else {
+//        if (AuthUtil.isAdmin()) {
+//            return ruleInfoData.findAll(request.to(RuleInfo.class)).to(RuleInfoVo.class);
+////            return MapstructUtils.convert(ruleInfoData.findByType(type, page, size), RuleInfoVo.class);
+//        } else {
             request.getData().setUid(AuthUtil.getUserId());
             return ruleInfoData.findAll(request.to(RuleInfo.class)).to(RuleInfoVo.class);
 //            return MapstructUtils.convert(ruleInfoData.findByUidAndType(AuthUtil.getUserId(),
 //                    request.getData().getType(), request.getPageNum(), request.getPageSize()), RuleInfoVo.class);
-        }
+//        }
     }
 
     @Override

iot-module/iot-message-notify/src/main/java/cc/iotkit/message/listener/PhoneMessageEventListener.java

@@ -1,16 +0,0 @@
-package cc.iotkit.message.listener;
-
-import cc.iotkit.message.model.Message;
-
-/**
- * author: 石恒
- * date: 2023-05-08 15:09
- * description:
- **/
-public class PhoneMessageEventListener implements MessageEventListener {
-
-    @Override
-    public void doEvent(Message message) {
-
-    }
-}

iot-module/iot-message-notify/src/main/java/cc/iotkit/message/listener/VoiceEventListener.java

@@ -1,16 +0,0 @@
-package cc.iotkit.message.listener;
-
-import cc.iotkit.message.model.Message;
-
-/**
- * author: 石恒
- * date: 2023-05-08 15:09
- * description:
- **/
-public class VoiceEventListener implements MessageEventListener {
-
-    @Override
-    public void doEvent(Message message) {
-
-    }
-}

iot-module/iot-message-notify/src/main/java/cc/iotkit/message/notify/EventManager.java

@@ -1,36 +0,0 @@
-package cc.iotkit.message.notify;
-
-import cc.iotkit.message.listener.MessageEventListener;
-import cc.iotkit.message.model.Message;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * author: 石恒
- * date: 2023-05-08 15:17
- * description:
- **/
-public class EventManager {
-
-    Map<Enum<EventType>, List<MessageEventListener>> listeners = new HashMap<>();
-
-    public void subscribe(Enum<EventType> eventType, MessageEventListener listener) {
-        List<MessageEventListener> users = listeners.get(eventType);
-        users.add(listener);
-    }
-
-    public void unsubscribe(Enum<EventType> eventType, MessageEventListener listener) {
-        List<MessageEventListener> users = listeners.get(eventType);
-        users.remove(listener);
-    }
-
-    public void notify(Enum<EventType> eventType, Message result) {
-        List<MessageEventListener> users = listeners.get(eventType);
-        for (MessageEventListener listener : users) {
-            listener.doEvent(result);
-        }
-    }
-
-}

iot-module/iot-message-notify/src/main/java/cc/iotkit/message/notify/EventType.java

@@ -1,10 +0,0 @@
-package cc.iotkit.message.notify;
-
-/**
- * author: 石恒
- * date: 2023-05-08 15:21
- * description:
- **/
-public enum EventType {
-    MQ, Message
-}