通知公告优化，用户查询API封装

base-modules/service-system/service-system-api/src/main/java/com/usky/system/RemoteUserService.java

@@ -46,4 +46,18 @@ public interface RemoteUserService
      */
     @GetMapping("/user/userList")
     public ApiResult<List<SysUser>> userList();
+
+    /**
+     * 根据ID集合查询用户列表
+     * @return
+     */
+    @PostMapping("/user/userByIdList")
+    public ApiResult<List<SysUser>> userByIdList(List<Integer> userIds);
+
+    /**
+     * 所有用户列表查询
+     * @return
+     */
+    @GetMapping("/user/userAllList")
+    public ApiResult<List<SysUser>> userAllList();
 }

base-modules/service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteUserFallbackFactory.java

@@ -45,6 +45,16 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             public ApiResult<List<SysUser>> userList() {
                 return ApiResult.error("500","获取用户信息:" + throwable.getMessage());
             }
+
+            @Override
+            public ApiResult<List<SysUser>> userByIdList(List<Integer> userIds) {
+                return ApiResult.error("500","获取用户信息:" + throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<List<SysUser>> userAllList() {
+                return ApiResult.error("500","获取所有用户信息:" + throwable.getMessage());
+            }
         };
     }
 }

base-modules/service-system/service-system-biz/pom.xml

@@ -48,6 +48,12 @@
             <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-iot-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/api/SysUserControllerApi.java

@@ -32,4 +32,12 @@ public class SysUserControllerApi implements RemoteUserService {
     public ApiResult<List<SysUser>>userList(){
         return ApiResult.success(iSysUserService.userList());
     }
+
+    public ApiResult<List<SysUser>>userByIdList(List<Integer> userIds){
+        return ApiResult.success(iSysUserService.userByIdList(userIds));
+    }
+
+    public ApiResult<List<SysUser>>userAllList(){
+        return ApiResult.success(iSysUserService.userAllList());
+    }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -159,4 +159,6 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
 
     SysUser selectUserDataOne(@Param("tenantId") Integer tenantId,
                               @Param("phone") String phone);
+
+    public List<SysUser> userAllList();
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -233,6 +233,9 @@ public interface ISysUserService extends CrudService<SysUser> {
 
     public List<SysUser> userList();
 
+    public List<SysUser> userByIdList(List<Integer> userIds);
+
+    public List<SysUser> userAllList();
 
 
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysNoticeServiceImpl.java

@@ -1,14 +1,18 @@
 package com.usky.system.service.impl;
 
 
+import com.usky.common.core.bean.ApiResult;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.iot.RemoteMceService;
 import com.usky.system.domain.SysNotice;
 import com.usky.system.mapper.SysNoticeMapper;
 import com.usky.system.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 公告 服务层实现
@@ -21,6 +25,9 @@ public class SysNoticeServiceImpl extends AbstractCrudService<SysNoticeMapper, S
     @Autowired
     private SysNoticeMapper noticeMapper;
 
+    @Autowired
+    private RemoteMceService remoteMceService;
+
     /**
      * 查询公告信息
      * 
@@ -54,7 +61,14 @@ public class SysNoticeServiceImpl extends AbstractCrudService<SysNoticeMapper, S
     @Override
     public int insertNotice(SysNotice notice)
     {
-        return noticeMapper.insertNotice(notice);
+        int insertId = noticeMapper.insertNotice(notice);
+        Map<String, Object> map = new HashMap<>();
+        map.put("infoTitle", notice.getNoticeTitle());
+        map.put("infoContent",notice.getNoticeContent());
+        map.put("infoType",1);
+        map.put("id",insertId);
+        ApiResult<Void> resultMce = remoteMceService.addMce(map.toString());
+        return insertId;
     }
 
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -602,4 +602,23 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         List<SysUser> list = userMapper.userList(SecurityUtils.getTenantId(), userName);
         return list;
     }
+
+    public List<SysUser> userByIdList(List<Integer> userIds) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        String userType = null;
+        if (loginUser != null && !"".equals(loginUser)) {
+            userType = loginUser.getSysUser().getUserType();
+        }
+        String userName = null;
+        if ("00".equals(userType)) {
+            userName = SecurityUtils.getUsername();
+        }
+        List<SysUser> list = userMapper.userList(SecurityUtils.getTenantId(), userName);
+        return list;
+    }
+
+    public List<SysUser> userAllList() {
+        List<SysUser> list = userMapper.userAllList();
+        return list;
+    }
 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -39,6 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">
 				AND create_by like concat('%', #{createBy}, '%')
 			</if>
+            <if test="noticeId != null and noticeId != ''">
+                AND noticeId = #{noticeId}
+            </if>
+            order by notice_id desc
 		</where>
     </select>
     

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -298,6 +298,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by user_id desc
 	</select>
 
+	<select id="userAllList" resultType="com.usky.system.domain.SysUser">
+		SELECT * FROM sys_user
+		where
+		del_flag=0 and status=0
+		order by user_id desc
+	</select>
+
 	<select id="selectUserData" resultMap="SysUserResult">
 		select * from sys_user
 		where