diff --git a/.classpath b/.classpath index fc20480..d73b071 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,7 @@ - + diff --git a/WebContent/WEB-INF/classes/ActiveMQ.xml b/WebContent/WEB-INF/classes/ActiveMQ.xml index 5d46e4d..678b0c6 100644 --- a/WebContent/WEB-INF/classes/ActiveMQ.xml +++ b/WebContent/WEB-INF/classes/ActiveMQ.xml @@ -48,7 +48,7 @@ - + diff --git a/build/classes/com/w1hd/zzhnc/enums/ActivityStatus.class b/build/classes/com/w1hd/zzhnc/enums/ActivityStatus.class index f89fdaf..67c5c97 100644 Binary files a/build/classes/com/w1hd/zzhnc/enums/ActivityStatus.class and b/build/classes/com/w1hd/zzhnc/enums/ActivityStatus.class differ diff --git a/build/classes/com/w1hd/zzhnc/service/ActivityService.class b/build/classes/com/w1hd/zzhnc/service/ActivityService.class index 4c8bb74..8f0a8af 100644 Binary files a/build/classes/com/w1hd/zzhnc/service/ActivityService.class and b/build/classes/com/w1hd/zzhnc/service/ActivityService.class differ diff --git a/build/classes/com/w1hd/zzhnc/service/AutoreplyService.class b/build/classes/com/w1hd/zzhnc/service/AutoreplyService.class index 3b0d5b8..a9087a9 100644 Binary files a/build/classes/com/w1hd/zzhnc/service/AutoreplyService.class and b/build/classes/com/w1hd/zzhnc/service/AutoreplyService.class differ diff --git a/build/classes/com/w1hd/zzhnc/service/SalesService.class b/build/classes/com/w1hd/zzhnc/service/SalesService.class index 014b336..93379ef 100644 Binary files a/build/classes/com/w1hd/zzhnc/service/SalesService.class and b/build/classes/com/w1hd/zzhnc/service/SalesService.class differ diff --git a/build/classes/com/w1hd/zzhnc/socket/PcWebSocketHandler.class b/build/classes/com/w1hd/zzhnc/socket/PcWebSocketHandler.class index 9ffbab3..6cf6b92 100644 Binary files a/build/classes/com/w1hd/zzhnc/socket/PcWebSocketHandler.class and b/build/classes/com/w1hd/zzhnc/socket/PcWebSocketHandler.class differ diff --git a/build/classes/com/w1hd/zzhnc/socket/ZzHncTopicReceiver.class b/build/classes/com/w1hd/zzhnc/socket/ZzHncTopicReceiver.class index 3eefa46..79affcf 100644 Binary files a/build/classes/com/w1hd/zzhnc/socket/ZzHncTopicReceiver.class and b/build/classes/com/w1hd/zzhnc/socket/ZzHncTopicReceiver.class differ diff --git a/build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class b/build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class index 77f89ef..2e68bc2 100644 Binary files a/build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class and b/build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class differ diff --git a/build/classes/org/theyeasy/weixin/service/impl/WxMiniServiceImpl.class b/build/classes/org/theyeasy/weixin/service/impl/WxMiniServiceImpl.class index 17ef8dd..aef560d 100644 Binary files a/build/classes/org/theyeasy/weixin/service/impl/WxMiniServiceImpl.class and b/build/classes/org/theyeasy/weixin/service/impl/WxMiniServiceImpl.class differ diff --git a/build/classes/org/theyeasy/weixin/service/impl/WxOpenServiceImpl.class b/build/classes/org/theyeasy/weixin/service/impl/WxOpenServiceImpl.class index e22f809..47110eb 100644 Binary files a/build/classes/org/theyeasy/weixin/service/impl/WxOpenServiceImpl.class and b/build/classes/org/theyeasy/weixin/service/impl/WxOpenServiceImpl.class differ diff --git a/build/classes/org/theyeasy/weixin/util/SHA1.class b/build/classes/org/theyeasy/weixin/util/SHA1.class index 8ba5045..3531ce6 100644 Binary files a/build/classes/org/theyeasy/weixin/util/SHA1.class and b/build/classes/org/theyeasy/weixin/util/SHA1.class differ diff --git a/src/com/w1hd/zzhnc/enums/ActivityStatus.java b/src/com/w1hd/zzhnc/enums/ActivityStatus.java index f095e4a..a5033ab 100644 --- a/src/com/w1hd/zzhnc/enums/ActivityStatus.java +++ b/src/com/w1hd/zzhnc/enums/ActivityStatus.java @@ -2,7 +2,7 @@ package com.w1hd.zzhnc.enums; public enum ActivityStatus { - 未开始(1),进行中(2),已结束(3); + UNSTART(1),RUNNING(2),FINISH(3); ActivityStatus(int index){ this.index=index; diff --git a/src/com/w1hd/zzhnc/service/ActivityService.java b/src/com/w1hd/zzhnc/service/ActivityService.java index e6c634b..4e4f3e1 100644 --- a/src/com/w1hd/zzhnc/service/ActivityService.java +++ b/src/com/w1hd/zzhnc/service/ActivityService.java @@ -41,7 +41,7 @@ public class ActivityService { try { Activity activity = null; Integer turnid = 1; - Integer status = ActivityStatus.鏈紑濮�.getIndex(); + Integer status = ActivityStatus.UNSTART.getIndex(); String activityjson = RedisUtil.get(ACTIVITY_SETTING); if (!Strings.isNullOrEmpty(activityjson)) { activityjson = CommonUtil.JsonToObject(activityjson); @@ -137,12 +137,12 @@ public class ActivityService { Activity activity = CommonUtil.getEntity(activityjson, Activity.class); if (activity == null) return "娲诲姩涓嶅瓨鍦�"; - if (activity.getStatus() <= 0 || activity.getStatus() != ActivityStatus.宸茬粨鏉�.getIndex()) { + if (activity.getStatus() <= 0 || activity.getStatus() != ActivityStatus.FINISH.getIndex()) { return "褰撳墠娲诲姩杩樻湭缁撴潫锛岄渶娲诲姩缁撴潫鍚庢墠鍙噸鏂板紑鍚�"; } int turnid = activity.getTurn(); - if (activity.getStatus() == ActivityStatus.宸茬粨鏉�.getIndex()) { - activity.setStatus(ActivityStatus.鏈紑濮�.getIndex()); + if (activity.getStatus() == ActivityStatus.FINISH.getIndex()) { + activity.setStatus(ActivityStatus.UNSTART.getIndex()); activity.setTurn(turnid + 1); activity.setPlanMny(BigDecimal.ZERO); } diff --git a/src/com/w1hd/zzhnc/service/AutoreplyService.java b/src/com/w1hd/zzhnc/service/AutoreplyService.java index 84fbe15..ed9a6c4 100644 --- a/src/com/w1hd/zzhnc/service/AutoreplyService.java +++ b/src/com/w1hd/zzhnc/service/AutoreplyService.java @@ -147,7 +147,7 @@ public class AutoreplyService { for (RegexKeywordFilter filter : filterList) { Set keys = Sets.newHashSet(); filter.replace(string, new ReplaceStrategy() { - @Override + public String replaceWith(String keyword) { keys.add(keyword); sets.add(keys); @@ -157,7 +157,7 @@ public class AutoreplyService { } Collections.sort(sets, new Comparator() { - @Override + public int compare(Set o1, Set o2) { if (o1.size() > o2.size()) { return -1; @@ -182,7 +182,7 @@ public class AutoreplyService { } Collections.sort(autoreplys, new Comparator() { - @Override + public int compare(Autoreply o1, Autoreply o2) { if (o1.getSort() < o2.getSort()) { return -1; @@ -198,7 +198,7 @@ public class AutoreplyService { } - @Override + public PageResults getAutoReplyList(Integer page, String keyword, Boolean isRedirectStaff, Integer projectId) { Example example = new Example(Autoreply.class); @@ -234,7 +234,7 @@ public class AutoreplyService { * com.w1hd.zzhnc.service.AutoreplyService#addAutoReply(java.lang.String, * boolean, java.lang.String) */ - @Override + public String addAutoReply(String keywords, boolean isRedirectStaff, String content, Integer projectId, String projectName, Integer sort) { if (Strings.isNullOrEmpty(keywords)) @@ -259,7 +259,7 @@ public class AutoreplyService { return row > 0 ? "ok" : "添加失败，数据异常"; } - @Override + public String updateAutoReply(Integer id, String keywords, boolean isRedirectStaff, String content, Integer projectId, String projectName, Integer sort) { if (StringUtil.isZearoOrNull(id)) @@ -280,7 +280,7 @@ public class AutoreplyService { return row > 0 ? "ok" : "修改失败，数据异常"; } - @Override + public String deleteAutoReply(Integer id) { if (StringUtil.isZearoOrNull(id)) return "id 不能为空"; @@ -292,14 +292,14 @@ public class AutoreplyService { return row > 0 ? "ok" : "删除失败，数据异常"; } - @Override + public Autoreply getAutoReply(Integer id) { if (StringUtil.isZearoOrNull(id)) return null; return autoreplyDao.selectByPrimaryKey(id); } - @Override + public String KeywordsToString() { Example example = new Example(Autoreply.class); Example.Criteria criteria = example.createCriteria(); diff --git a/src/com/w1hd/zzhnc/service/SalesService.java b/src/com/w1hd/zzhnc/service/SalesService.java index c579259..10eb7dc 100644 --- a/src/com/w1hd/zzhnc/service/SalesService.java +++ b/src/com/w1hd/zzhnc/service/SalesService.java @@ -102,7 +102,7 @@ public class SalesService{ * @see com.w1hd.zzhnc.service.SalesService#getSalesList(java.lang.Integer, * java.lang.String) */ - @Override + public PageResults getSalesList(Integer page, Integer pagesize, String keyword, Integer projectid, Boolean isvanker) { @@ -124,7 +124,7 @@ public class SalesService{ * @see com.w1hd.zzhnc.service.SalesService#addSales(java.lang.String, * java.lang.String, java.lang.Integer) */ - @Override + public String addSales(String name, String phone, Integer projectid, Boolean isValid, Boolean isVanker) { // 判断销售是否已存在 @@ -151,7 +151,7 @@ public class SalesService{ * @see com.w1hd.zzhnc.service.SalesService#updateSales(java.lang.Integer, * java.lang.String, java.lang.String, java.lang.Integer) */ - @Override + public String updateSales(Integer id, String name, String phone, Integer projectid, Boolean isValid, Boolean isVanker) { Sales sale = saleDao.selectByPrimaryKey(id); @@ -185,7 +185,7 @@ public class SalesService{ * * @see com.w1hd.zzhnc.service.SalesService#deleteSales(java.lang.Integer) */ - @Override + public String deleteSales(Integer id) { // TODO Auto-generated method stub Sales sale = saleDao.selectByPrimaryKey(id); @@ -201,7 +201,7 @@ public class SalesService{ * * @see com.w1hd.zzhnc.service.SalesService#getSales(java.lang.Integer) */ - @Override + public Sales getSales(Integer id) { // TODO Auto-generated method stub return saleDao.selectByPrimaryKey(id); @@ -213,7 +213,7 @@ public class SalesService{ * @see com.w1hd.zzhnc.service.SalesService#ExcelSales(java.lang.String, * java.io.InputStream) */ - @Override + public String ExcelSales(String suffix, InputStream file) { ReadExcel readexcel = new ReadExcel(); int row = 0; @@ -281,7 +281,7 @@ public class SalesService{ return 0; } - @Override + public Sales updateSalesOpenId(String phone, String openId) { Example example = new Example(Sales.class); example.createCriteria().andEqualTo("phone", phone); @@ -294,7 +294,7 @@ public class SalesService{ /** * 通过小程序openid获取销售，无效的或已删除的不会被获取。 */ - @Override + public Sales getSaleByMiniOpenId(String miniOpenid) { Example example = new Example(Sales.class); example.createCriteria().andEqualTo("deleted", false).andEqualTo("isvalid", 1).andEqualTo("miniopenid", @@ -305,7 +305,7 @@ public class SalesService{ return list.get(0); } - @Override + public Vo_msg updateSalesOpenId(String phone, String openId, String wxMiniCode) { Sales sales = null; try { @@ -340,7 +340,7 @@ public class SalesService{ return new Vo_msg(0, sales); } - @Override + public List getVankers() { Example example = new Example(Sales.class); example.createCriteria().andEqualTo("deleted", false).andEqualTo("isvalid", true).andEqualTo("isvanker", true); @@ -356,7 +356,7 @@ public class SalesService{ * * @see com.w1hd.zzhnc.service.SalesService#CheckBinding(java.lang.String) */ - @Override + public String CheckBinding(String miniopenid) { System.out.println("miniopenid:" + miniopenid); if (Strings.isNullOrEmpty(miniopenid)) @@ -386,7 +386,7 @@ public class SalesService{ * @see com.w1hd.zzhnc.service.SalesService#getSalesReportList(int, * java.lang.String) */ - @Override + public PageResults getSalesReportList(int page, String keyword) { List list = saleDao.getSalesReportList((page - 1) * 10, 10, keyword); int total = saleDao.getSalesReportCount(keyword); @@ -401,7 +401,7 @@ public class SalesService{ @Autowired ChatlogDao chatlogDao; - @Override + @Transactional public void transferSales2Sales(int salesId, int newSalesId, int fansId) { Example fansExample = new Example(Fans.class); @@ -447,7 +447,7 @@ public class SalesService{ } - @Override + public String sendProudct(Integer projectId, Integer fansId) { Fans fans = fansService.getFansById(fansId); Projects project = projectService.getProject(projectId); @@ -458,7 +458,7 @@ public class SalesService{ "pages/index/index?id=" + projectId, project.getPicurl(), media_id); } - @Override + public Sales nextVanker() { Example example = new Example(Sales.class); Criteria criteria = example.createCriteria(); @@ -487,7 +487,7 @@ public class SalesService{ } } - @Override + public void addTags(Integer saleId,String tag) { Sales sales = saleDao.selectByPrimaryKey(saleId); String tags = sales.getTags(); diff --git a/src/com/w1hd/zzhnc/socket/PcWebSocketHandler.java b/src/com/w1hd/zzhnc/socket/PcWebSocketHandler.java index c9c480e..c936262 100644 --- a/src/com/w1hd/zzhnc/socket/PcWebSocketHandler.java +++ b/src/com/w1hd/zzhnc/socket/PcWebSocketHandler.java @@ -22,6 +22,7 @@ import org.springframework.web.socket.WebSocketSession; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.w1hd.zzhnc.model.WebSockMsg; +import com.w1hd.zzhnc.service.ZzhncSocketService; import com.w1hd.zzhnc.util.QQFaceUtil; public class PcWebSocketHandler implements WebSocketHandler { diff --git a/src/com/w1hd/zzhnc/socket/ZzHncTopicReceiver.java b/src/com/w1hd/zzhnc/socket/ZzHncTopicReceiver.java index 0824649..1b203d3 100644 --- a/src/com/w1hd/zzhnc/socket/ZzHncTopicReceiver.java +++ b/src/com/w1hd/zzhnc/socket/ZzHncTopicReceiver.java @@ -44,8 +44,7 @@ import com.w1hd.zzhnc.model.WebSockMsg; * 消费者 */ @Component -public class ZzHncTopicReceiver -implements MessageListener { +public class ZzHncTopicReceiver implements MessageListener { private Logger log = LoggerFactory.getLogger(getClass()); diff --git a/src/org/theyeasy/weixin/service/impl/WxMiniServiceImpl.java b/src/org/theyeasy/weixin/service/impl/WxMiniServiceImpl.java index 51c6244..93e9efd 100644 --- a/src/org/theyeasy/weixin/service/impl/WxMiniServiceImpl.java +++ b/src/org/theyeasy/weixin/service/impl/WxMiniServiceImpl.java @@ -44,10 +44,11 @@ import com.w1hd.zzhnc.model.WebSockMsg; import com.w1hd.zzhnc.service.ActivityService; import com.w1hd.zzhnc.service.AutoreplyService; import com.w1hd.zzhnc.service.ChatLogService; -import com.w1hd.zzhnc.service.zzhncSocketService; + import com.w1hd.zzhnc.service.FansService; import com.w1hd.zzhnc.service.PosterService; import com.w1hd.zzhnc.service.SalesService; +import com.w1hd.zzhnc.service.ZzhncSocketService; import com.w1hd.zzhnc.util.CommonUtil; import com.w1hd.zzhnc.util.JsonMapper; import com.w1hd.zzhnc.util.QQFaceUtil; @@ -62,7 +63,7 @@ import tk.mybatis.mapper.entity.Example.Criteria; @Service public class WxMiniServiceImpl implements WxMiniService { @Autowired - zzhncSocketService zzhncSocketService; + ZzhncSocketService zzhncSocketService; @Autowired WxOpenService wxOpenService; @@ -165,7 +166,8 @@ public class WxMiniServiceImpl implements WxMiniService { content = QQFaceUtil.regix(content); Activity activitySetting = activityService.getActivitySetting(); - if (activitySetting != null && activitySetting.getStatus() > ActivityStatus.未开始.getIndex() + if (activitySetting != null && activitySetting.getStatus() > ActivityStatus.UNSTART + .getIndex() && !content.equals("人工万小二")) { String[] keywords = activitySetting.getKeyword().split("\\|"); boolean containKeyword = false; @@ -460,7 +462,7 @@ public class WxMiniServiceImpl implements WxMiniService { if (firstEnter) { // 如果红包活动正在进行中，发送红包活动的提醒文字 Activity activitySetting = activityService.getActivitySetting(); - if (activitySetting != null && activitySetting.getStatus() == ActivityStatus.进行中.getIndex()) { + if (activitySetting != null && activitySetting.getStatus() == ActivityStatus.RUNNING.getIndex()) { welcome = activitySetting.getReplyWelcome(); } } diff --git a/src/org/theyeasy/weixin/service/impl/WxOpenServiceImpl.java b/src/org/theyeasy/weixin/service/impl/WxOpenServiceImpl.java index b8075ff..1e30655 100644 --- a/src/org/theyeasy/weixin/service/impl/WxOpenServiceImpl.java +++ b/src/org/theyeasy/weixin/service/impl/WxOpenServiceImpl.java @@ -43,7 +43,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.w1hd.zzhnc.model.SysWxauthorize; -import com.w1hd.zzhnc.service.impl.SysWxauthorizeServiceImpl; +import com.w1hd.zzhnc.service.SysWxauthorizeService; import com.w1hd.zzhnc.util.CommonUtil; import com.w1hd.zzhnc.util.PropertiesFileUtil; import com.w1hd.zzhnc.util.RedisUtil; @@ -116,7 +116,7 @@ public class WxOpenServiceImpl implements WxOpenService { private SubscribeHandler subscribeHandler; @Autowired - private SysWxauthorizeServiceImpl sysWxauthorizeService; + private SysWxauthorizeService sysWxauthorizeService; private ConcurrentMap router = new ConcurrentHashMap();