ソースを参照

操作成功统一code为0

gaodm 6 年 前
コミット
7e2327a23b

+ 0 - 8
diagbotman-service/src/main/java/com/diagbot/facade/OpenedProductsFacade.java

@@ -178,12 +178,4 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         }
         return RespDTO.onSuc(res);
     }
-    /**
-     * 
-     * @param userIds
-     * @return
-     */
-    public List<UserAndProdutDTO> getInformationAvailableByUserIds(List<Long> userIds){
-    	return getInformationAvailableByUserIds(userIds);
-    }
 }

+ 1 - 1
diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -150,7 +150,7 @@ public class ProductOrderController {
     @PostMapping("/getInformationAvailableAll")
     @SysLogger("getInformationAvailableAll")
     @ApiIgnore
-    public RespDTO<List<UserAndProdutDTO>>  getInformationAvailableByUserIds(List<Long> userIds){
+    public RespDTO<List<UserAndProdutDTO>>  getInformationAvailableByUserIds(@RequestBody List<Long> userIds){
     	List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserIds(userIds);
     	return RespDTO.onSuc(UserAndProdutData);
     }

+ 5 - 2
diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -189,7 +189,7 @@
             and a.product_id =#{productId}
         </if>
     </select>
-    <select id="getInformationAvailableByUserIds" resultType="com.diagbot.dto.UserAndProdutDTO">
+    <select id="getInformationAvailableByUserIds" parameterType="java.util.List" resultType="com.diagbot.dto.UserAndProdutDTO">
         SELECT
         a.id as Id,
         a.product_id as productId,
@@ -204,6 +204,9 @@
         ON a.product_id=b.id
         WHERE
         a.is_deleted = "N"
-        AND a.user_id in(#{userId})
+        AND a.user_id in
+        <foreach collection="list" item="ids" open="(" close=")" separator=",">
+            #{ids}
+        </foreach>
     </select>
 </mapper>

+ 25 - 24
user-service/src/main/java/com/diagbot/client/DiagbotmanService.java

@@ -1,24 +1,25 @@
-package com.diagbot.client;
-
-import java.util.List;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import com.diagbot.client.hystrix.DiagbotmanServiceHystrix;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserAndProdutUDTO;
-
-/**
- * 
- * @Description: 调用产品服务
- * @author wangfeng
- * @date 2018年9月26日 下午2:05:45
- */
-@FeignClient(value = "diagbotman-service",fallback = DiagbotmanServiceHystrix.class )
-public interface DiagbotmanService {
-	
-	@PostMapping(value = "/productOrder/getInformationAvailableAll")
-	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(List<Long> userIds);
-
-}
+package com.diagbot.client;
+
+import java.util.List;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.diagbot.client.hystrix.DiagbotmanServiceHystrix;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutUDTO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 
+ * @Description: 调用产品服务
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:05:45
+ */
+@FeignClient(value = "diagbotman-service",fallback = DiagbotmanServiceHystrix.class )
+public interface DiagbotmanClient {
+	
+	@PostMapping(value = "/productOrder/getInformationAvailableAll")
+	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(@RequestBody List<Long> userIds);
+
+}

+ 2 - 2
user-service/src/main/java/com/diagbot/client/hystrix/DiagbotmanServiceHystrix.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import org.springframework.stereotype.Component;
 
-import com.diagbot.client.DiagbotmanService;
+import com.diagbot.client.DiagbotmanClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAndProdutUDTO;
 
@@ -18,7 +18,7 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Component
 @Slf4j
-public class DiagbotmanServiceHystrix implements DiagbotmanService {
+public class DiagbotmanServiceHystrix implements DiagbotmanClient {
 	
 	@Override
 	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(List<Long> userIds){

+ 2 - 10
user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.AuthServiceClient;
-import com.diagbot.client.DiagbotmanService;
+import com.diagbot.client.DiagbotmanClient;
 import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
@@ -12,7 +12,6 @@ import com.diagbot.dto.UserAndProdutUDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserOrgDTO;
-import com.diagbot.dto.UserOrganProductDTO;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
@@ -43,14 +42,9 @@ import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
 import com.diagbot.vo.UserSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -59,8 +53,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.Valid;
-
 /**
  * @Description: 用户业务层
  * @author: gaodm
@@ -88,7 +80,7 @@ public class UserFacade extends UserServiceImpl {
     @Autowired
     PermissionFacade permissionFacade;
     @Autowired
-    DiagbotmanService diagbotmanService;
+    DiagbotmanClient diagbotmanService;
 
     /**
      * 注册