港口资料、集装箱model

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/BasicContainerDescDTO.java

@@ -0,0 +1,17 @@
+package org.springblade.client.dto;
+
+import lombok.Data;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicPortDesc;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class BasicContainerDescDTO extends BasicContainerDesc
+{
+	@NotBlank(message = "港口类型名称不能为空")
+   private String typeName;
+   @NotBlank(message = "港口类型id不能为空")
+   private Long typeId;
+}
+

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/BasicPortDescDTO.java

@@ -0,0 +1,16 @@
+package org.springblade.client.dto;
+
+import lombok.Data;
+import org.springblade.client.entity.BasicPortDesc;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class BasicPortDescDTO extends BasicPortDesc
+{
+	@NotBlank(message = "港口类型名称不能为空")
+   private String typeName;
+   @NotBlank(message = "港口类型id不能为空")
+   private Long typeId;
+}
+ 

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/BasicContainerDesc.java

@@ -0,0 +1,77 @@
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:07
+ */
+@Data
+@TableName("basic_container_desc")
+public class BasicContainerDesc extends TenantEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	//
+	@TableId
+	private Long id;
+	//编码
+	private String code;
+	//费用名称
+	private String name;
+	//英文名称
+	private String enName;
+	//Uncode
+	private String unCode;
+	//Teu
+	private BigDecimal teu;
+	//体积
+	private BigDecimal volume;
+	//毛重
+	private BigDecimal gorssweight;
+	//尺码值
+	private BigDecimal containerSize;
+	//备注
+	private String remarks;
+	//版本
+	private String version;
+	//租户ID
+	private String tenantId;
+	//创建人
+	private Long createUser;
+	//创建时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	//修改人
+	private Long updateUser;
+	//修改时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	//创建人姓名
+	private String createUserName;
+	//修改人姓名
+	private String updateUserName;
+	//是否删除
+	private Integer isDeleted;
+	//
+	private Integer status;
+	//创建部门
+	private Long createDept;
+
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/BasicContainerType.java

@@ -0,0 +1,70 @@
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Data
+@TableName("basic_container_type")
+public class BasicContainerType extends TenantEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	//
+	@TableId
+	private Long id;
+	//类别名称
+	private String name;
+	//父主键
+	private Long parentId;
+	//祖级列表
+	private String ancestors;
+	//排序
+	private Integer sort;
+	//备注
+	private String remarks;
+	//版本
+	private String version;
+	//租户ID
+	private String tenantId;
+	//创建人
+	private Long createUser;
+	//创建时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	//修改人
+	private Long updateUser;
+	//修改时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	//创建人姓名
+	private String createUserName;
+	//修改人姓名
+	private String updateUserName;
+	//是否删除
+	@TableLogic
+	private Integer isDeleted;
+	//
+	private Integer status;
+	//创建部门
+	private Long createDept;
+
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/BasicContainerTypeDesc.java

@@ -0,0 +1,63 @@
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Data
+@TableName("basic_container_type_desc")
+public class BasicContainerTypeDesc extends TenantEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	//
+	@TableId
+	private Long id;
+	//港口类型id
+	private Long containerTypeId;
+	//港口id
+	private Long containerId;
+	//版本
+	private String version;
+	//租户ID
+	private String tenantId;
+	//创建人
+	private Long createUser;
+	//创建时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	//修改人
+	private Long updateUser;
+	//修改时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	//创建人姓名
+	private String createUserName;
+	//修改人姓名
+	private String updateUserName;
+	//是否删除
+	@TableLogic
+	private Integer isDeleted;
+	//
+	private Integer status;
+	//创建部门
+	private Long createDept;
+
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/BasicPortDesc.java

@@ -0,0 +1,78 @@
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Data
+@TableName("basic_port_type")
+public class BasicPortDesc  extends TenantEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	//
+	@TableId
+	private Long id;
+	//编码
+	private String code;
+	//费用名称
+	private String name;
+	//英文名称
+	private String enName;
+	//Uncode
+	private String unCode;
+	//国家
+	private String country;
+	//省
+	private String province;
+	//市
+	private String city;
+	//航线
+	private String lines;
+	//备注
+	private String remarks;
+	//版本
+	private String version;
+	//租户ID
+	private String tenantId;
+	//创建人
+	private Long createUser;
+	//创建时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	//修改人
+	private Long updateUser;
+	//修改时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	//创建人姓名
+	private String createUserName;
+	//修改人姓名
+	private String updateUserName;
+	//是否删除
+	@TableLogic
+	private Integer isDeleted;
+	//
+	private Integer status;
+	//创建部门
+	private Long createDept;
+
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/BasicPortType.java

@@ -0,0 +1,72 @@
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Data
+@TableName("basic_port_type")
+public class BasicPortType extends TenantEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	//
+	@TableField
+	private Long id;
+	//类别名称
+	private String name;
+	//父主键
+	private Long parentId;
+	//祖级列表
+	private String ancestors;
+	//排序
+	private Integer sort;
+	//备注
+	private String remarks;
+	//版本
+	private String version;
+	//租户ID
+	private String tenantId;
+	//创建人
+	private Long createUser;
+	//创建时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	//修改人
+	private Long updateUser;
+	//修改时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	//创建人姓名
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private String createUserName;
+	//修改人姓名
+	private String updateUserName;
+	//是否删除
+	@TableLogic
+	private Integer isDeleted;
+	//
+	private Integer status;
+	//创建部门
+	private Long createDept;
+
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/BasicPortTypeDesc.java

@@ -0,0 +1,64 @@
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Data
+@TableName("basic_port_type_desc")
+public class BasicPortTypeDesc extends TenantEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	//
+	@TableId
+	private Long id;
+	//港口类型id
+	private Long portsTypeId;
+	//港口id
+	private Long portsId;
+	//版本
+	private String version;
+	//租户ID
+	private String tenantId;
+	//创建人
+	private Long createUser;
+	//创建时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	//修改人
+	private Long updateUser;
+	//修改时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	//创建人姓名
+	private String createUserName;
+	//修改人姓名
+	private String updateUserName;
+	//是否删除
+	@TableLogic
+	private Integer isDeleted;
+	//
+	private Integer status;
+	//创建部门
+	private Long createDept;
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/controller/ContainerController.java

@@ -0,0 +1,119 @@
+package org.springblade.client.container.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import org.springblade.client.container.service.BasicContainerDescService;
+import org.springblade.client.container.service.BasicContainerTypeService;
+import org.springblade.client.dto.BasicPortDescDTO;
+import org.springblade.client.entity.BasicContainerType;
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.client.entity.BasicPortType;
+import org.springblade.client.port.service.BasicPortDescService;
+import org.springblade.client.port.service.BasicPortTypeDescService;
+import org.springblade.client.port.service.BasicPortTypeService;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Arrays;
+import java.util.List;
+
+@NonDS
+@ApiIgnore
+@RestController
+@RequestMapping("/container")
+@AllArgsConstructor
+public class ContainerController
+{
+
+	@Autowired
+	private BasicPortDescService basicPortDescService;
+	@Autowired
+	private BasicPortTypeService basicPortTypeService;
+	@Autowired
+	private BasicPortTypeDescService midBasicPortTypeDescService;
+	@Autowired
+	private BasicContainerDescService basicContainerDescService;
+	@Autowired
+	private BasicContainerTypeService basicContainerTypeService;
+
+
+	@GetMapping("type/list")
+	public R typeList(@RequestParam(name = "current", defaultValue = "1") Integer current,
+					  @RequestParam(name = "size", defaultValue = "10") Integer size,
+					  @RequestParam(name = "parentId", required = false) Long parentId)
+
+	{
+		LambdaQueryWrapper<BasicContainerType> typeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		typeLambdaQueryWrapper
+			.eq(parentId!=null,BasicContainerType::getParentId,parentId)
+			.orderByDesc(BasicContainerType::getCreateTime);
+		Page<BasicContainerType> page=new Page<>(current,size);
+		IPage<BasicContainerType> iPage=basicContainerTypeService.page(page,typeLambdaQueryWrapper);
+		return R.data(iPage);
+	}
+
+	@PostMapping("type/add")
+	public R typeList(@RequestBody BasicContainerType portType )
+	{
+		basicContainerTypeService.save(portType);
+		return R.success("操作成功");
+	}
+
+	@PutMapping("type/edit")
+	public R typeEdit(@RequestBody BasicContainerType portType)
+	{
+		basicContainerTypeService.updateById(portType);
+		return R.success("操作成功");
+	}
+
+	@DeleteMapping("type/delet")
+	public R  typeDelet(@RequestParam(name = "id", required = true) Long id)
+	{
+		List<Long> ids= Arrays.asList(id);
+		basicContainerTypeService.deleteLogic(ids);
+		return R.success("操作成功");
+	}
+
+
+	@GetMapping("list")
+	public R list(@RequestParam(name = "current", defaultValue = "1") Integer current,
+				  @RequestParam(name = "size", defaultValue = "10") Integer size,
+				  @RequestParam(name = "name", required = false) String name,
+				  @RequestParam(name = "code", required = false) String lines,
+				  @RequestParam(name = "status", required = false) String status)
+	{
+		/*Page<BasicPortDescDTO> page=new Page<>(current,size);
+		IPage<BasicPortDescDTO> iPage = basicPortDescService.listBasicPortDesc(page, name, lines, unCode, status);
+		return R.data(iPage);*/
+		return null;
+	}
+
+	@PostMapping("add")
+	public R add (@RequestBody BasicPortDescDTO dto)
+	{
+		basicPortDescService.addBasicPortDesc(dto);
+		return R.success("操作成功");
+	}
+
+	@PostMapping("edit")
+	public R edit( @RequestBody BasicPortDesc body )
+	{
+		basicPortDescService.updateById(body);
+		return R.success("操作成功");
+	}
+
+	@DeleteMapping("delete")
+	public R delete(@RequestParam(name = "id", required = true) Long id)
+	{
+		List<Long> ids= Arrays.asList(id);
+		basicPortDescService.deleteLogic(ids);
+		return R.success("操作成功");
+	}
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/mapper/BasicContainerDescMapper.java

@@ -0,0 +1,18 @@
+package org.springblade.client.container.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.client.entity.BasicContainerDesc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:07
+ */
+@Mapper
+public interface BasicContainerDescMapper extends BaseMapper<BasicContainerDesc> {
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/mapper/BasicContainerTypeDescMapper.java

@@ -0,0 +1,18 @@
+package org.springblade.client.container.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicContainerTypeDesc;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:07
+ */
+@Mapper
+public interface BasicContainerTypeDescMapper extends BaseMapper<BasicContainerTypeDesc> {
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/mapper/BasicContainerTypeMapper.java

@@ -0,0 +1,18 @@
+package org.springblade.client.container.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.client.entity.BasicContainerType;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Mapper
+public interface BasicContainerTypeMapper extends BaseMapper<BasicContainerType> {
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/service/BasicContainerDescService.java

@@ -0,0 +1,22 @@
+package org.springblade.client.container.service;
+
+
+
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:07
+ */
+public interface BasicContainerDescService extends BaseService<BasicContainerDesc>
+{
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/service/BasicContainerTypeDescService.java

@@ -0,0 +1,21 @@
+package org.springblade.client.container.service;
+
+
+
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicContainerType;
+import org.springblade.client.entity.BasicContainerTypeDesc;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:07
+ */
+public interface BasicContainerTypeDescService extends BaseService<BasicContainerTypeDesc>
+{
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/service/BasicContainerTypeService.java

@@ -0,0 +1,22 @@
+package org.springblade.client.container.service;
+
+
+
+import org.springblade.client.entity.BasicContainerType;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+public interface BasicContainerTypeService extends BaseService<BasicContainerType>
+{
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/service/imp/BasicContainerDescServiceImpl.java

@@ -0,0 +1,24 @@
+package org.springblade.client.container.service.imp;
+
+import org.springblade.client.container.mapper.BasicContainerDescMapper;
+import org.springblade.client.container.mapper.BasicContainerTypeMapper;
+import org.springblade.client.container.service.BasicContainerDescService;
+import org.springblade.client.container.service.BasicContainerTypeService;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicContainerType;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+@Service
+public class BasicContainerDescServiceImpl extends BaseServiceImpl<BasicContainerDescMapper, BasicContainerDesc> implements BasicContainerDescService
+{
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/service/imp/BasicContainerTypeDescServiceImpl.java

@@ -0,0 +1,18 @@
+package org.springblade.client.container.service.imp;
+
+import org.springblade.client.container.mapper.BasicContainerDescMapper;
+import org.springblade.client.container.mapper.BasicContainerTypeDescMapper;
+import org.springblade.client.container.service.BasicContainerDescService;
+import org.springblade.client.container.service.BasicContainerTypeDescService;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicContainerType;
+import org.springblade.client.entity.BasicContainerTypeDesc;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class BasicContainerTypeDescServiceImpl extends BaseServiceImpl<BasicContainerTypeDescMapper, BasicContainerTypeDesc> implements BasicContainerTypeDescService
+{
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/container/service/imp/BasicContainerTypeServiceImpl.java

@@ -0,0 +1,22 @@
+package org.springblade.client.container.service.imp;
+
+import org.springblade.client.container.mapper.BasicContainerTypeMapper;
+import org.springblade.client.container.service.BasicContainerTypeService;
+import org.springblade.client.entity.BasicContainerType;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+@Service
+public class BasicContainerTypeServiceImpl extends BaseServiceImpl<BasicContainerTypeMapper, BasicContainerType> implements BasicContainerTypeService
+{
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/controller/PortController.java

@@ -0,0 +1,123 @@
+package org.springblade.client.port.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.undertow.attribute.SubstituteEmptyWrapper;
+import lombok.AllArgsConstructor;
+import oracle.jdbc.proxy.annotation.Post;
+import org.apache.commons.lang.StringUtils;
+import org.springblade.client.container.service.BasicContainerDescService;
+import org.springblade.client.container.service.BasicContainerTypeService;
+import org.springblade.client.dto.BasicPortDescDTO;
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.client.entity.BasicPortType;
+import org.springblade.client.port.service.BasicPortDescService;
+import org.springblade.client.port.service.BasicPortTypeDescService;
+import org.springblade.client.port.service.BasicPortTypeService;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Arrays;
+import java.util.List;
+
+@NonDS
+@ApiIgnore
+@RestController
+@RequestMapping("/port")
+@AllArgsConstructor
+public class PortController
+{
+    @Autowired
+	private BasicPortDescService basicPortDescService;
+    @Autowired
+	private BasicPortTypeService basicPortTypeService;
+    @Autowired
+	private BasicPortTypeDescService midBasicPortTypeDescService;
+    @Autowired
+	private BasicContainerDescService basicContainerDescService;
+    @Autowired
+	private BasicContainerTypeService basicContainerTypeService;
+
+	@GetMapping("list")
+	public R list(@RequestParam(name = "current", defaultValue = "1") Integer current,
+				  @RequestParam(name = "size", defaultValue = "10") Integer size,
+				  @RequestParam(name = "name", required = false) String name,
+				  @RequestParam(name = "lines", required = false) String lines,
+				  @RequestParam(name = "unCode", required = false) String unCode,
+				  @RequestParam(name = "status", required = false) String status)
+	{
+		Page<BasicPortDescDTO> page=new Page<>(current,size);
+		IPage<BasicPortDescDTO> iPage = basicPortDescService.listBasicPortDesc(page, name, lines, unCode, status);
+		return R.data(iPage);
+	}
+
+    @PostMapping("add")
+	public R add (@RequestBody BasicPortDescDTO dto)
+	{
+		basicPortDescService.addBasicPortDesc(dto);
+        return R.success("操作成功");
+	}
+
+	@PostMapping("edit")
+	public R edit( @RequestBody BasicPortDesc body )
+	{
+		basicPortDescService.updateById(body);
+		return R.success("操作成功");
+	}
+
+	@DeleteMapping("delete")
+    public R delete(@RequestParam(name = "id", required = true) Long id)
+	{
+		List<Long> ids= Arrays.asList(id);
+		basicPortDescService.deleteLogic(ids);
+		return R.success("操作成功");
+	}
+
+	@GetMapping("type/list")
+	public R typeList(@RequestParam(name = "current", defaultValue = "1") Integer current,
+					  @RequestParam(name = "size", defaultValue = "10") Integer size,
+					  @RequestParam(name = "parentId", required = false) Long parentId)
+
+	{
+		LambdaQueryWrapper<BasicPortType> typeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		typeLambdaQueryWrapper
+			.eq(parentId!=null,BasicPortType::getParentId,parentId)
+		    .orderByDesc(BasicPortType::getCreateTime);
+		Page<BasicPortType> page=new Page<>(current,size);
+		IPage<BasicPortType> iPage=basicPortTypeService.page(page,typeLambdaQueryWrapper);
+		return R.data(iPage);
+	}
+
+
+	@PostMapping("type/add")
+	public R typeList(@RequestBody BasicPortType portType )
+	{
+		basicPortTypeService.save(portType);
+		return R.success("操作成功");
+	}
+
+	@PutMapping("type/edit")
+	public R typeEdit(@RequestBody BasicPortType portType)
+	{
+		basicPortTypeService.updateById(portType);
+		return R.success("操作成功");
+	}
+
+	@DeleteMapping("type/delet")
+	public R  typeDelet(@RequestParam(name = "id", required = true) Long id)
+	{
+		List<Long> ids= Arrays.asList(id);
+		basicPortTypeService.deleteLogic(ids);
+		return R.success("操作成功");
+	}
+
+
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/mapper/BasicContainerDescMapper.java

@@ -0,0 +1,24 @@
+package org.springblade.client.port.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.client.dto.BasicContainerDescDTO;
+import org.springblade.client.dto.BasicPortDescDTO;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicPortDesc;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Mapper
+public interface BasicContainerDescMapper extends BaseMapper<BasicContainerDesc>
+{
+   IPage<BasicContainerDescDTO> listBasicContainerDesc(Page<BasicContainerDescDTO> page, @Param("containerName") String containerName,  @Param("code") String code, @Param("status") String status);
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/mapper/BasicContainerDescMapper.xml

@@ -0,0 +1,53 @@
+<?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="org.springblade.client.port.mapper.BasicContainerDescMapper">
+
+    <select id="listBasicPortDesc" resultType="org.springblade.client.dto.BasicContainerDescDTO">
+        SELECT
+        b.id as id,
+        b.`code` as `code`,
+        b.`name` as `name`,
+        b.en_name as enName,
+        b.un_code as unCode,
+        b.teu as teu,
+        b.volume as volume,
+        b.gorssweight as gorssweight,
+        b.container_size as containerSize,
+        b.remarks as remarks,
+        b.version as version,
+        b.create_user as createUser,
+        b.create_time as createTime,
+        b.update_user as updateUser,
+        b.update_time as updateTime,
+        b.update_user_name as updateUserName,
+        b.create_user_name as createUserName,
+        b.`status` as `status`,
+        a.`name` as typeName
+        FROM
+        basic_container_type a,
+        basic_container_desc b,
+        basic_container_type_desc c
+        WHERE
+        a.id = c.container_type_id
+        AND b.id = c.container_id
+        and b.is_deleted=0
+        <if test="containerName != null and containerName != ''">
+            AND b.`name` LIKE CONCAT('%',#{containerName,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="code != null and code != ''">
+            AND b.`code`=#{code}
+        </if>
+        <if test="status != null and status != ''">
+            AND b.status in
+            (
+            <foreach item="item" index="index" collection="status.split(',')" open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+            )
+        </if>
+
+
+    </select>
+
+</mapper>

blade-service/blade-client/src/main/java/org/springblade/client/port/mapper/BasicPortDescMapper.java

@@ -0,0 +1,23 @@
+package org.springblade.client.port.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.client.dto.BasicPortDescDTO;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.client.entity.BasicPortDesc;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Mapper
+public interface BasicPortDescMapper extends BaseMapper<BasicPortDesc>
+{
+   IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page, @Param("portName") String portName, @Param("lines")String lines,@Param("unCode") String unCode,@Param("status") String status);
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/mapper/BasicPortDescMapper.xml

@@ -0,0 +1,56 @@
+<?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="org.springblade.client.port.mapper.BasicPortDescMapper">
+
+    <select id="listBasicPortDesc" resultType="org.springblade.client.dto.BasicPortDescDTO">
+
+    SELECT
+	b.id as id,
+	b.`name` as `name`,
+	b.en_name as enName,
+	b.un_code as unCode,
+	b.country as country,
+	b.province as province,
+	b.city as city,
+	b.`lines` as `lines`,
+	b.remarks as remarks,
+	b.create_user as createUser,
+	b.create_time as createTime,
+	b.update_user as updateUser,
+	b.update_time as updateTime,
+	b.update_user_name as updateUserName,
+	b.create_user_name as createUserName,
+	b.`status` as `status`,
+	a.`name` as typeName
+FROM
+	basic_port_type a,
+	basic_port_desc b,
+	basic_port_type_desc c
+WHERE
+	a.id = c.ports_type_id
+	AND b.id = c.ports_id
+    and b.is_deleted=0
+        <if test="portName != null and portName != ''">
+            AND b.`name` LIKE CONCAT('%',#{portName,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="lines != null and lines != ''">
+            AND b.`lines`=#{lines}
+        </if>
+        <if test="unCode != null and unCode != ''">
+            AND b.un_code=#{unCode}
+        </if>
+        <if test="status != null and status != ''">
+            AND b.status in
+            (
+                <foreach item="item" index="index" collection="status.split(',')" open="(" separator="," close=")">
+                '${item}'
+                </foreach>
+            )
+        </if>
+
+
+
+    </select>
+
+</mapper>

blade-service/blade-client/src/main/java/org/springblade/client/port/mapper/BasicPortTypeDescMapper.java

@@ -0,0 +1,19 @@
+package org.springblade.client.port.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.client.entity.BasicPortTypeDesc;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Mapper
+public interface BasicPortTypeDescMapper extends BaseMapper<BasicPortTypeDesc>
+{
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/mapper/BasicPortTypeMapper.java

@@ -0,0 +1,19 @@
+package org.springblade.client.port.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.client.entity.BasicPortType;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+@Mapper
+public interface BasicPortTypeMapper extends BaseMapper<BasicPortType>
+{
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/service/BasicPortContainerService.java

@@ -0,0 +1,24 @@
+package org.springblade.client.port.service;
+
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.client.dto.BasicContainerDescDTO;
+import org.springblade.client.dto.BasicPortDescDTO;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+public interface BasicPortContainerService extends BaseService<BasicContainerDesc>
+{
+	IPage<BasicContainerDescDTO> listBasicContainerDesc(Page<BasicContainerDescDTO> page, String containerName, String code,  String status);
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/service/BasicPortDescService.java

@@ -0,0 +1,27 @@
+package org.springblade.client.port.service;
+
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.client.dto.BasicPortDescDTO;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+public interface BasicPortDescService extends BaseService<BasicPortDesc>
+{
+    IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page,String portName,String lines,String unCode,String status );
+
+    void addBasicPortDesc(BasicPortDescDTO dto);
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/service/BasicPortTypeDescService.java

@@ -0,0 +1,21 @@
+package org.springblade.client.port.service;
+
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.client.entity.BasicPortTypeDesc;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+public interface BasicPortTypeDescService extends BaseService<BasicPortTypeDesc>
+{
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/service/BasicPortTypeService.java

@@ -0,0 +1,23 @@
+package org.springblade.client.port.service;
+
+
+
+import org.springblade.client.entity.BasicPortType;
+import org.springblade.client.entity.BasicPortTypeDesc;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ *
+ * @author castiel
+ * @email sunlightcs@gmail.com
+ * @date 2021-10-29 10:50:06
+ */
+public interface BasicPortTypeService extends BaseService<BasicPortType>
+{
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/service/impl/BasicPortDescServiceImpl.java

@@ -0,0 +1,67 @@
+package org.springblade.client.port.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.client.container.mapper.BasicContainerDescMapper;
+import org.springblade.client.container.service.BasicContainerDescService;
+import org.springblade.client.dto.BasicPortDescDTO;
+import org.springblade.client.entity.BasicContainerDesc;
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.client.entity.BasicPortType;
+import org.springblade.client.entity.BasicPortTypeDesc;
+import org.springblade.client.port.mapper.BasicPortDescMapper;
+import org.springblade.client.port.mapper.BasicPortTypeDescMapper;
+import org.springblade.client.port.mapper.BasicPortTypeMapper;
+import org.springblade.client.port.service.BasicPortDescService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.SecureUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+@Service
+public class BasicPortDescServiceImpl extends BaseServiceImpl<BasicPortDescMapper, BasicPortDesc> implements BasicPortDescService
+{
+   @Autowired
+   private BasicPortDescMapper basicPortDescMapper;
+   @Autowired
+   private BasicPortTypeMapper basicPortTypeMapper;
+   @Autowired
+   private BasicPortTypeDescMapper basicPortTypeDescMapper;
+
+	@Override
+	public IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page, String portName, String lines, String unCode, String status)
+	{
+		return	basicPortDescMapper.listBasicPortDesc(page,portName,lines,unCode,status);
+	}
+
+	@Override
+	@Transactional
+	public void addBasicPortDesc(BasicPortDescDTO dto)
+	{
+		//类型id
+		Long typeId = dto.getTypeId();
+		BasicPortDesc basicPortDesc=new BasicPortDesc();
+		BeanUtils.copyProperties(dto,basicPortDesc);
+
+		basicPortDescMapper.insert(basicPortDesc);
+
+		BasicPortTypeDesc middle=new BasicPortTypeDesc();
+		middle.setPortsId(basicPortDesc.getId());
+		middle.setPortsTypeId(typeId);
+
+		basicPortTypeDescMapper.insert(middle);
+
+
+	}
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/service/impl/BasicPortTypeDescServiceImpl.java

@@ -0,0 +1,25 @@
+package org.springblade.client.port.service.impl;
+
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.client.entity.BasicPortTypeDesc;
+import org.springblade.client.port.mapper.BasicPortDescMapper;
+import org.springblade.client.port.mapper.BasicPortTypeDescMapper;
+import org.springblade.client.port.service.BasicPortDescService;
+import org.springblade.client.port.service.BasicPortTypeDescService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+@Service
+public class BasicPortTypeDescServiceImpl extends BaseServiceImpl<BasicPortTypeDescMapper, BasicPortTypeDesc> implements BasicPortTypeDescService
+{
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/service/impl/BasicPortTypeServiceImpl.java

@@ -0,0 +1,24 @@
+package org.springblade.client.port.service.impl;
+
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.client.entity.BasicPortType;
+import org.springblade.client.port.mapper.BasicPortDescMapper;
+import org.springblade.client.port.mapper.BasicPortTypeMapper;
+import org.springblade.client.port.service.BasicPortDescService;
+import org.springblade.client.port.service.BasicPortTypeService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+@Service
+public class BasicPortTypeServiceImpl extends BaseServiceImpl<BasicPortTypeMapper, BasicPortType> implements BasicPortTypeService
+{
+
+}