Przeglądaj źródła

全部成員接口

yumeng 5 lat temu
rodzic
commit
eac6debcec

+ 24 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -18,10 +18,8 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.entity.SysUserDepart;
-import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.entity.*;
+import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserDepartsVO;
 import org.jeecg.modules.system.service.*;
@@ -76,6 +74,8 @@ public class SysUserController {
 
     @Autowired
     private IUserCompanyService userCompanyService;
+    @Autowired
+    private SysUserMapper sysUserMapper;
 
 
     @RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
@@ -100,6 +100,26 @@ public class SysUserController {
         return result;
     }
 
+
+    @RequestMapping(value = "/getAllUserList", method = RequestMethod.GET)
+    public Result<List<SysUserVo>> getAllList() {
+        Result<List<SysUserVo>> result = new Result<>();
+        try {
+
+            List<SysUserVo> userList = sysUserService.getAllUser();
+            result.setSuccess(true);
+            result.setResult(userList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+            result.setMessage("请求失败");
+
+        }
+
+        return result;
+    }
+
+
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @RequiresPermissions("user:add")
     public Result<SysUser> add(@RequestBody JSONObject jsonObject) {

+ 33 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserVo.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.system.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户表
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUserVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private String userId;
+
+    private String username;
+
+    private String realName;
+
+    private String roleName;
+
+}

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserVo;
 
 import java.util.List;
 import java.util.Map;
@@ -73,4 +74,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      SysUser getUserByEmail(@Param("email") String email);
 
     Map<String, Object> queryRoleCode(@Param("userId") String userId);
+
+    List<SysUserVo> getAllUser();
 }

+ 14 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -67,4 +67,18 @@ SELECT
 </select>
 
 
+    <select id="getAllUser" resultType="org.jeecg.modules.system.entity.SysUserVo">
+
+      SELECT
+      t1.id userId,
+      t1.username userName,
+      t1.realname realName,
+      (SELECT role_name FROM sys_role WHERE id = t2.role_id ) roleName
+    FROM sys_user t1
+    LEFT JOIN sys_user_role t2 on t1.id = t2.user_id;
+
+
+</select>
+
+
 </mapper>

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -12,6 +12,7 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.modules.system.entity.SysUser;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.entity.SysUserVo;
 
 /**
  * <p>
@@ -125,4 +126,6 @@ public interface ISysUserService extends IService<SysUser> {
 	Result checkUserIsEffective(SysUser sysUser);
 
     Map<String, Object> queryRoleCode(String userId);
+
+    List<SysUserVo> getAllUser();
 }

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -264,4 +264,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public Map<String, Object> queryRoleCode(String userId) {
         return userMapper.queryRoleCode(userId);
     }
+
+    @Override
+    public List<SysUserVo> getAllUser() {
+        return userMapper.getAllUser();
+    }
 }

+ 3 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -13,7 +13,6 @@ import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResult;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
 import cn.com.ctop.kuaishou.modules.report.entity.*;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
 import cn.com.ctop.kuaishou.modules.report.service.*;
 import com.alibaba.fastjson.JSONArray;
@@ -58,14 +57,12 @@ import java.util.concurrent.Executors;
 @Slf4j
 @Service
 public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
-    @Autowired
-    private KuaishouReportDailyAccountMapper dailyAccountMapper;
+
     @Autowired
     KuaishouReportDailyCampaignMapper dailyCampaignMapper;
     @Autowired
     private KuaiShouCampaignCreateMapper kuaiShouCampaignCreateMapper;
-    @Autowired
-    private KuaiShouCampaignMapper campaignMapper;
+
     @Autowired
     private KuaiShouGroupMapper groupMapper;
     @Autowired
@@ -84,8 +81,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     private KuaiShouVideoUploadMapper videoUploadMapper;
     @Autowired
     private KuaiShouVideoMapper kuaiShouVideoMapper;
-    @Autowired
-    private KuaiShouVideoGetMapper videoGetMapper;
+
     @Autowired
     private KuaiShouImageGetMapper imageGetMapper;
     @Autowired