Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 206ff21c 由 sunke
选项

温湿度图表

1 个父辈 c3263820
内嵌 并排
正在显示 7 个修改的文件 包含 22 行增加 和 63 行删除
src/main/java/com/neotel/smfcore/core/humiture/rest/HumitureController.java
...@@ -66,7 +66,7 @@ public class HumitureController { ...@@ -66,7 +66,7 @@ public class HumitureController {
@ApiOperation("获取温湿度") @ApiOperation("获取温湿度")
@GetMapping("api/humiture/list") @GetMapping("api/humiture/list")
public HumitureDto info(HumitureQueryCriteria criteria) { public HumitureDto info(HumitureQueryCriteria criteria, Pageable pageable) {
MSDSettiings msdSettiings = dataCache.getCache(Constants.CACHE_msdSetting); MSDSettiings msdSettiings = dataCache.getCache(Constants.CACHE_msdSetting);
if (msdSettiings == null){ if (msdSettiings == null){
msdSettiings = new MSDSettiings(); msdSettiings = new MSDSettiings();
...@@ -75,24 +75,7 @@ public class HumitureController { ...@@ -75,24 +75,7 @@ public class HumitureController {
Float maxHumidity = msdSettiings.getMaxHumidity(); Float maxHumidity = msdSettiings.getMaxHumidity();
Query query = QueryHelp.getQuery(criteria); Query query = QueryHelp.getQuery(criteria);
query.with(Sort.by(Sort.Direction.ASC, "id")); query.with(Sort.by(Sort.Direction.ASC, "id"));
query.limit(100000); PageData<Humiture> humitureList = humitureManager.findByPage(query,pageable);
List<Humiture> humitureList = humitureManager.findByQuery(query);
if(humitureList.isEmpty()){
Humiture humiture1 = new Humiture();
humiture1.setHumidity("13");
humiture1.setCid("001");
humiture1.setTemperature("22.3");
humiture1.setCodeAirTemp("5");
humitureList.add(humiture1);
Humiture humiture = new Humiture();
humiture.setHumidity("12");
humiture.setCid("001");
humiture.setTemperature("23");
humiture.setCodeAirTemp("5");
humitureList.add(humiture);
}
HumitureDto restultDto = new HumitureDto(); HumitureDto restultDto = new HumitureDto();
restultDto.setMaxHumidity(maxHumidity); restultDto.setMaxHumidity(maxHumidity);
restultDto.setMaxTemperature(maxTemperature); restultDto.setMaxTemperature(maxTemperature);
......
src/main/java/com/neotel/smfcore/core/humiture/rest/bean/dto/HumitureDto.java
package com.neotel.smfcore.core.humiture.rest.bean.dto; package com.neotel.smfcore.core.humiture.rest.bean.dto;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.core.kanban.rest.bean.dto.BoxStatusDto; import com.neotel.smfcore.core.kanban.rest.bean.dto.BoxStatusDto;
import com.neotel.smfcore.core.system.service.po.Humiture; import com.neotel.smfcore.core.system.service.po.Humiture;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -29,5 +30,5 @@ public class HumitureDto { ...@@ -29,5 +30,5 @@ public class HumitureDto {
@ApiModelProperty("最大湿度") @ApiModelProperty("最大湿度")
private float maxHumidity = 100.0F; private float maxHumidity = 100.0F;
@ApiModelProperty("温湿度数据") @ApiModelProperty("温湿度数据")
List<Humiture> humitureList; PageData<Humiture> humitureList;
} }
src/main/java/com/neotel/smfcore/core/humiture/rest/bean/query/HumitureQueryCriteria.java
...@@ -16,6 +16,12 @@ public class HumitureQueryCriteria { ...@@ -16,6 +16,12 @@ public class HumitureQueryCriteria {
@QueryCondition(type = QueryCondition.Type.IN, propName = "cid") @QueryCondition(type = QueryCondition.Type.IN, propName = "cid")
private List<String> cids; private List<String> cids;
/**
* 仅搜索大于此ID的温湿度值
*/
@QueryCondition(type = QueryCondition.Type.GT, propName = "id")
private String humitureId;
@QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "createDate") @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "createDate")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private BetweenData<Date> createDate; private BetweenData<Date> createDate;
......
src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java
...@@ -142,8 +142,7 @@ public class BoxKanbanController { ...@@ -142,8 +142,7 @@ public class BoxKanbanController {
} }
List<DataLog> allTasks=taskService.getAllTasks(); List<DataLog> allTasks=taskService.getAllTasks();
List<BoxTaskDto> dtos=new ArrayList<>(); List<BoxTaskDto> dtos=new ArrayList<>();
for (DataLog datalog : for (DataLog datalog : allTasks) {
allTasks) {
//判断类型 //判断类型
if (criteria.getType() != null && (!criteria.getType().equals(datalog.getType()))) { if (criteria.getType() != null && (!criteria.getType().equals(datalog.getType()))) {
continue; continue;
...@@ -194,8 +193,7 @@ public class BoxKanbanController { ...@@ -194,8 +193,7 @@ public class BoxKanbanController {
String[] valueArray = new String[]{datalog.getPosName(), datalog.getStorageName(), datalog.getCid(), datalog.getPartNumber(), datalog.getBarcode(), datalog.getSourceName()}; String[] valueArray = new String[]{datalog.getPosName(), datalog.getStorageName(), datalog.getCid(), datalog.getPartNumber(), datalog.getBarcode(), datalog.getSourceName()};
for (String s : blurrys) { for (String s : blurrys) {
if(ObjectUtil.isNotEmpty(s)){ if(ObjectUtil.isNotEmpty(s)){
for (String v : for (String v : valueArray) {
valueArray) {
try { try {
Pattern pattern = Pattern.compile(QueryHelp.escapeExprSpecialWord(s), Pattern.CASE_INSENSITIVE); Pattern pattern = Pattern.compile(QueryHelp.escapeExprSpecialWord(s), Pattern.CASE_INSENSITIVE);
Matcher m = pattern.matcher(v); Matcher m = pattern.matcher(v);
...@@ -224,37 +222,6 @@ public class BoxKanbanController { ...@@ -224,37 +222,6 @@ public class BoxKanbanController {
} }
} }
return new PageData<>(dtos, dtos.size()); return new PageData<>(dtos, dtos.size());
// Query query = QueryHelp.getQuery(criteria);
// String groupId = criteria.getGroupId();
// List<String> cidList = dataCache. getCidsByGroupId(groupId,true);
// query.addCriteria(Criteria.where("cid").in(cidList));
//
// //只查找近12个小时未完成的任务
// //暂时改成48小时
// Calendar calendar = Calendar.getInstance();
// calendar.add(Calendar.HOUR_OF_DAY, -48);
// query.addCriteria(Criteria.where("updateDate").gte(calendar.getTime()));
//
// Calendar ca2 = Calendar.getInstance();
// ca2.add(Calendar.MINUTE, -10);
//
// Date lastUpdateTime=new Date((new Date().getTime())-10 * 60 * 1000);
// //正常
// if(criteria.getTaskStatus()==1){
// query.addCriteria(Criteria.where("updateDate").gte(ca2.getTime()).and("status").is(OP_STATUS.EXECUTING.name()));
// }//异常
// else if(criteria.getTaskStatus()==2){
// query.addCriteria(Criteria.where("updateDate").lte(ca2.getTime()).and("status").is(OP_STATUS.EXECUTING.name()));
// }//等待
// else if(criteria.getTaskStatus()==3){
// query.addCriteria(Criteria.where("status").is(OP_STATUS.WAIT.name()));
// }else{
// query.addCriteria(Criteria.where("status").nin(OP_STATUS.CANCEL.name(), OP_STATUS.FINISHED.name()));
// }
//
// PageData<DataLog> dataLogPageData=dataLogManager.findByPage(query,pageable);
// List<BoxTaskDto> boxTaskDtos=boxTaskMapper.toDto(dataLogPageData.getContent());
// return new PageData(boxTaskDtos, boxTaskDtos.size());
} }
......
src/main/java/com/neotel/smfcore/core/solder/rest/bean/dto/SpBoxDto.java
...@@ -15,11 +15,11 @@ public class SpBoxDto { ...@@ -15,11 +15,11 @@ public class SpBoxDto {
@ApiModelProperty("是否是单盘出库（联电指出库项目,默认为false即默认批量出库）") @ApiModelProperty("是否是单盘出库（联电指出库项目,默认为false即默认批量出库）")
private boolean singleOut = false; private boolean singleOut = false;
@ApiModelProperty("料仓名称") @ApiModelProperty("入料区门状态")
private String storageName; private String inDoorStatus;
@ApiModelProperty("料仓 ID") @ApiModelProperty("出料区门状态")
private String storageId; private String outDoorStatus;
@ApiModelProperty("库位号ID") @ApiModelProperty("库位号ID")
private String posId; private String posId;
......
src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java
...@@ -304,12 +304,12 @@ public class DataLog extends BasePo implements Serializable { ...@@ -304,12 +304,12 @@ public class DataLog extends BasePo implements Serializable {
} }
/** /**
* 超过5秒的任务不再显示 * 超过15秒的任务不再显示
* @return * @return
*/ */
public boolean needRemoveFromShow(){ public boolean needRemoveFromShow(){
if(isFinished() || isCancel()){ if(isFinished() || isCancel() || isEnd()){
if(System.currentTimeMillis() - super.getUpdateDate().getTime() > 25 * 1000){ if(System.currentTimeMillis() - super.getUpdateDate().getTime() > 15 * 1000){
return true; return true;
} }
} }
......
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
...@@ -260,7 +260,9 @@ public class TaskService { ...@@ -260,7 +260,9 @@ public class TaskService {
if (task.needRemoveFromCache()) { if (task.needRemoveFromCache()) {
theFinishedTaskMap.remove(task.getId()); theFinishedTaskMap.remove(task.getId());
} else { } else {
resultTasks.add(task); if(!task.needRemoveFromShow()){
resultTasks.add(task);
}
} }
} }
return resultTasks; return resultTasks;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!