Merge branch '20220505' into 'master'

refactor: 意见反馈业务逻辑调整

See merge request huang/thingsboard3.3.2!93

@@ -249,7 +249,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
 
 
         //Thingskit function
         //Thingskit function
         JsonNode old = JacksonUtil.toJsonNode(request.getAdditionalInfo());
         JsonNode old = JacksonUtil.toJsonNode(request.getAdditionalInfo());
-        ObjectNode additional = old.isEmpty() ?mapper.createObjectNode():(ObjectNode)old;
+        ObjectNode additional = (old == null || old.isEmpty()) ?mapper.createObjectNode():(ObjectNode)old;
         if(!additional.has("cmdType")){
         if(!additional.has("cmdType")){
             additional.put("cmdType", DeviceTransportType.MQTT.name());
             additional.put("cmdType", DeviceTransportType.MQTT.name());
         }
         }

@@ -23,13 +23,13 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("api/yt/opinion")
 @RequestMapping("api/yt/opinion")
 @Api(tags = {"意见反馈"})
 @Api(tags = {"意见反馈"})
 @RequiredArgsConstructor
 @RequiredArgsConstructor
-@PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
 public class YtOpinionController extends BaseController {
 public class YtOpinionController extends BaseController {
 
 
     private final YtOpinionService opinionService;
     private final YtOpinionService opinionService;
 
 
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
     @ApiOperation("分页")
+    @PreAuthorize("hasAnyAuthority('PLATFORM_ADMIN','SYS_ADMIN')")
     public YtPageData<YtOpinionDTO> pageAlarmProfile(
     public YtPageData<YtOpinionDTO> pageAlarmProfile(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(PAGE) int page,
@@ -58,6 +58,7 @@ public class YtOpinionController extends BaseController {
     }
     }
 
 
     @DeleteMapping
     @DeleteMapping
+    @PreAuthorize("hasAnyAuthority('PLATFORM_ADMIN','SYS_ADMIN')")
     @ApiOperation("删除")
     @ApiOperation("删除")
     public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
     public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
             throws ThingsboardException {
             throws ThingsboardException {
@@ -66,6 +67,7 @@ public class YtOpinionController extends BaseController {
     }
     }
 
 
     @GetMapping("{entityId}")
     @GetMapping("{entityId}")
+    @PreAuthorize("hasAnyAuthority('PLATFORM_ADMIN','SYS_ADMIN')")
     @ApiOperation("详情")
     @ApiOperation("详情")
     public YtOpinionDTO detail(@PathVariable("entityId") String entityId)
     public YtOpinionDTO detail(@PathVariable("entityId") String entityId)
             throws ThingsboardException {
             throws ThingsboardException {

@@ -45,7 +45,7 @@ public class YtOpinionServiceImpl extends AbstractBaseService<YtOpinionMapper, Y
   @Override
   @Override
   public YtOpinionDTO detail(String tenantId, String entityId) {
   public YtOpinionDTO detail(String tenantId, String entityId) {
     Wrapper filter = new QueryWrapper<YtOpinionEntity>().lambda()
     Wrapper filter = new QueryWrapper<YtOpinionEntity>().lambda()
-            .eq(YtOpinionEntity::getTenantId,tenantId)
+//            .eq(YtOpinionEntity::getTenantId,tenantId)
             .eq(YtOpinionEntity::getId,entityId);
             .eq(YtOpinionEntity::getId,entityId);
     YtOpinionEntity self = baseMapper.selectOne(filter);
     YtOpinionEntity self = baseMapper.selectOne(filter);
     return     self.getDTO(YtOpinionDTO.class);
     return     self.getDTO(YtOpinionDTO.class);
@@ -76,7 +76,7 @@ public class YtOpinionServiceImpl extends AbstractBaseService<YtOpinionMapper, Y
   @Transactional(rollbackFor=Exception.class)
   @Transactional(rollbackFor=Exception.class)
   public boolean deleteDataByIds(DeleteDTO deleteDTO) {
   public boolean deleteDataByIds(DeleteDTO deleteDTO) {
     Wrapper filter = new QueryWrapper<YtOpinionEntity>().lambda()
     Wrapper filter = new QueryWrapper<YtOpinionEntity>().lambda()
-            .eq(YtOpinionEntity::getTenantId,deleteDTO.getTenantId())
+//            .eq(YtOpinionEntity::getTenantId,deleteDTO.getTenantId())
             .in(YtOpinionEntity::getId,deleteDTO.getIds());
             .in(YtOpinionEntity::getId,deleteDTO.getIds());
     return baseMapper.delete(filter) > 0;
     return baseMapper.delete(filter) > 0;
   }
   }

@@ -117,18 +117,19 @@ class ReactState {
             ctx.tellSuccess(msg);
             ctx.tellSuccess(msg);
         }
         }
 
 
-        boolean matched;
+        boolean matched = false;
         if (triggers == null || triggers.isEmpty()) {
         if (triggers == null || triggers.isEmpty()) {
             matched = true;
             matched = true;
         } else {
         } else {
-            matched = false;
+            boolean itemMatched = false;
             for (TriggerDTO trigger : triggers) {
             for (TriggerDTO trigger : triggers) {
                 TriggerState triggerState = getOrCreateTriggerState(trigger, deviceId);
                 TriggerState triggerState = getOrCreateTriggerState(trigger, deviceId);
                 if (triggerState == null) {
                 if (triggerState == null) {
                     continue;
                     continue;
                 }
                 }
-                matched = triggerState.process(ctx, msg);
-                if (matched) {
+                itemMatched = triggerState.process(ctx, msg);
+                if (itemMatched) {
+                    matched = true;
                     detail.append(triggerState.getAlarmDetails());
                     detail.append(triggerState.getAlarmDetails());
                     if (this.alarmAction != null) {
                     if (this.alarmAction != null) {
                         noticeMsg(ctx, msg, alarmAction, deviceId, triggerState.getAlarmDetails(), triggerState.getLatestValues().getTs());
                         noticeMsg(ctx, msg, alarmAction, deviceId, triggerState.getAlarmDetails(), triggerState.getLatestValues().getTs());