From 93563d127480c843d171884d44e4867c180d052a Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期一, 25 十一月 2024 20:40:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/FlowableTypeMapper.xml | 57 ++++++++++++++
business/src/main/java/com/ycl/domain/entity/FlowableType.java | 39 +++++++++
business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java | 11 ++
business/src/main/java/com/ycl/service/FlowableTypeService.java | 12 +++
business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java | 23 +++++
business/src/main/java/com/ycl/controller/FlowableTypeController.java | 72 ++++++++++++++++++
6 files changed, 214 insertions(+), 0 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/FlowableTypeController.java b/business/src/main/java/com/ycl/controller/FlowableTypeController.java
new file mode 100644
index 0000000..3541bf4
--- /dev/null
+++ b/business/src/main/java/com/ycl/controller/FlowableTypeController.java
@@ -0,0 +1,72 @@
+package com.ycl.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.common.base.Result;
+import com.ycl.common.group.Add;
+import com.ycl.common.group.Update;
+import com.ycl.domain.entity.FlowableType;
+import com.ycl.domain.form.PlanForm;
+import com.ycl.domain.query.PlanQuery;
+import com.ycl.domain.vo.PlanVO;
+import com.ycl.framework.utils.PageUtil;
+import com.ycl.service.FlowableTypeService;
+import com.ycl.service.PlanService;
+import com.ycl.system.domain.base.AbsQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 宸ヤ綔娴佸垎绫� 鍓嶇鎺у埗鍣�
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "宸ヤ綔娴佸垎绫�", tags = "宸ヤ綔娴佸垎绫荤鐞�")
+@RestController
+@RequestMapping("/flowable_type")
+public class FlowableTypeController {
+
+ private final FlowableTypeService flowableTypeService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+// @PreAuthorize("hasAuthority('flowableType:add')")
+ public Result add(@RequestBody @Validated(Add.class) FlowableType form) {
+ flowableTypeService.save(form);
+ return Result.ok();
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+// @PreAuthorize("hasAuthority('flowableType:edit')")
+ public Result update(@RequestBody @Validated(Update.class) FlowableType form) {
+ flowableTypeService.updateById(form);
+ return Result.ok();
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+// @PreAuthorize("hasAuthority('flowableType:del')")
+ public Result removeById(@PathVariable("id") String id) {
+ flowableTypeService.removeById(id);
+ return Result.ok();
+ }
+
+
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+// @PreAuthorize("hasAuthority('flowableType:page')")
+ public Result page(AbsQuery query) {
+ IPage<FlowableType> page = PageUtil.getPage(query, FlowableType.class);
+ flowableTypeService.page(page);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+}
diff --git a/business/src/main/java/com/ycl/domain/entity/FlowableType.java b/business/src/main/java/com/ycl/domain/entity/FlowableType.java
new file mode 100644
index 0000000..fa18704
--- /dev/null
+++ b/business/src/main/java/com/ycl/domain/entity/FlowableType.java
@@ -0,0 +1,39 @@
+package com.ycl.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.system.domain.base.AbsEntity;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 娴佺▼鍒嗙被
+ */
+@Data
+@TableName("t_flowable_type")
+public class FlowableType extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableField(value = "name")
+ private String name;
+
+ @TableField(value = "parent_id")
+ private Integer parentId;
+
+ @TableField(value = "level")
+ private Integer level;
+
+ @TableField(value = "leaf")
+ private Boolean leaf;
+
+ @TableField(value = "create_by")
+ private String createBy;
+
+ @TableField(value = "update_by")
+ private String updateBy;
+
+
+}
diff --git a/business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java b/business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java
new file mode 100644
index 0000000..428a7ee
--- /dev/null
+++ b/business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java
@@ -0,0 +1,11 @@
+package com.ycl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.domain.entity.FlowableType;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FlowableTypeMapper extends BaseMapper<FlowableType> {
+
+
+}
diff --git a/business/src/main/java/com/ycl/service/FlowableTypeService.java b/business/src/main/java/com/ycl/service/FlowableTypeService.java
new file mode 100644
index 0000000..924b6e9
--- /dev/null
+++ b/business/src/main/java/com/ycl/service/FlowableTypeService.java
@@ -0,0 +1,12 @@
+package com.ycl.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.common.base.Result;
+import com.ycl.domain.entity.FlowableType;
+
+import java.util.List;
+
+public interface FlowableTypeService extends IService<FlowableType> {
+
+
+}
diff --git a/business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java
new file mode 100644
index 0000000..c871d79
--- /dev/null
+++ b/business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java
@@ -0,0 +1,23 @@
+package com.ycl.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.common.base.Result;
+import com.ycl.domain.entity.FlowableType;
+import com.ycl.framework.utils.PageUtil;
+import com.ycl.mapper.FlowableTypeMapper;
+import com.ycl.service.FlowableTypeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Service
+@RequiredArgsConstructor
+public class FlowableTypeServiceImpl extends ServiceImpl<FlowableTypeMapper, FlowableType> implements FlowableTypeService {
+
+}
diff --git a/business/src/main/resources/mapper/FlowableTypeMapper.xml b/business/src/main/resources/mapper/FlowableTypeMapper.xml
new file mode 100644
index 0000000..456f26d
--- /dev/null
+++ b/business/src/main/resources/mapper/FlowableTypeMapper.xml
@@ -0,0 +1,57 @@
+<?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="com.ycl.mapper.FlowableTypeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.domain.entity.FlowableType">
+ <result column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="parent_id" property="parentId" />
+ <result column="level" property="level" />
+ <result column="leaf" property="leaf" />
+ <result column="create_by" property="createBy"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="gmt_create_time" property="gmtCreateTime" />
+ <result column="gmt_update_time" property="gmtUpdateTime" />
+ </resultMap>
+
+
+
+
+
+
+
+ <select id="getById" resultMap="BaseResultMap">
+ SELECT
+ TP.project_info_id,
+ TP.report_status,
+ TP.month_status,
+ TP.season_status,
+ TP.year_status,
+ TP.gmt_create_time,
+ TP.gmt_update_time,
+ TP.id
+ FROM
+ t_plan TP
+ WHERE
+ TP.id = #{id} AND TP.deleted = 0
+ </select>
+
+
+ <select id="getPage" resultMap="BaseResultMap">
+ SELECT
+ TP.project_info_id,
+ TP.report_status,
+ TP.month_status,
+ TP.season_status,
+ TP.year_status,
+ TP.gmt_create_time,
+ TP.gmt_update_time,
+ TP.id
+ FROM
+ t_plan TP
+ WHERE
+ TP.deleted = 0
+ </select>
+
+</mapper>
--
Gitblit v1.8.0