Commit 0672e0e4 tyler

update fix error

1 个父辈 a7311f04
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_151"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<jms:listener-container destination-type="topic" <jms:listener-container destination-type="topic"
container-type="default" connection-factory="connectionFactory" container-type="default" connection-factory="connectionFactory"
acknowledge="auto"> acknowledge="auto">
<jms:listener destination="zzhnc.topic" ref="zzhncTopicReceiver" /> <jms:listener destination="zzhnc.topic" ref="zzHncTopicReceiver" />
</jms:listener-container> </jms:listener-container>
<!-- 消息消费者 end --> <!-- 消息消费者 end -->
......
...@@ -2,7 +2,7 @@ package com.w1hd.zzhnc.enums; ...@@ -2,7 +2,7 @@ package com.w1hd.zzhnc.enums;
public enum ActivityStatus { public enum ActivityStatus {
未开始(1),进行中(2),已结束(3); UNSTART(1),RUNNING(2),FINISH(3);
ActivityStatus(int index){ ActivityStatus(int index){
this.index=index; this.index=index;
......
...@@ -41,7 +41,7 @@ public class ActivityService { ...@@ -41,7 +41,7 @@ public class ActivityService {
try { try {
Activity activity = null; Activity activity = null;
Integer turnid = 1; Integer turnid = 1;
Integer status = ActivityStatus.鏈紑濮�.getIndex(); Integer status = ActivityStatus.UNSTART.getIndex();
String activityjson = RedisUtil.get(ACTIVITY_SETTING); String activityjson = RedisUtil.get(ACTIVITY_SETTING);
if (!Strings.isNullOrEmpty(activityjson)) { if (!Strings.isNullOrEmpty(activityjson)) {
activityjson = CommonUtil.JsonToObject(activityjson); activityjson = CommonUtil.JsonToObject(activityjson);
...@@ -137,12 +137,12 @@ public class ActivityService { ...@@ -137,12 +137,12 @@ public class ActivityService {
Activity activity = CommonUtil.getEntity(activityjson, Activity.class); Activity activity = CommonUtil.getEntity(activityjson, Activity.class);
if (activity == null) if (activity == null)
return "娲诲姩涓嶅瓨鍦�"; return "娲诲姩涓嶅瓨鍦�";
if (activity.getStatus() <= 0 || activity.getStatus() != ActivityStatus.宸茬粨鏉�.getIndex()) { if (activity.getStatus() <= 0 || activity.getStatus() != ActivityStatus.FINISH.getIndex()) {
return "褰撳墠娲诲姩杩樻湭缁撴潫锛岄渶娲诲姩缁撴潫鍚庢墠鍙噸鏂板紑鍚�"; return "褰撳墠娲诲姩杩樻湭缁撴潫锛岄渶娲诲姩缁撴潫鍚庢墠鍙噸鏂板紑鍚�";
} }
int turnid = activity.getTurn(); int turnid = activity.getTurn();
if (activity.getStatus() == ActivityStatus.宸茬粨鏉�.getIndex()) { if (activity.getStatus() == ActivityStatus.FINISH.getIndex()) {
activity.setStatus(ActivityStatus.鏈紑濮�.getIndex()); activity.setStatus(ActivityStatus.UNSTART.getIndex());
activity.setTurn(turnid + 1); activity.setTurn(turnid + 1);
activity.setPlanMny(BigDecimal.ZERO); activity.setPlanMny(BigDecimal.ZERO);
} }
......
...@@ -147,7 +147,7 @@ public class AutoreplyService { ...@@ -147,7 +147,7 @@ public class AutoreplyService {
for (RegexKeywordFilter filter : filterList) { for (RegexKeywordFilter filter : filterList) {
Set<String> keys = Sets.newHashSet(); Set<String> keys = Sets.newHashSet();
filter.replace(string, new ReplaceStrategy() { filter.replace(string, new ReplaceStrategy() {
@Override
public String replaceWith(String keyword) { public String replaceWith(String keyword) {
keys.add(keyword); keys.add(keyword);
sets.add(keys); sets.add(keys);
...@@ -157,7 +157,7 @@ public class AutoreplyService { ...@@ -157,7 +157,7 @@ public class AutoreplyService {
} }
Collections.sort(sets, new Comparator<Set>() { Collections.sort(sets, new Comparator<Set>() {
@Override
public int compare(Set o1, Set o2) { public int compare(Set o1, Set o2) {
if (o1.size() > o2.size()) { if (o1.size() > o2.size()) {
return -1; return -1;
...@@ -182,7 +182,7 @@ public class AutoreplyService { ...@@ -182,7 +182,7 @@ public class AutoreplyService {
} }
Collections.sort(autoreplys, new Comparator<Autoreply>() { Collections.sort(autoreplys, new Comparator<Autoreply>() {
@Override
public int compare(Autoreply o1, Autoreply o2) { public int compare(Autoreply o1, Autoreply o2) {
if (o1.getSort() < o2.getSort()) { if (o1.getSort() < o2.getSort()) {
return -1; return -1;
...@@ -198,7 +198,7 @@ public class AutoreplyService { ...@@ -198,7 +198,7 @@ public class AutoreplyService {
} }
@Override
public PageResults<Autoreply> getAutoReplyList(Integer page, String keyword, Boolean isRedirectStaff, public PageResults<Autoreply> getAutoReplyList(Integer page, String keyword, Boolean isRedirectStaff,
Integer projectId) { Integer projectId) {
Example example = new Example(Autoreply.class); Example example = new Example(Autoreply.class);
...@@ -234,7 +234,7 @@ public class AutoreplyService { ...@@ -234,7 +234,7 @@ public class AutoreplyService {
* com.w1hd.zzhnc.service.AutoreplyService#addAutoReply(java.lang.String, * com.w1hd.zzhnc.service.AutoreplyService#addAutoReply(java.lang.String,
* boolean, java.lang.String) * boolean, java.lang.String)
*/ */
@Override
public String addAutoReply(String keywords, boolean isRedirectStaff, String content, Integer projectId, public String addAutoReply(String keywords, boolean isRedirectStaff, String content, Integer projectId,
String projectName, Integer sort) { String projectName, Integer sort) {
if (Strings.isNullOrEmpty(keywords)) if (Strings.isNullOrEmpty(keywords))
...@@ -259,7 +259,7 @@ public class AutoreplyService { ...@@ -259,7 +259,7 @@ public class AutoreplyService {
return row > 0 ? "ok" : "添加失败,数据异常"; return row > 0 ? "ok" : "添加失败,数据异常";
} }
@Override
public String updateAutoReply(Integer id, String keywords, boolean isRedirectStaff, String content, public String updateAutoReply(Integer id, String keywords, boolean isRedirectStaff, String content,
Integer projectId, String projectName, Integer sort) { Integer projectId, String projectName, Integer sort) {
if (StringUtil.isZearoOrNull(id)) if (StringUtil.isZearoOrNull(id))
...@@ -280,7 +280,7 @@ public class AutoreplyService { ...@@ -280,7 +280,7 @@ public class AutoreplyService {
return row > 0 ? "ok" : "修改失败,数据异常"; return row > 0 ? "ok" : "修改失败,数据异常";
} }
@Override
public String deleteAutoReply(Integer id) { public String deleteAutoReply(Integer id) {
if (StringUtil.isZearoOrNull(id)) if (StringUtil.isZearoOrNull(id))
return "id 不能为空"; return "id 不能为空";
...@@ -292,14 +292,14 @@ public class AutoreplyService { ...@@ -292,14 +292,14 @@ public class AutoreplyService {
return row > 0 ? "ok" : "删除失败,数据异常"; return row > 0 ? "ok" : "删除失败,数据异常";
} }
@Override
public Autoreply getAutoReply(Integer id) { public Autoreply getAutoReply(Integer id) {
if (StringUtil.isZearoOrNull(id)) if (StringUtil.isZearoOrNull(id))
return null; return null;
return autoreplyDao.selectByPrimaryKey(id); return autoreplyDao.selectByPrimaryKey(id);
} }
@Override
public String KeywordsToString() { public String KeywordsToString() {
Example example = new Example(Autoreply.class); Example example = new Example(Autoreply.class);
Example.Criteria criteria = example.createCriteria(); Example.Criteria criteria = example.createCriteria();
......
...@@ -102,7 +102,7 @@ public class SalesService{ ...@@ -102,7 +102,7 @@ public class SalesService{
* @see com.w1hd.zzhnc.service.SalesService#getSalesList(java.lang.Integer, * @see com.w1hd.zzhnc.service.SalesService#getSalesList(java.lang.Integer,
* java.lang.String) * java.lang.String)
*/ */
@Override
public PageResults<Sales_Vo> getSalesList(Integer page, Integer pagesize, String keyword, Integer projectid, public PageResults<Sales_Vo> getSalesList(Integer page, Integer pagesize, String keyword, Integer projectid,
Boolean isvanker) { Boolean isvanker) {
...@@ -124,7 +124,7 @@ public class SalesService{ ...@@ -124,7 +124,7 @@ public class SalesService{
* @see com.w1hd.zzhnc.service.SalesService#addSales(java.lang.String, * @see com.w1hd.zzhnc.service.SalesService#addSales(java.lang.String,
* java.lang.String, java.lang.Integer) * java.lang.String, java.lang.Integer)
*/ */
@Override
public String addSales(String name, String phone, Integer projectid, Boolean isValid, Boolean isVanker) { public String addSales(String name, String phone, Integer projectid, Boolean isValid, Boolean isVanker) {
// 判断销售是否已存在 // 判断销售是否已存在
...@@ -151,7 +151,7 @@ public class SalesService{ ...@@ -151,7 +151,7 @@ public class SalesService{
* @see com.w1hd.zzhnc.service.SalesService#updateSales(java.lang.Integer, * @see com.w1hd.zzhnc.service.SalesService#updateSales(java.lang.Integer,
* java.lang.String, java.lang.String, 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, public String updateSales(Integer id, String name, String phone, Integer projectid, Boolean isValid,
Boolean isVanker) { Boolean isVanker) {
Sales sale = saleDao.selectByPrimaryKey(id); Sales sale = saleDao.selectByPrimaryKey(id);
...@@ -185,7 +185,7 @@ public class SalesService{ ...@@ -185,7 +185,7 @@ public class SalesService{
* *
* @see com.w1hd.zzhnc.service.SalesService#deleteSales(java.lang.Integer) * @see com.w1hd.zzhnc.service.SalesService#deleteSales(java.lang.Integer)
*/ */
@Override
public String deleteSales(Integer id) { public String deleteSales(Integer id) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
Sales sale = saleDao.selectByPrimaryKey(id); Sales sale = saleDao.selectByPrimaryKey(id);
...@@ -201,7 +201,7 @@ public class SalesService{ ...@@ -201,7 +201,7 @@ public class SalesService{
* *
* @see com.w1hd.zzhnc.service.SalesService#getSales(java.lang.Integer) * @see com.w1hd.zzhnc.service.SalesService#getSales(java.lang.Integer)
*/ */
@Override
public Sales getSales(Integer id) { public Sales getSales(Integer id) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return saleDao.selectByPrimaryKey(id); return saleDao.selectByPrimaryKey(id);
...@@ -213,7 +213,7 @@ public class SalesService{ ...@@ -213,7 +213,7 @@ public class SalesService{
* @see com.w1hd.zzhnc.service.SalesService#ExcelSales(java.lang.String, * @see com.w1hd.zzhnc.service.SalesService#ExcelSales(java.lang.String,
* java.io.InputStream) * java.io.InputStream)
*/ */
@Override
public String ExcelSales(String suffix, InputStream file) { public String ExcelSales(String suffix, InputStream file) {
ReadExcel readexcel = new ReadExcel(); ReadExcel readexcel = new ReadExcel();
int row = 0; int row = 0;
...@@ -281,7 +281,7 @@ public class SalesService{ ...@@ -281,7 +281,7 @@ public class SalesService{
return 0; return 0;
} }
@Override
public Sales updateSalesOpenId(String phone, String openId) { public Sales updateSalesOpenId(String phone, String openId) {
Example example = new Example(Sales.class); Example example = new Example(Sales.class);
example.createCriteria().andEqualTo("phone", phone); example.createCriteria().andEqualTo("phone", phone);
...@@ -294,7 +294,7 @@ public class SalesService{ ...@@ -294,7 +294,7 @@ public class SalesService{
/** /**
* 通过小程序openid获取销售,无效的或已删除的不会被获取。 * 通过小程序openid获取销售,无效的或已删除的不会被获取。
*/ */
@Override
public Sales getSaleByMiniOpenId(String miniOpenid) { public Sales getSaleByMiniOpenId(String miniOpenid) {
Example example = new Example(Sales.class); Example example = new Example(Sales.class);
example.createCriteria().andEqualTo("deleted", false).andEqualTo("isvalid", 1).andEqualTo("miniopenid", example.createCriteria().andEqualTo("deleted", false).andEqualTo("isvalid", 1).andEqualTo("miniopenid",
...@@ -305,7 +305,7 @@ public class SalesService{ ...@@ -305,7 +305,7 @@ public class SalesService{
return list.get(0); return list.get(0);
} }
@Override
public Vo_msg updateSalesOpenId(String phone, String openId, String wxMiniCode) { public Vo_msg updateSalesOpenId(String phone, String openId, String wxMiniCode) {
Sales sales = null; Sales sales = null;
try { try {
...@@ -340,7 +340,7 @@ public class SalesService{ ...@@ -340,7 +340,7 @@ public class SalesService{
return new Vo_msg(0, sales); return new Vo_msg(0, sales);
} }
@Override
public List<Sales> getVankers() { public List<Sales> getVankers() {
Example example = new Example(Sales.class); Example example = new Example(Sales.class);
example.createCriteria().andEqualTo("deleted", false).andEqualTo("isvalid", true).andEqualTo("isvanker", true); example.createCriteria().andEqualTo("deleted", false).andEqualTo("isvalid", true).andEqualTo("isvanker", true);
...@@ -356,7 +356,7 @@ public class SalesService{ ...@@ -356,7 +356,7 @@ public class SalesService{
* *
* @see com.w1hd.zzhnc.service.SalesService#CheckBinding(java.lang.String) * @see com.w1hd.zzhnc.service.SalesService#CheckBinding(java.lang.String)
*/ */
@Override
public String CheckBinding(String miniopenid) { public String CheckBinding(String miniopenid) {
System.out.println("miniopenid:" + miniopenid); System.out.println("miniopenid:" + miniopenid);
if (Strings.isNullOrEmpty(miniopenid)) if (Strings.isNullOrEmpty(miniopenid))
...@@ -386,7 +386,7 @@ public class SalesService{ ...@@ -386,7 +386,7 @@ public class SalesService{
* @see com.w1hd.zzhnc.service.SalesService#getSalesReportList(int, * @see com.w1hd.zzhnc.service.SalesService#getSalesReportList(int,
* java.lang.String) * java.lang.String)
*/ */
@Override
public PageResults<SalesReport_Vo> getSalesReportList(int page, String keyword) { public PageResults<SalesReport_Vo> getSalesReportList(int page, String keyword) {
List<SalesReport_Vo> list = saleDao.getSalesReportList((page - 1) * 10, 10, keyword); List<SalesReport_Vo> list = saleDao.getSalesReportList((page - 1) * 10, 10, keyword);
int total = saleDao.getSalesReportCount(keyword); int total = saleDao.getSalesReportCount(keyword);
...@@ -401,7 +401,7 @@ public class SalesService{ ...@@ -401,7 +401,7 @@ public class SalesService{
@Autowired @Autowired
ChatlogDao chatlogDao; ChatlogDao chatlogDao;
@Override
@Transactional @Transactional
public void transferSales2Sales(int salesId, int newSalesId, int fansId) { public void transferSales2Sales(int salesId, int newSalesId, int fansId) {
Example fansExample = new Example(Fans.class); Example fansExample = new Example(Fans.class);
...@@ -447,7 +447,7 @@ public class SalesService{ ...@@ -447,7 +447,7 @@ public class SalesService{
} }
@Override
public String sendProudct(Integer projectId, Integer fansId) { public String sendProudct(Integer projectId, Integer fansId) {
Fans fans = fansService.getFansById(fansId); Fans fans = fansService.getFansById(fansId);
Projects project = projectService.getProject(projectId); Projects project = projectService.getProject(projectId);
...@@ -458,7 +458,7 @@ public class SalesService{ ...@@ -458,7 +458,7 @@ public class SalesService{
"pages/index/index?id=" + projectId, project.getPicurl(), media_id); "pages/index/index?id=" + projectId, project.getPicurl(), media_id);
} }
@Override
public Sales nextVanker() { public Sales nextVanker() {
Example example = new Example(Sales.class); Example example = new Example(Sales.class);
Criteria criteria = example.createCriteria(); Criteria criteria = example.createCriteria();
...@@ -487,7 +487,7 @@ public class SalesService{ ...@@ -487,7 +487,7 @@ public class SalesService{
} }
} }
@Override
public void addTags(Integer saleId,String tag) { public void addTags(Integer saleId,String tag) {
Sales sales = saleDao.selectByPrimaryKey(saleId); Sales sales = saleDao.selectByPrimaryKey(saleId);
String tags = sales.getTags(); String tags = sales.getTags();
......
...@@ -22,6 +22,7 @@ import org.springframework.web.socket.WebSocketSession; ...@@ -22,6 +22,7 @@ import org.springframework.web.socket.WebSocketSession;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.w1hd.zzhnc.model.WebSockMsg; import com.w1hd.zzhnc.model.WebSockMsg;
import com.w1hd.zzhnc.service.ZzhncSocketService;
import com.w1hd.zzhnc.util.QQFaceUtil; import com.w1hd.zzhnc.util.QQFaceUtil;
public class PcWebSocketHandler implements WebSocketHandler { public class PcWebSocketHandler implements WebSocketHandler {
......
...@@ -44,8 +44,7 @@ import com.w1hd.zzhnc.model.WebSockMsg; ...@@ -44,8 +44,7 @@ import com.w1hd.zzhnc.model.WebSockMsg;
* 消费者 * 消费者
*/ */
@Component @Component
public class ZzHncTopicReceiver public class ZzHncTopicReceiver implements MessageListener {
implements MessageListener {
private Logger log = LoggerFactory.getLogger(getClass()); private Logger log = LoggerFactory.getLogger(getClass());
......
...@@ -44,10 +44,11 @@ import com.w1hd.zzhnc.model.WebSockMsg; ...@@ -44,10 +44,11 @@ import com.w1hd.zzhnc.model.WebSockMsg;
import com.w1hd.zzhnc.service.ActivityService; import com.w1hd.zzhnc.service.ActivityService;
import com.w1hd.zzhnc.service.AutoreplyService; import com.w1hd.zzhnc.service.AutoreplyService;
import com.w1hd.zzhnc.service.ChatLogService; import com.w1hd.zzhnc.service.ChatLogService;
import com.w1hd.zzhnc.service.zzhncSocketService;
import com.w1hd.zzhnc.service.FansService; import com.w1hd.zzhnc.service.FansService;
import com.w1hd.zzhnc.service.PosterService; import com.w1hd.zzhnc.service.PosterService;
import com.w1hd.zzhnc.service.SalesService; import com.w1hd.zzhnc.service.SalesService;
import com.w1hd.zzhnc.service.ZzhncSocketService;
import com.w1hd.zzhnc.util.CommonUtil; import com.w1hd.zzhnc.util.CommonUtil;
import com.w1hd.zzhnc.util.JsonMapper; import com.w1hd.zzhnc.util.JsonMapper;
import com.w1hd.zzhnc.util.QQFaceUtil; import com.w1hd.zzhnc.util.QQFaceUtil;
...@@ -62,7 +63,7 @@ import tk.mybatis.mapper.entity.Example.Criteria; ...@@ -62,7 +63,7 @@ import tk.mybatis.mapper.entity.Example.Criteria;
@Service @Service
public class WxMiniServiceImpl implements WxMiniService { public class WxMiniServiceImpl implements WxMiniService {
@Autowired @Autowired
zzhncSocketService zzhncSocketService; ZzhncSocketService zzhncSocketService;
@Autowired @Autowired
WxOpenService wxOpenService; WxOpenService wxOpenService;
...@@ -165,7 +166,8 @@ public class WxMiniServiceImpl implements WxMiniService { ...@@ -165,7 +166,8 @@ public class WxMiniServiceImpl implements WxMiniService {
content = QQFaceUtil.regix(content); content = QQFaceUtil.regix(content);
Activity activitySetting = activityService.getActivitySetting(); Activity activitySetting = activityService.getActivitySetting();
if (activitySetting != null && activitySetting.getStatus() > ActivityStatus.未开始.getIndex() if (activitySetting != null && activitySetting.getStatus() > ActivityStatus.UNSTART
.getIndex()
&& !content.equals("人工万小二")) { && !content.equals("人工万小二")) {
String[] keywords = activitySetting.getKeyword().split("\\|"); String[] keywords = activitySetting.getKeyword().split("\\|");
boolean containKeyword = false; boolean containKeyword = false;
...@@ -460,7 +462,7 @@ public class WxMiniServiceImpl implements WxMiniService { ...@@ -460,7 +462,7 @@ public class WxMiniServiceImpl implements WxMiniService {
if (firstEnter) { if (firstEnter) {
// 如果红包活动正在进行中,发送红包活动的提醒文字 // 如果红包活动正在进行中,发送红包活动的提醒文字
Activity activitySetting = activityService.getActivitySetting(); Activity activitySetting = activityService.getActivitySetting();
if (activitySetting != null && activitySetting.getStatus() == ActivityStatus.进行中.getIndex()) { if (activitySetting != null && activitySetting.getStatus() == ActivityStatus.RUNNING.getIndex()) {
welcome = activitySetting.getReplyWelcome(); welcome = activitySetting.getReplyWelcome();
} }
} }
......
...@@ -43,7 +43,7 @@ import com.google.gson.JsonElement; ...@@ -43,7 +43,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.w1hd.zzhnc.model.SysWxauthorize; 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.CommonUtil;
import com.w1hd.zzhnc.util.PropertiesFileUtil; import com.w1hd.zzhnc.util.PropertiesFileUtil;
import com.w1hd.zzhnc.util.RedisUtil; import com.w1hd.zzhnc.util.RedisUtil;
...@@ -116,7 +116,7 @@ public class WxOpenServiceImpl implements WxOpenService { ...@@ -116,7 +116,7 @@ public class WxOpenServiceImpl implements WxOpenService {
private SubscribeHandler subscribeHandler; private SubscribeHandler subscribeHandler;
@Autowired @Autowired
private SysWxauthorizeServiceImpl sysWxauthorizeService; private SysWxauthorizeService sysWxauthorizeService;
private ConcurrentMap<String, WxMpMessageRouter> router = new ConcurrentHashMap<String, WxMpMessageRouter>(); private ConcurrentMap<String, WxMpMessageRouter> router = new ConcurrentHashMap<String, WxMpMessageRouter>();
......
Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
请先完成此消息的编辑!