root/stand_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ludj
2023-05-16 20:20:56 +08:00
parent 7a09c4aa27
commit 8ab4faac68
7 changed files with 108 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.sch.task.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -65,12 +66,21 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigM
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
// 起点区域配置
String startRegion = String.join(",", entity.getStart_region_strs());
entity.setStart_region_str(startRegion);
// 终点区域配置
String nextRegion = String.join(",", entity.getNext_region_strs());
entity.setNext_region_str(nextRegion);
if (ObjectUtil.isAllEmpty(entity.getStart_region_strs(), entity.getNext_region_strs()))
throw new BadRequestException("起点区域和终点区域不能同时为空!");
if (ObjectUtil.isNotEmpty(entity.getStart_region_strs())) {
// 起点区域配置
String startRegion = String.join(",", entity.getStart_region_strs());
entity.setStart_region_str(startRegion);
}
if (ObjectUtil.isNotEmpty(entity.getNext_region_strs())) {
// 终点区域配置
String nextRegion = String.join(",", entity.getNext_region_strs());
entity.setNext_region_str(nextRegion);
}
entity.setCreate_id(currentUserId);
entity.setCreate_name(nickName);
entity.setCreate_time(now);
@@ -84,13 +94,20 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigM
public void update(SchBaseTaskconfig entity) {
SchBaseTaskconfig dto = schBaseTaskconfigMapper.selectById(entity.getConfig_code());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
// 起点区域配置
String startRegion = String.join(",", entity.getStart_region_strs());
entity.setStart_region_str(startRegion);
// 终点区域配置
String nextRegion = String.join(",", entity.getNext_region_strs());
entity.setNext_region_str(nextRegion);
if (ObjectUtil.isAllEmpty(entity.getStart_region_strs(), entity.getNext_region_strs()))
throw new BadRequestException("起点区域和终点区域不能同时为空!");
if (ObjectUtil.isNotEmpty(entity.getStart_region_strs())) {
// 起点区域配置
String startRegion = String.join(",", entity.getStart_region_strs());
entity.setStart_region_str(startRegion);
}
if (ObjectUtil.isNotEmpty(entity.getNext_region_strs())) {
// 终点区域配置
String nextRegion = String.join(",", entity.getNext_region_strs());
entity.setNext_region_str(nextRegion);
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();

29
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/BaseTask.java
View File

@@ -24,13 +24,37 @@ public abstract class BaseTask {
@Autowired
private ISchBaseTaskService taskService;
/**
* 创建
*/
protected abstract void create(JSONObject param);
/**
* 下发
*/
protected abstract void issue();
/**
* 定时任务
*/
protected abstract void schedule();
protected abstract void updateStatus();
/**
* 寻找合适的点位
*
* @return
*/
protected abstract List<Object> findPoints();
public void apply(JSONObject param) {
String point_code = "";
String config_code = "d";
String config_code = "HNMLTask";
//1、校验数据
SchBaseTaskconfig taskConfig = SpringContextHolder.getBean(SchBaseTaskconfigServiceImpl.class).getById(config_code);
Integer tcmn = taskConfig.getTask_create_max_num();
SchBaseTaskServiceImpl taskService = SpringContextHolder.getBean(SchBaseTaskServiceImpl.class);
List<SchBaseTask> unFinishTasksByTaskConfig = taskService.findUnFinishTasksByTaskConfig(taskConfig.getConfig_code());
@@ -54,4 +78,5 @@ public abstract class BaseTask {
//校验
}
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTask.java
View File

@@ -1 +0,0 @@
package org.nl.wms.sch.task_manage.task.core;

11
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTaskDto.java
View File

@@ -1,11 +0,0 @@
package org.nl.wms.sch.task_manage.task.core;
/**
* @author ldjun
* @version 1.0
* @date 2023年05月08日 13:35
* @desc desc
*/
public class BaseTaskDto {
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskInterface.java
View File

@@ -1 +0,0 @@
package org.nl.wms.sch.task_manage.task.core;

24
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java
View File

@@ -1 +1,23 @@
package org.nl.wms.sch.task_manage.task.core;
package org.nl.wms.sch.task_manage.task.core;
/**
* 任务操作终端类型
*/
public enum TaskOperateType {
ACS("1", "ACS", "ACS"),
PC("2", "PC", "创建完成"),
MOBILE("3", "手持", "手持"),
QUARTZ("4", "定时任务", "定时任务"),
OTHER("5", "其它", "其它");
TaskOperateType(String code, String name, String desc) {
this.code = code;
this.name = name;
this.desc = desc;
}
private String code;
private String name;
private String desc;
}

30
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java
View File

@@ -1,12 +1,40 @@
package org.nl.wms.sch.task_manage.task.tasks;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.sch.task_manage.BaseTask;
import java.util.List;
/**
* @author ldjun
* @author ldjun 混碾满料任务
* @version 1.0
* @date 2023年05月16日 16:44
* @desc desc
*/
public class HNMLTask extends BaseTask {
@Override
protected void updateStatus() {
}
@Override
protected void create(JSONObject param) {
}
@Override
protected void issue() {
}
@Override
protected void schedule() {
}
@Override
protected List<Object> findPoints() {
return null;
}
}