Przeglądaj źródła

日志打卡新增图片

Administrator 4 lat temu
rodzic
commit
360296d65d

+ 1 - 0
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -244,6 +244,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			customerService.addFollow(fbb,ufid);
 		}
 		PublicReleaseLog log=new PublicReleaseLog(id,TokenManager.getAdminId(),3,"公出人员打卡",new Date());
+		log.setPhotoUrl(photoUrl);
 		publicReleaseLogMapper.insertSelective(log);
 		publicReleaseMapper.updateByPrimaryKeySelective(p);
 		return 1;

+ 12 - 6
src/main/java/com/goafanti/common/dao/PublicReleaseLogMapper.java

@@ -11,37 +11,43 @@ public interface PublicReleaseLogMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int insert(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int insertSelective(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	PublicReleaseLog selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int updateByPrimaryKeySelective(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
+	 */
+	int updateByPrimaryKeyWithBLOBs(PublicReleaseLog record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int updateByPrimaryKey(PublicReleaseLog record);
 

+ 0 - 1
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -100,7 +100,6 @@ public interface UserLockReleaseMapper {
 
 	List<LockingReleaseBo> selectWaitReleaseBusiness(String aid);
 
-	void updateReleaseLock(@Param("time")String time);
 
 	void updatePendingReleaseLock(@Param("lockIds")String lockIds);
 

+ 56 - 14
src/main/java/com/goafanti/common/mapper/PublicReleaseLogMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="prid" jdbcType="INTEGER" property="prid" />
@@ -14,22 +14,40 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.PublicReleaseLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
+    -->
+    <result column="photo_url" jdbcType="LONGVARCHAR" property="photoUrl" />
+  </resultMap>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     id, prid, aid, remarks, `status`, create_time
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <sql id="Blob_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
+    -->
+    photo_url
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from public_release_log
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -37,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     delete from public_release_log
     where id = #{id,jdbcType=INTEGER}
@@ -46,20 +64,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     insert into public_release_log (id, prid, aid, 
-      remarks, `status`, create_time
-      )
+      remarks, `status`, create_time, 
+      photo_url)
     values (#{id,jdbcType=INTEGER}, #{prid,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{photoUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PublicReleaseLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     insert into public_release_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -81,6 +99,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="photoUrl != null">
+        photo_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -101,13 +122,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="photoUrl != null">
+        #{photoUrl,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicReleaseLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     update public_release_log
     <set>
@@ -126,14 +150,32 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="photoUrl != null">
+        photo_url = #{photoUrl,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.PublicReleaseLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
+    -->
+    update public_release_log
+    set prid = #{prid,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      photo_url = #{photoUrl,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PublicReleaseLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     update public_release_log
     set prid = #{prid,jdbcType=INTEGER},
@@ -144,7 +186,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="listPublicReleaseLog" resultType="com.goafanti.admin.bo.outPublicReleaseLog">
-  select a.id,a.aid ,a.prid ,a.remarks ,a.status ,b.name aname,
+  select a.id,a.aid ,a.prid ,a.remarks ,a.status ,b.name aname,a.photo_url photoUrl,
 	date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes
 	from public_release_log a left join admin b on a.aid =b.id
 	left  join public_release pr  on a.prid =pr.id

+ 0 - 4
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -410,9 +410,6 @@
 	where datediff(t1.last_follow_time,lock_time)>360 or datediff(now(),t0.lock_time)>900
   </select>
   
-  <update id="updateReleaseLock" parameterType="java.lang.String">
-  		update user_lock_release set status = 2,release_time =  #{time} where status=1
-  </update>
   
   <update id="updatePendingReleaseLock" parameterType="java.lang.String">
   	update user_lock_release set status = 1 where id in (${lockIds})
@@ -470,7 +467,6 @@
 	left join user u on t0.uid=u.id
 	where u.channel=0
 	and datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time)) &gt; 15 
-		
 	UNION 
 	  select  t0.uid, t0.aid, u.nickname name ,u.channel ,0 type
 	from

+ 3 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1646,7 +1646,9 @@
     </select>
     
     <update id="updateReleaseLock" parameterType="java.lang.String">
-    	update user a,user_lock_release b set a.share_type = 1,a.transfer_time =  #{time} where b.status=1 and b.`type`=0 and a.id=b.uid 
+    	update user a,user_lock_release b set a.share_type = 1,a.transfer_time =  #{time} 
+    	,b.status=2,b.release_time= #{time}
+    	where b.status=1 and b.`type`=0 and a.id=b.uid 
     </update>
     
     <select id="marketingStatistics" parameterType="java.lang.String" resultType="com.goafanti.report.bo.marketingESBo">

+ 42 - 20
src/main/java/com/goafanti/common/model/PublicReleaseLog.java

@@ -6,43 +6,48 @@ import java.util.Date;
 public class PublicReleaseLog implements Serializable {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.id
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.prid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private Integer prid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.aid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.remarks
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.status
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.create_time
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private Date createTime;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.photo_url
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
+	 */
+	private String photoUrl;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private static final long serialVersionUID = 1L;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.id
 	 * @return  the value of public_release_log.id
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -50,7 +55,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.id
 	 * @param id  the value for public_release_log.id
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -58,7 +63,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.prid
 	 * @return  the value of public_release_log.prid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public Integer getPrid() {
 		return prid;
@@ -66,7 +71,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.prid
 	 * @param prid  the value for public_release_log.prid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setPrid(Integer prid) {
 		this.prid = prid;
@@ -74,7 +79,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.aid
 	 * @return  the value of public_release_log.aid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public String getAid() {
 		return aid;
@@ -82,7 +87,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.aid
 	 * @param aid  the value for public_release_log.aid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setAid(String aid) {
 		this.aid = aid == null ? null : aid.trim();
@@ -90,7 +95,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.remarks
 	 * @return  the value of public_release_log.remarks
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -98,7 +103,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.remarks
 	 * @param remarks  the value for public_release_log.remarks
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks == null ? null : remarks.trim();
@@ -106,7 +111,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.status
 	 * @return  the value of public_release_log.status
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public Integer getStatus() {
 		return status;
@@ -114,7 +119,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.status
 	 * @param status  the value for public_release_log.status
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -122,7 +127,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.create_time
 	 * @return  the value of public_release_log.create_time
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -130,14 +135,30 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.create_time
 	 * @param createTime  the value for public_release_log.create_time
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.photo_url
+	 * @return  the value of public_release_log.photo_url
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
+	 */
+	public String getPhotoUrl() {
+		return photoUrl;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.photo_url
+	 * @param photoUrl  the value for public_release_log.photo_url
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
+	 */
+	public void setPhotoUrl(String photoUrl) {
+		this.photoUrl = photoUrl == null ? null : photoUrl.trim();
+	}
+	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	@Override
 	public String toString() {
@@ -151,6 +172,7 @@ public class PublicReleaseLog implements Serializable {
 		sb.append(", remarks=").append(remarks);
 		sb.append(", status=").append(status);
 		sb.append(", createTime=").append(createTime);
+		sb.append(", photoUrl=").append(photoUrl);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append("]");
 		return sb.toString();

+ 7 - 13
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -15,10 +15,12 @@ import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
@@ -38,6 +40,9 @@ public class ReleaseUserTask {
 	private UserService userService;
 	@Autowired
 	private AsyncUtils	asyncUtils;
+	
+	@Autowired
+	private NoticeMapper	noticeMapper;
 
 	int pointsDataLimit = 50;
 
@@ -58,7 +63,7 @@ public class ReleaseUserTask {
 		}
 
 	}
-
+	@ResponseBody
 	@RequestMapping(value = "/open/remindUser", method = RequestMethod.GET)
 	private void pushUserDays() throws InterruptedException {
 		LoggerUtils.debug(getClass(), "==============客户提醒开始============");
@@ -98,18 +103,7 @@ public class ReleaseUserTask {
 						NoticeStatus.CUSTOMER_PRIVATE_REMINDER.getCode(), str,ub.getUid()));
 			}
 		}
-		List<Notice> newList = new ArrayList<>();
-		if (ln != null && ln.size() > 0) {
-			for (int i = 0; i < ln.size(); i++) {
-				newList.add(ln.get(i));
-				if (pointsDataLimit == newList.size() || i == ln.size() - 1) {
-					if (newList.size() > 0)
-						asyncUtils.addNoticeBatch(newList);
-					newList.clear();
-					Thread.sleep(2000);
-				}
-			}
-		}
+		asyncUtils.addNoticeBatch(ln);
 		LoggerUtils.debug(getClass(), "==============客户提醒结束============");
 	}
 

+ 18 - 4
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.utils;
 
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.mail.MessagingException;
@@ -37,11 +38,24 @@ public class AsyncUtils {
 	}
 	
 	
-	public void addNoticeBatch(List<Notice> list){
-		for (Notice n : list) {
-			n.setType(NoticeTypes.getType(n.getNoticeType()));
+	public void addNoticeBatch(List<Notice> ln) {
+		List<Notice> newList=new ArrayList<Notice>();
+		if (ln != null && ln.size() > 0) {
+			for (int i = 0; i < ln.size(); i++) {
+				ln.get(i).setType(NoticeTypes.getType(ln.get(i).getNoticeType()));
+				newList.add(ln.get(i));
+				if (50 == newList.size() || i == ln.size() - 1) {
+					if (newList.size() > 0) noticeMapper.insertBatch(newList);
+					newList.clear();
+					try {
+						Thread.sleep(2000);
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+					}
+				}
+			}
 		}
-		noticeMapper.insertBatch(list);
+			
 		
 	}
 

+ 0 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1764,7 +1764,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String time = formatter.format(releaseTime);
 		userMapper.updateReleaseLock(time);
-		userLockReleaseMapper.updateReleaseLock(time);
 
 	}