From 5408d461787ce97a546d6f24740a9247a3d9db86 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 09:25:04 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java | 23 +++++++++++
/dev/null | 5 --
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java | 45 +++++++++++-----------
3 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ContainerController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ContainerController.java
deleted file mode 100644
index 051e3a6..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ContainerController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.asrs.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.common.annotation.OperationLog;
-import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.common.domain.KeyValVo;
-import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.asrs.entity.Container;
-import com.zy.asrs.wms.asrs.service.ContainerService;
-import com.zy.asrs.wms.system.controller.BaseController;
-import com.zy.asrs.wms.utils.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api")
-public class ContainerController extends BaseController {
-
- @Autowired
- private ContainerService containerService;
-
- @PreAuthorize("hasAuthority('asrs:container:list')")
- @PostMapping("/container/page")
- public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<Container, BaseParam> pageParam = new PageParam<>(baseParam, Container.class);
- return R.ok().add(containerService.page(pageParam, pageParam.buildWrapper(true)));
- }
-
- @PreAuthorize("hasAuthority('asrs:container:list')")
- @PostMapping("/container/list")
- public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(containerService.list());
- }
-
- @PreAuthorize("hasAuthority('asrs:container:list')")
- @GetMapping("/container/{id}")
- public R get(@PathVariable("id") Long id) {
- return R.ok().add(containerService.getById(id));
- }
-
- @PreAuthorize("hasAuthority('asrs:container:save')")
- @OperationLog("娣诲姞瀹瑰櫒绠＄悊")
- @PostMapping("/container/save")
- public R save(@RequestBody Container container) {
- if (!containerService.save(container)) {
- return R.error("娣诲姞澶辫触");
- }
- return R.ok("娣诲姞鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:container:update')")
- @OperationLog("淇敼瀹瑰櫒绠＄悊")
- @PostMapping("/container/update")
- public R update(@RequestBody Container container) {
- if (!containerService.updateById(container)) {
- return R.error("淇敼澶辫触");
- }
- return R.ok("淇敼鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:container:remove')")
- @OperationLog("鍒犻櫎瀹瑰櫒绠＄悊")
- @PostMapping("/container/remove/{ids}")
- public R remove(@PathVariable Long[] ids) {
- if (!containerService.removeByIds(Arrays.asList(ids))) {
- return R.error("鍒犻櫎澶辫触");
- }
- return R.ok("鍒犻櫎鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:container:list')")
- @PostMapping("/container/query")
- public R query(@RequestParam(required = false) String condition) {
- List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Container> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Container::getName, condition);
- }
- containerService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getName()))
- );
- return R.ok().add(vos);
- }
-
- @PreAuthorize("hasAuthority('asrs:container:list')")
- @PostMapping("/container/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<Container, BaseParam> pageParam = new PageParam<>(baseParam, Container.class);
- List<Container> data = containerService.list(pageParam.buildWrapper(true));
-
- ExcelUtil.build(ExcelUtil.create(data, Container.class), response);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java
index 3b281f2..8df973f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -118,7 +119,7 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Integer hostId;
/**
* 娣诲姞浜哄憳
@@ -131,6 +132,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -144,6 +146,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
@@ -167,7 +170,7 @@
this.flagLogic = flagLogic;
this.status = status;
this.deleted = deleted;
- this.tenantId = tenantId;
+ this.hostId = tenantId;
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
@@ -175,27 +178,23 @@
this.memo = memo;
}
-// Container container = new Container(
-// null, // 鍚嶇О
-// null, // 瀹瑰櫒缂栫爜[闈炵┖]
-// null, // 瀹瑰櫒绫诲瀷[闈炵┖]
-// null, // 浣跨敤娆℃暟[闈炵┖]
-// null, // 闀垮害
-// null, // 瀹藉害
-// null, // 楂樺害
-// null, // 鏈夋晥鏈�
-// null, // 鏄惁鍥炴敹[闈炵┖]
-// null, // 鏄惁铏氭嫙[闈炵┖]
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case "1":
+ return " 閽㈡墭鐩�";
+ case "2":
+ return " 鏈ㄦ墭鐩�";
+ case "3":
+ return " 濉戞枡鏂欐";
+ case "4":
+ return "鎵樼洏绗肩";
+ case "5":
+ return "閽㈡枡鏋�";
+ default:
+ return String.valueOf(this.type);
+ }
+ }
public String getVaildTime$(){
if (Cools.isEmpty(this.vaildTime)){
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java
new file mode 100644
index 0000000..10c4984
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java
@@ -0,0 +1,23 @@
+package com.zy.asrs.wms.asrs.entity.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ContainerParams", description = "瀹瑰櫒鍒濆鍖栧弬鏁�")
+public class ContainerParams implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("璧峰鏁板��")
+ private Integer startNum;
+
+ @ApiModelProperty("缁堟鏁板��")
+ private Integer endNum;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ContainerMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ContainerMapper.java
deleted file mode 100644
index 530098e..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ContainerMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.wms.asrs.mapper;
-
-import com.zy.asrs.wms.asrs.entity.Container;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface ContainerMapper extends BaseMapper<Container> {
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ContainerService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ContainerService.java
deleted file mode 100644
index de31fe7..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ContainerService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.wms.asrs.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wms.asrs.entity.Container;
-
-public interface ContainerService extends IService<Container> {
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ContainerServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ContainerServiceImpl.java
deleted file mode 100644
index c77362a..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ContainerServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.wms.asrs.service.impl;
-
-import com.zy.asrs.wms.asrs.mapper.ContainerMapper;
-import com.zy.asrs.wms.asrs.entity.Container;
-import com.zy.asrs.wms.asrs.service.ContainerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("containerService")
-public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService {
-
-}
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/ContainerMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/ContainerMapper.xml
deleted file mode 100644
index f2d9ecc..0000000
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/ContainerMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wms.asrs.mapper.ContainerMapper">
-
-</mapper>
--
Gitblit v1.9.1