Skip to content

D
data-acquisition
Commit 6fbb7508 authored by 罗贤顺's avatar 罗贤顺
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition 

 Conflicts:
	acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
parents 4ea2b219 f901fbdc
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 25 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
View file @ 6fbb7508
......@@ -22,16 +22,15 @@ import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
* <p>
* 服务实现类
......@@ -59,6 +58,9 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
@Autowired
private ITSysUserService itSysUserService;
@Resource
private TProcessesBlastdesignHoleMapper processesBlastdesignHoleMapper;
@Override
public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
......@@ -261,11 +263,11 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
}
//判断爆区是否存在
QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel()).toString(), query.getStepName());
queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel()).toString(), query.getStopeName());
queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel()).toString(), query.getBlastAreaName());
List<TProcessesBlastdesignHoleVo> holeVo = baseMapper.getByQuery(queryWrapper);
if (CollectionUtils.isNotEmpty(holeVo)) {
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel(), query.getStepName());
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel(), query.getStopeName());
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel(), query.getBlastAreaName());
List<TProcessesBlastdesignHole> holeVoList = processesBlastdesignHoleMapper.selectList(queryWrapper);
if (holeVoList == null || holeVoList.size()==0) {
return R.failed("炮孔设计中->泡孔设计中爆区已存在，StopeName,StepName,BlastAreaName");
}
//条件封装
......@@ -338,12 +340,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
uid.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel());
queryWrapper.eq(uid.toString(), query.getUid());
//查询并且返回
List<TProcessesBlastdesignHoleVo> data = baseMapper.getByQuery(queryWrapper);
if (null != data && data.size() != 1) {
log.error("炮孔设计中->根据uid获取数据出现多条数据:{}", JSON.toJSONString(data));
return R.failed("炮孔设计中->根据uid获取数据出现多条数据");
}
return R.ok(data.get(0));
return R.ok(baseMapper.getByQuery(queryWrapper));
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java
View file @ 6fbb7508
......@@ -56,15 +56,28 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
Map<String, Object> map = new HashMap<>();
QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
if (StringUtils.isNoneBlank(digDate)) {
qw.apply("DATE(DigDate) = digDate");
try {
SimpleDateFormat formatter = new SimpleDateFormat(
"yyyy-MM-dd HH:mm:ss");
String startDate = digDate + " 00:00:00";
String endDate = digDate + " 23:59:59";
qw.between("DigDate", formatter.parse(startDate), formatter.parse(endDate));
} catch (ParseException e) {
e.printStackTrace();
}
} else {
qw.apply("DATE(DigDate) = DATE(now())");
qw.apply("DigDate BETWEEN CONVERT(varchar(100), GETDATE(), 23) +' 00:00:00' AND CONVERT(varchar(100), GETDATE(), 23) +' 23:59:59'");
}
List<TProcessesDigging> list = processesDiggingMapper.selectList(qw);
Float workTimes = list.stream().map(p -> p.getWorkTime()).reduce(Float::sum).get();
Double workLoads = list.stream().mapToDouble(TProcessesDigging::getWorkload).sum();
map.put("workTimes", workTimes);
map.put("workLoads", workLoads);
if(list!= null && list.size()>0){
Float workTimes = list.stream().map(p -> p.getWorkTime()).reduce(Float::sum).get();
Double workLoads = list.stream().mapToDouble(TProcessesDigging::getWorkload).sum();
map.put("workTimes", workTimes);
map.put("workLoads", workLoads);
}else{
map.put("workTimes", 0);
map.put("workLoads", 0);
}
return R.ok(map);
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java
View file @ 6fbb7508
......@@ -53,15 +53,28 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
Map<String,Object> map = new HashMap<>();
QueryWrapper<TProcessesTruck> qw = new QueryWrapper<>();
if(StringUtils.isNoneBlank(deliveryDate)){
qw.apply("DATE(DeliveryDate) = deliveryDate");
try {
SimpleDateFormat formatter = new SimpleDateFormat(
"yyyy-MM-dd HH:mm:ss");
String startDate = deliveryDate + " 00:00:00";
String endDate = deliveryDate + " 23:59:59";
qw.between("DeliveryDate", formatter.parse(startDate), formatter.parse(endDate));
} catch (ParseException e) {
e.printStackTrace();
}
}else{
qw.apply("DATE(DeliveryDate) = DATE(now())");
qw.apply("DeliveryDate BETWEEN CONVERT(varchar(100), GETDATE(), 23) +' 00:00:00' AND CONVERT(varchar(100), GETDATE(), 23) +' 23:59:59'");
}
List<TProcessesTruck> list = processesTruckMapper.selectList(qw);
Integer cshjs = list.stream().map(p -> p.getCshj()).reduce(Integer::sum).get();
Double dwhjs = list.stream().mapToDouble(TProcessesTruck::getDwhj).sum();
map.put("cshjs",cshjs);
map.put("dwhjs",dwhjs);
if(list!= null && list.size()>0){
Integer cshjs = list.stream().map(p -> p.getCshj()).reduce(Integer::sum).get();
Double dwhjs = list.stream().mapToDouble(TProcessesTruck::getDwhj).sum();
map.put("cshjs",cshjs);
map.put("dwhjs",dwhjs);
}else{
map.put("cshjs",0);
map.put("dwhjs",0);
}
return R.ok(map);
}
......
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