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

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

@@ -1,5 +1,6 @@
 package org.springblade.client.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -65,6 +66,7 @@ public class BasicContainerType extends TenantEntity implements Serializable {
 	private Integer status;
 	//创建部门
 	private Long createDept;
-
+	@TableField(exist = false)
+	private Boolean hasChildren;
 
 }

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

@@ -21,7 +21,7 @@ import java.util.Date;
  * @date 2021-10-29 10:50:06
  */
 @Data
-@TableName("basic_port_type")
+@TableName("basic_port_desc")
 public class BasicPortDesc  extends TenantEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
@@ -43,7 +43,7 @@ public class BasicPortDesc  extends TenantEntity implements Serializable {
 	//市
 	private String city;
 	//航线
-	private String lines;
+	private String line;
 	//备注
 	private String remarks;
 	//版本

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

@@ -67,6 +67,8 @@ public class BasicPortType extends TenantEntity implements Serializable {
 	private Integer status;
 	//创建部门
 	private Long createDept;
+    @TableField(exist = false)
+	private Boolean hasChildren;
 
 
 }

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

@@ -15,13 +15,16 @@ 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.secure.utils.SecureUtil;
 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.Date;
 import java.util.List;
 
 @NonDS
@@ -56,20 +59,54 @@ public class ContainerController
 			.orderByDesc(BasicContainerType::getCreateTime);
 		Page<BasicContainerType> page=new Page<>(current,size);
 		IPage<BasicContainerType> iPage=basicContainerTypeService.page(page,typeLambdaQueryWrapper);
+		List<BasicContainerType> records = iPage.getRecords();
+		if(!CollectionUtils.isEmpty(records))
+		{
+			records.forEach(e->{
+				LambdaQueryWrapper<BasicContainerType> basicContainerTypeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+				basicContainerTypeLambdaQueryWrapper.eq(BasicContainerType::getParentId,e.getId());
+				int count = basicContainerTypeService.count(basicContainerTypeLambdaQueryWrapper);
+				e.setHasChildren(count>0?true:false);
+			});
+		}
 		return R.data(iPage);
 	}
 
+	@GetMapping("getContainerTypeList")
+	public List<BasicContainerType> getContainerTypeList( @RequestParam(name = "pid", required = false) Long pid)
+	{
+		LambdaQueryWrapper<BasicContainerType> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(pid!=null,BasicContainerType::getParentId,pid);
+		List<BasicContainerType> typeList = basicContainerTypeService.list(lambdaQueryWrapper);
+		if(!CollectionUtils.isEmpty(typeList))
+		{
+			typeList.forEach(e->{
+				LambdaQueryWrapper<BasicContainerType> basicPortTypeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+				basicPortTypeLambdaQueryWrapper.eq(BasicContainerType::getParentId,e.getId());
+				int count = basicContainerTypeService.count(basicPortTypeLambdaQueryWrapper);
+				e.setHasChildren(count>0?true:false);
+			});
+		}
+		return typeList;
+	}
+
 	@PostMapping("type/add")
-	public R typeList(@RequestBody BasicContainerType portType )
+	public R typeList(@RequestBody BasicContainerType containerType )
 	{
-		basicContainerTypeService.save(portType);
+		containerType.setCreateTime(new Date());
+		containerType.setCreateUser(SecureUtil.getUserId());
+		containerType.setCreateUserName(SecureUtil.getUser().getRoleName());
+		basicContainerTypeService.save(containerType);
 		return R.success("操作成功");
 	}
 
 	@PutMapping("type/edit")
-	public R typeEdit(@RequestBody BasicContainerType portType)
+	public R typeEdit(@RequestBody BasicContainerType containerType)
 	{
-		basicContainerTypeService.updateById(portType);
+		containerType.setUpdateTime(new Date());
+		containerType.setUpdateUser(SecureUtil.getUserId());
+		containerType.setUpdateUserName(SecureUtil.getUser().getRoleName());
+		basicContainerTypeService.updateById(containerType);
 		return R.success("操作成功");
 	}
 
@@ -82,6 +119,7 @@ public class ContainerController
 	}
 
 
+
 	@GetMapping("list")
 	public R list(@RequestParam(name = "current", defaultValue = "1") Integer current,
 				  @RequestParam(name = "size", defaultValue = "10") Integer size,
@@ -97,13 +135,19 @@ public class ContainerController
 	@PostMapping("add")
 	public R add (@RequestBody BasicContainerDescDTO dto)
 	{
+		dto.setCreateTime(new Date());
+		dto.setCreateUser(SecureUtil.getUserId());
+		dto.setCreateUserName(SecureUtil.getUser().getRoleName());
 		basicContainerDescService.addBasicContainerDesc(dto);
 		return R.success("操作成功");
 	}
 
-	@PostMapping("edit")
+	@PutMapping("edit")
 	public R edit( @RequestBody BasicContainerDesc body )
 	{
+		body.setUpdateTime(new Date());
+		body.setUpdateUser(SecureUtil.getUserId());
+		body.setUpdateUserName(SecureUtil.getUser().getRoleName());
 		basicContainerDescService.updateById(body);
 		return R.success("操作成功");
 	}

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

@@ -16,6 +16,7 @@ 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.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @NonDS
@@ -60,13 +62,19 @@ public class PortController
     @PostMapping("add")
 	public R add (@RequestBody BasicPortDescDTO dto)
 	{
+		dto.setCreateTime(new Date());
+		dto.setCreateUser(SecureUtil.getUserId());
+		dto.setCreateUserName(SecureUtil.getUser().getRoleName());
 		basicPortDescService.addBasicPortDesc(dto);
         return R.success("操作成功");
 	}
 
-	@PostMapping("edit")
+	@PutMapping("edit")
 	public R edit( @RequestBody BasicPortDesc body )
 	{
+		body.setUpdateTime(new Date());
+		body.setUpdateUser(SecureUtil.getUserId());
+		body.setUpdateUserName(SecureUtil.getUser().getRoleName());
 		basicPortDescService.updateById(body);
 		return R.success("操作成功");
 	}
@@ -91,13 +99,44 @@ public class PortController
 		    .orderByDesc(BasicPortType::getCreateTime);
 		Page<BasicPortType> page=new Page<>(current,size);
 		IPage<BasicPortType> iPage=basicPortTypeService.page(page,typeLambdaQueryWrapper);
+		List<BasicPortType> records = iPage.getRecords();
+		if(!CollectionUtils.isEmpty(records))
+		{
+			records.forEach(e->{
+				LambdaQueryWrapper<BasicPortType> basicPortTypeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+				basicPortTypeLambdaQueryWrapper.eq(BasicPortType::getParentId,e.getId());
+				int count = basicPortTypeService.count(basicPortTypeLambdaQueryWrapper);
+				e.setHasChildren(count>0?true:false);
+			});
+		}
+
 		return R.data(iPage);
 	}
 
+	@GetMapping("getPortTypeList")
+	public List<BasicPortType> getPortTypeList( @RequestParam(name = "pid", required = false) Long pid)
+	{
+		LambdaQueryWrapper<BasicPortType> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(pid!=null,BasicPortType::getParentId,pid);
+		List<BasicPortType> typeList = basicPortTypeService.list(lambdaQueryWrapper);
+		if(!CollectionUtils.isEmpty(typeList))
+		{
+			typeList.forEach(e->{
+				LambdaQueryWrapper<BasicPortType> basicPortTypeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+				basicPortTypeLambdaQueryWrapper.eq(BasicPortType::getParentId,e.getId());
+				int count = basicPortTypeService.count(basicPortTypeLambdaQueryWrapper);
+				e.setHasChildren(count>0?true:false);
+			});
+		}
+		return typeList;
+	}
 
 	@PostMapping("type/add")
 	public R typeList(@RequestBody BasicPortType portType )
 	{
+		portType.setCreateTime(new Date());
+		portType.setCreateUser(SecureUtil.getUserId());
+		portType.setCreateUserName(SecureUtil.getUser().getRoleName());
 		basicPortTypeService.save(portType);
 		return R.success("操作成功");
 	}
@@ -105,11 +144,14 @@ public class PortController
 	@PutMapping("type/edit")
 	public R typeEdit(@RequestBody BasicPortType portType)
 	{
+		portType.setUpdateTime(new Date());
+		portType.setUpdateUser(SecureUtil.getUserId());
+		portType.setUpdateUserName(SecureUtil.getUser().getRoleName());
 		basicPortTypeService.updateById(portType);
 		return R.success("操作成功");
 	}
 
-	@DeleteMapping("type/delet")
+	@DeleteMapping("type/delete")
 	public R  typeDelet(@RequestParam(name = "id", required = true) Long id)
 	{
 		List<Long> ids= Arrays.asList(id);

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

@@ -7,13 +7,14 @@
 
     SELECT
 	b.id as id,
+	b.`code` as code,
 	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.`line` as `line`,
 	b.remarks as remarks,
 	b.create_user as createUser,
 	b.create_time as createTime,