基础配置

snowy-web-app/src/main/java/vip/xiaonuo/core/enums/BaseDataTypeEnum.java

@@ -9,11 +9,25 @@ public enum BaseDataTypeEnum {
      */
     PIGPEN("PIGPEN"),
 
+    /**
+     * 基础配置
+     */
     BASE_CONFIG("BASE_CONFIG"),
 
+    /**
+     * 物资领用
+     */
     INVENTORY_USE("INVENTORY_USE"),
 
-    DEPARTMENT("DEPARTMENT");
+    /**
+     * 部门
+     */
+    DEPARTMENT("DEPARTMENT"),
+
+    /**
+     * 季节
+     */
+    SEASON("SEASON");
 
     private final String value;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/baseConfig/entity/BaseConfig.java

@@ -13,9 +13,13 @@
 package vip.xiaonuo.modular.base.baseConfig.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.pojo.CommonEntity;
 
 import java.util.Date;
 
@@ -28,7 +32,7 @@ import java.util.Date;
 @Getter
 @Setter
 @TableName("base_config")
-public class BaseConfig {
+public class BaseConfig extends CommonEntity implements TransPojo {
 
     /** ID */
     @TableId
@@ -41,6 +45,7 @@ public class BaseConfig {
 
     /** 父ID */
     @ApiModelProperty(value = "父ID", position = 3)
+    @Trans(type = TransType.SIMPLE, target = BaseConfig.class, fields = "name", alias = "config", ref = "configName")
     private String parentId;
 
     /** 状态 0:禁用 1:启用 */
@@ -59,30 +64,4 @@ public class BaseConfig {
     @ApiModelProperty(value = "组织ID", position = 7)
     @TableField(fill = FieldFill.INSERT)
     private String orgId;
-
-    /** 删除标志 */
-    @ApiModelProperty(value = "删除标志", position = 8)
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private String deleteFlag;
-
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间", position = 9)
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /** 创建用户 */
-    @ApiModelProperty(value = "创建用户", position = 10)
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    /** 修改时间 */
-    @ApiModelProperty(value = "修改时间", position = 11)
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
-    /** 修改用户 */
-    @ApiModelProperty(value = "修改用户", position = 12)
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/department/entity/Department.java

@@ -13,9 +13,14 @@
 package vip.xiaonuo.modular.base.department.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.pojo.CommonEntity;
+import vip.xiaonuo.sys.modular.user.entity.SysUser;
 
 import java.util.Date;
 
@@ -28,7 +33,7 @@ import java.util.Date;
 @Getter
 @Setter
 @TableName("department")
-public class Department {
+public class Department extends CommonEntity implements TransPojo {
 
     /** ID */
     @TableId
@@ -61,6 +66,7 @@ public class Department {
 
     /** 部门负责人ID */
     @ApiModelProperty(value = "部门负责人ID", position = 8)
+    @Trans(type = TransType.SIMPLE, target = SysUser.class, fields = "name", alias = "manager", ref = "managerName")
     private String departmentManager;
 
     /** 描述 */
@@ -73,31 +79,11 @@ public class Department {
 
     /** 组织ID */
     @ApiModelProperty(value = "组织ID", position = 11)
-    private String orgId;
-
-    /** 删除标志 */
-    @ApiModelProperty(value = "删除标志", position = 12)
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private String deleteFlag;
-
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间", position = 13)
     @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /** 创建用户 */
-    @ApiModelProperty(value = "创建用户", position = 14)
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    /** 修改时间 */
-    @ApiModelProperty(value = "修改时间", position = 15)
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
+    private String orgId;
 
-    /** 修改用户 */
-    @ApiModelProperty(value = "修改用户", position = 16)
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
+    /** 负责人名称 */
+    @ApiModelProperty(value = "负责人名称", position = 12)
+    @TableField(exist = false)
+    private String managerName;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/department/service/impl/DepartmentServiceImpl.java

@@ -40,6 +40,8 @@ import vip.xiaonuo.modular.base.department.param.DepartmentIdParam;
 import vip.xiaonuo.modular.base.department.param.DepartmentPageParam;
 import vip.xiaonuo.modular.base.department.service.DepartmentService;
 import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
+import vip.xiaonuo.sys.modular.user.entity.SysUser;
+import vip.xiaonuo.sys.modular.user.mapper.SysUserMapper;
 
 import javax.validation.constraints.NotBlank;
 import java.util.List;
@@ -53,7 +55,8 @@ import java.util.List;
 @Service
 public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
 
-    private static final String SNOWY_SYS_DEFAULT_FILE_ENGINE_KEY = "SNOWY_SYS_DEFAULT_FILE_ENGINE";
+    @Autowired
+    private SysUserMapper sysUserMapper;
 
     @Autowired
     private DevFileService devFileService;
@@ -129,6 +132,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             if (this.count(new QueryWrapper<Department>().lambda().eq(Department::getParentId,s)) > 0) {
                 throw new CommonException("部门存在下级,请先删除下级部门!");
             }
+            if (sysUserMapper.selectCount(new QueryWrapper<SysUser>().eq("department_id",s)) > 0){
+                throw new CommonException("部门存在人员,请先编辑或删除下属人员!");
+            }
         }
         // 执行删除
         this.removeByIds(toDeleteDepartmentIdList);

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/controller/InventoryUseController.java

@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo.modular.base.inventoryUse.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -20,10 +21,15 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.baseConfig.service.BaseConfigService;
 import vip.xiaonuo.modular.base.inventoryUse.entity.InventoryUse;
+import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseDetailVo;
+import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseVo;
 import vip.xiaonuo.modular.base.inventoryUse.param.*;
 import vip.xiaonuo.modular.base.inventoryUse.service.InventoryUseService;
 
@@ -31,6 +37,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 物资领用控制器
@@ -46,6 +53,8 @@ public class InventoryUseController {
 
     @Resource
     private InventoryUseService inventoryUseService;
+    @Resource
+    private BaseConfigService baseConfigService;
 
     /**
      * 获取物资领用分页
@@ -136,4 +145,36 @@ public class InventoryUseController {
         inventoryUseService.revert(returnImgUrl,id,returnTime,remarks);
         return CommonResult.ok();
     }
+
+    /**
+     * 获取物资类别选择器
+     *
+     * @author newspaper
+     * @date  2023/12/11 10:43
+     */
+    @ApiOperationSupport(order = 7)
+    @ApiOperation("获取物资类别选择器")
+    @GetMapping("/base/inventoryUse/typeSelector")
+    public CommonResult<List<BaseConfig>> typeSelector() {
+        String orgId = StpLoginUserUtil.getLoginUser().getOrgId();
+        BaseConfig baseConfig = baseConfigService.getOne(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getConfigName, "物资类别").eq(BaseConfig::getParentId, 0));
+        List<BaseConfig> baseConfigs = baseConfigService.list(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, baseConfig.getId()).eq(BaseConfig::getOrgId, orgId));
+        return CommonResult.data(baseConfigs);
+    }
+
+    /**
+     * 获取仓库选择器
+     *
+     * @author newspaper
+     * @date  2023/12/11 10:43
+     */
+    @ApiOperationSupport(order = 8)
+    @ApiOperation("获取仓库选择器")
+    @GetMapping("/base/inventoryUse/warehouseSelector")
+    public CommonResult<List<BaseConfig>> warehouseSelector() {
+        String orgId = StpLoginUserUtil.getLoginUser().getOrgId();
+        BaseConfig baseConfig = baseConfigService.getOne(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getConfigName, "仓库").eq(BaseConfig::getParentId, 0));
+        List<BaseConfig> baseConfigs = baseConfigService.list(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, baseConfig.getId()).eq(BaseConfig::getOrgId, orgId));
+        return CommonResult.data(baseConfigs);
+    }
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/entity/InventoryUse.java

@@ -13,9 +13,17 @@
 package vip.xiaonuo.modular.base.inventoryUse.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.pojo.CommonEntity;
+import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.department.entity.Department;
+import vip.xiaonuo.sys.modular.user.entity.SysUser;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -27,8 +35,8 @@ import java.util.Date;
  **/
 @Getter
 @Setter
-@TableName("inventory_use")
-public class InventoryUse {
+@TableName(value = "inventory_use", autoResultMap = true)
+public class InventoryUse extends CommonEntity implements TransPojo {
 
     /** ID */
     @TableId
@@ -45,6 +53,7 @@ public class InventoryUse {
 
     /** 物资类别 */
     @ApiModelProperty(value = "物资类别", position = 4)
+    @Trans(type = TransType.SIMPLE, target = BaseConfig.class, fields = "configName", alias = "type", ref = "itemTypeName")
     private String itemType;
 
     /** 品牌 */
@@ -59,62 +68,63 @@ public class InventoryUse {
     @ApiModelProperty(value = "单位", position = 7)
     private String unit;
 
+    /** 仓库ID */
+    @ApiModelProperty(value = "仓库ID", position = 8)
+    @Trans(type = TransType.SIMPLE, target = BaseConfig.class, fields = "configName", alias = "warehouse", ref = "warehouseName")
+    private String warehouseId;
+
     /** 领用时间 */
-    @ApiModelProperty(value = "领用时间", position = 8)
+    @ApiModelProperty(value = "领用时间", position = 9)
     private Date useTime;
 
     /** 领用数量 */
-    @ApiModelProperty(value = "领用数量", position = 9)
+    @ApiModelProperty(value = "领用数量", position = 10)
     private BigDecimal useQuantity;
 
     /** 领用部门ID */
-    @ApiModelProperty(value = "领用部门ID", position = 10)
-    private String useOrgId;
+    @ApiModelProperty(value = "领用部门ID", position = 11)
+    @Trans(type = TransType.SIMPLE, target = Department.class, fields = "departmentName", alias = "department", ref = "departmentName")
+    private String useDepartmentId;
 
     /** 领用人ID */
-    @ApiModelProperty(value = "领用人ID", position = 11)
+    @ApiModelProperty(value = "领用人ID", position = 12)
+    @Trans(type = TransType.SIMPLE, target = SysUser.class, fields = "name", alias = "user", ref = "userName")
     private String userId;
 
     /** 归还时间 */
-    @ApiModelProperty(value = "归还时间", position = 12)
+    @ApiModelProperty(value = "归还时间", position = 13)
     private Date returnTime;
 
     /** 归还图片地址 */
-    @ApiModelProperty(value = "归还图片地址", position = 13)
+    @ApiModelProperty(value = "归还图片地址", position = 14)
     private String returnImgUrl;
 
     /** 备注 */
-    @ApiModelProperty(value = "备注", position = 14)
-
+    @ApiModelProperty(value = "备注", position = 15)
     private String remarks;
 
     /** 组织ID */
-    @ApiModelProperty(value = "组织ID", position = 15)
-    private String orgId;
-
-    /** 删除标志 */
-    @ApiModelProperty(value = "删除标志", position = 16)
-    @TableLogic
+    @ApiModelProperty(value = "组织ID", position = 16)
     @TableField(fill = FieldFill.INSERT)
-    private String deleteFlag;
-
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间", position = 17)
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /** 创建用户 */
-    @ApiModelProperty(value = "创建用户", position = 18)
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    /** 修改时间 */
-    @ApiModelProperty(value = "修改时间", position = 19)
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
+    private String orgId;
 
-    /** 修改用户 */
-    @ApiModelProperty(value = "修改用户", position = 20)
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
+    /** 物资类别名称 */
+    @ApiModelProperty(value = "物资类别名称", position = 17)
+    @TableField(exist = false)
+    private String itemTypeName;
+
+    /** 仓库名称 */
+    @ApiModelProperty(value = "仓库名称", position = 18)
+    @TableField(exist = false)
+    private String warehouseName;
+
+    /** 部门名称 */
+    @ApiModelProperty(value = "部门名称", position = 19)
+    @TableField(exist = false)
+    private String departmentName;
+
+    /** 领用人名称 */
+    @ApiModelProperty(value = "领用人名称", position = 20)
+    @TableField(exist = false)
+    private String userName;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/mapper/InventoryUseMapper.java

@@ -12,8 +12,14 @@
  */
 package vip.xiaonuo.modular.base.inventoryUse.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.modular.base.inventoryUse.entity.InventoryUse;
+import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseDetailVo;
+import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseVo;
 
 /**
  * 物资领用Mapper接口

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/param/InventoryUseAddParam.java

@@ -62,29 +62,34 @@ public class InventoryUseAddParam {
     @NotBlank(message = "unit不能为空")
     private String unit;
 
+    /** 仓库ID */
+    @ApiModelProperty(value = "仓库ID", required = true, position = 8)
+    @NotBlank(message = "仓库ID不能为空")
+    private String warehouseId;
+
     /** 领用时间 */
-    @ApiModelProperty(value = "领用时间", required = true, position = 8)
+    @ApiModelProperty(value = "领用时间", required = true, position = 9)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @NotNull(message = "useTime不能为空")
     private Date useTime;
 
     /** 领用数量 */
-    @ApiModelProperty(value = "领用数量", required = true, position = 9)
+    @ApiModelProperty(value = "领用数量", required = true, position = 10)
     @NotNull(message = "useQuantity不能为空")
     private BigDecimal useQuantity;
 
     /** 领用部门ID */
-    @ApiModelProperty(value = "领用部门ID", required = true, position = 10)
-    @NotBlank(message = "useOrgId不能为空")
-    private String useOrgId;
+    @ApiModelProperty(value = "领用部门ID", required = true, position = 11)
+    @NotBlank(message = "useDepartmentId不能为空")
+    private String useDepartmentId;
 
     /** 领用人ID */
-    @ApiModelProperty(value = "领用人ID", required = true, position = 11)
+    @ApiModelProperty(value = "领用人ID", required = true, position = 12)
     @NotBlank(message = "userId不能为空")
     private String userId;
 
     /** 备注 */
-    @ApiModelProperty(value = "备注", position = 14)
+    @ApiModelProperty(value = "备注", position = 13)
     private String remarks;
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/service/InventoryUseService.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.modular.base.inventoryUse.entity.InventoryUse;
+import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseDetailVo;
+import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseVo;
 import vip.xiaonuo.modular.base.inventoryUse.param.*;
 
 import java.util.Date;

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/service/impl/InventoryUseServiceImpl.java

@@ -31,6 +31,8 @@ import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.core.enums.BaseDataTypeEnum;
 import vip.xiaonuo.dev.modular.file.service.DevFileService;
 import vip.xiaonuo.modular.base.inventoryUse.entity.InventoryUse;
+import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseDetailVo;
+import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseVo;
 import vip.xiaonuo.modular.base.inventoryUse.mapper.InventoryUseMapper;
 import vip.xiaonuo.modular.base.inventoryUse.param.*;
 import vip.xiaonuo.modular.base.inventoryUse.service.InventoryUseService;
@@ -51,18 +53,14 @@ public class InventoryUseServiceImpl extends ServiceImpl<InventoryUseMapper, Inv
     @Autowired
     private DevFileService devFileService;
 
+    @Autowired
+    private InventoryUseMapper inventoryUseMapper;
+
     @Override
     public Page<InventoryUse> page(InventoryUsePageParam inventoryUsePageParam) {
         QueryWrapper<InventoryUse> queryWrapper = new QueryWrapper<>();
         if(ObjectUtil.isNotEmpty(inventoryUsePageParam.getItemName())) {
-            queryWrapper.lambda().like(InventoryUse::getItemName, inventoryUsePageParam.getItemName());
-        }
-        if(ObjectUtil.isAllNotEmpty(inventoryUsePageParam.getSortField(), inventoryUsePageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(inventoryUsePageParam.getSortOrder());
-            queryWrapper.orderBy(true, inventoryUsePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(inventoryUsePageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(InventoryUse::getId);
+            queryWrapper.like("item_name", inventoryUsePageParam.getItemName()).orderByDesc("use_time");;
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
@@ -101,7 +99,7 @@ public class InventoryUseServiceImpl extends ServiceImpl<InventoryUseMapper, Inv
 
     @Override
     public InventoryUse detail(InventoryUseIdParam inventoryUseIdParam) {
-        return this.queryEntity(inventoryUseIdParam.getId());
+        return queryEntity(inventoryUseIdParam.getId());
     }
 
     @Override

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/pigpen/entity/BasePigpen.java

@@ -14,9 +14,11 @@ package vip.xiaonuo.modular.base.pigpen.entity;
 
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fhs.core.trans.vo.TransPojo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.pojo.CommonEntity;
 
 import java.util.Date;
 
@@ -28,8 +30,8 @@ import java.util.Date;
  **/
 @Getter
 @Setter
-@TableName("base_pigpen")
-public class BasePigpen {
+@TableName(value = "base_pigpen", autoResultMap = true)
+public class BasePigpen extends CommonEntity implements TransPojo {
 
     /** ID */
     @TableId
@@ -68,30 +70,4 @@ public class BasePigpen {
     /** 排序 */
     @ApiModelProperty(value = "栋舍全名", position = 9)
     private String fullName;
-
-    /** 删除标志 */
-    @ApiModelProperty(value = "删除标志", position = 10)
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private String deleteFlag;
-
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间", position = 11)
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /** 创建用户 */
-    @ApiModelProperty(value = "创建用户", position = 12)
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    /** 修改时间 */
-    @ApiModelProperty(value = "修改时间", position = 13)
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
-    /** 修改用户 */
-    @ApiModelProperty(value = "修改用户", position = 14)
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/pigpen/service/impl/BasePigpenServiceImpl.java

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
@@ -147,7 +148,13 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             throw new CommonException("不可选择上级栋舍：{}", this.getById(originDataList, basePigpen.getParentId()).getBuildName());
         }
         this.updateById(basePigpen);
-
+        List<BasePigpen> child = this.list(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getParentId, basePigpen.getId()));
+        if (CollectionUtil.isNotEmpty(child)){
+            for (BasePigpen pigpen : child) {
+                pigpen.setFullName(basePigpen.getFullName()+pigpen.getBuildName());
+                this.updateById(pigpen);
+            }
+        }
         // 发布更新事件
         CommonDataChangeEventCenter.doUpdateWithData(BaseDataTypeEnum.PIGPEN.getValue(), JSONUtil.createArray().put(basePigpen));
     }

snowy-web-app/src/main/java/vip/xiaonuo/modular/stage/controller/PigpenStageController.java

@@ -1,140 +0,0 @@
-/*
- * Copyright [2022] [https://www.xiaonuo.vip]
- *
- * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
- *
- * 1.请不要删除和修改根目录下的LICENSE文件。
- * 2.请不要删除和修改Snowy源码头部的版权声明。
- * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
- * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
- * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
- * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
-package vip.xiaonuo.modular.stage.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-import vip.xiaonuo.common.annotation.CommonLog;
-import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.common.pojo.CommonValidList;
-import vip.xiaonuo.modular.stage.param.PigpenStageAddParam;
-import vip.xiaonuo.modular.stage.param.PigpenStageEditParam;
-import vip.xiaonuo.modular.stage.param.PigpenStageIdParam;
-import vip.xiaonuo.modular.stage.param.PigpenStagePageParam;
-import vip.xiaonuo.modular.stage.entity.PigpenStage;
-import vip.xiaonuo.modular.stage.service.PigpenStageService;
-
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-/**
- * 栋舍阶段控制器
- *
- * @author newspaper
- * @date  2023/12/05 15:12
- */
-@Api(tags = "栋舍阶段控制器")
-@ApiSupport(author = "SNOWY_TEAM", order = 1)
-@RestController
-@Validated
-public class PigpenStageController {
-
-    @Resource
-    private PigpenStageService pigpenStageService;
-
-    /**
-     * 获取栋舍阶段分页
-     *
-     * @author newspaper
-     * @date  2023/12/05 15:12
-     */
-    @ApiOperationSupport(order = 1)
-    @ApiOperation("获取栋舍阶段分页")
-    @GetMapping("/biz/stage/page")
-    public CommonResult<Page<PigpenStage>> page(PigpenStagePageParam pigpenStagePageParam) {
-        return CommonResult.data(pigpenStageService.page(pigpenStagePageParam));
-    }
-
-    /**
-     * 添加栋舍阶段
-     *
-     * @author newspaper
-     * @date  2023/12/05 15:12
-     */
-    @ApiOperationSupport(order = 2)
-    @ApiOperation("添加栋舍阶段")
-    @CommonLog("添加栋舍阶段")
-    @PostMapping("/biz/stage/add")
-    public CommonResult<String> add(@RequestBody @Valid PigpenStageAddParam pigpenStageAddParam) {
-        pigpenStageService.add(pigpenStageAddParam);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 编辑栋舍阶段
-     *
-     * @author newspaper
-     * @date  2023/12/05 15:12
-     */
-    @ApiOperationSupport(order = 3)
-    @ApiOperation("编辑栋舍阶段")
-    @CommonLog("编辑栋舍阶段")
-    @PostMapping("/biz/stage/edit")
-    public CommonResult<String> edit(@RequestBody @Valid PigpenStageEditParam pigpenStageEditParam) {
-        pigpenStageService.edit(pigpenStageEditParam);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 删除栋舍阶段
-     *
-     * @author newspaper
-     * @date  2023/12/05 15:12
-     */
-    @ApiOperationSupport(order = 4)
-    @ApiOperation("删除栋舍阶段")
-    @CommonLog("删除栋舍阶段")
-    @PostMapping("/biz/stage/delete")
-    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
-                                                   CommonValidList<PigpenStageIdParam> pigpenStageIdParamList) {
-        pigpenStageService.delete(pigpenStageIdParamList);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 获取栋舍阶段详情
-     *
-     * @author newspaper
-     * @date  2023/12/05 15:12
-     */
-    @ApiOperationSupport(order = 5)
-    @ApiOperation("获取栋舍阶段详情")
-    @GetMapping("/biz/stage/detail")
-    public CommonResult<PigpenStage> detail(@Valid PigpenStageIdParam pigpenStageIdParam) {
-        return CommonResult.data(pigpenStageService.detail(pigpenStageIdParam));
-    }
-
-    /**
-     * 获取所有栋舍阶段
-     *
-     * @author newspaper
-     * @date  2023/12/05 15:12
-     */
-    @ApiOperationSupport(order = 6)
-    @ApiOperation("获取所有栋舍阶段")
-    @GetMapping("/biz/stage/list")
-    public CommonResult<List<PigpenStage>> list() {
-        return CommonResult.data(pigpenStageService.getAllPigpenList());
-    }
-}

snowy-web-app/src/main/java/vip/xiaonuo/modular/stage/mapper/mapping/PigpenStageMapper.xml

@@ -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="vip.xiaonuo.modular.stage.mapper.PigpenStageMapper">
-
-</mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/stage/service/impl/PigpenStageServiceImpl.java

@@ -1,130 +0,0 @@
-/*
- * Copyright [2022] [https://www.xiaonuo.vip]
- *
- * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
- *
- * 1.请不要删除和修改根目录下的LICENSE文件。
- * 2.请不要删除和修改Snowy源码头部的版权声明。
- * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
- * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
- * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
- * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
-package vip.xiaonuo.modular.stage.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollStreamUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
-import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
-import vip.xiaonuo.common.enums.CommonSortOrderEnum;
-import vip.xiaonuo.common.exception.CommonException;
-import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
-import vip.xiaonuo.common.page.CommonPageRequest;
-import vip.xiaonuo.core.enums.BaseDataTypeEnum;
-import vip.xiaonuo.modular.stage.param.PigpenStageAddParam;
-import vip.xiaonuo.modular.stage.param.PigpenStageEditParam;
-import vip.xiaonuo.modular.stage.param.PigpenStageIdParam;
-import vip.xiaonuo.modular.stage.param.PigpenStagePageParam;
-import vip.xiaonuo.modular.stage.service.PigpenStageService;
-import vip.xiaonuo.modular.stage.entity.PigpenStage;
-import vip.xiaonuo.modular.stage.mapper.PigpenStageMapper;
-
-
-import java.util.List;
-
-/**
- * 栋舍阶段Service接口实现类
- *
- * @author newspaper
- * @date  2023/12/05 15:12
- **/
-@Service
-public class PigpenStageServiceImpl extends ServiceImpl<PigpenStageMapper, PigpenStage> implements PigpenStageService {
-
-    @Override
-    public Page<PigpenStage> page(PigpenStagePageParam pigpenStagePageParam) {
-        QueryWrapper<PigpenStage> queryWrapper = new QueryWrapper<>();
-        if(ObjectUtil.isAllNotEmpty(pigpenStagePageParam.getSortField(), pigpenStagePageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(pigpenStagePageParam.getSortOrder());
-            queryWrapper.orderBy(true, pigpenStagePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(pigpenStagePageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(PigpenStage::getSortCode);
-        }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void add(PigpenStageAddParam pigpenStageAddParam) {
-        SaBaseLoginUser user = StpLoginUserUtil.getLoginUser();
-        PigpenStage pigpenStage = BeanUtil.toBean(pigpenStageAddParam, PigpenStage.class);
-        pigpenStage.setOrgId(user.getOrgId());
-        boolean repeatName = this.count(new LambdaQueryWrapper<PigpenStage>().eq(PigpenStage::getStageName, pigpenStage.getStageName()).eq(PigpenStage::getOrgId, user.getOrgId())) > 0;
-        if (repeatName){
-            throw new CommonException("存在重复的栋舍阶段，名称为：{}", pigpenStage.getStageName());
-        }
-        this.save(pigpenStage);
-
-        //发布增加事件
-        CommonDataChangeEventCenter.doAddWithData(BaseDataTypeEnum.STAGE.getValue(), JSONUtil.createArray().put(pigpenStage));
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void edit(PigpenStageEditParam pigpenStageEditParam) {
-        SaBaseLoginUser user = StpLoginUserUtil.getLoginUser();
-        PigpenStage pigpenStage = this.queryEntity(pigpenStageEditParam.getId());
-        BeanUtil.copyProperties(pigpenStageEditParam, pigpenStage);
-        boolean repeatName = this.count(new LambdaQueryWrapper<PigpenStage>().eq(PigpenStage::getStageName, pigpenStage.getStageName()).eq(PigpenStage::getOrgId, user.getOrgId())) > 0;
-        if (repeatName){
-            throw new CommonException("存在重复的栋舍阶段，名称为：{}", pigpenStage.getStageName());
-        }
-        pigpenStage.setUpdateBy(user.getId());
-        this.updateById(pigpenStage);
-
-        //发布更新事件
-        CommonDataChangeEventCenter.doUpdateWithData(BaseDataTypeEnum.STAGE.getValue(), JSONUtil.createArray().put(pigpenStage));
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void delete(List<PigpenStageIdParam> pigpenStageIdParamList) {
-        List<String> toDeleteStageIdList = CollStreamUtil.toList(pigpenStageIdParamList, PigpenStageIdParam::getId);
-        // 执行删除
-        this.removeByIds(toDeleteStageIdList);
-
-        //发布删除事件
-        CommonDataChangeEventCenter.doDeleteWithDataId(BaseDataTypeEnum.STAGE.getValue(),toDeleteStageIdList);
-    }
-
-    @Override
-    public PigpenStage detail(PigpenStageIdParam pigpenStageIdParam) {
-        return this.queryEntity(pigpenStageIdParam.getId());
-    }
-
-    @Override
-    public PigpenStage queryEntity(String id) {
-        PigpenStage pigpenStage = this.getById(id);
-        if(ObjectUtil.isEmpty(pigpenStage)) {
-            throw new CommonException("栋舍阶段不存在，id值为：{}", id);
-        }
-        return pigpenStage;
-    }
-
-    @Override
-    public List<PigpenStage> getAllPigpenList() {
-        SaBaseLoginUser user = StpLoginUserUtil.getLoginUser();
-        List<PigpenStage> pigpenStages = this.list(new LambdaQueryWrapper<PigpenStage>().eq(PigpenStage::getOrgId, user.getOrgId()).orderByAsc(PigpenStage::getSortCode));
-        return pigpenStages;
-    }
-}