Skip to content

H
haoban-manage3.0
Commit bc7dcfd6 by 徐高华
Options

Merge branch 'feature/社群' into 'developer' 

Feature/社群

See merge request !686
parents 20876098 5047c627
Showing with 44 additions and 20 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkChatDTO.java
......@@ -35,6 +35,16 @@ public class HmLinkChatDTO implements Serializable {
private String name;
private Integer linkCount ;
private String esId ;
// 用于人群回显
private String searchJson;
public String getSearchJson() {
return searchJson;
}
public void setSearchJson(String searchJson) {
this.searchJson = searchJson;
}
public String getEsId() {
return esId;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatPlanMapper.java
......@@ -24,7 +24,7 @@ public interface GroupChatPlanMapper {
@Param("clerkName") String clerkName);
public int stopById(@Param("planId") Long planId, @Param("clerkId") String clerkId,
@Param("clerkName") String clerkName);
@Param("clerkName") String clerkName, @Param("modifyStartTimeFlag") Integer modifyStartTimeFlag);
public int updateSendFlag(@Param("planId") Long planId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java
......@@ -349,7 +349,12 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
@Override
public void stop(String clerkId, String clerkName, Long planId) {
logger.info("终止计划,并触发统计planId={}", planId);
this.groupChatPlanMapper.stopById(planId, clerkId, clerkName);
Integer modifyStartTimeFlag = null;
TabGroupChatPlan plan = this.groupChatPlanMapper.selectById(planId);
if (plan.getStartTime().getTime() >= new Date().getTime()) {
modifyStartTimeFlag = 1;
}
this.groupChatPlanMapper.stopById(planId, clerkId, clerkName, modifyStartTimeFlag);
this.putMQForData(planId);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkChatServiceImpl.java
......@@ -58,7 +58,7 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
TabHmLinkChat entity = EntityUtil.changeEntityByJSON(TabHmLinkChat.class, item);
this.hmLinkChatMapper.update(entity);
if (item.getMemberType() == 0) {
screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), item.getFilterJson());
screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), item.getSearchJson());
}
}
}
......@@ -71,7 +71,7 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
entity.setLinkId(linkId);
this.hmLinkChatMapper.insert(entity);
if (dto.getMemberType() == 0) {
screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), dto.getFilterJson());
screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), dto.getSearchJson());
}
}
}
......
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatHmMapper.xml
......@@ -151,7 +151,7 @@
and create_time >= #{startDate} and create_time <![CDATA[<=]]> #{endDate}
</if>
<if test="null != searchParams and '' !=searchParams ">
and name like '%${searchParams}%'
and ( name like '%${searchParams}%' or chat_hm_code like like '${searchParams}%' or creator_name like '%${searchParams}%' )
</if>
<if test="null != status">
and status_flag = #{status}
......
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanMapper.xml
......@@ -111,11 +111,15 @@
<update id="stopById">
UPDATE
tab_haoban_group_chat_plan SET status_flag = 0 , modifier_id =
#{clerkId} , modifier_name = #{clerkName} , end_time = now() , update_time=now() WHERE plan_id = #{planId}
#{clerkId} , modifier_name = #{clerkName} , end_time = now() , update_time=now()
<if test="null != modifyStartTimeFlag">
, startTime = now()
</if>
WHERE plan_id = #{planId}
</update>
<update id="updateSendFlag">
UPDATE tab_haoban_group_chat_plan SET send_flag = 2 , send_time = now() WHERE plan_id = #{planId}
UPDATE tab_haoban_group_chat_plan SET send_flag = 2 , send_time = now() WHERE plan_id = #{planId}
</update>
<!-- ==================更新 ========== -->
......
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatUserMapper.xml
......@@ -203,7 +203,7 @@
<if test="null != startDate">
and a.user_quit_time <![CDATA[>=]]> #{startDate} and a.user_quit_time <![CDATA[<=]]> #{endDate}
</if>
<if test="null != searchParams">
<if test="null != searchParams and '' != searchParams">
and (b.name like '%${searchParams}%' or c.staff_name like '%${searchParams}%' or b.wx_chat_id like '${searchParams}%')
</if>
</if>
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatPlanController.java
......@@ -47,7 +47,7 @@ import com.gic.log.record.util.GicLogRecordOptTypeEnum;
/**
*
* @ClassName: GroupChatPlanController
* @Description: 群群发计划
* @Description: 群群发任务
* @author xugh
* @date 2022年11月26日 上午9:32:56
*
......@@ -92,12 +92,12 @@ public class GroupChatPlanController {
public RestResponse<Object> del(Long planId) {
if (null == planId) {
GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure("9999", "计划ID空");
return RestResponse.failure("9999", "任务ID空");
}
ServiceResponse<GroupChatPlanDTO> planResp = this.groupChatPlanApiService.detail(planId);
if (!planResp.isSuccess()) {
GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure("1", "计划不存在");
return RestResponse.failure("1", "任务不存在");
}
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
this.groupChatPlanApiService.del(loginUser.getClerkId(), loginUser.getClerkName(), planId);
......@@ -121,16 +121,21 @@ public class GroupChatPlanController {
public RestResponse<Object> stop(Long planId) {
if (null == planId) {
GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure("9999", "计划ID空");
return RestResponse.failure("9999", "任务ID空");
}
ServiceResponse<GroupChatPlanDTO> planResp = this.groupChatPlanApiService.detail(planId);
if (!planResp.isSuccess()) {
GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure("1", "计划不存在");
return RestResponse.failure("1", "任务不存在");
}
GroupChatPlanDTO plan = planResp.getResult() ;
if(plan.getEndTime().getTime()<=new Date().getTime()) {
GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure("1", "任务已结束");
}
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
this.groupChatPlanApiService.stop(loginUser.getClerkId(), loginUser.getClerkName(), planId);
String logContent = "终止客户群群发【" + planResp.getResult().getName() + "】";
String logContent = "终止客户群群发【" + plan.getName() + "】";
GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
return RestResponse.successResult();
......@@ -144,7 +149,7 @@ public class GroupChatPlanController {
GroupChatPlanDTO oldPlan = oldResp.getResult();
if (null == oldPlan) {
GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure("9999", "计划不存在");
return RestResponse.failure("9999", "任务不存在");
}
if (oldPlan.getSendType() == 1) {
GicLogRecordEvaluationContext.noWriteLog();
......@@ -286,7 +291,7 @@ public class GroupChatPlanController {
public RestResponse<Object> detail(Long planId, @RequestParam(defaultValue = "0") int updteFlag) {
ServiceResponse<GroupChatPlanDTO> planResp = this.groupChatPlanApiService.detail(planId);
if (!planResp.isSuccess()) {
return RestResponse.failure("1", "计划不存在");
return RestResponse.failure("1", "任务不存在");
}
GroupChatPlanDTO plan = planResp.getResult();
plan.getStaffIdList();
......@@ -328,14 +333,14 @@ public class GroupChatPlanController {
@RequestMapping("owner-log")
public RestResponse<Object> ownerLog(Long planId, GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
if (null == planId) {
return RestResponse.failure("9999", "计划ID空");
return RestResponse.failure("9999", "任务ID空");
}
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> resp = this.groupChatPlanApiService.listOwnerLogPage(planId,
qdto, basePageInfo);
if (!resp.isSuccess()) {
return RestResponse.failure("1", "计划不存在");
return RestResponse.failure("1", "任务不存在");
}
return RestResponse.successResult(resp.getResult());
}
......@@ -343,14 +348,14 @@ public class GroupChatPlanController {
@RequestMapping("log")
public RestResponse<Object> log(Long planId, GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
if (null == planId) {
return RestResponse.failure("9999", "计划ID空");
return RestResponse.failure("9999", "任务ID空");
}
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
ServiceResponse<Page<GroupChatPlanLogDTO>> resp = this.groupChatPlanApiService.listLogPage(planId, qdto,
basePageInfo);
if (!resp.isSuccess()) {
return RestResponse.failure("1", "计划不存在");
return RestResponse.failure("1", "任务不存在");
}
return RestResponse.successResult(resp.getResult());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment