Commit c3749158 by pfh

仓库状态列表修改

parent e1ab500e
package com.jomalls.custom.app.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public enum CustomWarehouseEnums {
ONLINE(1, "已上线"),
PENDING_ONLINE(10, "待上线"),
OFFLINE(20, "已下线"),
PENDING_OFFLINE(30, "待下线");
public final Integer status;
public final String remark;
CustomWarehouseEnums(Integer status, String remark) {
this.status = status;
this.remark = remark;
}
public static CustomWarehouseEnums getByStatus(Integer status) {
for (CustomWarehouseEnums item : CustomWarehouseEnums.values()) {
if (item.status.equals(status)) {
return item;
}
}
return null;
}
// 获取所有枚举的 Map 列表
public static List<Map<String,Object>> getAll() {
List<Map<String,Object>> list = new ArrayList<>();
for (CustomWarehouseEnums value : values()) {
Map<String, Object> map = new HashMap<>();
map.put("status", value.status);
map.put("remark", value.remark);
list.add(map);
}
return list;
}
}
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jomalls.custom.app.dto.warehouse.CustomWarehouseInfoSaveDTO; import com.jomalls.custom.app.dto.warehouse.CustomWarehouseInfoSaveDTO;
import com.jomalls.custom.app.dto.warehouse.CustomWarehouseInfoUpdateDTO; import com.jomalls.custom.app.dto.warehouse.CustomWarehouseInfoUpdateDTO;
import com.jomalls.custom.app.enums.CustomWarehouseEnums;
import com.jomalls.custom.app.service.warehouse.CustomWarehouseInfoService; import com.jomalls.custom.app.service.warehouse.CustomWarehouseInfoService;
import com.jomalls.custom.app.utils.BeanMapper; import com.jomalls.custom.app.utils.BeanMapper;
import com.jomalls.custom.app.vo.warehouse.CustomWarehouseInfoSnakeVO; import com.jomalls.custom.app.vo.warehouse.CustomWarehouseInfoSnakeVO;
...@@ -62,16 +63,7 @@ public class CustomWarehouseInfoServiceImpl implements CustomWarehouseInfoServic ...@@ -62,16 +63,7 @@ public class CustomWarehouseInfoServiceImpl implements CustomWarehouseInfoServic
@Override @Override
public List<Map<String, Object>> statusList() { public List<Map<String, Object>> statusList() {
List<Map<String, Object>> list = new ArrayList<>(2); return CustomWarehouseEnums.getAll();
Map<String, Object> enabled = new HashMap<>(2);
enabled.put("code", 1);
enabled.put("label", "启用");
list.add(enabled);
Map<String, Object> disabled = new HashMap<>(2);
disabled.put("code", 0);
disabled.put("label", "停用");
list.add(disabled);
return list;
} }
@Override @Override
......
...@@ -2,6 +2,7 @@ package com.jomalls.custom.webapp.controller.rest; ...@@ -2,6 +2,7 @@ package com.jomalls.custom.webapp.controller.rest;
import com.jomalls.custom.app.handler.SyntheticServerCallbackHandler; import com.jomalls.custom.app.handler.SyntheticServerCallbackHandler;
import com.jomalls.custom.utils.R; import com.jomalls.custom.utils.R;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -18,7 +19,11 @@ public class SyntheticServerCallbackController { ...@@ -18,7 +19,11 @@ public class SyntheticServerCallbackController {
@Autowired @Autowired
SyntheticServerCallbackHandler syntheticServerCallbackHandler; SyntheticServerCallbackHandler syntheticServerCallbackHandler;
/**
* 合成服务器回调
*/
@Operation(summary = "合成服务器回调", description = "合成服务器回调")
@GetMapping("/callback") @GetMapping("/callback")
public R callback(HttpServletRequest request) { public R callback(HttpServletRequest request) {
String queryString = request.getQueryString(); String queryString = request.getQueryString();
......
...@@ -2,6 +2,7 @@ package com.jomalls.custom.webapp.controller.upload; ...@@ -2,6 +2,7 @@ package com.jomalls.custom.webapp.controller.upload;
import com.jomalls.custom.utils.R; import com.jomalls.custom.utils.R;
import io.swagger.v3.oas.annotations.Operation;
import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.FileInfo;
import org.dromara.x.file.storage.core.FileStorageService; import org.dromara.x.file.storage.core.FileStorageService;
import org.springframework.beans.factory.annotation.Autowired;; import org.springframework.beans.factory.annotation.Autowired;;
...@@ -29,8 +30,9 @@ public class UploadController { ...@@ -29,8 +30,9 @@ public class UploadController {
/** /**
* 通用上传请求(单个) * 通用上传文件请求(单个)
*/ */
@Operation(summary = "通用上传文件请求", description = "通用上传文件请求")
@PostMapping("/upload") @PostMapping("/upload")
public R<Map<String,Object>> uploadFile(MultipartFile file){ public R<Map<String,Object>> uploadFile(MultipartFile file){
try { try {
......
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