feat：接口返回方式调整

haoban-manage3-service/src/test/java/TestQo.java

+import com.gic.haoban.base.api.common.AppJSONField;
+
+import java.io.Serializable;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class TestQo implements Serializable {
+    private String id;
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

haoban-manage3-service/src/test/java/test.java

@@ -6,8 +6,11 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import cn.hutool.cache.CacheUtil;
+import cn.hutool.cache.impl.TimedCache;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -15,16 +18,30 @@ import org.apache.commons.lang3.time.DateUtils;
 
 
 public class test {
+    private static final TimedCache<String, TestQo> cache = CacheUtil.newTimedCache(3000L);
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
         Date date = new Date();
         Date tomrrow = DateUtils.addDays(date, 1);
         Date yestory = DateUtils.addDays(date, -1);
         long l = DateUtil.betweenDay(tomrrow, date, true);
 
         long l2 = DateUtil.betweenDay(date, tomrrow, true);
-
+        TestQo qo=new TestQo();
+        qo.setName("test");
         System.out.println(l + "=" + l2);
+
+        cache.put("test",qo);
+        Thread.sleep(1000L);
+        TestQo test = cache.get("test");
+        System.out.println(JSONObject.toJSONString(test));
+
+        Thread.sleep(4000L);
+        System.out.println(JSONObject.toJSONString(test));
+
+        test = cache.get("test");
+        System.out.println(JSONObject.toJSONString(test));
+
 //        String key = "3.2.1";
 //        String[] split = key.split(".");
 //

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -676,7 +676,6 @@ public class ClerkController extends WebBaseController {
     /**
      * 未关联导购列表
      *
-     * @param keyword
      * @param wxEnterpriseId
      * @param staffId
      * @return
@@ -1174,11 +1173,11 @@ public class ClerkController extends WebBaseController {
      */
     @RequestMapping("customer-info")
     @IgnoreLogin
-    public HaobanResponse customerInfo(@RequestBody @Valid CommonQO qo) {
+    public RestResponse customerInfo(@RequestBody @Valid CommonQO qo) {
         CustomerFriendMemberVO ret = new CustomerFriendMemberVO();
         StaffDTO staffDTO = staffApiService.selectById(qo.getStaffId());
         if (staffDTO == null) {
-            return resultResponse(HaoBanErrCode.ERR_6);
+            return RestResponse.failure(HaoBanErrCode.ERR_6.getCode()+"",HaoBanErrCode.ERR_6.getMsg());
         }
         int friendCount = externalClerkRelatedApiService.countFriendCountByClerkId(qo.getWxEnterpriseId(), qo.getEnterpriseId(), staffDTO.getWxUserId(), qo.getClerkId());
         int memberCount = customerApiService.countMember(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId());
@@ -1186,7 +1185,7 @@ public class ClerkController extends WebBaseController {
         ret.setFriendCount(friendCount);
         ret.setMemberCount(memberCount);
 
-        return resultResponse(HaoBanErrCode.ERR_1, ret);
+        return RestResponse.successResult(ret);
     }
 
     /**
@@ -1196,10 +1195,10 @@ public class ClerkController extends WebBaseController {
      */
     @RequestMapping("can-relation-count")
     @IgnoreLogin
-    public HaobanResponse canRelationCount(@RequestBody @Valid CommonQO qo) {
+    public RestResponse canRelationCount(@RequestBody @Valid CommonQO qo) {
         List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(qo.getWxEnterpriseId());
         if (list == null || list.isEmpty()) {
-            return resultResponse(HaoBanErrCode.ERR_1);
+            return RestResponse.successResult();
         }
         List<String> enterpriseIdList = list.stream().filter(s -> {
             boolean over = isEnterpriseOver(s.getEnterpriseId());
@@ -1208,7 +1207,7 @@ public class ClerkController extends WebBaseController {
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(qo.getWxEnterpriseId());
         List<ClerkDTO> clerkList = this.getUnbindClerkList(enterpriseIdList, storeIds, qo.getStaffId());
 
-        return resultResponse(HaoBanErrCode.ERR_1, clerkList.size());
+        return RestResponse.successResult(clerkList.size());
     }
 
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/NotifyController.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.web.qo.PageQo;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
@@ -50,7 +51,7 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/commission/list")
-    public HaobanResponse pendingList(@RequestBody @Valid PendingListQO qo) {
+    public RestResponse pendingList(@RequestBody @Valid PendingListQO qo) {
         PendingListQDTO pendingListQDTO = EntityUtil.changeEntityByOrika(PendingListQDTO.class, qo);
         pendingListQDTO.setFinishFlag(0);
         pendingListQDTO.setOverdueFlag(0);
@@ -63,7 +64,7 @@ public class NotifyController extends WebBaseController {
         ServiceResponse<Page<PendingTaskDetailDTO>> retPage = pendingTaskApiService.pagePendingTask(pendingListQDTO, qo.getBasePageInfo());
 
         PageResult2 pageInfo = PageUtil.getPageInfo(retPage.getResult());
-        return resultResponse(HaoBanErrCode.ERR_1, pageInfo);
+        return RestResponse.successResult(pageInfo);
     }
 
     /**
@@ -72,10 +73,10 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/commission/today-list")
-    public HaobanResponse pendingToday(@RequestBody @Valid CommonQO qo) {
+    public RestResponse pendingToday(@RequestBody @Valid CommonQO qo) {
         ServiceResponse<List<PendingTaskDetailDTO>> response = pendingTaskApiService
                 .listPendingTaskToday(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId(), false);
-        return resultResponse(HaoBanErrCode.ERR_1, response.getResult());
+        return RestResponse.successResult(response.getResult());
     }
 
 
@@ -85,7 +86,7 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/commission/filter-info")
-    public HaobanResponse filterInfo(@RequestBody @Valid CommonQO qo) {
+    public RestResponse filterInfo(@RequestBody @Valid CommonQO qo) {
         Map<String, Object> ret = new HashMap<String, Object>();
 
         List<PairValVO> taskTypes = new ArrayList<PairValVO>();
@@ -112,7 +113,7 @@ public class NotifyController extends WebBaseController {
         ret.put("taskTypes", taskTypes);
         ret.put("filter", filter);
 
-        return resultResponse(HaoBanErrCode.ERR_1, ret);
+        return RestResponse.successResult(ret);
     }
 
 
@@ -122,9 +123,9 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/list")
-    public HaobanResponse list(@RequestBody @Valid MessageListQO qo) {
+    public RestResponse list(@RequestBody @Valid MessageListQO qo) {
         ServiceResponse<Page<NoticeMessageInfoDTO>> retPage = noticeMessageService.pageNoticeMessage(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId(), qo.getCategoryType(), qo.getBasePageInfo());
-        return resultResponse(HaoBanErrCode.ERR_1, PageUtil.getPageInfo(retPage.getResult()));
+        return RestResponse.successResult(PageUtil.getPageInfo(retPage.getResult()));
     }
 
     /**
@@ -133,12 +134,12 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/read")
-    public HaobanResponse readSingle(Long noticeMessageId) {
+    public RestResponse readSingle(Long noticeMessageId) {
         if (noticeMessageId == null) {
-            return resultResponse(HaoBanErrCode.ERR_2);
+            return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"",HaoBanErrCode.ERR_2.getMsg());
         }
         noticeMessageService.updateReadFlagById(noticeMessageId);
-        return resultResponse(HaoBanErrCode.ERR_1);
+        return RestResponse.successResult();
     }
 
     /**
@@ -158,7 +159,7 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/category")
-    public HaobanResponse category(@RequestBody @Valid MessageListQO qo) {
+    public RestResponse category(@RequestBody @Valid MessageListQO qo) {
         List<PairValVO> ret = new ArrayList<PairValVO>();
         NoticeMessageCategoryTypeEnum[] values = NoticeMessageCategoryTypeEnum.values();
         for (NoticeMessageCategoryTypeEnum val : values) {
@@ -167,7 +168,7 @@ public class NotifyController extends WebBaseController {
             vo.setName(val.getName());
             ret.add(vo);
         }
-        return resultResponse(HaoBanErrCode.ERR_1, ret);
+        return RestResponse.successResult(ret);
     }
 
 
@@ -177,9 +178,9 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/count")
-    public HaobanResponse messageCount(@RequestBody @Valid MessageListQO qo) {
+    public RestResponse messageCount(@RequestBody @Valid MessageListQO qo) {
         ServiceResponse<Integer> ret = noticeMessageService.countUnReadNoticeMessage(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId());
-        return resultResponse(HaoBanErrCode.ERR_1, ret.getResult());
+        return RestResponse.successResult(ret.getResult());
     }