细节优化
zhaoxiaolin
7 months ago
parent
bb82554e6f
commit
9074446d16
@ -1,24 +1,131 @@
|
|||||||
package com.op.mes.service.impl;
|
package com.op.mes.service.impl;
|
||||||
|
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
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.mes.domain.MesReportWork;
|
import com.op.mes.domain.MesReportWork;
|
||||||
|
import com.op.mes.domain.ProOrderWorkorder;
|
||||||
|
import com.op.mes.mapper.MesReportWorkMapper;
|
||||||
import com.op.mes.mapper.MesReportWorksMapper;
|
import com.op.mes.mapper.MesReportWorksMapper;
|
||||||
import com.op.mes.service.IMesReportWorksService;
|
import com.op.mes.service.IMesReportWorksService;
|
||||||
|
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 org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
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 static com.op.common.core.web.domain.AjaxResult.error;
|
||||||
|
import static com.op.common.core.web.domain.AjaxResult.success;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class MesReportWorksServiceImpl implements IMesReportWorksService {
|
public class MesReportWorksServiceImpl implements IMesReportWorksService {
|
||||||
|
protected Logger logger = LoggerFactory.getLogger(getClass());
|
||||||
|
@Autowired
|
||||||
|
private MesReportWorkMapper mesReportWorkMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private MesReportWorksMapper mesReportWorksMapper;
|
private RemoteOpenService remoteOpenService;
|
||||||
|
@Autowired
|
||||||
|
private RemoteUserService remoteUserService;
|
||||||
|
private static Pattern p2= Pattern.compile("<[^>]+>");
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@DS("#header.poolName")
|
@DS("#header.poolName")
|
||||||
public List<MesReportWork> getReportWorksList(MesReportWork mesReportWork) {
|
public List<MesReportWork> getReportWorksList(MesReportWork mesReportWork) {
|
||||||
return null;//mesReportWorksMapper.getReportWorkList(mesReportWork);
|
return null;//mesReportWorksMapper.getReportWorkList(mesReportWork);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public R mesProTask() {
|
||||||
|
// 加载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 -> {
|
||||||
|
if("ds_1000".equals(dateSource.get("poolName"))){
|
||||||
|
logger.info("++++++++++++" + dateSource.get("poolName") + "++++车间生产情况企业微信提醒开始++++++++++");
|
||||||
|
Runnable run = () -> setMesProInfoFunc(dateSource.get("poolName"));
|
||||||
|
executorService.execute(run);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("service == mesProTask == exception", e);
|
||||||
|
return R.fail("service == mesProTask == exception");
|
||||||
|
} finally {
|
||||||
|
executorService.shutdown();
|
||||||
|
}
|
||||||
|
return R.ok();
|
||||||
|
}
|
||||||
|
public void setMesProInfoFunc(String poolName){
|
||||||
|
DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
|
||||||
|
//工厂名称
|
||||||
|
|
||||||
|
//车间名称
|
||||||
|
|
||||||
|
//发送企业微信
|
||||||
|
ProOrderWorkorder prowork = new ProOrderWorkorder();
|
||||||
|
prowork.setFactoryCode("小榄工厂");
|
||||||
|
prowork.setWorkorderName("黑蚊香生产车间");
|
||||||
|
this.sendWX(prowork);
|
||||||
|
}
|
||||||
|
protected void sendWX(ProOrderWorkorder prowork){
|
||||||
|
//发企业微信--------------------开始（跟班组有关）
|
||||||
|
SysNoticeGroup noticeQo = new SysNoticeGroup();
|
||||||
|
//取模板
|
||||||
|
noticeQo.setNoticeId(23L);
|
||||||
|
|
||||||
|
List<SysNoticeGroup> notices = mesReportWorkMapper.getNoticesGroup(noticeQo);
|
||||||
|
if(!CollectionUtils.isEmpty(notices)) {
|
||||||
|
List<WechartDTO> wecharts = new ArrayList<>();
|
||||||
|
for (SysNoticeGroup noticedto : notices) {
|
||||||
|
WechartDTO wechart0 = new WechartDTO();
|
||||||
|
wechart0.setUserId(noticedto.getWxId());
|
||||||
|
String contentInfo = noticedto.getNoticeContent();
|
||||||
|
contentInfo = contentInfo.replace("${ymd}", DateUtils.getDate())
|
||||||
|
.replace("${factory}", prowork.getFactoryCode())
|
||||||
|
.replace("${carName}", prowork.getWorkorderName());
|
||||||
|
|
||||||
|
Matcher m = p2.matcher(contentInfo);
|
||||||
|
contentInfo = m.replaceAll("");
|
||||||
|
wechart0.setText(contentInfo);
|
||||||
|
wecharts.add(wechart0);
|
||||||
|
}
|
||||||
|
logger.info("检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts));
|
||||||
|
if (!CollectionUtils.isEmpty(wecharts)) {
|
||||||
|
new Thread(() -> {
|
||||||
|
AjaxResult wxresult = remoteOpenService.sendWeChartMessage(wecharts);
|
||||||
|
logger.info("检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult));
|
||||||
|
|
||||||
|
}).start();
|
||||||
|
}
|
||||||
|
//发企业微信--------------------结束
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue