栋舍管理

admin/src/main/java/com/your/packages/pigpen/controller/BasePigpenController.java

@@ -4,14 +4,18 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hccake.ballcat.common.model.result.BaseResultCode;
 import com.hccake.ballcat.common.model.result.R;
+import com.hccake.ballcat.common.security.userdetails.ClientPrincipal;
+import com.hccake.ballcat.common.security.userdetails.User;
 import com.hccake.ballcat.system.model.dto.SysOrganizationDTO;
 import com.your.packages.pigpen.entity.BasePigpen;
 import com.your.packages.pigpen.entity.Vo.BasePigpenTree;
 import com.your.packages.pigpen.service.IBasePigpenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.xml.ws.Action;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -34,9 +38,10 @@ public class BasePigpenController {
 	@Autowired
 	private IBasePigpenService basePigpenService;
 
-	@PostMapping("list")
-	public R list(@RequestBody Map<String, String> paramsMap) {
-		String organizationId = paramsMap.get("organizationId");
+	@GetMapping("/list")
+	public R list(Authentication authentication) {
+		User user = (User) authentication.getPrincipal();
+		Long organizationId = user.getOrganizationId();
 		List<BasePigpen> basePigpenList = basePigpenService
 			.list(new QueryWrapper<BasePigpen>().eq("organization_id", organizationId));
 		if (CollUtil.isEmpty(basePigpenList)) {
@@ -48,11 +53,12 @@ public class BasePigpenController {
 		}
 	}
 
-	@PostMapping("/tree")
-	public R<List<BasePigpenTree>> tree(@RequestBody Map<String, String> paramsMap) {
-		String organizationId = paramsMap.get("organizationId");
-		return R.ok();
-	}
+//	@PostMapping("/tree")
+//	public R<List<BasePigpenTree>> tree(@RequestBody Map<String, String> paramsMap) {
+//		String organizationId = paramsMap.get("organizationId");
+//
+//		return R.ok();
+//	}
 
 	@PostMapping("/update")
 	public R updete(@RequestBody BasePigpen basePigpen) {
@@ -65,8 +71,8 @@ public class BasePigpenController {
 	}
 
 	@PostMapping("/save")
-	public R save(@RequestBody BasePigpen basePigpen) {
-		return basePigpenService.create(basePigpen);
+	public R save(@RequestBody BasePigpen basePigpen,Authentication authentication) {
+		return basePigpenService.create(basePigpen,authentication);
 	}
 
 }

admin/src/main/java/com/your/packages/pigpen/entity/BasePigpen.java

@@ -43,8 +43,11 @@ public class BasePigpen implements Serializable {
 	@TableField("remarks")
 	private String remarks;
 
+	@TableField("deleted")
+	private Long deleted;
+
 	@TableField("organization_id")
-	private Integer organizationId;
+	private Long organizationId;
 
 	@TableField("sort")
 	private Integer sort;

admin/src/main/java/com/your/packages/pigpen/mapper/BasePigpenMapper.java

@@ -3,6 +3,7 @@ package com.your.packages.pigpen.mapper;
 import com.your.packages.pigpen.entity.BasePigpen;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.your.packages.pigpen.entity.Vo.BasePigpenMoveChildParam;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,6 +15,6 @@ import com.your.packages.pigpen.entity.Vo.BasePigpenMoveChildParam;
  */
 public interface BasePigpenMapper extends BaseMapper<BasePigpen> {
 
-	void followMoveChildNode(BasePigpenMoveChildParam param);
+	void followMoveChildNode(@Param("param")BasePigpenMoveChildParam param);
 
 }

admin/src/main/java/com/your/packages/pigpen/service/IBasePigpenService.java

@@ -3,6 +3,7 @@ package com.your.packages.pigpen.service;
 import com.hccake.ballcat.common.model.result.R;
 import com.your.packages.pigpen.entity.BasePigpen;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.security.core.Authentication;
 
 import java.util.Map;
 
@@ -16,7 +17,7 @@ import java.util.Map;
  */
 public interface IBasePigpenService extends IService<BasePigpen> {
 
-	R create(BasePigpen basePigpen);
+	R create(BasePigpen basePigpen, Authentication authentication);
 
 	R delete(Map<String, String> paramsMap);
 

admin/src/main/java/com/your/packages/pigpen/service/impl/BasePigpenServiceImpl.java

@@ -8,12 +8,14 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.hccake.ballcat.common.core.constant.GlobalConstants;
 import com.hccake.ballcat.common.model.result.BaseResultCode;
 import com.hccake.ballcat.common.model.result.R;
+import com.hccake.ballcat.common.security.userdetails.User;
 import com.your.packages.pigpen.entity.BasePigpen;
 import com.your.packages.pigpen.entity.Vo.BasePigpenMoveChildParam;
 import com.your.packages.pigpen.mapper.BasePigpenMapper;
 import com.your.packages.pigpen.service.IBasePigpenService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -34,7 +36,9 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
 	private BasePigpenMapper basePigpenMapper;
 
 	@Override
-	public R create(BasePigpen basePigpen) {
+	public R create(BasePigpen basePigpen, Authentication authentication) {
+		User user = (User) authentication.getPrincipal();
+		basePigpen.setOrganizationId(user.getOrganizationId());
 		Long count = basePigpenMapper
 			.selectCount(new QueryWrapper<BasePigpen>().eq("build_name", basePigpen.getBuildName())
 				.eq("organization_id", basePigpen.getOrganizationId()));
@@ -62,7 +66,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
 	public R updatePigpen(BasePigpen newBasePigpen) {
 		Long id = newBasePigpen.getId();
 		BasePigpen originBasePigpen = basePigpenMapper.selectById(id);
-		Long targetParentId = originBasePigpen.getParentId();
+		Long targetParentId = newBasePigpen.getParentId();
 		if (originBasePigpen.getParentId().equals(targetParentId)) {
 			return SqlHelper.retBool(basePigpenMapper.updateById(newBasePigpen)) ? R.ok()
 					: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "更新栋舍失败");
@@ -87,8 +91,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
 
 	}
 
-	private BasePigpenMoveChildParam getBasePigpenMoveChildParam(BasePigpen newBasePigpen,
-			BasePigpen originBasePigpen) {
+	private BasePigpenMoveChildParam getBasePigpenMoveChildParam(BasePigpen newBasePigpen, BasePigpen originBasePigpen) {
 		Long parentId = newBasePigpen.getId();
 		String originParentHierarchy = originBasePigpen.getHierarchy();
 		String targetParentHierarchy = newBasePigpen.getHierarchy();
@@ -100,6 +103,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
 		param.setTargetParentHierarchy(targetParentHierarchy);
 		param.setDepthDiff(depthDiff);
 		param.setGrandsonConditionalStatement(originParentHierarchy + "-" + parentId + "-%");
+		System.out.println(param);
 		return param;
 	}