Merge remote-tracking branch 'origin/feature-201825-wangcz' into feature-201825-wangcz

src/main/java/com/uas/platform/b2c/common/psmessage/OrderCompleteInfo.java

@@ -1,7 +0,0 @@
-package com.uas.platform.b2c.common.psmessage;
-
-/**
- * Created by yujia on 2018/7/12.
- */
-public interface OrderCompleteInfo {
-}

src/main/java/com/uas/platform/b2c/common/psmessage/controller/MessageController.java

@@ -1,61 +0,0 @@
-package com.uas.platform.b2c.common.psmessage.controller;
-
-import com.uas.platform.b2c.common.message.model.MessageModel;
-import com.uas.platform.b2c.common.psmessage.service.MessageService;
-import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.model.PageParams;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * 获取ps-message保存的站内信的接口
- *
- * @author yuj 2018-07-11 17:01
- */
-@RestController
-@RequestMapping("/webMessage")
-public class MessageController {
-
-    private final MessageService messageService;
-
-    @Autowired
-    public MessageController(MessageService messageService) {
-        this.messageService = messageService;
-    }
-
-    /**
-     * 根据分页信息和过滤类型分页获取站内信
-     * @param params
-     * @param type
-     * @return
-     */
-    @RequestMapping(value = "/page", method = RequestMethod.GET)
-    public Page<MessageModel> findByPageAndParams(PageParams params, String type) {
-        return messageService.findByPageAndParams(params, type);
-    }
-
-
-    /**
-     * 获取未读消息数量
-     * @return
-     */
-    @RequestMapping(value = "/count/unread", method = RequestMethod.GET)
-    public Map<String, Object> getUnReadMessageCount(String type) {
-        return messageService.getUnReadMessageCount(type);
-    }
-
-    /**
-     * 阅读消息
-     * @param messageId 消息接收者信息
-     * @return
-     */
-    @RequestMapping(value = "/read", method = RequestMethod.POST)
-    public ResultMap read(Long messageId) {
-        return messageService.readMessage(messageId);
-    }
-}

src/main/java/com/uas/platform/b2c/common/psmessage/dao/OrderCompleteInfoDao.java

@@ -1,13 +0,0 @@
-package com.uas.platform.b2c.common.psmessage.dao;
-
-import com.uas.platform.b2c.common.psmessage.model.OrderCompleteInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by yujia on 2018/7/12.
- */
-@Repository
-public interface OrderCompleteInfoDao extends JpaRepository<OrderCompleteInfo, Long>, JpaSpecificationExecutor<OrderCompleteInfo> {
-}

src/main/java/com/uas/platform/b2c/common/psmessage/model/OrderCompleteInfo.java

@@ -1,61 +0,0 @@
-package com.uas.platform.b2c.common.psmessage.model;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * Created by yujia on 2018/7/12.
- */
-@Entity
-@Table(name = "ordercompleteinfo")
-public class OrderCompleteInfo implements Serializable {
-
-
-    private static final long serialVersionUID = 3488774334604983126L;
-
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name = "order_id")
-    private String orderId;
-
-    @Column(name = "remark")
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public OrderCompleteInfo setId(Long id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public OrderCompleteInfo setOrderId(String orderId) {
-        this.orderId = orderId;
-        return this;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public OrderCompleteInfo setRemark(String remark) {
-        this.remark = remark;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "OrderCompleteInfo{" +
-                "id=" + id +
-                ", orderId='" + orderId + '\'' +
-                '}';
-    }
-}

src/main/java/com/uas/platform/b2c/common/psmessage/service/MessageService.java

@@ -1,66 +0,0 @@
-package com.uas.platform.b2c.common.psmessage.service;
-
-import com.uas.platform.b2c.common.message.model.MessageModel;
-import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.model.PageParams;
-import org.springframework.data.domain.Page;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 公共消息服务接口
- * Created by wangyc on 2018/6/29.
- *
- * @version 2018/6/29 15:06 wangyc
- */
-public interface MessageService {
-
-    /**
-     * 发送消息
-     * @param messageModel 消息实体
-     * @return
-     */
-    String sendMessage(List<MessageModel> messageModel);
-
-
-
-    /**
-     * 根据分页信息和过滤类型分页获取站内信
-     * @param params
-     * @param type
-     * @return
-     */
-    Page<MessageModel> findByPageAndParams(PageParams params, String type);
-
-
-
-
-    /**
-     * 根据所给字段生成消息
-     * @param content 消息内容
-     * @param type 消息类型
-     * @param receiverUu 接收人
-     * @param receiverEnuu 接收企业
-     * @param consumerType 消费类型
-     * @param consumerApp 消费应用
-     * @param smsType
-     * @return
-     */
-    MessageModel initMessage(String content, String type, Long receiverUu, Long receiverEnuu, String consumerType,String consumerApp, String smsType, String remark, Long... args);
-
-
-    /**
-     * 获取未读消息数量
-     * @return
-     */
-    Map<String, Object> getUnReadMessageCount(String type);
-
-    /**
-     * 短信
-     *
-     * @param messageId 消息的接口
-     * @return ModelMap
-     */
-    ResultMap readMessage(Long messageId);
-}

src/main/java/com/uas/platform/b2c/common/psmessage/service/impl/MessageServiceImpl.java

@@ -1,290 +0,0 @@
-package com.uas.platform.b2c.common.psmessage.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2c.common.account.model.Enterprise;
-import com.uas.platform.b2c.common.account.model.User;
-import com.uas.platform.b2c.common.account.service.EnterpriseService;
-import com.uas.platform.b2c.common.account.service.UserService;
-import com.uas.platform.b2c.common.message.model.MessageModel;
-import com.uas.platform.b2c.common.message.type.ConsumerApp;
-import com.uas.platform.b2c.common.message.type.ProducerApp;
-import com.uas.platform.b2c.common.psmessage.service.MessageService;
-import com.uas.platform.b2c.common.psmessage.util.JsonObjectUtil;
-import com.uas.platform.b2c.core.config.SysConf;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.utils.FastjsonUtils;
-import com.uas.platform.b2c.prod.commodity.constant.IntegerConstant;
-import com.uas.platform.b2c.trade.support.CodeType;
-import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.b2c.trade.util.BoundedExecutor;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.util.HttpUtil;
-import org.apache.commons.collections.map.HashedMap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * Created by wangyc on 2018/6/29.
- *
- * @version 2018/6/29 15:12 wangyc
- */
-@Service
-public class MessageServiceImpl implements MessageService {
-
-    private final SysConf sysConf;
-
-    private final BoundedExecutor executor;
-
-    private final EnterpriseService enterpriseService;
-
-    private final UserService userService;
-
-    @Autowired
-    public MessageServiceImpl(SysConf sysConf, EnterpriseService enterpriseService, UserService userService) {
-        this.sysConf = sysConf;
-        this.enterpriseService = enterpriseService;
-        this.userService = userService;
-        ExecutorService executorService = Executors.newCachedThreadPool();
-        executor = new BoundedExecutor(executorService, 1600);
-    }
-
-    @Override
-    public String sendMessage(final List<MessageModel> models) {
-        final Runnable sendMessage = new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    String result = HttpUtil.doPost(sysConf.getMessageServiceUrl() + "messages", FastjsonUtils.toJson(models));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        };
-        try {
-            executor.submitTask(sendMessage);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            return "false";
-        }
-        return "true";
-    }
-
-
-    /**
-     * 根据分页信息和过滤类型分页获取站内信
-     *
-     * @param params
-     * @param type
-     * @return
-     */
-    @Override
-    public Page<MessageModel> findByPageAndParams(PageParams params, String type) {
-        if (params == null) {
-            params = new PageParams();
-            params.setPage(1);
-            params.setCount(10);
-        } else {
-            int page = params.getPage();
-            if (page < 1) {
-                params.setPage(1);
-            }
-            int count = params.getCount();
-            if (count < 1) {
-                params.setCount(10);
-            }
-        }
-        Map<String, Object> map = new HashedMap();
-        map.put("consumerApp", ConsumerApp.MALL);
-        map.put("isRead", 0);
-        map.put("page", params.getPage());
-        map.put("count", params.getCount());
-        map.put("sorting", "{\"createTime\":\"DESC\"}");
-        if (!StringUtils.isEmpty(type)) {
-            map.put("type", type);
-        }
-        User user = SystemSession.getUser();
-        if (user != null) {
-            map.put("receiverUu", user.getUserUU());
-            Enterprise enterprise = user.getEnterprise();
-            if (enterprise != null) {
-                map.put("receiverEnuu", enterprise.getUu());
-            }
-        }
-        try {
-            HttpUtil.Response response = HttpUtil.sendGetRequest(sysConf.getMessageServiceUrl() + "/messages", map);
-            int statusCode = response.getStatusCode();
-            if (statusCode == HttpStatus.OK.value()) {
-                String text = response.getResponseText();
-                if (!StringUtils.isEmpty(text)) {
-                    JSONObject jsonObject = FastjsonUtils.fromJson(text, JSONObject.class);
-                    Page<MessageModel> messageModels = JsonObjectUtil.convertToMessageModelPage(jsonObject);
-                    for (MessageModel messageModel : messageModels) {
-                            if (messageModel.getSenderEnuu() != null) {
-                                Enterprise enterpriseInfo = enterpriseService.getEnterpriseInfo(messageModel.getSenderEnuu());
-                                if (enterpriseInfo != null) {
-                                    messageModel.setSendEnterpriseName(enterpriseInfo.getEnName());
-                                }
-                            }
-                        if (messageModel.getSenderUu() != null) {
-                            User userByUserUU = userService.findUserByUserUU(messageModel.getSenderUu());
-                            if (userByUserUU != null) {
-                                messageModel.setSendUserName(userByUserUU.getUserName());
-                            }
-                        }
-                    }
-                    return messageModels;
-                }
-            }
-            return new PageImpl<MessageModel>(Collections.<MessageModel>emptyList(), new PageInfo(params), 0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new PageImpl<MessageModel>(Collections.<MessageModel>emptyList(), new PageInfo(params), 0);
-        }
-    }
-
-    /**
-     * 根据所给字段生成消息
-     *
-     * @param content 发送内容
-     * @param type   消息的类型，用户自己定义
-     * @param receiverUu 接收人
-     * @param receiverEnuu
-     * @param consumerType 消费类型(所有应用共享："PUBLIC",单个应用独享："SINGLE",多个应用共享："MULTI")
-     * @param consumerApp MALL等
-     * @return
-     */
-    @Override
-    public MessageModel initMessage(String content, String type, Long receiverUu, Long receiverEnuu, String consumerType, String consumerApp, String smsType, String remark, Long... args) {
-        if (StringUtils.isEmpty(content) || StringUtils.isEmpty(type) || receiverUu == null || receiverEnuu == null || StringUtils.isEmpty(consumerType) || StringUtils.isEmpty(consumerApp)) {
-            return null;
-        } else {
-            MessageModel model = new MessageModel();
-            model.setRemark(remark);
-            model.setConsumerApp(consumerApp);
-            model.setConsumerType(consumerType);
-            model.setSmsType(smsType);
-            model.setContent(content);
-            model.setType(type);
-            model.setCreateTime(new Date());
-            model.setReceiverEnuu(receiverEnuu);
-            model.setReceiverUu(receiverUu);
-            if (args.length == 0) {
-                User user = SystemSession.getUser();
-                model.setSenderUu(user.getUserUU());
-                if (user.getEnterprise() != null) {
-                    model.setSenderEnuu(user.getEnterprise().getUu());
-                }
-            } else {
-                model.setSenderUu(args[0]);
-                model.setSenderEnuu(args[1]);
-            }
-            model.setProducerApp(ProducerApp.MALL);
-            return model;
-        }
-    }
-
-    /**
-     * 获取未读消息数量
-     * @return
-     */
-    @Override
-    public Map<String, Object> getUnReadMessageCount(String type) {
-        Map<String , Object> resultMap = new HashedMap();
-        resultMap.put("success", "success");
-        resultMap.put("count", "0");
-        User user = SystemSession.getUser();
-        Map<String, Object> map = new HashedMap();
-        if (user != null) {
-            map.put("receiverUu", user.getUserUU());
-            Enterprise enterprise = user.getEnterprise();
-            if (enterprise != null) {
-                map.put("receiverEnuu", enterprise.getUu());
-            }
-        }
-        map.put("consumerApp", ConsumerApp.MALL);
-        if (!StringUtils.isEmpty(type)) {
-            map.put("type", type);
-        }
-        map.put("isRead", IntegerConstant.NO_INT);
-        try {
-            HttpUtil.Response response = HttpUtil.sendGetRequest(sysConf.getMessageServiceUrl() + "messages/count", map);
-            int statusCode = response.getStatusCode();
-            if (statusCode == HttpStatus.OK.value()) {
-                String responseText = response.getResponseText();
-                if (!StringUtils.isEmpty(responseText)) {
-                    resultMap = FastjsonUtils.fromJson(responseText, HashedMap.class);
-                    return resultMap;
-                } else {
-                    return resultMap;
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return resultMap;
-        }
-        return resultMap;
-        }
-
-    /**
-     * 短信
-     *
-     * @param messageId 消息的接口
-     * @return ModelMap
-     */
-    @Override
-    public ResultMap readMessage(Long messageId) {
-        Map<String, Object> resultMap = new HashedMap();
-        resultMap.put("success", "success");
-        resultMap.put("data", "");
-        Map<String, Object> map = new HashedMap();
-        if (messageId ==  null) {
-            return  new ResultMap(CodeType.NO_INFO, "未阅读任何信息");
-        } else {
-            map.put("messageId", messageId);
-        }
-        User user = SystemSession.getUser();
-        if (user != null) {
-            map.put("receiverUu", user.getUserUU());
-            Enterprise enterprise = user.getEnterprise();
-            if (enterprise != null) {
-                map.put("receiverEnuu", enterprise.getUu());
-            }
-        }
-        map.put("consumerApp", ConsumerApp.MALL);
-        String response = null;
-        try {
-            response = HttpUtil.doPost(sysConf.getMessageServiceUrl() + "messages/read", FastjsonUtils.toJson(map));
-            if (!StringUtils.isEmpty(response)) {
-                HashedMap hashedMap = FastjsonUtils.fromJson(response, HashedMap.class);
-                if (hashedMap != null) {
-                    Object success = hashedMap.get("success");
-                    if ("success".equals(success)) {
-                        return ResultMap.success(null);
-                    } else {
-                        return new ResultMap(CodeType.ERROR_STATE, hashedMap.get("data").toString());
-                    }
-                }
-            } else {
-                return new ResultMap(CodeType.ERROR_STATE, "删除失败");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new ResultMap(CodeType.ERROR_STATE, "删除失败");
-        }
-        return new ResultMap(CodeType.ERROR_STATE, "删除失败");
-    }
-
-
-}

src/main/java/com/uas/platform/b2c/common/psmessage/task/MessageTask.java

@@ -1,86 +0,0 @@
-package com.uas.platform.b2c.common.psmessage.task;
-
-import com.uas.platform.b2c.common.account.model.Enterprise;
-import com.uas.platform.b2c.common.account.service.EnterpriseService;
-import com.uas.platform.b2c.common.message.model.MessageModel;
-import com.uas.platform.b2c.common.message.type.ConsumerApp;
-import com.uas.platform.b2c.common.message.type.ConsumerType;
-import com.uas.platform.b2c.common.message.type.SMSType;
-import com.uas.platform.b2c.common.psmessage.dao.OrderCompleteInfoDao;
-import com.uas.platform.b2c.common.psmessage.model.OrderCompleteInfo;
-import com.uas.platform.b2c.common.psmessage.service.MessageService;
-import com.uas.platform.b2c.core.config.SysConf;
-import com.uas.platform.b2c.trade.order.StringConstant.StringFormat;
-import com.uas.platform.b2c.trade.order.model.MessageNotifyPersonalManagement;
-import com.uas.platform.b2c.trade.order.service.MessageNotifyPersonalManagementService;
-import com.uas.platform.b2c.trade.order.type.MessageType;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * description
- *
- * @author yuj 2018-07-12 9:08
- */
-@Component("MessageTask")
-public class MessageTask {
-
-    private final MessageService messageService;
-
-    private final OrderCompleteInfoDao completeInfoDao;
-
-    private final MessageNotifyPersonalManagementService messageNotifyPersonalManagementService;
-
-    private final SysConf sysConf;
-
-    private final EnterpriseService enterpriseService;
-
-    @Autowired
-    public MessageTask(MessageService messageService, OrderCompleteInfoDao completeInfoDao, MessageNotifyPersonalManagementService messageNotifyPersonalManagementService, SysConf sysConf, EnterpriseService enterpriseService) {
-        this.messageService = messageService;
-        this.completeInfoDao = completeInfoDao;
-        this.messageNotifyPersonalManagementService = messageNotifyPersonalManagementService;
-        this.sysConf = sysConf;
-        this.enterpriseService = enterpriseService;
-    }
-
-    /**
-     * 根据订单信息获取
-     */
-    public void sendMessage() {
-        List<OrderCompleteInfo> completeInfos = completeInfoDao.findAll();
-        List<MessageNotifyPersonalManagement> managements = messageNotifyPersonalManagementService.findNotifyPersonalEnuuAndType(sysConf.getEnUU(), MessageType.APPLY_PAID.getType());
-        List<MessageModel> sendMessageList = new ArrayList<>();
-        Enterprise enterpriseInfo = enterpriseService.getEnterpriseInfo(sysConf.getEnUU());
-        Long adminUu = null;
-        if (enterpriseInfo != null) {
-            adminUu = enterpriseInfo.getEnAdminuu();
-        }
-        if (CollectionUtils.isNotEmpty(managements)) {
-            if (CollectionUtils.isNotEmpty(completeInfos)) {
-                for (OrderCompleteInfo completeInfo : completeInfos) {
-                    String orderId = completeInfo.getOrderId();
-                    if (!StringUtils.isEmpty(orderId)) {
-                        for (MessageNotifyPersonalManagement management : managements) {
-                            Long notifyPersonalUseruu = management.getNotifyPersonalUseruu();
-                            MessageModel model = messageService.initMessage(String.format(StringFormat.APPLYPAID, orderId), MessageType.APPLY_PAID.getType(), notifyPersonalUseruu, sysConf.getEnUU(), ConsumerType.SINGLE, ConsumerApp.MALL, SMSType.DONT_SEND, completeInfo.getRemark(), adminUu, sysConf.getEnUU());
-                            sendMessageList.add(model);
-                        }
-
-                    }
-                }
-            }
-        }
-        if (CollectionUtils.isNotEmpty(sendMessageList)) {
-            messageService.sendMessage(sendMessageList);
-        }
-        if (CollectionUtils.isNotEmpty(completeInfos)) {
-            completeInfoDao.delete(completeInfos);
-        }
-    }
-}

src/main/java/com/uas/platform/b2c/common/psmessage/util/JsonObjectUtil.java

@@ -1,75 +0,0 @@
-package com.uas.platform.b2c.common.psmessage.util;
-
-import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2c.common.message.model.MessageModel;
-import com.uas.platform.b2c.core.utils.FastjsonUtils;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * json 转换成 page
- *
- * @author yuj 2018-07-11 21:23
- */
-public class JsonObjectUtil {
-
-    /**
-     * jsonobject 转换成page
-     * @return
-     */
-    public static <T> Page<T> convertToPage(JSONObject jsonObject, Class<T> cls) {
-        String content  = String.valueOf(jsonObject.get("content"));
-        if (!StringUtils.isEmpty(content)) {
-            try {
-                List<? extends Class> list = FastjsonUtils.fromJsonArray(content, cls.getClass());
-                List<T> listT = new ArrayList<>();
-                for (Class aClass : list) {
-                    T t = cls.cast(aClass);
-                    listT.add(t);
-                }
-                Object number = jsonObject.get("number");
-                PageImpl<T> page = new PageImpl<T>(listT);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return new PageImpl<T>(Collections.<T>emptyList(), new PageInfo(new PageParams(1, 10, null, null)), 0);
-            }
-        }
-        return new PageImpl<T>(Collections.<T>emptyList(), new PageInfo(new PageParams(1, 10, null, null)), 0);
-    }
-
-
-    /**
-     * jsonobject 转换成page
-     * @return
-     */
-    public static Page<MessageModel> convertToMessageModelPage(JSONObject jsonObject) {
-        String content  = String.valueOf(jsonObject.get("content"));
-        if (!StringUtils.isEmpty(content)) {
-            try {
-                List<MessageModel> messageModels = FastjsonUtils.fromJsonArray(content, MessageModel.class);
-                PageParams pageParams = new PageParams();
-                Object number = jsonObject.get("number");
-                number = number  == null ? 1 : number;
-                pageParams.setPage((Integer) number);
-                Object size = jsonObject.get("size");
-                size = size == null ? 10 : size;
-                pageParams.setCount((Integer)size );
-                PageInfo info = new PageInfo(pageParams);
-                Object totalElements = jsonObject.get("totalElements");
-                totalElements = totalElements == null ? messageModels.size() : totalElements;
-                return new PageImpl<MessageModel>(messageModels, info, Long.valueOf(totalElements.toString()));
-            } catch (Exception e) {
-                e.printStackTrace();
-                return new PageImpl<MessageModel>(Collections.<MessageModel>emptyList(), new PageInfo(new PageParams(1, 10, null, null)), 0);
-            }
-        }
-        return new PageImpl<MessageModel>(Collections.<MessageModel>emptyList(), new PageInfo(new PageParams(1, 10, null, null)), 0);
-    }
-}

src/main/java/com/uas/platform/b2c/prod/product/common/CommonTask.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2c.prod.product.common.dao.CommonCountDao;
 import com.uas.platform.b2c.prod.product.common.model.CommonCount;
 import com.uas.platform.core.util.HttpUtil;
+import java.util.Date;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -49,6 +50,7 @@ public class CommonTask {
                 // 默认，通过执行SQL语句获取数据结果
                 commonCount.setCount(jdbcTemplate.queryForObject(commonCount.getSql(), Double.class));
             }
+            commonCount.setUpdateTime(new Date());
         }
         commonCountDao.save(commonCounts);
     }

src/main/java/com/uas/platform/b2c/prod/product/common/model/CommonCount.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2c.prod.product.common.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 
+import java.util.Date;
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -71,6 +72,12 @@ public class CommonCount implements Serializable{
     @Column(name = "cc_status")
     private Short status = 0;
 
+    /**
+     * 更新时间
+     */
+    @Column(name = "cc_updatetime")
+    private Date updateTime;
+
     public Long getId() {
         return id;
     }
@@ -127,6 +134,14 @@ public class CommonCount implements Serializable{
         this.status = status;
     }
 
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     public String getSourceType() {
         return sourceType;
     }

src/main/resources/spring/task.xml

@@ -33,9 +33,4 @@
         <task:scheduled ref="CommonTask" method="updateCount" cron="0 0 1 * * ?"/>
     </task:scheduled-tasks>
     <context:annotation-config />
-
-    <!--超时自动确认收货-->
-    <task:scheduled-tasks>
-        <task:scheduled ref="MessageTask" method="sendMessage" cron="0 0/1 * * * ?"/>
-    </task:scheduled-tasks>
 </beans>