通知规则接口修改

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/notice/controller/CoreNoticeRuleController.java

@@ -42,6 +42,13 @@ public class CoreNoticeRuleController {
         return AjaxResult.success(coreNoticeRuleService.selectUserList(dto));
     }
 
+    @ApiOperation(value = "查询机构下用户")
+    //@RequiresPermissions("core:noticeRule:getSelectUser")
+    @GetMapping("/getSelectUser/{orgId}")
+    public AjaxResult getSelectUserByOrgId(@PathVariable Long orgId) throws InterruptedException {
+        return AjaxResult.success(coreNoticeRuleService.selectUserListByOrgId(orgId));
+    }
+
     @ApiOperation(value = "查询传感器类型")
     //@RequiresPermissions("core:noticeRule:getSelectUser")
     @GetMapping("/getSelectProductType")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/notice/mapper/CoreNoticeRuleMapper.java

@@ -27,5 +27,7 @@ public interface CoreNoticeRuleMapper extends BaseMapper<CoreNoticeRule> {
 
     List<SelectUserVo> selectUserList(@Param("orgIds")List<Long> orgIds);
 
+    List<SelectUserVo> selectUserListByOrgId(@Param("orgId")Long orgId);
+
     List<SelectProductVo> selectProductTypeList();
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/notice/service/ICoreNoticeRuleService.java

@@ -24,6 +24,8 @@ public interface ICoreNoticeRuleService extends IService<CoreNoticeRule> {
 
     List<SelectUserVo> selectUserList(CoreNoticeRuleDto dto);
 
+    List<SelectUserVo> selectUserListByOrgId(Long orgId);
+
     List<SelectProductVo> selectProductTypeList();
 
     void saveOrUpdate(CoreNoticeRuleDto dto);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/notice/service/impl/CoreNoticeRuleServiceImpl.java

@@ -54,6 +54,11 @@ public class CoreNoticeRuleServiceImpl extends ServiceImpl<CoreNoticeRuleMapper,
     }
 
     @Override
+    public List<SelectUserVo> selectUserListByOrgId(Long orgId) {
+        return baseMapper.selectUserListByOrgId(orgId);
+    }
+
+    @Override
     public List<SelectProductVo> selectProductTypeList() {
         return baseMapper.selectProductTypeList();
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/notice/vo/SelectUserVo.java

@@ -13,4 +13,9 @@ public class SelectUserVo {
     private String name;
 
     private String username;
+
+    //多个角色用逗号隔开
+    private String roleIds;
+
+    private String roleNames;
 }

soc-modules/soc-modules-core/src/main/resources/mapper/notice/CoreNoticeRuleMapper.xml

@@ -36,4 +36,21 @@
     <select id="selectProductTypeList" resultType="com.xunmei.core.notice.vo.SelectProductVo">
         select product_type,product_name from iot_alarm_system_field where alarm_rule_property = 1 and `enable` = 1 GROUP BY product_type ;
     </select>
+    <select id="selectUserListByOrgId" resultType="com.xunmei.core.notice.vo.SelectUserVo">
+        SELECT
+            u.id,
+            u.`name`,
+            u.username,
+            GROUP_CONCAT( DISTINCT r.role_id ) AS roleIds,
+            GROUP_CONCAT( DISTINCT o.role_name ) AS roleNames
+        FROM
+            sys_user u
+                LEFT JOIN sys_user_role r ON r.user_id = u.id
+                LEFT JOIN sys_role o ON r.role_id = o.id
+        WHERE
+            u.is_lock = 0
+            AND u.org_id = #{orgId}
+        GROUP BY
+            u.id
+    </select>
 </mapper>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/NoticeServiceImpl.java

@@ -108,7 +108,7 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeLogMapper, WebsocketNot
     @Override
     public void endNotice(List<WebSocketSendVo> list) {
         if (list != null && list.size() > 0){
-            //修改发送记录（为主机结束报警）
+            //修改发送记录（为设备自动结束报警）
             JSONObject object = new JSONObject(list.get(0).getContent());
             WebSocketNoticeVo noticeVo = object.toBean(WebSocketNoticeVo.class);
             Long iotAlarmDataId = noticeVo.getIotAlarmDataId();