Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantEntryActivitesDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.biz.dal.dao;
-
-import com.ym.mec.biz.dal.entity.TenantEntryActivites;
-import com.ym.mec.common.dal.BaseDAO;
-
-public interface TenantEntryActivitesDao extends BaseDAO<Integer, TenantEntryActivites> {
-
-	
-}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantEntryActivitiesDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface TenantEntryActivitiesDao extends BaseDAO<Integer, TenantEntryActivities> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantEntryActivites.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantEntryActivities.java

@@ -5,7 +5,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 /**
  * 对应数据库表(tenant_entry_activites):
  */
-public class TenantEntryActivites {
+public class TenantEntryActivities {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/service/TenantEntryActivitesService.java

@@ -1,14 +0,0 @@
-package com.ym.mec.biz.service;
-
-import com.ym.mec.biz.dal.entity.TenantEntryActivites;
-import com.ym.mec.common.service.BaseService;
-
-public interface TenantEntryActivitesService extends BaseService<Integer, TenantEntryActivites> {
-
-	/**
-	 * 合并对象
-	 * @param tenantEntryActivites
-	 * @return
-	 */
-	public boolean merge(TenantEntryActivites tenantEntryActivites);
-}

mec-biz/src/main/java/com/ym/mec/biz/service/TenantEntryActivitiesService.java

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.common.service.BaseService;
+
+public interface TenantEntryActivitiesService extends BaseService<Integer, TenantEntryActivities> {
+
+	/**
+	 * 合并对象
+	 * @param tenantEntryActivites
+	 * @return
+	 */
+	public boolean merge(TenantEntryActivities tenantEntryActivites);
+
+	/**
+	 * 入驻
+	 * @param userId 用户编号
+	 * @param activitiesId 活动编号
+	 * @return
+	 */
+	public boolean enter(Integer userId, Integer activitiesId);
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantEntryActivitesServiceImpl.java → mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantEntryActivitiesServiceImpl.java

@@ -5,26 +5,26 @@ import java.util.Date;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.ym.mec.biz.dal.dao.TenantEntryActivitesDao;
-import com.ym.mec.biz.dal.entity.TenantEntryActivites;
-import com.ym.mec.biz.service.TenantEntryActivitesService;
+import com.ym.mec.biz.dal.dao.TenantEntryActivitiesDao;
+import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.biz.service.TenantEntryActivitiesService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
 @Service
-public class TenantEntryActivitesServiceImpl extends BaseServiceImpl<Integer, TenantEntryActivites> implements TenantEntryActivitesService {
+public class TenantEntryActivitiesServiceImpl extends BaseServiceImpl<Integer, TenantEntryActivities> implements TenantEntryActivitiesService {
 
 	@Autowired
-	private TenantEntryActivitesDao tenantEntryActivitesDao;
+	private TenantEntryActivitiesDao tenantEntryActivitesDao;
 
 	@Override
-	public BaseDAO<Integer, TenantEntryActivites> getDAO() {
+	public BaseDAO<Integer, TenantEntryActivities> getDAO() {
 		return tenantEntryActivitesDao;
 	}
 
 	@Override
-	public boolean merge(TenantEntryActivites tenantEntryActivites) {
+	public boolean merge(TenantEntryActivities tenantEntryActivites) {
 
 		if (!tenantEntryActivites.getStartDate().before(tenantEntryActivites.getEndDate())) {
 			throw new BizException("活动开始时间必须在结束时间之前");
@@ -32,7 +32,7 @@ public class TenantEntryActivitesServiceImpl extends BaseServiceImpl<Integer, Te
 
 		Date date = new Date();
 		if (tenantEntryActivites.getId() != null) {
-			TenantEntryActivites orginTenantEntryActivites = tenantEntryActivitesDao.get(tenantEntryActivites.getId());
+			TenantEntryActivities orginTenantEntryActivites = tenantEntryActivitesDao.get(tenantEntryActivites.getId());
 
 			if (orginTenantEntryActivites == null) {
 				throw new BizException("操作失败，请检查输入参数");
@@ -48,4 +48,9 @@ public class TenantEntryActivitesServiceImpl extends BaseServiceImpl<Integer, Te
 		return true;
 	}
 
+	@Override
+	public boolean enter(Integer userId, Integer activitiesId) {
+		return false;
+	}
+
 }

mec-biz/src/main/resources/config/mybatis/TenantEntryActivitesMapper.xml → mec-biz/src/main/resources/config/mybatis/TenantEntryActivitiesMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
-<mapper namespace="com.ym.mec.biz.dal.dao.TenantEntryActivitesDao">
+<mapper namespace="com.ym.mec.biz.dal.dao.TenantEntryActivitiesDao">
 
-	<resultMap type="com.ym.mec.biz.dal.entity.TenantEntryActivites"
-		id="TenantEntryActivites">
+	<resultMap type="com.ym.mec.biz.dal.entity.TenantEntryActivities"
+		id="TenantEntryActivities">
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
 		<result column="cover_img_" property="coverImg" />
@@ -32,29 +32,29 @@
 	</sql>
 
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="TenantEntryActivites">
-		SELECT * FROM tenant_entry_activites WHERE id_ = #{id}
+	<select id="get" resultMap="TenantEntryActivities">
+		SELECT * FROM tenant_entry_activities WHERE id_ = #{id}
 	</select>
 
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="TenantEntryActivites">
+	<select id="findAll" resultMap="TenantEntryActivities">
 		SELECT * FROM
-		tenant_entry_activites ORDER BY id_
+		tenant_entry_activities ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivites"
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivities"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
-		INSERT INTO tenant_entry_activites
+		INSERT INTO tenant_entry_activities
 		(id_,name_,cover_img_,detail_,total_price_,discount_price_,give_minutes_,start_date_,end_date_,condition_,del_flag_,create_time_,update_time_)
 		VALUES(#{id},#{name},#{coverImg},#{detail},#{totalPrice},#{discountPrice},#{giveMinutes},#{startDate},#{endDate},#{condition},#{delFlag},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivites">
-		UPDATE tenant_entry_activites
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivities">
+		UPDATE tenant_entry_activities
 		<set>
 			<if test="condition != null">
 				condition_ = #{condition},
@@ -101,13 +101,13 @@
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete">
-		DELETE FROM tenant_entry_activites WHERE id_ = #{id}
+		DELETE FROM tenant_entry_activities WHERE id_ = #{id}
 	</delete>
 
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="TenantEntryActivites"
+	<select id="queryPage" resultMap="TenantEntryActivities"
 		parameterType="map">
-		SELECT * FROM tenant_entry_activites
+		SELECT * FROM tenant_entry_activities
 		<include refid="queryCondition" />
 		order by id_ desc
 		<include refid="global.limit" />
@@ -115,7 +115,7 @@
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM tenant_entry_activites
+		SELECT COUNT(*) FROM tenant_entry_activities
 		<include refid="queryCondition" />
 		order by id_ desc
 	</select>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TenantEntryActivitesController.java → mec-teacher/src/main/java/com/ym/mec/teacher/controller/TenantEntryActivitiesController.java

@@ -11,23 +11,23 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.page.TenantEntryActivitesQueryInfo;
-import com.ym.mec.biz.service.TenantEntryActivitesService;
+import com.ym.mec.biz.service.TenantEntryActivitiesService;
 import com.ym.mec.common.controller.BaseController;
 
-@RequestMapping("tenantEntryActivites")
+@RequestMapping("tenantEntryActivities")
 @Api(tags = "租客入驻活动")
 @RestController
-public class TenantEntryActivitesController extends BaseController {
+public class TenantEntryActivitiesController extends BaseController {
 
     @Autowired
-    private TenantEntryActivitesService tenantEntryActivitesService;
+    private TenantEntryActivitiesService tenantEntryActivitiesService;
 
     @ApiOperation(value = "分页查询活动列表")
     @GetMapping("/queryPage")
     public Object queryPage(TenantEntryActivitesQueryInfo queryInfo) {
     	queryInfo.setDelFlag(false);
     	queryInfo.setStartDate(new Date());
-        return succeed(tenantEntryActivitesService.queryPage(queryInfo));
+        return succeed(tenantEntryActivitiesService.queryPage(queryInfo));
     }
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/TenantEntryActivitesController.java → mec-web/src/main/java/com/ym/mec/web/controller/TenantEntryActivitiesController.java

@@ -11,38 +11,38 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.biz.dal.entity.TenantEntryActivites;
-import com.ym.mec.biz.service.TenantEntryActivitesService;
+import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.biz.service.TenantEntryActivitiesService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
 
-@RequestMapping("tenantEntryActivites")
+@RequestMapping("tenantEntryActivities")
 @Api(tags = "租客入驻活动")
 @RestController
-public class TenantEntryActivitesController extends BaseController {
+public class TenantEntryActivitiesController extends BaseController {
 
 	@Autowired
-	private TenantEntryActivitesService tenantEntryActivitesService;
+	private TenantEntryActivitiesService tenantEntryActivitiesService;
 
 	@ApiOperation(value = "分页查询活动列表")
 	@GetMapping("/queryPage")
-	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/queryPage')")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/queryPage')")
 	public Object queryPage(QueryInfo queryInfo) {
-		return succeed(tenantEntryActivitesService.queryPage(queryInfo));
+		return succeed(tenantEntryActivitiesService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "查询活动信息")
 	@GetMapping("/query")
-	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/query')")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/query')")
 	public Object query(Integer id) {
-		return succeed(tenantEntryActivitesService.get(id));
+		return succeed(tenantEntryActivitiesService.get(id));
 	}
 
 	@ApiOperation(value = "新增、修改活动")
 	@PostMapping("/merge")
-	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/merge')")
-	public Object merge(@RequestBody TenantEntryActivites tenantEntryActivites) {
-		tenantEntryActivitesService.merge(tenantEntryActivites);
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/merge')")
+	public Object merge(@RequestBody TenantEntryActivities tenantEntryActivites) {
+		tenantEntryActivitiesService.merge(tenantEntryActivites);
 		return succeed();
 	}