admin
2020-12-26 b82493b0c083ed6bd5c0013bf21b8cb651a32eec
活动图片添加,自动生成代码框架初步搭建
32个文件已修改
9个文件已添加
625 ■■■■ 已修改文件
facade-lucky/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivityAwardResultExtra.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivityAwards.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivityImage.java 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/ActivityAssistMsgDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/ActivityDrawnMsgDTO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/ActivityJoinMsgDTO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/ActivityStateChangeMsgDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/BaseMQMsg.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generater/pom.xml 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generater/src/main/java/com/ks/generater/GeneraterMojo.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityLuckyCouponController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/pojo/DO/Announcement.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/pojo/VO/ActivityDetailVO.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/pojo/VO/UserMsgContentVO.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/pojo/VO/common/JumpDetailVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/impl/ActivityServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/UserMsgVOFactory.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/util/mq/CMQManager.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/util/mq/consumer/ActivityDrawnNotifyConsumer.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/util/mq/consumer/MsgConsumer.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/test/java/com/ks/MyBatisTest.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/test/java/com/ks/daylucky/ActivityTest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/test/java/com/ks/daylucky/MsgTest.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/pom.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/main/java/com/ks/lucky/config/XXLJobConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/main/java/com/ks/lucky/dao/LuckyActivityImageDao.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/main/java/com/ks/lucky/service/LuckyActivityImageService.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityImageServiceImpl.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/test/java/com/ks/MongoTest.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/test/java/com/ks/MyBatisTest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/test/java/com/ks/lucky/CMQTest.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/test/java/com/ks/lucky/DaoTest.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/pom.xml
@@ -20,6 +20,12 @@
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.2-SNAPSHOT</version>
        </dependency>
    </dependencies>
    <build>
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
@@ -132,6 +132,17 @@
    //开奖信息
    private LuckyActivityOpenInfo openInfo;
    //banner图片
    @Transient
    private List<LuckyActivityImage> bannerList;
    public List<LuckyActivityImage> getBannerList() {
        return bannerList;
    }
    public void setBannerList(List<LuckyActivityImage> bannerList) {
        this.bannerList = bannerList;
    }
    public List<LuckyActivityAwards> getAwardsList() {
        return awardsList;
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivityAwardResultExtra.java
@@ -1,7 +1,8 @@
package com.ks.lucky.pojo.DO;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
import org.yeshi.utils.generater.mybatis.Column;
import org.yeshi.utils.generater.mybatis.Table;
import java.io.Serializable;
import java.math.BigDecimal;
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivityAwards.java
@@ -1,7 +1,7 @@
package com.ks.lucky.pojo.DO;
import org.springframework.data.annotation.Transient;
import org.yeshi.utils.mybatis.Table;
import org.yeshi.utils.generater.mybatis.Table;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivityImage.java
New file
@@ -0,0 +1,92 @@
package com.ks.lucky.pojo.DO;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
@Document(collation = "luckyImage")
public class LuckyActivityImage implements Serializable {
    public enum LuckyImageType {
        banner("banner");
        private LuckyImageType(String type) {
        }
    }
    @Id
    private String id;
    @NotNull(message = "活动ID不能为空")
    private Long activityId;
    @NotEmpty(message = "链接不能为空")
    private String url;
    private Integer weight;
    @NotNull(message = "图片类型不能为空")
    private LuckyImageType type;
    private Date createTime;
    private Date updatetime;
    public Long getActivityId() {
        return activityId;
    }
    public void setActivityId(Long activityId) {
        this.activityId = activityId;
    }
    public Integer getWeight() {
        return weight;
    }
    public void setWeight(Integer weight) {
        this.weight = weight;
    }
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public LuckyImageType getType() {
        return type;
    }
    public void setType(LuckyImageType type) {
        this.type = type;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public Date getUpdatetime() {
        return updatetime;
    }
    public void setUpdatetime(Date updatetime) {
        this.updatetime = updatetime;
    }
}
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/ActivityAssistMsgDTO.java
@@ -1,12 +1,13 @@
package com.ks.lucky.pojo.DTO.mq;
import java.io.Serializable;
import com.ks.lucky.utils.LuckyCMQConstant;
import java.util.Date;
/**
 * 活动助力
 */
public class ActivityAssistMsgDTO implements Serializable {
public class ActivityAssistMsgDTO extends BaseMQMsg {
    //活动ID
    private Long activityId;
    //应用ID
@@ -28,6 +29,7 @@
        this.targetUid = targetUid;
        this.success = success;
        this.dateTime = dateTime;
        this.setCmqMsgTag(LuckyCMQConstant.TAG_ASSIST);
    }
    public Boolean getSuccess() {
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/ActivityDrawnMsgDTO.java
@@ -1,14 +1,14 @@
package com.ks.lucky.pojo.DTO.mq;
import com.ks.lucky.pojo.DO.LuckyActivityAwardResult;
import com.ks.lucky.utils.LuckyCMQConstant;
import java.io.Serializable;
import java.util.Date;
/**
 * 中奖消息
 */
public class ActivityDrawnMsgDTO implements Serializable {
public class ActivityDrawnMsgDTO  extends BaseMQMsg {
    //用户信息
    private String uid;
    private Long appId;
@@ -34,6 +34,7 @@
        dto.setAwardResultStateDesc(result.getStateDesc());
        dto.setDateTime(new Date());
        dto.setUid(result.getUid());
        dto.setCmqMsgTag(LuckyCMQConstant.TAG_ACTIVITY_DRAWN);
        return dto;
    }
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/ActivityJoinMsgDTO.java
@@ -1,6 +1,7 @@
package com.ks.lucky.pojo.DTO.mq;
import com.ks.lucky.pojo.DO.LuckyActivityJoinRecord;
import com.ks.lucky.utils.LuckyCMQConstant;
import java.io.Serializable;
import java.util.Date;
@@ -8,7 +9,7 @@
/**
 * 中奖消息
 */
public class ActivityJoinMsgDTO implements Serializable {
public class ActivityJoinMsgDTO  extends BaseMQMsg {
    //用户信息
    private Long joinId;
    //用户ID
@@ -28,6 +29,7 @@
        dto.setUid(record.getUid());
        dto.setJoinId(record.getId());
        dto.setDateTime(new Date());
        dto.setCmqMsgTag(LuckyCMQConstant.TAG_ACTIVITY_JOIN);
        return dto;
    }
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/ActivityStateChangeMsgDTO.java
@@ -1,12 +1,13 @@
package com.ks.lucky.pojo.DTO.mq;
import java.io.Serializable;
import com.ks.lucky.utils.LuckyCMQConstant;
import java.util.Date;
/**
 * 获取状态改变消息
 */
public class ActivityStateChangeMsgDTO implements Serializable {
public class ActivityStateChangeMsgDTO extends BaseMQMsg {
    //活动ID
    private Long activityId;
    //状态
@@ -21,6 +22,7 @@
        this.state = state;
        this.stateDesc = stateDesc;
        this.dateTime = dateTime;
        this.setCmqMsgTag(LuckyCMQConstant.TAG_ACTIVITY_STATE_CHANGE);
    }
    public Long getActivityId() {
facade-lucky/src/main/java/com/ks/lucky/pojo/DTO/mq/BaseMQMsg.java
New file
@@ -0,0 +1,15 @@
package com.ks.lucky.pojo.DTO.mq;
import java.io.Serializable;
public class BaseMQMsg implements Serializable {
    private String cmqMsgTag;
    public String getCmqMsgTag() {
        return cmqMsgTag;
    }
    public void setCmqMsgTag(String cmqMsgTag) {
        this.cmqMsgTag = cmqMsgTag;
    }
}
generater/pom.xml
New file
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>DayLucky</artifactId>
        <groupId>com.ks</groupId>
        <version>0.0.1-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>generater-maven-plugin</artifactId>
    <name>demo-mavne-plugin Maven Mojo</name>
    <packaging>maven-plugin</packaging>
    <version>1.0.0</version>
    <dependencies>
        <dependency>
            <groupId>org.apache.maven</groupId>
            <artifactId>maven-plugin-api</artifactId>
            <version>3.5.2</version>
        </dependency>
        <dependency>
            <groupId>org.apache.maven.plugin-tools</groupId>
            <artifactId>maven-plugin-annotations</artifactId>
            <version>3.5.2</version>
        </dependency>
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.2-SNAPSHOT</version>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-plugin-plugin</artifactId>
                <version>3.5.2</version>
            </plugin>
        </plugins>
    </build>
</project>
generater/src/main/java/com/ks/generater/GeneraterMojo.java
New file
@@ -0,0 +1,26 @@
package com.ks.generater;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@Mojo(name="mongoDao")
public class GeneraterMojo extends AbstractMojo {
    @Parameter(property = "configurationFile",defaultValue = "123")
    private String configureFilePath;
    @Override
    public void execute() throws MojoExecutionException, MojoFailureException {
        getLog().info("Hello Mojo123");
        getLog().info("configureFilePath:" + configureFilePath);
//        InputStream inputStream = GeneraterMojo.class.getClassLoader().getResourceAsStream(configureFilePath);
        //读取配置文件
    }
}
pom.xml
@@ -10,6 +10,7 @@
        <module>service-lucky</module>
        <module>service-app</module>
        <module>service-daylucky</module>
        <module>generater</module>
    </modules>
    <parent>
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
@@ -35,13 +35,13 @@
@RequestMapping("api/client/activity/assist")
public class ActivityAssistController {
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinService luckyActivityJoinService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityService luckyActivityService;
    @Resource
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java
@@ -35,10 +35,10 @@
@RequestMapping("api/client/activity/awards")
public class ActivityAwardsController {
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardResultService luckyActivityAwardResultService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardService luckyActivityAwardService;
    @Resource
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
@@ -31,10 +31,10 @@
@RequestMapping("api/client/activity")
public class ActivityController {
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityService luckyActivityService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
    @Resource
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
@@ -30,10 +30,10 @@
@RequestMapping("api/client/activity/join")
public class ActivityJoinController {
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinService luckyActivityJoinService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardResultService luckyActivityAwardResultService;
    @Resource
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityLuckyCouponController.java
@@ -23,7 +23,7 @@
@RequestMapping("api/client/activity/coupon")
public class ActivityLuckyCouponController {
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityUserWeightRecordService luckyActivityUserWeightRecordService;
service-daylucky/src/main/java/com/ks/daylucky/pojo/DO/Announcement.java
@@ -1,7 +1,7 @@
package com.ks.daylucky.pojo.DO;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
import org.yeshi.utils.generater.mybatis.Column;
import org.yeshi.utils.generater.mybatis.Table;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
service-daylucky/src/main/java/com/ks/daylucky/pojo/VO/ActivityDetailVO.java
@@ -197,13 +197,21 @@
        private Long id;
        private String name;
        private String poster;
        private Long leftTime;
        private List<String> bannerList;
        private SponsorVO sponsor;
        private SponsorAdBean sponsorAd;
        private List<ActivityAwardVO> awardList;
        public List<String> getBannerList() {
            return bannerList;
        }
        public void setBannerList(List<String> bannerList) {
            this.bannerList = bannerList;
        }
        //获取期号
        private String dateNumber;
@@ -230,14 +238,6 @@
        public void setName(String name) {
            this.name = name;
        }
        public String getPoster() {
            return poster;
        }
        public void setPoster(String poster) {
            this.poster = poster;
        }
        public Long getLeftTime() {
service-daylucky/src/main/java/com/ks/daylucky/pojo/VO/UserMsgContentVO.java
@@ -1,14 +1,23 @@
package com.ks.daylucky.pojo.VO;
import com.ks.daylucky.pojo.VO.common.JumpDetailVO;
public class UserMsgContentVO {
    private String title;
    private String content;
    private JumpDetailVO jump;
    public UserMsgContentVO(String title, String content) {
        this.title = title;
        this.content = content;
    }
    public UserMsgContentVO(String title, String content, JumpDetailVO jump) {
        this.title = title;
        this.content = content;
        this.jump = jump;
    }
    public String getTitle() {
        return title;
    }
service-daylucky/src/main/java/com/ks/daylucky/pojo/VO/common/JumpDetailVO.java
@@ -4,7 +4,7 @@
public class JumpDetailVO {
    public enum JumpType {
        alipayLife("支付宝生活号");
        alipayLife("支付宝生活号"),page("普通页面");
        private JumpType(String name) {
service-daylucky/src/main/java/com/ks/daylucky/service/impl/ActivityServiceImpl.java
@@ -27,14 +27,14 @@
@Service
public class ActivityServiceImpl implements ActivityService {
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityService luckyActivityService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinService luckyActivityJoinService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardResultService luckyActivityAwardResultService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardService luckyActivityAwardService;
    @Resource
service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java
@@ -14,6 +14,7 @@
import org.yeshi.utils.TimeUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ActivityDetailVOFactory {
@@ -71,7 +72,15 @@
            bean.setLeftTime(leftTime);
        }
        bean.setName(activity.getName());
        bean.setPoster(activity.getMaterialPoster());
        if (activity.getBannerList() == null || activity.getBannerList().size() == 0) {
            bean.setBannerList(Arrays.asList(new String[]{activity.getMaterialPoster()}));
        } else {
            List<String> bannerList = new ArrayList<>();
            for (LuckyActivityImage image : activity.getBannerList()) {
                bannerList.add(image.getUrl());
            }
            bean.setBannerList(bannerList);
        }
        bean.setSponsor(ActivityListItemInfoVOFactory.create(activity.getSponsorInfo().getSponsors()));
        bean.setSponsorAd(create(activity.getSponsorInfo()));
        bean.setDateNumber("活动期号:" + ActivityUtil.getActivityDateNumber(activity.getId()));
service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/UserMsgVOFactory.java
@@ -4,6 +4,8 @@
import com.ks.daylucky.pojo.DTO.msg.LuckyMsgContent;
import com.ks.daylucky.pojo.VO.UserMsgContentVO;
import com.ks.daylucky.pojo.VO.UserMsgVO;
import com.ks.daylucky.pojo.VO.common.JumpDetailVO;
import net.sf.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
@@ -33,7 +35,9 @@
    private static List<UserMsgContentVO> create(LuckyMsgContent luckyMsgContent) {
        LuckyMsgContent.LuckyMsgType luckyMsgType = luckyMsgContent.getLuckyMsgType();
        List<UserMsgContentVO> voList = new ArrayList<>();
        voList.add(new UserMsgContentVO("活动期号", getDateNumber(luckyMsgContent.getDateNumber())));
        JSONObject params = new JSONObject();
        params.put("url", "/pages/activity-detail/activity-detail?id=" + luckyMsgContent.getActivityId());
        voList.add(new UserMsgContentVO("活动期号", getDateNumber(luckyMsgContent.getDateNumber()), new JumpDetailVO(JumpDetailVO.JumpType.page, null, params)));
        if (luckyMsgType == LuckyMsgContent.LuckyMsgType.joinSuccess) {
            voList.add(new UserMsgContentVO("状态", "参与成功"));
service-daylucky/src/main/java/com/ks/daylucky/util/mq/CMQManager.java
@@ -4,6 +4,7 @@
import com.qcloud.cmq.Message;
import org.yeshi.utils.CMQUtil;
import java.util.Arrays;
import java.util.List;
public class CMQManager {
@@ -31,29 +32,29 @@
        cmqUtil.createQueue(QUEUENAME_DAY_LUCKY_ACTIVITY_DRAWN, 1024 * 1024);
        try {
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ACTIVITY_STATE_CHANGE, "msg_activity-state-change", QUEUENAME_DAY_LUCKY_MSG);
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ACTIVITY_STATE_CHANGE, QUEUENAME_DAY_LUCKY_MSG, QUEUENAME_DAY_LUCKY_MSG);
        } catch (Exception e) {
            e.printStackTrace();
        }
        try {
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ASSIST, "msg_assist", QUEUENAME_DAY_LUCKY_MSG);
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ASSIST, QUEUENAME_DAY_LUCKY_MSG, QUEUENAME_DAY_LUCKY_MSG);
        } catch (Exception e) {
        }
        try {
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ACTIVITY_DRAWN, "msg_activity_drawn", QUEUENAME_DAY_LUCKY_MSG);
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ACTIVITY_DRAWN, QUEUENAME_DAY_LUCKY_MSG, QUEUENAME_DAY_LUCKY_MSG);
        } catch (Exception e) {
        }
        try {
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ACTIVITY_JOIN, "msg_activity_join", QUEUENAME_DAY_LUCKY_MSG);
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ACTIVITY_JOIN, QUEUENAME_DAY_LUCKY_MSG, QUEUENAME_DAY_LUCKY_MSG);
        } catch (Exception e) {
        }
        try {
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ACTIVITY_DRAWN, "notify_activity_drawn", QUEUENAME_DAY_LUCKY_ACTIVITY_DRAWN);
            cmqUtil.subscribeTopic(LuckyCMQConstant.TOPIC_ACTIVITY_DRAWN, QUEUENAME_DAY_LUCKY_ACTIVITY_DRAWN, QUEUENAME_DAY_LUCKY_ACTIVITY_DRAWN);
        } catch (Exception e) {
        }
service-daylucky/src/main/java/com/ks/daylucky/util/mq/consumer/ActivityDrawnNotifyConsumer.java
@@ -6,6 +6,7 @@
import com.ks.lucky.pojo.DO.LuckyActivityAwardResult;
import com.ks.lucky.pojo.DO.LuckyActivityAwards;
import com.ks.lucky.pojo.DTO.mq.ActivityDrawnMsgDTO;
import com.ks.lucky.pojo.DTO.mq.BaseMQMsg;
import com.ks.lucky.remote.service.LuckyActivityAwardResultService;
import com.ks.lucky.remote.service.LuckyActivityAwardService;
import com.ks.lucky.utils.LuckyCMQConstant;
@@ -25,10 +26,10 @@
    Logger logger = LoggerFactory.getLogger(ActivityDrawnNotifyConsumer.class);
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardResultService luckyActivityAwardResultService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardService luckyActivityAwardService;
    @Resource
@@ -42,8 +43,9 @@
                List<Message> messageList = CMQManager.getInstance().consumeMsgMsg(16);
                if (messageList != null) {
                    for (Message message : messageList) {
                        Vector<String> vectors = message.msgTag;
                        if (vectors.contains(LuckyCMQConstant.TAG_ACTIVITY_DRAWN)) {
                        BaseMQMsg mqMsg = JsonUtil.getSimpleGson().fromJson(message.msgBody, BaseMQMsg.class);
                        String tag=mqMsg.getCmqMsgTag();
                        if (tag.equalsIgnoreCase(LuckyCMQConstant.TAG_ACTIVITY_DRAWN)) {
                            try {
                                //活动状态改变
service-daylucky/src/main/java/com/ks/daylucky/util/mq/consumer/MsgConsumer.java
@@ -11,10 +11,7 @@
import com.ks.daylucky.util.mq.CMQManager;
import com.ks.lucky.pojo.DO.*;
import com.ks.lucky.pojo.DTO.ActivitySimpleUser;
import com.ks.lucky.pojo.DTO.mq.ActivityAssistMsgDTO;
import com.ks.lucky.pojo.DTO.mq.ActivityDrawnMsgDTO;
import com.ks.lucky.pojo.DTO.mq.ActivityJoinMsgDTO;
import com.ks.lucky.pojo.DTO.mq.ActivityStateChangeMsgDTO;
import com.ks.lucky.pojo.DTO.mq.*;
import com.ks.lucky.remote.service.LuckyActivityAwardResultService;
import com.ks.lucky.remote.service.LuckyActivityAwardService;
import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
@@ -31,7 +28,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
public class MsgConsumer implements CMQConsumeRunner {
@@ -43,16 +39,16 @@
    @Resource
    private UserInfoService userInfoService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityJoinService luckyActivityJoinService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardResultService luckyActivityAwardResultService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityAwardService luckyActivityAwardService;
    @Resource
@@ -89,8 +85,10 @@
                List<Message> messageList = CMQManager.getInstance().consumeMsgMsg(16);
                if (messageList != null) {
                    for (Message message : messageList) {
                        Vector<String> vectors = message.msgTag;
                        if (vectors.contains(LuckyCMQConstant.TAG_ACTIVITY_STATE_CHANGE)) {
                        BaseMQMsg baseMQMsg = JsonUtil.getSimpleGson().fromJson(message.msgBody, BaseMQMsg.class);
                        String tag = baseMQMsg.getCmqMsgTag();
                        if (tag.equalsIgnoreCase(LuckyCMQConstant.TAG_ACTIVITY_STATE_CHANGE)) {
                            //活动状态改变
                            ActivityStateChangeMsgDTO dto = JsonUtil.getSimpleGson().fromJson(message.msgBody, ActivityStateChangeMsgDTO.class);
                            List<ActivitySimpleUser> userList;
@@ -145,7 +143,7 @@
                            }
                        } else if (vectors.contains(LuckyCMQConstant.TAG_ACTIVITY_JOIN)) {
                        } else if (tag.equalsIgnoreCase(LuckyCMQConstant.TAG_ACTIVITY_JOIN)) {
                            ActivityJoinMsgDTO dto = JsonUtil.getSimpleGson().fromJson(message.msgBody, ActivityJoinMsgDTO.class);
                            UserMsgSettings settings = getUserMsgSetting(Long.parseLong(dto.getUid()));
                            if (settings.getJoinActivityMsg()) {
@@ -176,7 +174,7 @@
                            }
                        } else if (vectors.contains(LuckyCMQConstant.TAG_ASSIST)) {
                        } else if (tag.equalsIgnoreCase(LuckyCMQConstant.TAG_ASSIST)) {
                            //助力
                            ActivityAssistMsgDTO dto = JsonUtil.getSimpleGson().fromJson(message.msgBody, ActivityAssistMsgDTO.class);
                            UserMsgSettings settings = getUserMsgSetting(Long.parseLong(dto.getUid()));
@@ -193,7 +191,7 @@
                                }
                            }
                        } else if (vectors.contains(LuckyCMQConstant.TAG_ACTIVITY_DRAWN)) {
                        } else if (tag.equalsIgnoreCase(LuckyCMQConstant.TAG_ACTIVITY_DRAWN)) {
                            ActivityDrawnMsgDTO dto = JsonUtil.getSimpleGson().fromJson(message.msgBody, ActivityDrawnMsgDTO.class);
                            switch (dto.getAwardResultState()) {
                                case LuckyActivityAwardResult.STATE_OUT_OF_DATE:
service-daylucky/src/test/java/com/ks/MyBatisTest.java
@@ -1,11 +1,8 @@
package com.ks;
import com.ks.daylucky.pojo.DO.Announcement;
import com.ks.lucky.pojo.DO.LuckyActivity;
import com.ks.lucky.pojo.DO.LuckyActivityAwardResultExtra;
import org.junit.jupiter.api.Test;
import org.yeshi.utils.mybatis.ColumnParseUtil;
import org.yeshi.utils.mybatis.MyBatisMapperUtil;
import org.yeshi.utils.generater.mybatis.MyBatisMapperUtil;
public class MyBatisTest {
service-daylucky/src/test/java/com/ks/daylucky/ActivityTest.java
@@ -17,7 +17,7 @@
    @Resource
    private ActivityService activityService;
    @Reference(version = "1.0.0")
    @Reference(version = "1.0.0",check = false)
    private LuckyActivityService luckyActivityService;
service-daylucky/src/test/java/com/ks/daylucky/MsgTest.java
@@ -21,8 +21,6 @@
        } catch (UserMsgException e) {
        }
    }
}
service-lucky/pom.xml
@@ -194,6 +194,17 @@
                    <!--</dependency>-->
                <!--</dependencies>-->
            <!--</plugin>-->
            <plugin>
                <groupId>com.ks</groupId>
                <artifactId>generater-maven-plugin</artifactId>
                <version>1.0.0</version>
                <configuration>
                    <!--配置文件的位置-->
                    <configurationFile>src/main/resources/generatorConfig.xml</configurationFile>
                </configuration>
            </plugin>
        </plugins>
    </build>
service-lucky/src/main/java/com/ks/lucky/config/XXLJobConfig.java
@@ -7,7 +7,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
//@Configuration
public class XXLJobConfig {
    Logger log = LoggerFactory.getLogger(XXLJobConfig.class);
service-lucky/src/main/java/com/ks/lucky/dao/LuckyActivityImageDao.java
New file
@@ -0,0 +1,56 @@
package com.ks.lucky.dao;
import com.ks.lucky.pojo.DO.LuckyActivityImage;
import com.ks.lib.common.dao.MongodbBaseDao;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List;
@Repository
public class LuckyActivityImageDao extends MongodbBaseDao<LuckyActivityImage> {
    public void updateSelective(LuckyActivityImage bean) {
        Query query = new Query();
        Update update = new Update();
        query.addCriteria(Criteria.where("id").is(bean.getId()));
        if (bean.getUrl() != null) {
            update.set("url", bean.getUrl());
        }
        if (bean.getType() != null) {
            update.set("type", bean.getType());
        }
        if (bean.getWeight() != null) {
            update.set("weight", bean.getWeight());
        }
        if (bean.getCreateTime() != null) {
            update.set("createTime", bean.getCreateTime());
        }
        update.set("updateTime", new Date());
        update(query, update);
    }
    /**
     * 根据活动ID获取图片
     *
     * @param activityId
     * @param page
     * @param pageSize
     * @return
     */
    public List<LuckyActivityImage> listByActivityId(Long activityId, LuckyActivityImage.LuckyImageType type, int page, int pageSize) {
        Query query = new Query();
        query.addCriteria(Criteria.where("activityId").is(activityId).and("type").is(type));
        query.skip((page - 1) * pageSize);
        query.limit(pageSize);
        query.with(Sort.by(Sort.Order.desc("weight")));
        return findList(query);
    }
}
service-lucky/src/main/java/com/ks/lucky/service/LuckyActivityImageService.java
New file
@@ -0,0 +1,44 @@
package com.ks.lucky.service;
import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.pojo.DO.LuckyActivityImage;
import java.util.List;
/**
 * 活动图片服务
 */
public interface LuckyActivityImageService {
    /**
     * 添加
     *
     * @param image
     * @throws ParamsException
     */
    public void add(LuckyActivityImage image) throws ParamsException;
    /**
     * @param activityId
     * @return
     */
    public List<LuckyActivityImage> listByActivityId(Long activityId, LuckyActivityImage.LuckyImageType type);
    /**
     * 根据主键查询
     *
     * @param activityId
     * @return
     */
    public List<String> listUrlByActivityId(Long activityId,LuckyActivityImage.LuckyImageType type);
    /**
     * 删除
     *
     * @param id
     */
    public void deleteById(String id);
}
service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityImageServiceImpl.java
New file
@@ -0,0 +1,62 @@
package com.ks.lucky.service.impl;
import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.dao.LuckyActivityImageDao;
import com.ks.lucky.pojo.DO.LuckyActivityImage;
import com.ks.lucky.service.LuckyActivityImageService;
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Service
public class LuckyActivityImageServiceImpl implements LuckyActivityImageService {
    @Resource
    private LuckyActivityImageDao luckyActivityImageDao;
    @Validated
    @Override
    public void add(@Valid LuckyActivityImage image) throws ParamsException {
        if (image.getWeight() == null) {
            image.setWeight(0);
        }
        if (image.getCreateTime() == null) {
            image.setCreateTime(new Date());
        }
        luckyActivityImageDao.save(image);
    }
    @Override
    public List<LuckyActivityImage> listByActivityId(Long activityId, LuckyActivityImage.LuckyImageType type) {
        return luckyActivityImageDao.listByActivityId(activityId, type, 1, 100);
    }
    @Override
    public List<String> listUrlByActivityId(Long activityId, LuckyActivityImage.LuckyImageType type) {
        List<LuckyActivityImage> list = listByActivityId(activityId, type);
        List<String> urlList = new ArrayList<>();
        if (list != null) {
            for (LuckyActivityImage image : list) {
                urlList.add(image.getUrl());
            }
        }
        return urlList;
    }
    @Override
    public void deleteById(String id) {
        luckyActivityImageDao.delete(id);
    }
}
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
@@ -7,6 +7,7 @@
import com.ks.lucky.pojo.DO.*;
import com.ks.lucky.query.ActivityDaoQuery;
import com.ks.lucky.remote.service.LuckyActivityService;
import com.ks.lucky.service.LuckyActivityImageService;
import com.ks.lucky.service.LuckyMQService;
import com.ks.lucky.service.impl.*;
import com.ks.lucky.util.mq.LuckyMQFactory;
@@ -43,6 +44,9 @@
    @Resource
    private LuckyMQService luckyMQService;
    @Resource
    private LuckyActivityImageService luckyActivityImageService;
    private void notNull(LuckyActivity activity) throws LuckyActivityException {
@@ -258,6 +262,11 @@
        if (activity == null) {
            return null;
        }
        //加载图片信息
        List<LuckyActivityImage> bannerList = luckyActivityImageService.listByActivityId(id, LuckyActivityImage.LuckyImageType.banner);
        activity.setBannerList(bannerList);
        //加载开奖信息
        LuckyActivityOpenInfo openInfo = luckyActivityOpenInfoManager.getOpenInfo(activity.getId());
        activity.setOpenInfo(openInfo);
service-lucky/src/test/java/com/ks/MongoTest.java
New file
@@ -0,0 +1,53 @@
package com.ks;
import com.ks.lib.common.dao.MongodbBaseDao;
import com.ks.lucky.dao.LuckyActivityImageDao;
import com.ks.lucky.pojo.DO.LuckyActivityImage;
import com.ks.lucky.service.LuckyActivityImageService;
import org.junit.jupiter.api.Test;
import org.yeshi.utils.generater.SpringComponentGenerater;
import org.yeshi.utils.generater.entity.MongoDBDaoData;
import org.yeshi.utils.generater.entity.ServiceData;
public class MongoTest {
    @Test
    public void createDao() {
        try {
            SpringComponentGenerater.createMongoDao(new MongoDBDaoData.Builder().setBaseDaoClass(MongodbBaseDao.class).setDaoPackageName("com.ks.lucky.dao").setEntityClass(LuckyActivityImage.class).create(), "D:\\workspace\\DayLucky\\service-lucky\\src\\main\\java\\com\\ks\\lucky\\dao");
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    @Test
    public void createService() {
        try {
            SpringComponentGenerater.createService(new ServiceData.Builder().setPackageName("com.ks.lucky.service").setDaoClass(LuckyActivityImage.class).setEntityClass(LuckyActivityImage.class).build(), "D:\\workspace\\DayLucky\\service-lucky\\src\\main\\java\\com\\ks\\lucky\\service\\");
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    @Test
    public void createServiceImpl() {
        try {
            SpringComponentGenerater.createServiceImpl(new ServiceData.Builder().setPackageName("com.ks.lucky.service.impl").setServiceClass(LuckyActivityImageService.class).setDaoClass(LuckyActivityImageDao.class).setEntityClass(LuckyActivityImage.class).build(), "D:\\workspace\\DayLucky\\service-lucky\\src\\main\\java\\com\\ks\\lucky\\service\\impl\\");
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
//
//    @Test
//    public void createException() {
//        try {
//            SpringComponentGenerater.createException(new ExceptionData.Builder().setPackageName("com.ks.daylucky.exception").setBaseClass(BaseException.class).setEntityClass(LuckyImage.class).build(), "D:\\workspace\\DayLucky\\service-daylucky\\src\\main\\java\\com\\ks\\daylucky\\exception\\");
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//    }
}
service-lucky/src/test/java/com/ks/MyBatisTest.java
@@ -2,7 +2,7 @@
import com.ks.lucky.pojo.DO.*;
import org.junit.jupiter.api.Test;
import org.yeshi.utils.mybatis.ColumnParseUtil;
import org.yeshi.utils.generater.mybatis.ColumnParseUtil;
public class MyBatisTest {
service-lucky/src/test/java/com/ks/lucky/CMQTest.java
New file
@@ -0,0 +1,23 @@
package com.ks.lucky;
import com.ks.lucky.pojo.DTO.mq.ActivityJoinMsgDTO;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import com.ks.lucky.util.mq.CMQManager;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import javax.annotation.Resource;
@SpringBootTest
public class CMQTest {
    @Resource
    private LuckyActivityJoinService luckyActivityJoinService;
    @Test
    public void addJoinMsg() {
        CMQManager.getInstance().publishActivityJoinMsg(ActivityJoinMsgDTO.create(luckyActivityJoinService.getJoinRecord(6L)));
    }
}
service-lucky/src/test/java/com/ks/lucky/DaoTest.java
@@ -1,9 +1,8 @@
package com.ks.lucky;
import com.ks.lucky.pojo.DO.LuckyActivityAwardMaterial;
import com.ks.lucky.pojo.DO.LuckySponsorAd;
import org.junit.jupiter.api.Test;
import org.yeshi.utils.mongo.MongoDaoUtil;
import org.yeshi.utils.generater.mongo.MongoDaoUtil;
public class DaoTest {