Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024-06-06 质量/系统/定时任务模块-质量未检查检验任务一小时后再次提醒

Browse Source
master
A0010407 10 months ago
parent 5d89dfa31c
commit 4f9f609e10
8 changed files with 212 additions and 2 deletions
Show Stats Download Patch File Download Diff File

3
op-api/op-api-system/src/main/java/com/op/system/api/RemoteQualityService.java
Unescape Escape View File

@ -41,4 +41,7 @@ public interface RemoteQualityService {
@PostMapping("/qcWarehousing/createCPBatchTask")
public R createCPBatchTask();
@PostMapping("/qcDetail/resendWXTask")
public R resendWXTask();
}

5
op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteQualityFallbackFactory.java
Unescape Escape View File

@ -57,6 +57,11 @@ public class RemoteQualityFallbackFactory implements FallbackFactory<RemoteQuali
public R createCPBatchTask() {
return R.fail("入库检验任务创建失败:" + throwable.getMessage());
}
@Override
public R resendWXTask() {
return R.fail("微信二次提醒失败:" + throwable.getMessage());
}
};
}
}

6
op-modules/op-job/src/main/java/com/op/job/task/RyTask.java
Unescape Escape View File

@ -178,6 +178,12 @@ public class RyTask {
logger.info("++质量管理系统+成品检验任务创建+开始++createCPBatchTask+++++");
remoteQualityService.createCPBatchTask();
}
//质量检验任务没有检查的，一小时后重新发送微信提醒,三分钟一次
public void resendWXTask(){
logger.info("++质量管理系统+检验任务一小时后重新发送微信提醒+开始++createCPBatchTask+++++");
remoteQualityService.resendWXTask();
}
/************质量管理系统定时任务结束*****************/
/************hr 人力基础数据定时任务开始*****************/

11
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskDetailController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.op.quality.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -85,4 +86,14 @@ public class QcCheckTaskDetailController extends BaseController {
public AjaxResult remove(@PathVariable String[] recordIds) {
return toAjax(qcCheckTaskDetailService.deleteQcCheckTaskDetailByRecordIds(recordIds));
}
/**
* 质量检验任务提醒，一小时后微信二次发送
*/
@PostMapping("/resendWXTask")
public R resendWXTask() {
qcCheckTaskDetailService.resendWXTask();
return R.ok();
}
}

7
op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDetailMapper.java
Unescape Escape View File

@ -2,8 +2,8 @@ package com.op.quality.mapper;
import java.util.List;
import com.op.quality.domain.QcCheckReportIncome;
import com.op.quality.domain.QcCheckTaskDetail;
import com.op.quality.domain.QcCheckTaskIncome;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -69,4 +69,9 @@ public interface QcCheckTaskDetailMapper {
//逻辑删除详情表
void deleteQcCheckTaskDetailByBelongTo(String recordId);
//查询未检查的检验任务
List<QcCheckReportIncome> selectNoCheckList();
int updateBatchConfirmTime(@Param("list") List<QcCheckReportIncome> list);
}

4
op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDetailService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.op.quality.service;
import java.util.List;
import com.op.common.core.web.domain.AjaxResult;
import com.op.quality.domain.QcCheckTaskDetail;
/**
@ -58,4 +59,7 @@ public interface IQcCheckTaskDetailService {
* @return 结果
*/
public int deleteQcCheckTaskDetailByRecordId(String recordId);
//质量检验任务提醒，一小时后微信二次发送
AjaxResult resendWXTask();
}

147
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDetailServiceImpl.java
Unescape Escape View File

@ -1,14 +1,44 @@
package com.op.quality.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.domain.R;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.bean.BeanUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.quality.domain.*;
import com.op.quality.mapper.QcCheckTaskIncomeMapper;
import com.op.system.api.RemoteOpenService;
import com.op.system.api.RemoteUserService;
import com.op.system.api.domain.SysNoticeGroup;
import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.dto.WechartDTO;
import com.op.system.api.domain.mes.ProOrderWorkorderDTO;
import com.op.system.api.domain.quality.QcUserMaterialDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.quality.mapper.QcCheckTaskDetailMapper;
import com.op.quality.domain.QcCheckTaskDetail;
import com.op.quality.service.IQcCheckTaskDetailService;
import org.springframework.util.CollectionUtils;
import static com.op.common.core.web.domain.AjaxResult.error;
import static com.op.common.core.web.domain.AjaxResult.success;
/**
* 检验任务详情Service业务层处理
@ -18,9 +48,22 @@ import com.op.quality.service.IQcCheckTaskDetailService;
*/
@Service
public class QcCheckTaskDetailServiceImpl implements IQcCheckTaskDetailService {
protected Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private QcCheckTaskDetailMapper qcCheckTaskDetailMapper;
@Autowired
private RemoteUserService remoteUserService;
@Autowired
private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper;
@Autowired
private RemoteOpenService remoteOpenService;
private static Pattern p2= Pattern.compile("<[^>]+>");
/**
* 查询检验任务详情
*
@ -94,4 +137,106 @@ public class QcCheckTaskDetailServiceImpl implements IQcCheckTaskDetailService {
public int deleteQcCheckTaskDetailByRecordId(String recordId) {
return qcCheckTaskDetailMapper.deleteQcCheckTaskDetailByRecordId(recordId);
}
/**质量检验任务提醒，一小时后微信二次发送**/
@Override
public AjaxResult resendWXTask() {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
List<Map<String, String>> dateSources = dateSources0.getData();
ExecutorService executorService = new ThreadPoolExecutor(
dateSources.size(),
dateSources.size(),
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>());
try {
dateSources.forEach(dateSource -> {
logger.info("++++++++++++" + dateSource.get("poolName") + "++++质量检验任务提醒,一小时后微信二次发送开始++++++++++");
Runnable run = () -> resendWXFunc(dateSource.get("poolName"));
executorService.execute(run);
});
} catch (Exception e) {
logger.error("service == resendWXTask == exception", e);
return error("service == resendWXTask == exception");
} finally {
executorService.shutdown();
}
return success();
}
private void resendWXFunc(String poolName){
DynamicDataSourceContextHolder.push(poolName); //这是数据源的key
List<QcCheckReportIncome> noCheckList = qcCheckTaskDetailMapper.selectNoCheckList();
//发企业微信--------------------开始
SysNoticeGroup noticeQo = new SysNoticeGroup();
//筛选成品检验 id 7
List<QcCheckReportIncome> noCheckListCP = noCheckList.stream().filter(condition -> condition.getCheckType().equals("checkTypeCP")).collect(Collectors.toList());
String CP = StringUtils.join(noCheckListCP.stream().map(QcCheckReportIncome::getCheckNo).collect(Collectors.toList()).toArray(),",");
//批次成品检验 id 12
List<QcCheckReportIncome> noCheckListCPPC = noCheckList.stream().filter(condition -> condition.getCheckType().equals("checkTypeCPPC")).collect(Collectors.toList());
String CPPC = StringUtils.join(noCheckListCPPC.stream().map(QcCheckReportIncome::getCheckNo).collect(Collectors.toList()).toArray(),",");
//来料检验 id 6
List<QcCheckReportIncome> noCheckListLL = noCheckList.stream().filter(condition -> condition.getCheckType().equals("checkTypeLL")).collect(Collectors.toList());
String LL = StringUtils.join(noCheckListLL.stream().map(QcCheckReportIncome::getCheckNo).collect(Collectors.toList()).toArray(),",");
//过程巡检 id 20
List<QcCheckReportIncome> noCheckListSCXJ = noCheckList.stream().filter(condition -> condition.getCheckType().equals("checkTypeSCXJ")).collect(Collectors.toList());
String SCXJ = StringUtils.join(noCheckListSCXJ.stream().map(QcCheckReportIncome::getCheckNo).collect(Collectors.toList()).toArray(),",");
//首件检验 id 19
List<QcCheckReportIncome> noCheckListSC = noCheckList.stream().filter(condition -> condition.getCheckType().equals("checkTypeSC")).collect(Collectors.toList());
String SC = StringUtils.join(noCheckListSC.stream().map(QcCheckReportIncome::getCheckNo).collect(Collectors.toList()).toArray(),",");
if(noCheckListCP != null || noCheckListCP.size() > 0) {
noticeQo.setNoticeId(7L);
sendWeChartMessage(noticeQo,CP,noCheckListCP.size()+"个成品检验",noCheckListCP);
}
if(noCheckListCPPC != null || noCheckListCPPC.size() > 0){
noticeQo.setNoticeId(12L);
sendWeChartMessage(noticeQo,CPPC,noCheckListCPPC.size()+"个批次成品检验",noCheckListCPPC);
}
if(noCheckListLL != null || noCheckListLL.size() > 0){
noticeQo.setNoticeId(6L);
sendWeChartMessage(noticeQo,LL,noCheckListLL.size()+"个来料检验",noCheckListLL);
}
if(noCheckListSCXJ != null || noCheckListSCXJ.size() > 0){
noticeQo.setNoticeId(20L);
sendWeChartMessage(noticeQo,SCXJ,noCheckListSCXJ.size()+"个过程巡检",noCheckListSCXJ);
}
if(noCheckListSC != null || noCheckListSC.size() > 0){
noticeQo.setNoticeId(19L);
sendWeChartMessage(noticeQo,SC,noCheckListSC.size()+"个首件检验",noCheckListSC);
}
}
private void sendWeChartMessage(SysNoticeGroup noticeQo,String checkNoList,String message,List<QcCheckReportIncome> noCheckList){
if(StringUtils.isNotEmpty(checkNoList)){
List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo);
if(!CollectionUtils.isEmpty(notices) && notices.size() > 0) {
List<WechartDTO> wecharts = new ArrayList<>();
for (SysNoticeGroup noticedto : notices) {
WechartDTO wechart0 = new WechartDTO();
wechart0.setUserId(noticedto.getWxId());
String contentInfo = notices.get(0).getNoticeContent();
contentInfo = contentInfo.replace("${checkNo}", checkNoList + "(批量检验任务二次提醒)"+"\n");
Matcher m = p2.matcher(contentInfo);
contentInfo = m.replaceAll("");
wechart0.setText(contentInfo);
wecharts.add(wechart0);
}
logger.info("任务编号为:"+ checkNoList + "的"+ message + ",企业微信二次提醒请求：" + JSONObject.toJSONString(wecharts));
if (!CollectionUtils.isEmpty(wecharts)) {
new Thread(() -> {
AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts);
logger.info("企业微信二次提醒结果：" + JSONObject.toJSONString(result));
}).start();
}
//发企业微信--------------------结束
qcCheckTaskDetailMapper.updateBatchConfirmTime(noCheckList);
}
}
}
}

31
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml
Unescape Escape View File

@ -189,4 +189,35 @@
#{recordId}
</foreach>
</delete>
<select id="selectNoCheckList" resultType="com.op.quality.domain.QcCheckReportIncome">
select
record_id as recordId,
check_no as checkNo,
income_batch_no as incomeBatchNo,
order_no as orderNo,
material_code as materialCode,
material_name as materialName,
check_type as checkType,
check_status as checkStatus,
confirm_time as confirmTime
from qc_check_task
where del_flag = '0'
and check_status = '0'
and datediff( hour, create_time,CONVERT(varchar(10),GETDATE())) > 1
and confirm_time is null
</select>
<!-- 批量更新 -->
<update id="updateBatchConfirmTime" parameterType="java.util.List">
<foreach collection="list" item="item" separator=";">
UPDATE qc_check_task
set confirm_time = getdate()
WHERE record_id = #{item.recordId}
and del_flag = '0'
and check_status = '0'
and confirm_time is null
</foreach>
</update>
</mapper>

Write Preview
Loading…
Cancel
Save