Merge branch 'zx_saas_1220' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ClientEnum;
+import com.ym.mec.biz.dal.page.SysSuggestionQueryInfo;
 import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.biz.service.im.ImGroupCoreService;
@@ -43,7 +44,7 @@ public class StudentManageController extends BaseController {
     @Autowired
     private SysSuggestionService suggestionService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private SysUserCashAccountService sysUserCashAccountService;
     @Autowired
@@ -130,10 +131,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "新增建议")
     @PostMapping("suggestion/add")
     public Object add(SysSuggestion sysSuggestion) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            return failed("请重新登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
     	sysSuggestion.setClientType("STUDENT");
         sysSuggestion.setUserId(sysUser.getId().longValue());
         if(StringUtils.isEmpty(sysSuggestion.getMobileNo())){
@@ -143,6 +141,13 @@ public class StudentManageController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "分页查询")
+    @PostMapping("sysSuggestion/queryPage")
+    public Object queryPage(@RequestBody SysSuggestionQueryInfo queryInfo) {
+        queryInfo.setUserId(sysUserService.getUserId());
+        return succeed(suggestionService.queryPage(queryInfo));
+    }
+
     @ApiOperation(value = "获取详情")
     @GetMapping("sysSuggestion/detail")
     public HttpResponseResult<SysSuggestion> detail(Long id) {
@@ -154,10 +159,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "获取学员基本信息")
     @GetMapping("student/queryUserInfo")
 	public Object queryUserInfo(String platform) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (user == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
+		SysUser user = sysUserService.getUser();
 		Student student = studentService.get(user.getId());
 		student.setId(user.getId());
 		student.setUsername(user.getUsername());
@@ -279,21 +281,14 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "获取用户账户信息")
     @GetMapping("userCashAccount/get")
     public Object add() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            return failed("请重新登录");
-        }
-        return succeed(sysUserCashAccountService.get(sysUser.getId()));
+        SysUser sysUser = sysUserService.getUser();
+        return succeed(sysUserCashAccountService.get(sysUserService.getUserId()));
     }
 
     @ApiOperation(value = "分页查询用户交易明细")
     @GetMapping("userCashAccountDetail/queryPage")
     public Object queryPage(CashAccountDetail queryInfo) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(user == null || user.getId() != null){
-            return failed("请重新登录");
-        }
-        queryInfo.setUserId(user.getId());
+        queryInfo.setUserId(sysUserService.getUserId());
         return succeed(sysUserCashAccountDetailService.queryPage(queryInfo));
     }
 
@@ -303,11 +298,7 @@ public class StudentManageController extends BaseController {
         if(sysUserBankCard == null){
             return failed("参数校验异常");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null || sysUser.getId() == null){
-            return failed("获取用户失败");
-        }
-        sysUserBankCard.setUserId(sysUser.getId());
+        sysUserBankCard.setUserId(sysUserService.getUserId());
         return succeed(sysUserBankCardService.add(sysUserBankCard));
     }
 
@@ -317,36 +308,24 @@ public class StudentManageController extends BaseController {
         if(id == null){
             return failed("参数校验失败");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null || sysUser.getId() == null){
-            return failed("获取用户信息失败");
-        }
-        sysUserBankCardService.del(id,sysUser.getId());
+        sysUserBankCardService.del(id,sysUserService.getUserId());
         return succeed();
     }
 
     @ApiOperation(value = "分页查询银行卡信息列表")
     @GetMapping("userBankCard/queryPage")
     public Object queryPage() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null || sysUser.getId() == null){
-            return failed("获取用户失败");
-        }
-        return succeed(sysUserBankCardService.findByUser(sysUser.getId()));
+        return succeed(sysUserBankCardService.findByUser(sysUserService.getUserId()));
     }
 
     @ApiOperation(value = "修改用户")
     @PostMapping(value = "user/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     public Object update(SysUser sysUser) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user != null) {
-            Date date = new Date();
-            sysUser.setId(user.getId());
-            sysUser.setUpdateTime(date);
-            studentManageService.updateUser(sysUser);
-            return succeed();
-        }
-        return failed("获取用户失败");
+        Date date = new Date();
+        sysUser.setId(sysUserService.getUserId());
+        sysUser.setUpdateTime(date);
+        studentManageService.updateUser(sysUser);
+        return succeed();
     }
 
     /**
@@ -368,11 +347,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "获取用户所在分部的年级列表）")
     @GetMapping("studentManage/getGradeList")
     public HttpResponseResult<Map<Integer,String>> getGradeList() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            return failed("请重新登录");
-        }
-        return succeed(organizationService.getGradeList(sysUser.getOrganId()));
+        return succeed(organizationService.getGradeList(sysUserService.getUserId()));
     }
 
     @ApiOperation(value = "url短链接")

mec-application/src/main/java/com/ym/mec/student/controller/SysSuggestionTypeController.java

@@ -0,0 +1,43 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.dal.entity.SysSuggestionType;
+import com.ym.mec.biz.service.SysSuggestionTypeService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "意见反馈类型")
+@RestController
+@RequestMapping("${app-config.url.student:}/sysSuggestionType/")
+public class SysSuggestionTypeController extends BaseController {
+
+    @Autowired
+    private SysSuggestionTypeService sysSuggestionTypeService;
+
+    @ApiOperation(value = "查询所有")
+    @PostMapping("queryAll")
+    public HttpResponseResult<Map<Integer,String>> queryAll() {
+        Map<Integer,String> result = new HashMap<>();
+        List<SysSuggestionType> list = sysSuggestionTypeService.lambdaQuery()
+                .eq(SysSuggestionType::getTenantId, TenantContextHolder.getTenantId())
+                .orderByDesc(SysSuggestionType::getId).list();
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                result.put(item.getId(),item.getType());
+            });
+        }
+        return succeed(result);
+    }
+
+}

mec-application/src/main/java/com/ym/mec/teacher/controller/SysSuggestionTypeController.java

@@ -0,0 +1,43 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.biz.dal.entity.SysSuggestionType;
+import com.ym.mec.biz.service.SysSuggestionTypeService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "意见反馈类型")
+@RestController
+@RequestMapping("${app-config.url.teacher:}/sysSuggestionType/")
+public class SysSuggestionTypeController extends BaseController {
+
+    @Autowired
+    private SysSuggestionTypeService sysSuggestionTypeService;
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("queryAll")
+    public HttpResponseResult<Map<Integer,String>> queryAll() {
+        Map<Integer,String> result = new HashMap<>();
+        List<SysSuggestionType> list = sysSuggestionTypeService.lambdaQuery()
+                .eq(SysSuggestionType::getTenantId, TenantContextHolder.getTenantId())
+                .orderByDesc(SysSuggestionType::getId).list();
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                result.put(item.getId(),item.getType());
+            });
+        }
+        return succeed(result);
+    }
+
+}

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -1,12 +1,12 @@
 package com.ym.mec.teacher.controller;
 
 import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.dal.page.SysSuggestionQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -31,7 +31,7 @@ public class TeacherManageController extends BaseController {
     @Autowired
     private SysSuggestionService suggestionService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private SysUserCashAccountService sysUserCashAccountService;
     @Autowired
@@ -95,10 +95,7 @@ public class TeacherManageController extends BaseController {
     @ApiOperation(value = "新增建议")
     @PostMapping("suggestion/add")
     public Object add(SysSuggestion sysSuggestion) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            return failed("请重新登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
         sysSuggestion.setUserId(sysUser.getId().longValue());
     	sysSuggestion.setClientType("TEACHER");
         if(StringUtils.isEmpty(sysSuggestion.getMobileNo())){
@@ -108,6 +105,13 @@ public class TeacherManageController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "分页查询")
+    @PostMapping("sysSuggestion/queryPage")
+    public Object queryPage(@RequestBody SysSuggestionQueryInfo queryInfo) {
+        queryInfo.setUserId(sysUserService.getUserId());
+        return succeed(suggestionService.queryPage(queryInfo));
+    }
+
     @ApiOperation(value = "根据群编号，获取群组基本信息")
     @GetMapping("/course/findGroupById")
     public Object findGroupById(String imGroupId){
@@ -141,21 +145,13 @@ public class TeacherManageController extends BaseController {
     @ApiOperation(value = "获取用户账户信息")
     @GetMapping("userCashAccount/get")
     public Object add() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            return failed("请重新登录");
-        }
-        return succeed(sysUserCashAccountService.get(sysUser.getId()));
+        return succeed(sysUserCashAccountService.get(sysUserService.getUserId()));
     }
 
     @ApiOperation(value = "分页查询用户交易明细")
     @GetMapping("userCashAccountDetail/queryPage")
     public Object queryPage(CashAccountDetail queryInfo) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(user == null || user.getId() != null){
-            return failed("请重新登录");
-        }
-        queryInfo.setUserId(user.getId());
+        queryInfo.setUserId(sysUserService.getUserId());
         return succeed(sysUserCashAccountDetailService.queryPage(queryInfo));
     }
 
@@ -165,11 +161,7 @@ public class TeacherManageController extends BaseController {
         if(sysUserBankCard == null){
             return failed("参数校验异常");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null || sysUser.getId() == null){
-            return failed("获取用户失败");
-        }
-        sysUserBankCard.setUserId(sysUser.getId());
+        sysUserBankCard.setUserId(sysUserService.getUserId());
         return succeed(sysUserBankCardService.add(sysUserBankCard));
     }
 
@@ -179,22 +171,14 @@ public class TeacherManageController extends BaseController {
         if(id == null){
             return failed("参数校验失败");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null || sysUser.getId() == null){
-            return failed("获取用户信息失败");
-        }
-        sysUserBankCardService.del(id,sysUser.getId());
+        sysUserBankCardService.del(id,sysUserService.getUserId());
         return succeed();
     }
 
     @ApiOperation(value = "分页查询银行卡信息列表")
     @GetMapping("userBankCard/queryPage")
     public Object queryPage() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null || sysUser.getId() == null){
-            return failed("获取用户失败");
-        }
-        return succeed(sysUserBankCardService.findByUser(sysUser.getId()));
+        return succeed(sysUserBankCardService.findByUser(sysUserService.getUserId()));
     }
 
     @ApiOperation(value = "调剂学生报名专业")

mec-application/src/main/java/com/ym/mec/web/controller/SysSuggestionTypeController.java

@@ -18,6 +18,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -25,6 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Api(tags = "意见反馈类型")
 @RestController
 @RequestMapping("${app-config.url.web:}/sysSuggestionType/")
@@ -79,4 +82,13 @@ public class SysSuggestionTypeController extends BaseController {
         return succeed(PageUtil.pageInfo(iPage));
     }
 
+    @ApiOperation(value = "查询")
+    @PostMapping("queryAll")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionType/queryAll')")
+    public HttpResponseResult<List<SysSuggestionType>> queryAll() {
+        return succeed(sysSuggestionTypeService.lambdaQuery()
+                .eq(SysSuggestionType::getTenantId, TenantContextHolder.getTenantId())
+                .orderByDesc(SysSuggestionType::getId).list());
+    }
+
 }

mec-application/src/main/java/com/ym/mec/web/controller/education/EduSysSuggestionController.java

@@ -0,0 +1,77 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.SysSuggestion;
+import com.ym.mec.biz.dal.entity.SysSuggestionType;
+import com.ym.mec.biz.dal.page.SysSuggestionQueryInfo;
+import com.ym.mec.biz.service.SysSuggestionService;
+import com.ym.mec.biz.service.SysSuggestionTypeService;
+import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "意见反馈")
+@RestController
+@RequestMapping("${app-config.url.web:}/eduSuggestion")
+public class EduSysSuggestionController extends BaseController {
+
+    @Autowired
+    private SysSuggestionService suggestionService;
+    @Autowired
+    private SysSuggestionTypeService sysSuggestionTypeService;
+    @Autowired
+    private SysUserService sysUserService;
+
+    @ApiOperation(value = "新增建议")
+    @PostMapping("add")
+    public Object add(SysSuggestion sysSuggestion) {
+        SysUser sysUser = sysUserService.getUser();
+    	sysSuggestion.setClientType("SYSTEM");
+        sysSuggestion.setUserId(sysUser.getId().longValue());
+        if(StringUtils.isEmpty(sysSuggestion.getMobileNo())){
+            sysSuggestion.setMobileNo(sysUser.getPhone());
+        }
+        suggestionService.insert(sysSuggestion);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("queryPage")
+    public Object queryPage(@RequestBody SysSuggestionQueryInfo queryInfo) {
+        queryInfo.setUserId(sysUserService.getUserId());
+        return succeed(suggestionService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "获取详情")
+    @GetMapping("detail")
+    public HttpResponseResult<SysSuggestion> detail(Long id) {
+        return succeed(suggestionService.getDetail(id));
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("queryAll")
+    public HttpResponseResult<Map<Integer,String>> queryAll() {
+        Map<Integer,String> result = new HashMap<>();
+        List<SysSuggestionType> list = sysSuggestionTypeService.lambdaQuery()
+                .eq(SysSuggestionType::getTenantId, TenantContextHolder.getTenantId())
+                .orderByDesc(SysSuggestionType::getId).list();
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                result.put(item.getId(),item.getType());
+            });
+        }
+        return succeed(result);
+    }
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysSuggestionQueryInfo.java

@@ -33,4 +33,6 @@ public class SysSuggestionQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "客户端类型",required = false)
     private String clientType;
+
+    private Integer userId;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SysSuggestionTypeWrapper.java

@@ -0,0 +1,69 @@
+package com.ym.mec.biz.dal.wrapper;
+
+import com.alibaba.fastjson.JSON;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Optional;
+
+/**
+ * app版本信息管理
+ * 2023-11-03 13:55:54
+ */
+@ApiModel(value = "SysSuggestionTypeWrapper对象")
+public class SysSuggestionTypeWrapper {
+
+    @Data
+	@Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" AppVersionInfoQuery-app版本信息管理")
+    public static class AppVersionInfoQuery implements QueryInfo {
+    
+    	@ApiModelProperty("当前页")
+        private Integer page;
+        
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+        
+        @ApiModelProperty("关键字匹配")
+		private String keyword;
+
+        @ApiModelProperty("平台")
+        private String platform;
+
+        @ApiModelProperty("状态")
+        private String status;
+
+        public String getKeyword() {
+            return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
+        }
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static AppVersionInfoQuery from(String json) {
+            return JSON.parseObject(json, AppVersionInfoQuery.class);
+        }
+    }  
+
+	@ApiModel(" AppVersionInfo-app版本信息管理")
+    public static class AppVersionInfo {
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static AppVersionInfo from(String json) {
+            return JSON.parseObject(json, AppVersionInfo.class);
+        }
+	}
+
+}

mec-biz/src/main/resources/config/mybatis/SysSuggestionMapper.xml

@@ -109,6 +109,9 @@
             <if test="operatorId != null">
                 AND ss.operator_id_ = #{operatorId}
             </if>
+            <if test="userId != null">
+                AND ss.user_id_ = #{userId}
+            </if>
             <if test="id != null">
                 AND ss.id_ = #{id}
             </if>