zhangzq
4 weeks ago
320 changed files with 1591 additions and 1545 deletions
@ -1,19 +0,0 @@ |
|||
package org.nl.config; |
|||
|
|||
/** |
|||
* <p> |
|||
* ID生成工具类 |
|||
* </p> |
|||
* |
|||
* @author generator |
|||
* @since 2023-11-16 |
|||
*/ |
|||
public class IdUtil { |
|||
public static Long getLongId() { |
|||
return cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId(); |
|||
} |
|||
|
|||
public static String getStringId() { |
|||
return String.valueOf(IdUtil.getLongId()); |
|||
} |
|||
} |
|||
@ -1,25 +0,0 @@ |
|||
package org.nl.config; |
|||
|
|||
|
|||
import org.checkerframework.checker.units.qual.K; |
|||
import org.springframework.util.CollectionUtils; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.HashMap; |
|||
import java.util.Iterator; |
|||
|
|||
/** |
|||
* s |
|||
* @author ZZQ |
|||
* @Date 2022/11/29 2:55 下午 |
|||
*/ |
|||
public class MapOf implements Serializable { |
|||
|
|||
public static <K> HashMap of(K... key){ |
|||
HashMap map = new HashMap<>(); |
|||
for (int i = 0; i < (key.length & ~1); i=i+2) { |
|||
map.put(key[i],key[i+1]); |
|||
} |
|||
return map; |
|||
} |
|||
} |
|||
@ -1,9 +1,9 @@ |
|||
package org.nl.wms.gateway.controller; |
|||
package org.nl.gateway.controller; |
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.wms.gateway.service.GateWayService; |
|||
import org.nl.wms.gateway.dto.InteracteDto; |
|||
import org.nl.gateway.service.GateWayService; |
|||
import org.nl.gateway.dto.InteracteDto; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.gateway.dto; |
|||
package org.nl.gateway.dto; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Builder; |
|||
@ -1,13 +1,12 @@ |
|||
package org.nl.wms.gateway.service; |
|||
package org.nl.gateway.service; |
|||
|
|||
import cn.hutool.core.lang.Assert; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|||
import org.nl.common.exception.BadRequestException; |
|||
import org.nl.common.utils.RedissonUtils; |
|||
import org.nl.wms.ext.service.AcsToWmsService; |
|||
import org.nl.wms.gateway.dto.InteracteDto; |
|||
import org.nl.wms.gateway.service.impl.GateWayServiceImpl; |
|||
import org.nl.gateway.dto.InteracteDto; |
|||
import org.nl.gateway.service.impl.GateWayServiceImpl; |
|||
import org.nl.wms.sch_manage.service.ISchBasePointService; |
|||
import org.nl.wms.sch_manage.service.ISchBaseTaskService; |
|||
import org.nl.wms.sch_manage.service.dao.SchBasePoint; |
|||
@ -0,0 +1,40 @@ |
|||
package org.nl.wms.bigscreen_manage.controller; |
|||
|
|||
|
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
import lombok.RequiredArgsConstructor; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.wms.bigscreen_manage.service.BigScreenService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
/** |
|||
* <p> |
|||
* 大屏显示 控制层 |
|||
* </p> |
|||
* |
|||
* @author Liuxy |
|||
* @since 2025-06-24 |
|||
*/ |
|||
@RestController |
|||
@RequiredArgsConstructor |
|||
@RequestMapping("/api/bigScreen") |
|||
@Slf4j |
|||
public class BigScreenController { |
|||
|
|||
@Autowired |
|||
private BigScreenService bigScreenService; |
|||
|
|||
@PostMapping("/getData") |
|||
@Log("大屏数据") |
|||
@SaIgnore |
|||
public ResponseEntity<Object> getData() { |
|||
return new ResponseEntity<>(bigScreenService.getData(null), HttpStatus.OK); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package org.nl.wms.bigscreen_manage.service; |
|||
|
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
|
|||
/** |
|||
* <p> |
|||
* 大屏显示 服务类 |
|||
* </p> |
|||
* |
|||
* @author Liuxy |
|||
* @since 2025-06-24 |
|||
*/ |
|||
public interface BigScreenService { |
|||
|
|||
/** |
|||
* 获取大屏数据 |
|||
*根据配置的仓库 |
|||
* @return PdaResponse |
|||
*/ |
|||
JSONObject getData(String[] stors); |
|||
} |
|||
@ -0,0 +1,376 @@ |
|||
package org.nl.wms.bigscreen_manage.service.impl; |
|||
|
|||
import cn.hutool.core.date.DateField; |
|||
import cn.hutool.core.date.DateTime; |
|||
import cn.hutool.core.date.DateUtil; |
|||
import cn.hutool.core.util.NumberUtil; |
|||
import cn.hutool.core.util.ObjectUtil; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|||
import org.nl.common.utils.MapOf; |
|||
import org.nl.wms.basedata_manage.service.IStructattrService; |
|||
import org.nl.wms.basedata_manage.service.dao.Structattr; |
|||
import org.nl.wms.basedata_manage.service.dao.StructattrVechielDto; |
|||
import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper; |
|||
import org.nl.wms.bigscreen_manage.service.BigScreenService; |
|||
import org.nl.wms.pda_manage.util.PdaResponse; |
|||
import org.nl.wms.sch_manage.enums.TaskStatus; |
|||
import org.nl.wms.sch_manage.service.ISchBaseTaskService; |
|||
import org.nl.wms.sch_manage.service.dao.SchBaseTask; |
|||
import org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
import java.util.stream.Collectors; |
|||
|
|||
/** |
|||
* <p> |
|||
* 大屏显示 实现类 |
|||
* </p> |
|||
* |
|||
* @author Liuxy |
|||
* @since 2025-06-24 |
|||
*/ |
|||
@Service |
|||
public class BigScreenServiceImpl implements BigScreenService { |
|||
|
|||
/** |
|||
* 仓位服务 |
|||
*/ |
|||
@Autowired |
|||
private IStructattrService iStructattrService; |
|||
|
|||
/** |
|||
* 载具扩展属性mapper服务 |
|||
*/ |
|||
@Autowired |
|||
private MdPbStoragevehicleextMapper mdPbStoragevehicleextMapper; |
|||
|
|||
/** |
|||
* 任务服务 |
|||
*/ |
|||
@Autowired |
|||
private ISchBaseTaskService iSchBaseTaskService; |
|||
|
|||
@Override |
|||
public JSONObject getData(String[] stors) { |
|||
// String storCode = "GW";
|
|||
JSONObject result = new JSONObject(); |
|||
// //1.【货位使用】数据
|
|||
// result.put("pointUse", pointUse(storCode));
|
|||
// //2.【实时库存分析】数据
|
|||
// result.put("ivtAnalyse", ivtAnalyse(storCode));
|
|||
// //3.【出入库趋势】数据
|
|||
// result.put("inAndOutTrend", inAndOutTrend(storCode));
|
|||
// //4.【今日出入库】数据
|
|||
// result.put("toDayInAndOut", toDayInAndOut(storCode));
|
|||
// //5.【今日出入库】数据
|
|||
// result.put("realTask", realTask(storCode));
|
|||
// //6.【未完成单据】数据
|
|||
// result.put("unIos", unIos(storCode));
|
|||
return result; |
|||
} |
|||
/** |
|||
//
|
|||
// * 货位使用
|
|||
// *
|
|||
// * @return JSONObject {
|
|||
// * total_qty: 总货位数
|
|||
// * use_qty: 已用货位
|
|||
// * emp_qty: 空余货位
|
|||
// * use_percentage: 百分比（使用货位百分比）
|
|||
// * }
|
|||
// */
|
|||
// private JSONObject pointUse(String storCode) {
|
|||
// // 返回数据
|
|||
// JSONObject result = new JSONObject();
|
|||
// // 查询所有未删除且启用仓位
|
|||
// int emp_qty = iStructattrService.count(
|
|||
// new QueryWrapper<Structattr>().lambda()
|
|||
// .eq(Structattr::getIs_used, Boolean.TRUE)
|
|||
// .eq(Structattr::getStor_code, storCode)
|
|||
// .isNull(Structattr::getStoragevehicle_code));
|
|||
// int use_qty = iStructattrService.count(
|
|||
// new QueryWrapper<Structattr>().lambda()
|
|||
// .eq(Structattr::getIs_used, Boolean.TRUE)
|
|||
// .eq(Structattr::getStor_code, storCode)
|
|||
// .isNotNull(Structattr::getStoragevehicle_code));
|
|||
// int total_qty = iStructattrService.count(
|
|||
// new QueryWrapper<Structattr>().lambda()
|
|||
// .eq(Structattr::getIs_used, Boolean.TRUE)
|
|||
// .eq(Structattr::getStor_code, storCode));
|
|||
// // 总货位数
|
|||
// result.put("total_qty", total_qty);
|
|||
// // 已用货位数
|
|||
// result.put("use_qty", use_qty);
|
|||
// // 空余货位
|
|||
// result.put("emp_qty", emp_qty);
|
|||
// // 使用货位百分比
|
|||
// double use_percentage = NumberUtil.mul(NumberUtil.div(use_qty, total_qty), 100);
|
|||
// result.put("use_percentage", NumberUtil.round(use_percentage, 2));
|
|||
// return result;
|
|||
// }
|
|||
//
|
|||
// /**
|
|||
// * 实时库存分析
|
|||
// *
|
|||
// * @return JSONObject {
|
|||
// * total_qty: 总数
|
|||
// * data: [
|
|||
// * material_name: 物料名称
|
|||
// * ivt_qty: 库存数量
|
|||
// * percentage: 百分比
|
|||
// * ]
|
|||
// * }
|
|||
// */
|
|||
// private JSONObject ivtAnalyse(String storCode) {
|
|||
// // 返回数据
|
|||
// JSONObject result = new JSONObject();
|
|||
// // 查询所有库存
|
|||
// List<StructattrVechielDto> vechielDtos = iStructattrService.collectVechicle(MapOf.of("stor_code", storCode));
|
|||
// // 总数
|
|||
// double total_qty = ivtList.stream()
|
|||
// .map(row -> row.getDoubleValue("canuse_qty"))
|
|||
// .reduce(Double::sum).orElse(0.0);
|
|||
// result.put("total_qty", NumberUtil.round(total_qty, 2));
|
|||
//
|
|||
// // 查询排名前五的物料库存
|
|||
// List<JSONObject> topFiveList;
|
|||
// List<JSONObject> otherList = null;
|
|||
// if (ivtList.size() < 5) {
|
|||
// topFiveList = ivtList;
|
|||
// } else {
|
|||
// topFiveList = ivtList.subList(0, 5);
|
|||
// otherList = ivtList.subList(5, ivtList.size());
|
|||
// }
|
|||
// // 组织数据（物料前五）
|
|||
// for (JSONObject json : topFiveList) {
|
|||
// // 库存数量
|
|||
// json.put("ivt_qty", NumberUtil.round(json.getDoubleValue("canuse_qty"), 2));
|
|||
// // 百分比
|
|||
// double percentage = NumberUtil.mul(NumberUtil.div(json.getDoubleValue("canuse_qty"), total_qty), 100);
|
|||
// json.put("percentage", NumberUtil.round(percentage, 2));
|
|||
// }
|
|||
//
|
|||
// // 计算其他物料
|
|||
// if (ObjectUtil.isNotEmpty(otherList)) {
|
|||
// JSONObject jsonOther = new JSONObject();
|
|||
// jsonOther.put("material_name", "其他");
|
|||
// double ivt_qty = otherList.stream()
|
|||
// .map(row -> row.getDoubleValue("canuse_qty"))
|
|||
// .reduce(Double::sum).orElse(0.0);
|
|||
// jsonOther.put("ivt_qty", NumberUtil.round(ivt_qty, 2));
|
|||
// // 百分比
|
|||
// double percentage = NumberUtil.mul(NumberUtil.div(ivt_qty, total_qty), 100);
|
|||
// jsonOther.put("percentage", NumberUtil.round(percentage, 2));
|
|||
// topFiveList.add(jsonOther);
|
|||
// }
|
|||
//
|
|||
// result.put("data", topFiveList);
|
|||
// return result;
|
|||
// }
|
|||
//
|
|||
// /**
|
|||
// * 出入库趋势
|
|||
// *
|
|||
// * @return JSONObject {
|
|||
// * in: [{date:日期，qty:数量}]
|
|||
// * out: [{date:日期，qty:数量}]
|
|||
// * }
|
|||
// */
|
|||
// private JSONObject inAndOutTrend() {
|
|||
// // 获取七天天数集合
|
|||
// DateTime dateTime = DateUtil.offsetDay(DateUtil.parseDate(DateUtil.today()), -6);
|
|||
// List<String> dateList = DateUtil.rangeToList(dateTime, DateUtil.parse(DateUtil.today()), DateField.DAY_OF_YEAR).stream()
|
|||
// .map(DateTime::toString)
|
|||
// .map(row -> row.substring(0, 10))
|
|||
// .collect(Collectors.toList());
|
|||
// // 查询七天内的出入库数据
|
|||
// List<IOStorInv> allIosList = iOutBillService.list(
|
|||
// new QueryWrapper<IOStorInv>().lambda()
|
|||
// .in(IOStorInv::getBiz_date, dateList)
|
|||
// .eq(IOStorInv::getIs_delete, IOSConstant.IS_DELETE_NO)
|
|||
// .eq(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
|
|||
// );
|
|||
//
|
|||
// // 查询入库单据
|
|||
// List<IOStorInv> inIosList = allIosList.stream()
|
|||
// .filter(row -> row.getIo_type().equals(IOSEnum.IO_TYPE.code("入库")))
|
|||
// .collect(Collectors.toList());
|
|||
// // 查询出库单据
|
|||
// List<IOStorInv> outIosList = allIosList.stream()
|
|||
// .filter(row -> row.getIo_type().equals(IOSEnum.IO_TYPE.code("出库")))
|
|||
// .collect(Collectors.toList());
|
|||
// // 组织数据
|
|||
// List<JSONObject> inList = new ArrayList<>();
|
|||
// List<JSONObject> outList = new ArrayList<>();
|
|||
// for (String date : dateList) {
|
|||
// // 处理入库数量
|
|||
// JSONObject jsonIn = new JSONObject();
|
|||
// jsonIn.put("date", date);
|
|||
// double in_qty = inIosList.stream()
|
|||
// .filter(row -> row.getBiz_date().equals(date))
|
|||
// .map(row -> row.getTotal_qty().doubleValue())
|
|||
// .reduce(Double::sum).orElse(0.00);
|
|||
// jsonIn.put("qty", NumberUtil.round(in_qty, 2));
|
|||
// inList.add(jsonIn);
|
|||
//
|
|||
// // 处理出库数据
|
|||
// JSONObject jsonOut = new JSONObject();
|
|||
// jsonOut.put("date", date);
|
|||
// double out_qty = outIosList.stream()
|
|||
// .filter(row -> row.getBiz_date().equals(date))
|
|||
// .map(row -> row.getTotal_qty().doubleValue())
|
|||
// .reduce(Double::sum).orElse(0.00);
|
|||
// jsonOut.put("qty", NumberUtil.round(out_qty, 2));
|
|||
// outList.add(jsonOut);
|
|||
// }
|
|||
//
|
|||
// JSONObject result = new JSONObject();
|
|||
// result.put("in", inList);
|
|||
// result.put("out", outList);
|
|||
// return result;
|
|||
// }
|
|||
//
|
|||
// /**
|
|||
// * 今日出入库
|
|||
// *
|
|||
// * @return JSONObject {
|
|||
// * in: {total_qty:总数量，vehicle_qty:托盘数量}
|
|||
// * out: {total_qty:总数量，vehicle_qty:托盘数量}
|
|||
// * }
|
|||
// */
|
|||
// private JSONObject toDayInAndOut() {
|
|||
// // 查询今天出入库单据
|
|||
// List<IOStorInv> inList = iOutBillService.list(
|
|||
// new QueryWrapper<IOStorInv>().lambda()
|
|||
// .eq(IOStorInv::getBiz_date, DateUtil.today())
|
|||
// .eq(IOStorInv::getIs_delete, IOSConstant.IS_DELETE_NO)
|
|||
// .eq(IOStorInv::getIo_type, IOSEnum.IO_TYPE.code("入库"))
|
|||
// .eq(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
|
|||
// );
|
|||
// // 查询今天出库单据
|
|||
// List<IOStorInv> outList = iOutBillService.list(
|
|||
// new QueryWrapper<IOStorInv>().lambda()
|
|||
// .eq(IOStorInv::getBiz_date, DateUtil.today())
|
|||
// .eq(IOStorInv::getIs_delete, IOSConstant.IS_DELETE_NO)
|
|||
// .eq(IOStorInv::getIo_type, IOSEnum.IO_TYPE.code("出库"))
|
|||
// .eq(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
|
|||
// );
|
|||
//
|
|||
// // 入库
|
|||
// JSONObject jsonIn = new JSONObject();
|
|||
// // 总数量
|
|||
// double total_qty_in = inList.stream()
|
|||
// .map(row -> row.getTotal_qty().doubleValue())
|
|||
// .reduce(Double::sum).orElse(0.0);
|
|||
// jsonIn.put("total_qty", NumberUtil.round(total_qty_in, 2));
|
|||
//
|
|||
// // 托盘数
|
|||
// List<IOStorInvDis> inDisList = new ArrayList<>();
|
|||
// if (ObjectUtil.isNotEmpty(inList)) {
|
|||
// inDisList = ioStorInvDisMapper.selectList(
|
|||
// new QueryWrapper<IOStorInvDis>().lambda()
|
|||
// .in(IOStorInvDis::getIostorinv_id, inList.stream()
|
|||
// .map(IOStorInv::getIostorinv_id)
|
|||
// .collect(Collectors.toList())
|
|||
// )
|
|||
// );
|
|||
// }
|
|||
// jsonIn.put("vehicle_qty", inDisList.size());
|
|||
//
|
|||
// // 出库
|
|||
// JSONObject jsonOut = new JSONObject();
|
|||
// // 总数量
|
|||
// double total_qty_out = outList.stream()
|
|||
// .map(row -> row.getTotal_qty().doubleValue())
|
|||
// .reduce(Double::sum).orElse(0.0);
|
|||
// jsonOut.put("total_qty", NumberUtil.round(total_qty_out, 2));
|
|||
// // 托盘数
|
|||
// List<IOStorInvDis> outDisList = new ArrayList<>();
|
|||
// if (ObjectUtil.isNotEmpty(outList)) {
|
|||
// outDisList = ioStorInvDisMapper.selectList(
|
|||
// new QueryWrapper<IOStorInvDis>().lambda()
|
|||
// .in(IOStorInvDis::getIostorinv_id, outList.stream()
|
|||
// .map(IOStorInv::getIostorinv_id)
|
|||
// .collect(Collectors.toList())
|
|||
// )
|
|||
// );
|
|||
// }
|
|||
// jsonOut.put("vehicle_qty", outDisList.size());
|
|||
//
|
|||
// JSONObject result = new JSONObject();
|
|||
// result.put("in", jsonIn);
|
|||
// result.put("out", jsonOut);
|
|||
// return result;
|
|||
// }
|
|||
//
|
|||
// /**
|
|||
// * 实时任务
|
|||
// *
|
|||
// * @return List<SchBaseTask> {
|
|||
// * 任务实体列
|
|||
// * }
|
|||
// */
|
|||
// private List<SchBaseTask> realTask() {
|
|||
// List<SchBaseTask> list = iSchBaseTaskService.list(
|
|||
// new QueryWrapper<SchBaseTask>().lambda()
|
|||
// .in(SchBaseTask::getTask_status, TaskStatus.CREATE.getCode()
|
|||
// , TaskStatus.ISSUED.getCode(), TaskStatus.EXECUTING.getCode()
|
|||
// )
|
|||
// .eq(SchBaseTask::getIs_delete, IOSConstant.IS_DELETE_NO)
|
|||
// );
|
|||
// list.stream().forEach(item -> {
|
|||
// if (item.getTask_status().equals(TaskStatus.CREATE.getCode())) {
|
|||
// item.setTask_status(TaskStatus.CREATE.getName());
|
|||
// }
|
|||
// if (item.getTask_status().equals(TaskStatus.ISSUED.getCode())) {
|
|||
// item.setTask_status(TaskStatus.ISSUED.getName());
|
|||
// }
|
|||
// if (item.getTask_status().equals(TaskStatus.EXECUTING.getCode())) {
|
|||
// item.setTask_status(TaskStatus.EXECUTING.getName());
|
|||
// }
|
|||
// });
|
|||
//
|
|||
// return list;
|
|||
// }
|
|||
//
|
|||
// /**
|
|||
// * 未完成单据
|
|||
// *
|
|||
// * @return List<IOStorInv>{
|
|||
// * 出入库实体类
|
|||
// * }
|
|||
// */
|
|||
// private List<IOStorInv> unIos() {
|
|||
// List<Dict> dicts = sysDictMapper.selectList(
|
|||
// new QueryWrapper<Dict>().lambda()
|
|||
// .in(Dict::getCode, "ST_INV_IN_TYPE", "ST_INV_OUT_TYPE")
|
|||
// );
|
|||
//
|
|||
// List<IOStorInv> list = iOutBillService.list(
|
|||
// new QueryWrapper<IOStorInv>().lambda()
|
|||
// .eq(IOStorInv::getIs_delete, IOSConstant.IS_DELETE_NO)
|
|||
// .ne(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
|
|||
// );
|
|||
// list.stream().forEach(item -> {
|
|||
// item.setIo_type(item.getIo_type().equals(IOSEnum.IO_TYPE.code("入库")) ? IOSConstant.IOS_IO_TYPE_IN : IOSConstant.IOS_IO_TYPE_OUT);
|
|||
// if (item.getBill_status().equals(IOSEnum.BILL_STATUS.code("生成"))) {
|
|||
// item.setBill_status("生成");
|
|||
// }
|
|||
// if (item.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配中"))) {
|
|||
// item.setBill_status("分配中");
|
|||
// }
|
|||
// if (item.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完"))) {
|
|||
// item.setBill_status("分配完");
|
|||
// }
|
|||
// Dict dict = dicts.stream()
|
|||
// .filter(row -> row.getValue().equals(item.getBill_type()))
|
|||
// .findFirst().orElse(null);
|
|||
// item.setBill_type(dict.getLabel());
|
|||
// });
|
|||
// return list;
|
|||
// }
|
|||
} |
|||
@ -1,9 +1,9 @@ |
|||
package org.nl.wms.ext.controller; |
|||
package org.nl.wms.ext_manage.controller; |
|||
|
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.wms.ext.service.AcsToWmsService; |
|||
import org.nl.wms.ext_manage.service.AcsToWmsService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.ext.enums; |
|||
package org.nl.wms.ext_manage.enums; |
|||
|
|||
/** |
|||
* @author Liuyx |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.ext.enums; |
|||
package org.nl.wms.ext_manage.enums; |
|||
|
|||
/** |
|||
* <p> |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.ext.service; |
|||
package org.nl.wms.ext_manage.service; |
|||
|
|||
import java.util.Map; |
|||
|
|||
@ -1,7 +1,7 @@ |
|||
package org.nl.wms.ext.service; |
|||
package org.nl.wms.ext_manage.service; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import org.nl.wms.ext.service.util.ErpResponse; |
|||
import org.nl.wms.ext_manage.service.util.ErpResponse; |
|||
|
|||
/** |
|||
* <p> |
|||
@ -1,7 +1,7 @@ |
|||
package org.nl.wms.ext.service; |
|||
package org.nl.wms.ext_manage.service; |
|||
|
|||
|
|||
import org.nl.wms.ext.service.util.AcsResponse; |
|||
import org.nl.wms.ext_manage.service.util.AcsResponse; |
|||
import org.nl.wms.sch_manage.service.util.AcsTaskDto; |
|||
|
|||
import java.util.List; |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.ext.service; |
|||
package org.nl.wms.ext_manage.service; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
|
|||
@ -1,12 +1,12 @@ |
|||
package org.nl.wms.ext.service.impl; |
|||
package org.nl.wms.ext_manage.service.impl; |
|||
|
|||
import com.alibaba.fastjson.JSONArray; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
import lombok.SneakyThrows; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.exception.BadRequestException; |
|||
import org.nl.wms.ext.enums.ResultAcsStatus; |
|||
import org.nl.wms.ext.service.AcsToWmsService; |
|||
import org.nl.wms.ext_manage.enums.ResultAcsStatus; |
|||
import org.nl.wms.ext_manage.service.AcsToWmsService; |
|||
import org.nl.wms.sch_manage.enums.TaskStatus; |
|||
import org.nl.wms.sch_manage.service.ISchBaseTaskService; |
|||
import org.nl.wms.sch_manage.service.dao.SchBaseTask; |
|||
@ -1,10 +1,10 @@ |
|||
package org.nl.wms.ext.service.impl; |
|||
package org.nl.wms.ext_manage.service.impl; |
|||
|
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.wms.ext.enums.EXTConstant; |
|||
import org.nl.wms.ext.service.WmsToAcsService; |
|||
import org.nl.wms.ext.service.util.AcsResponse; |
|||
import org.nl.wms.ext.util.AcsUtil; |
|||
import org.nl.wms.ext_manage.enums.EXTConstant; |
|||
import org.nl.wms.ext_manage.service.WmsToAcsService; |
|||
import org.nl.wms.ext_manage.service.util.AcsResponse; |
|||
import org.nl.wms.ext_manage.util.AcsUtil; |
|||
import org.nl.wms.sch_manage.service.util.AcsTaskDto; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
@ -1,14 +1,14 @@ |
|||
package org.nl.wms.ext.service.impl; |
|||
package org.nl.wms.ext_manage.service.impl; |
|||
|
|||
import cn.hutool.http.HttpRequest; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.exception.BadRequestException; |
|||
import org.nl.config.SpringContextHolder; |
|||
import org.nl.system.enums.SysParamConstant; |
|||
import org.nl.system.service.param.impl.SysParamServiceImpl; |
|||
import org.nl.wms.ext.enums.EXTConstant; |
|||
import org.nl.wms.ext.service.WmsToErpService; |
|||
import org.nl.wms.system_manage.enums.SysParamConstant; |
|||
import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl; |
|||
import org.nl.wms.ext_manage.enums.EXTConstant; |
|||
import org.nl.wms.ext_manage.service.WmsToErpService; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
@ -1,10 +1,10 @@ |
|||
package org.nl.wms.ext.service.util; |
|||
package org.nl.wms.ext_manage.service.util; |
|||
|
|||
import cn.hutool.core.date.DateUtil; |
|||
import cn.hutool.http.HttpStatus; |
|||
import com.alibaba.fastjson.JSONArray; |
|||
import lombok.Data; |
|||
import org.nl.wms.ext.util.BaseResponse; |
|||
import org.nl.wms.ext_manage.util.BaseResponse; |
|||
|
|||
/** |
|||
* @Author: Liuxy |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.ext.service.util; |
|||
package org.nl.wms.ext_manage.service.util; |
|||
|
|||
import cn.hutool.http.HttpStatus; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
@ -1,15 +1,15 @@ |
|||
package org.nl.wms.ext.util; |
|||
package org.nl.wms.ext_manage.util; |
|||
|
|||
import cn.hutool.core.util.ObjectUtil; |
|||
import cn.hutool.http.HttpRequest; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.config.SpringContextHolder; |
|||
import org.nl.system.enums.SysParamConstant; |
|||
import org.nl.system.service.param.dao.Param; |
|||
import org.nl.system.service.param.impl.SysParamServiceImpl; |
|||
import org.nl.wms.ext.service.util.AcsResponse; |
|||
import org.nl.wms.warehouse_management.enums.IOSConstant; |
|||
import org.nl.wms.system_manage.enums.SysParamConstant; |
|||
import org.nl.wms.system_manage.service.param.dao.Param; |
|||
import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl; |
|||
import org.nl.wms.ext_manage.service.util.AcsResponse; |
|||
import org.nl.wms.warehouse_manage.enums.IOSConstant; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.ext.util; |
|||
package org.nl.wms.ext_manage.util; |
|||
|
|||
import cn.hutool.core.date.DateUtil; |
|||
import cn.hutool.http.HttpStatus; |
|||
@ -1,8 +1,8 @@ |
|||
package org.nl.wms.pda.authorization.controller; |
|||
package org.nl.wms.pda_manage.authorization.controller; |
|||
|
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.system.service.menu.ISysMenuService; |
|||
import org.nl.wms.system_manage.service.menu.ISysMenuService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
@ -1,15 +1,12 @@ |
|||
package org.nl.wms.pda.ios_manage.controller; |
|||
package org.nl.wms.pda_manage.ios_manage.controller; |
|||
|
|||
|
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
import lombok.RequiredArgsConstructor; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.nl.common.base.TableDataInfo; |
|||
import org.nl.common.exception.BadRequestException; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.wms.pda.ios_manage.service.PdaIosOutService; |
|||
import org.nl.wms.pda_manage.ios_manage.service.PdaIosOutService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
@ -1,9 +1,9 @@ |
|||
package org.nl.wms.pda.ios_manage.service; |
|||
package org.nl.wms.pda_manage.ios_manage.service; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import com.baomidou.mybatisplus.extension.service.IService; |
|||
import org.nl.wms.pda.util.PdaResponse; |
|||
import org.nl.wms.warehouse_management.service.dao.StIvtCheckdtl; |
|||
import org.nl.wms.pda_manage.util.PdaResponse; |
|||
import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl; |
|||
|
|||
/** |
|||
* <p> |
|||
@ -1,11 +1,10 @@ |
|||
package org.nl.wms.pda.ios_manage.service; |
|||
package org.nl.wms.pda_manage.ios_manage.service; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import org.nl.common.base.TableDataInfo; |
|||
import org.nl.common.domain.vo.SelectItemVo; |
|||
import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; |
|||
import org.nl.wms.pda.util.PdaResponse; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.nl.wms.pda_manage.util.PdaResponse; |
|||
|
|||
import java.util.List; |
|||
|
|||
@ -1,7 +1,7 @@ |
|||
package org.nl.wms.pda.ios_manage.service; |
|||
package org.nl.wms.pda_manage.ios_manage.service; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import org.nl.wms.pda.util.PdaResponse; |
|||
import org.nl.wms.pda_manage.util.PdaResponse; |
|||
|
|||
/** |
|||
* <p> |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.pda.ios_manage.service.dto; |
|||
package org.nl.wms.pda_manage.ios_manage.service.dto; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Builder; |
|||
@ -1,15 +1,15 @@ |
|||
package org.nl.wms.pda.ios_manage.service.impl; |
|||
package org.nl.wms.pda_manage.ios_manage.service.impl; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|||
import org.nl.wms.pda.ios_manage.service.PdaIosCheckService; |
|||
import org.nl.wms.pda.util.PdaResponse; |
|||
import org.nl.wms.warehouse_management.enums.IOSEnum; |
|||
import org.nl.wms.warehouse_management.service.IStIvtCheckdtlService; |
|||
import org.nl.wms.warehouse_management.service.IStIvtCheckmstService; |
|||
import org.nl.wms.warehouse_management.service.dao.StIvtCheckdtl; |
|||
import org.nl.wms.warehouse_management.service.dao.mapper.StIvtCheckdtlMapper; |
|||
import org.nl.wms.pda_manage.ios_manage.service.PdaIosCheckService; |
|||
import org.nl.wms.pda_manage.util.PdaResponse; |
|||
import org.nl.wms.warehouse_manage.enums.IOSEnum; |
|||
import org.nl.wms.warehouse_manage.service.IStIvtCheckdtlService; |
|||
import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService; |
|||
import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl; |
|||
import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckdtlMapper; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
@ -1,8 +1,8 @@ |
|||
package org.nl.wms.pda.sch_manage.service; |
|||
package org.nl.wms.pda_manage.sch_manage.service; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import com.baomidou.mybatisplus.extension.service.IService; |
|||
import org.nl.wms.pda.util.PdaResponse; |
|||
import org.nl.wms.pda_manage.util.PdaResponse; |
|||
import org.nl.wms.sch_manage.service.dao.SchBasePoint; |
|||
|
|||
/** |
|||
@ -1,8 +1,8 @@ |
|||
package org.nl.wms.pda.sch_manage.service; |
|||
package org.nl.wms.pda_manage.sch_manage.service; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import com.baomidou.mybatisplus.extension.service.IService; |
|||
import org.nl.wms.pda.util.PdaResponse; |
|||
import org.nl.wms.pda_manage.util.PdaResponse; |
|||
import org.nl.wms.sch_manage.service.dao.SchBaseTask; |
|||
|
|||
/** |
|||
@ -1,11 +1,11 @@ |
|||
package org.nl.wms.pda.sch_manage.service.impl; |
|||
package org.nl.wms.pda_manage.sch_manage.service.impl; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|||
import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService; |
|||
import org.nl.wms.pda.sch_manage.service.PdaSchPointService; |
|||
import org.nl.wms.pda.util.PdaResponse; |
|||
import org.nl.wms.pda_manage.sch_manage.service.PdaSchPointService; |
|||
import org.nl.wms.pda_manage.util.PdaResponse; |
|||
import org.nl.wms.sch_manage.service.dao.SchBasePoint; |
|||
import org.nl.wms.sch_manage.service.dao.mapper.SchBasePointMapper; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.pda.util; |
|||
package org.nl.wms.pda_manage.util; |
|||
|
|||
import cn.hutool.http.HttpStatus; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
@ -1,123 +0,0 @@ |
|||
package org.nl.wms.pm_manage.form_data.service.dao.dto; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Builder; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
import java.math.BigDecimal; |
|||
|
|||
|
|||
/** |
|||
* {@code @Description:} 表单信息表(PmFormData)数据传输类 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2025-06-27 |
|||
*/ |
|||
@Data |
|||
@Builder |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
public class PmFormDataDto implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -7739291296662381396L; |
|||
|
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
/** |
|||
* 编号 |
|||
*/ |
|||
private String code; |
|||
/** |
|||
* 单据状态 |
|||
*/ |
|||
private String status; |
|||
/** |
|||
* 单据类型 |
|||
*/ |
|||
private String form_type; |
|||
/** |
|||
* 源单单据日期 |
|||
*/ |
|||
private String source_form_date; |
|||
/** |
|||
* 物料code |
|||
*/ |
|||
private String material_code; |
|||
/** |
|||
* 批次号 |
|||
*/ |
|||
private String pcsn; |
|||
/** |
|||
* 计划数量 |
|||
*/ |
|||
private BigDecimal plan_qty; |
|||
/** |
|||
* 数量 |
|||
*/ |
|||
private BigDecimal qty; |
|||
/** |
|||
* 分配数量 |
|||
*/ |
|||
private BigDecimal assign_qty; |
|||
/** |
|||
* 实际数量 |
|||
*/ |
|||
private BigDecimal actual_qty; |
|||
/** |
|||
* 单据累计数量 |
|||
*/ |
|||
private BigDecimal total_qty; |
|||
/** |
|||
* 数量单位 |
|||
*/ |
|||
private String unit_id; |
|||
/** |
|||
* 单位名称 |
|||
*/ |
|||
private String unit_name; |
|||
/** |
|||
* 载具信息 |
|||
*/ |
|||
private String vehicle_code; |
|||
/** |
|||
* 载具组盘id |
|||
*/ |
|||
private String vehicle_id; |
|||
/** |
|||
* 自定义表单字段 |
|||
*/ |
|||
private String form_data; |
|||
/** |
|||
* 创建id |
|||
*/ |
|||
private String create_time; |
|||
/** |
|||
* 创建id |
|||
*/ |
|||
private String create_name; |
|||
/** |
|||
* 修改时间 |
|||
*/ |
|||
private String update_time; |
|||
/** |
|||
* 修改人 |
|||
*/ |
|||
private String update_name; |
|||
/** |
|||
* 说明 |
|||
*/ |
|||
private String remark; |
|||
/** |
|||
* 是否完结 |
|||
*/ |
|||
private Integer is_finish; |
|||
|
|||
} |
|||
|
|||
|
|||
|
|||
@ -1,12 +1,14 @@ |
|||
package org.nl.wms.pm_manage.form_data.service; |
|||
package org.nl.wms.pm_manage.service; |
|||
|
|||
|
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.baomidou.mybatisplus.extension.service.IService; |
|||
import org.nl.common.domain.query.PageQuery; |
|||
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData; |
|||
import org.nl.wms.pm_manage.form_data.service.dao.dto.PmFormDataParam; |
|||
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery; |
|||
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto; |
|||
import org.nl.wms.pm_manage.service.dao.PmFormData; |
|||
import org.nl.wms.pm_manage.service.dto.PmFormDataDto; |
|||
import org.nl.wms.pm_manage.service.dto.PmFormDataParam; |
|||
import org.nl.wms.pm_manage.service.dto.FormDataQuery; |
|||
|
|||
|
|||
import java.util.List; |
|||
|
|||
@ -1,11 +1,11 @@ |
|||
package org.nl.wms.pm_manage.form_data.service.dao.mapper; |
|||
package org.nl.wms.pm_manage.service.dao.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
import org.apache.ibatis.annotations.Update; |
|||
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData; |
|||
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery; |
|||
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto; |
|||
import org.nl.wms.pm_manage.service.dao.PmFormData; |
|||
import org.nl.wms.pm_manage.service.dto.FormDataQuery; |
|||
import org.nl.wms.pm_manage.service.dto.PmFormDataDto; |
|||
|
|||
import java.math.BigDecimal; |
|||
import java.util.List; |
|||
@ -1,10 +1,10 @@ |
|||
package org.nl.wms.pm_manage.form_data.service.dto; |
|||
package org.nl.wms.pm_manage.service.dto; |
|||
|
|||
import lombok.Data; |
|||
import org.nl.common.domain.query.BaseQuery; |
|||
import org.nl.common.domain.query.QParam; |
|||
import org.nl.common.enums.QueryTEnum; |
|||
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData; |
|||
import org.nl.wms.pm_manage.service.dao.PmFormData; |
|||
|
|||
import java.util.Map; |
|||
|
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.pm_manage.form_data.service.dto; |
|||
package org.nl.wms.pm_manage.service.dto; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import lombok.Data; |
|||
@ -1,11 +1,11 @@ |
|||
package org.nl.wms.pm_manage.form_data.service.dao.dto; |
|||
package org.nl.wms.pm_manage.service.dto; |
|||
|
|||
|
|||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; |
|||
import lombok.*; |
|||
import org.nl.common.domain.handler.IsoToLocalDateTimeStringDeserializer; |
|||
import org.nl.common.domain.query.BaseQuery; |
|||
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData; |
|||
import org.nl.wms.pm_manage.service.dao.PmFormData; |
|||
|
|||
import java.math.BigDecimal; |
|||
|
|||
@ -1,12 +1,11 @@ |
|||
package org.nl.system.controller.generator; |
|||
package org.nl.wms.system_manage.controller.generator; |
|||
|
|||
|
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
|
|||
|
|||
import lombok.RequiredArgsConstructor; |
|||
import org.nl.system.service.generator.ICodeGenConfigService; |
|||
import org.nl.system.service.generator.dao.CodeGenConfig; |
|||
import org.nl.wms.system_manage.service.generator.ICodeGenConfigService; |
|||
import org.nl.wms.system_manage.service.generator.dao.CodeGenConfig; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
@ -1,10 +1,10 @@ |
|||
package org.nl.system.controller.lucence; |
|||
package org.nl.wms.system_manage.controller.lucence; |
|||
|
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.system.service.logserver.LogQuery; |
|||
import org.nl.system.service.logserver.LuceneLogService; |
|||
import org.nl.wms.system_manage.service.logserver.LogQuery; |
|||
import org.nl.wms.system_manage.service.logserver.LuceneLogService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
@ -1,11 +1,11 @@ |
|||
package org.nl.system.controller.redis; |
|||
package org.nl.wms.system_manage.controller.redis; |
|||
|
|||
|
|||
|
|||
import lombok.RequiredArgsConstructor; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.system.service.redis.RedisService; |
|||
import org.nl.wms.system_manage.service.redis.RedisService; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.springframework.web.bind.annotation.*; |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue