/student/cadreDept/tree 干部部门代码

src/main/java/com/xjrsoft/common/enums/AttendanceNodeEnum.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.common.enums;
 
 /**
- * @description：TODO
+ * @description：考勤节点
  * @author： phoenix
  * @create： 2023/12/19 9:42
  * @Version 1.0

src/main/java/com/xjrsoft/module/student/controller/CadreDeptController.java

@@ -0,0 +1,123 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.annotation.XjrLog;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.dto.DepartmentTreeDto;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.vo.DepartmentTreeVo;
+import com.xjrsoft.module.student.dto.AddCadreDeptDto;
+import com.xjrsoft.module.student.dto.CadreDeptTreeDto;
+import com.xjrsoft.module.student.dto.UpdateCadreDeptDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.CadreDeptPageDto;
+import com.xjrsoft.module.student.entity.CadreDept;
+import com.xjrsoft.module.student.service.ICadreDeptService;
+import com.xjrsoft.module.student.vo.CadreDeptPageVo;
+
+import com.xjrsoft.module.student.vo.CadreDeptTreeVo;
+import com.xjrsoft.module.student.vo.CadreDeptVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 干部部门
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/cadreDept")
+@Api(value = "/student"  + "/cadreDept",tags = "干部部门代码")
+@AllArgsConstructor
+public class CadreDeptController {
+
+
+    private final ICadreDeptService cadreDeptService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="干部部门列表(分页)")
+    @SaCheckPermission("cadredept:detail")
+    public RT<PageOutput<CadreDeptPageVo>> page(@Valid CadreDeptPageDto dto){
+
+        LambdaQueryWrapper<CadreDept> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(CadreDept::getId)
+                .select(CadreDept.class,x -> VoToColumnUtil.fieldsToColumns(CadreDeptPageVo.class).contains(x.getProperty()));
+        IPage<CadreDept> page = cadreDeptService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<CadreDeptPageVo> pageOutput = ConventPage.getPageOutput(page, CadreDeptPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/tree")
+    @ApiOperation(value = "干部部门树")
+    @SaCheckPermission("cadredept:detail")
+    public RT<List<CadreDeptTreeVo>> tree(CadreDeptTreeDto dto) {
+
+        List<CadreDept> list = cadreDeptService.list(Wrappers.<CadreDept>lambdaQuery()
+                .select(CadreDept.class, x -> VoToColumnUtil.fieldsToColumns(CadreDeptTreeVo.class).contains(x.getProperty())));
+
+        List<CadreDeptTreeVo> voList = BeanUtil.copyToList(list, CadreDeptTreeVo.class);
+        List<CadreDeptTreeVo> treeVoList = TreeUtil.build(voList);
+        return RT.ok(treeVoList);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询干部部门信息")
+    @SaCheckPermission("cadredept:detail")
+    public RT<CadreDeptVo> info(@RequestParam Long id){
+        CadreDept cadreDept = cadreDeptService.getById(id);
+        if (cadreDept == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(cadreDept, CadreDeptVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增干部部门")
+    @SaCheckPermission("cadredept:add")
+    public RT<Boolean> add(@Valid @RequestBody AddCadreDeptDto dto){
+        CadreDept cadreDept = BeanUtil.toBean(dto, CadreDept.class);
+        boolean isSuccess = cadreDeptService.save(cadreDept);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改干部部门")
+    @SaCheckPermission("cadredept:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateCadreDeptDto dto){
+
+        CadreDept cadreDept = BeanUtil.toBean(dto, CadreDept.class);
+        return RT.ok(cadreDeptService.updateById(cadreDept));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除干部部门")
+    @SaCheckPermission("cadredept:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(cadreDeptService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/student/dto/AddCadreDeptDto.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 干部部门
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+public class AddCadreDeptDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 机构名称
+    */
+    @ApiModelProperty("机构名称")
+    private String name;
+    /**
+    * 部门上级编号
+    */
+    @ApiModelProperty("部门上级编号")
+    private Long parentId;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/dto/CadreDeptPageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 干部部门分页查询入参
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CadreDeptPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/student/dto/CadreDeptTreeDto.java

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 干部部门树查询入参
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+public class CadreDeptTreeDto{
+
+
+}

src/main/java/com/xjrsoft/module/student/dto/UpdateCadreDeptDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 干部部门
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+public class UpdateCadreDeptDto extends AddCadreDeptDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/entity/CadreDept.java

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 干部部门
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+@TableName("cadre_dept")
+@ApiModel(value = "cadre_dept", description = "干部部门")
+public class CadreDept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 机构名称
+    */
+    @ApiModelProperty("机构名称")
+    private String name;
+    /**
+    * 部门上级编号
+    */
+    @ApiModelProperty("部门上级编号")
+    private Long parentId;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

src/main/java/com/xjrsoft/module/student/mapper/CadreDeptMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.CadreDept;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 干部部门
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Mapper
+public interface CadreDeptMapper extends MPJBaseMapper<CadreDept> {
+
+}

src/main/java/com/xjrsoft/module/student/service/ICadreDeptService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.CadreDept;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 干部部门
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+
+public interface ICadreDeptService extends MPJBaseService<CadreDept> {
+}

src/main/java/com/xjrsoft/module/student/service/impl/CadreDeptServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.CadreDept;
+import com.xjrsoft.module.student.mapper.CadreDeptMapper;
+import com.xjrsoft.module.student.service.ICadreDeptService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 干部部门
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class CadreDeptServiceImpl extends MPJBaseServiceImpl<CadreDeptMapper, CadreDept> implements ICadreDeptService {
+}

src/main/java/com/xjrsoft/module/student/vo/CadreDeptPageVo.java

@@ -0,0 +1,84 @@
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 干部部门分页列表出参
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+public class CadreDeptPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 机构名称
+    */
+    @ApiModelProperty("机构名称")
+    private String name;
+    /**
+    * 部门上级编号
+    */
+    @ApiModelProperty("部门上级编号")
+    private Long parentId;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/vo/CadreDeptTreeVo.java

@@ -0,0 +1,48 @@
+package com.xjrsoft.module.student.vo;
+
+import com.xjrsoft.common.model.tree.ITreeNode;
+import com.xjrsoft.module.organization.vo.DepartmentTreeVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 干部部门树列表出参
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+public class CadreDeptTreeVo implements ITreeNode<CadreDeptTreeVo,Long>, Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 机构名称
+    */
+    @ApiModelProperty("机构名称")
+    private String name;
+    /**
+    * 部门上级编号
+    */
+    @ApiModelProperty("部门上级编号")
+    private Long parentId;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    private List<CadreDeptTreeVo> children;
+}

src/main/java/com/xjrsoft/module/student/vo/CadreDeptVo.java

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 干部部门表单出参
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+public class CadreDeptVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 机构名称
+    */
+    @ApiModelProperty("机构名称")
+    private String name;
+    /**
+    * 部门上级编号
+    */
+    @ApiModelProperty("部门上级编号")
+    private Long parentId;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -1072,4 +1072,34 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 
+    /**
+     * 干部部门管理
+     *
+     */
+    @Test
+    public void gcCadreDept() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("cadre_dept");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
 }