Merge remote-tracking branch 'origin/dev'

张志伟
2 parents af4ecce0 ecbb43bc
Showing 1 changed file with 13 additions and 54 deletions
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/wx/CustomerWxController.java
 package cn.fw.valhalla.controller.wx;
  
+import cn.fw.common.web.annotation.ControllerMethod;
 import cn.fw.common.web.auth.PassportAuthBean;
 import cn.fw.common.web.auth.annotation.CurrentUser;
 import cn.fw.data.base.domain.common.Message;
@@ -12,7 +13,6 @@ import cn.fw.valhalla.domain.vo.customer.CustomerChangeInfoVO;
 import cn.fw.valhalla.service.bus.cust.ContactBizService;
 import cn.fw.valhalla.service.bus.cust.CustomerBizService;
 import cn.fw.valhalla.service.bus.cust.CustomerChangeBizService;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -22,10 +22,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
  
-import static cn.fw.common.web.util.ExceptionHandler.handleException;
-import static cn.fw.common.web.util.ResultBuilder.failureWithMessage;
 import static cn.fw.common.web.util.ResultBuilder.success;
-import static cn.fw.valhalla.common.constant.MessageStr.SAVE_FAILURE;
  
 /**
  * @author : kurisu
@@ -60,16 +57,9 @@ public class CustomerWxController {
      * @return 操作结果
      */
     @GetMapping("/exist/correlation")
+    @ControllerMethod("查询是否关联保有客档案")
     public Message<Boolean> existCorrelation(@CurrentUser PassportAuthBean user, @NotNull(message = "档案ID不能为空") Long customerId) {
-        final String msg = "C端-查询是否关联保有客档案[existCorrelation]";
-        log.info("{},param:[{}]", msg, customerId);
-        try {
-            return success(contactBizService.existCorrelation(user.getUserId(), customerId),
-                    data -> log.info("{} param[{},{}] data[{}]", msg, user, customerId, data));
-        } catch (Exception ex) {
-            handleException(ex, e -> log.error("{}失败：", msg, e));
-            return failureWithMessage("查询是否关联保有客档案失败");
-        }
+        return success(contactBizService.existCorrelation(user.getUserId(), customerId));
     }
  
     /**
@@ -80,16 +70,10 @@ public class CustomerWxController {
      * @return 操作结果
      */
     @PostMapping("/correlation")
+    @ControllerMethod("关联送修人")
     public Message<Boolean> correlation(@CurrentUser PassportAuthBean user,
                                         @Validated @RequestBody CorrelationDto correlationDto) {
-        final String msg = "C端wx-关联送修人[correlation]";
-        log.info("{},param:[{}]", msg, JSONObject.toJSONString(correlationDto));
-        try {
-            return success(contactBizService.correlation(user, correlationDto));
-        } catch (Exception ex) {
-            handleException(ex, e -> log.error("{}失败：", msg, e));
-            return failureWithMessage("关联送修人失败");
-        }
+        return success(contactBizService.correlation(user, correlationDto));
     }
  
     /**
@@ -99,15 +83,9 @@ public class CustomerWxController {
      * @return
      */
     @GetMapping("/info")
+    @ControllerMethod("保有客档案查询")
     public Message<CustomerChangeInfoVO> info(@NotNull(message = "档案id不能为空") Long cusId) {
-        final String msg = "C端wx-保有客档案查询[/info]";
-        log.info("{},param:[{}]", msg, cusId);
-        try {
-            return success(changeBizService.mpGetById(cusId));
-        } catch (Exception ex) {
-            handleException(ex, e -> log.error("{}失败：", msg, e));
-            return failureWithMessage("保有客档案信息获取失败");
-        }
+        return success(changeBizService.mpGetById(cusId));
     }
  
     /**
@@ -118,16 +96,10 @@ public class CustomerWxController {
      * @return
      */
     @GetMapping("/change/info")
+    @ControllerMethod("保有客档案变更基本信息回显")
     public Message<CustomerChangeInfoVO> changeInfo(@CurrentUser PassportAuthBean user,
                                                     @NotBlank(message = "口令不能为空") String key) {
-        final String msg = "C端wx-保有客档案变更基本信息回显[/change/info]";
-        log.info("{},param:[{}]", msg, key);
-        try {
-            return success(changeBizService.getInfo(user, key));
-        } catch (Exception ex) {
-            handleException(ex, e -> log.error("{}失败：", msg, e));
-            return failureWithMessage("保有客档案变更基本信息获取失败");
-        }
+        return success(changeBizService.getInfo(user, key));
     }
  
     /**
@@ -136,15 +108,9 @@ public class CustomerWxController {
      * @param dto 档案信息
      */
     @PostMapping("/save")
+    @ControllerMethod("修改档案信息")
     public Message<Long> updateOrCreate(@CurrentUser PassportAuthBean user, @Validated @RequestBody final CustomerChangeDto dto) {
-        final String msg = "修改档案信息[save]";
-        log.info("{}: param[{}]", msg, dto);
-        try {
-            return success(changeBizService.updateOrSave(user, dto));
-        } catch (Exception ex) {
-            handleException(ex, e -> log.error("{}失败：param[{}]", msg, dto, e));
-            return failureWithMessage(SAVE_FAILURE);
-        }
+        return success(changeBizService.updateOrSave(user, dto));
     }
  
     /**
@@ -154,15 +120,8 @@ public class CustomerWxController {
      * @return
      */
     @GetMapping("/car/list")
+    @ControllerMethod("查询所有档案")
     public Message<List<CarArchiveVO>> carList(@CurrentUser PassportAuthBean user) {
-        final String msg = "C端wx-查询所有档案[/car/default]";
-        log.info("{}", msg);
-        try {
-            return success(customerBizService.defaultCustomer(user.getUserId()),
-                    data -> log.info("{}: data.size[{}]", msg, data.size()));
-        } catch (Exception ex) {
-            handleException(ex, e -> log.error("{}失败：", msg, e));
-            return failureWithMessage("查询所有档案失败");
-        }
+        return success(customerBizService.defaultCustomer(user.getUserId()));
     }
 }