港口资料、集装箱 调试修改

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

@@ -9,9 +9,9 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class BasicContainerDescDTO extends BasicContainerDesc
 {
-	@NotBlank(message = "港口类型名称不能为空")
+
    private String typeName;
-   @NotBlank(message = "港口类型id不能为空")
+   @NotBlank(message = "集装箱类型id不能为空")
    private Long typeId;
 }
 

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

@@ -6,7 +6,9 @@ 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.BasicContainerDescDTO;
 import org.springblade.client.dto.BasicPortDescDTO;
+import org.springblade.client.entity.BasicContainerDesc;
 import org.springblade.client.entity.BasicContainerType;
 import org.springblade.client.entity.BasicPortDesc;
 import org.springblade.client.entity.BasicPortType;
@@ -84,26 +86,25 @@ public class ContainerController
 	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 = "code", required = false) String code,
 				  @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;
+		Page<BasicContainerDescDTO> page=new Page<>(current,size);
+		IPage<BasicContainerDescDTO> iPage = basicContainerDescService.listBasicContainerDesc(page, name, code, status);
+		return R.data(iPage);
 	}
 
 	@PostMapping("add")
-	public R add (@RequestBody BasicPortDescDTO dto)
+	public R add (@RequestBody BasicContainerDescDTO dto)
 	{
-		basicPortDescService.addBasicPortDesc(dto);
+		basicContainerDescService.addBasicContainerDesc(dto);
 		return R.success("操作成功");
 	}
 
 	@PostMapping("edit")
-	public R edit( @RequestBody BasicPortDesc body )
+	public R edit( @RequestBody BasicContainerDesc body )
 	{
-		basicPortDescService.updateById(body);
+		basicContainerDescService.updateById(body);
 		return R.success("操作成功");
 	}
 
@@ -111,7 +112,7 @@ public class ContainerController
 	public R delete(@RequestParam(name = "id", required = true) Long id)
 	{
 		List<Long> ids= Arrays.asList(id);
-		basicPortDescService.deleteLogic(ids);
+		basicContainerDescService.deleteLogic(ids);
 		return R.success("操作成功");
 	}
 

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

@@ -1,6 +1,10 @@
 package org.springblade.client.container.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.BasicContainerDescDTO;
 import org.springblade.client.entity.BasicContainerDesc;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -13,6 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-10-29 10:50:07
  */
 @Mapper
-public interface BasicContainerDescMapper extends BaseMapper<BasicContainerDesc> {
-
+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 → blade-service/blade-client/src/main/java/org/springblade/client/container/mapper/BasicContainerDescMapper.xml

@@ -1,9 +1,9 @@
 <?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">
+<mapper namespace="org.springblade.client.container.mapper.BasicContainerDescMapper">
 
-    <select id="listBasicPortDesc" resultType="org.springblade.client.dto.BasicContainerDescDTO">
+    <select id="listBasicContainerDesc" resultType="org.springblade.client.dto.BasicContainerDescDTO">
         SELECT
         b.id as id,
         b.`code` as `code`,

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

@@ -2,6 +2,10 @@ package org.springblade.client.container.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.entity.BasicContainerDesc;
 import org.springblade.core.mp.base.BaseService;
 
@@ -17,6 +21,7 @@ import java.util.Map;
  */
 public interface BasicContainerDescService extends BaseService<BasicContainerDesc>
 {
+	IPage<BasicContainerDescDTO> listBasicContainerDesc(Page<BasicContainerDescDTO> page,String containerName, String code, String status);
 
-
+	void addBasicContainerDesc(BasicContainerDescDTO dto);
 }

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

@@ -1,15 +1,25 @@
 package org.springblade.client.container.service.imp;
 
+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.mapper.BasicContainerTypeDescMapper;
 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.dto.BasicContainerDescDTO;
 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.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;
 
@@ -20,5 +30,36 @@ import java.util.Map;
 @Service
 public class BasicContainerDescServiceImpl extends BaseServiceImpl<BasicContainerDescMapper, BasicContainerDesc> implements BasicContainerDescService
 {
+    @Autowired
+	private BasicContainerDescMapper basicContainerDescMapper;
+    @Autowired
+	private BasicContainerTypeDescMapper basicContainerTypeDescMapper;
 
+	@Override
+	public IPage<BasicContainerDescDTO> listBasicContainerDesc(Page<BasicContainerDescDTO> page, String containerName, String code, String status) {
+		return basicContainerDescMapper.listBasicContainerDesc(page,containerName,code,status);
+	}
+
+	@Override
+	@Transactional
+	public void addBasicContainerDesc(BasicContainerDescDTO dto)
+	{
+		 //集装箱类型id
+		 Long typeId = dto.getTypeId();
+
+		 BasicContainerDesc target=new BasicContainerDesc();
+		 BeanUtils.copyProperties(dto,target);
+		 target.setCreateTime(new Date());
+		 target.setCreateUser(SecureUtil.getUserId());
+		 target.setCreateUserName(SecureUtil.getUser().getRoleName());
+		 basicContainerDescMapper.insert(target);
+
+		 BasicContainerTypeDesc middle=new BasicContainerTypeDesc();
+		 middle.setContainerId(target.getId());
+		 middle.setContainerTypeId(typeId);
+		 middle.setCreateTime(new Date());
+		 middle.setCreateUser(SecureUtil.getUserId());
+		 middle.setCreateUserName(SecureUtil.getUser().getRoleName());
+		 basicContainerTypeDescMapper.insert(middle);
+	}
 }

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

@@ -1,24 +0,0 @@
-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/service/impl/BasicPortDescServiceImpl.java

@@ -53,13 +53,18 @@ public class BasicPortDescServiceImpl extends BaseServiceImpl<BasicPortDescMappe
 		Long typeId = dto.getTypeId();
 		BasicPortDesc basicPortDesc=new BasicPortDesc();
 		BeanUtils.copyProperties(dto,basicPortDesc);
+		basicPortDesc.setCreateTime(new Date());
+		basicPortDesc.setCreateUser(SecureUtil.getUserId());
+		basicPortDesc.setCreateUserName(SecureUtil.getUser().getRoleName());
 
 		basicPortDescMapper.insert(basicPortDesc);
 
 		BasicPortTypeDesc middle=new BasicPortTypeDesc();
 		middle.setPortsId(basicPortDesc.getId());
 		middle.setPortsTypeId(typeId);
-
+		middle.setCreateTime(new Date());
+		middle.setCreateUser(SecureUtil.getUserId());
+		middle.setCreateUserName(SecureUtil.getUser().getRoleName());
 		basicPortTypeDescMapper.insert(middle);