Commit b7a90c2c128550e0cd8290dd7fa342db1f28351f
1 parent
08d72fe9
code review 动态表单
Showing
3 changed files
with
26 additions
and
20 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/form/OsFormController.java
| 1 | package cn.iocoder.yudao.adminserver.modules.activiti.controller.form; | 1 | package cn.iocoder.yudao.adminserver.modules.activiti.controller.form; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.adminserver.modules.activiti.controller.form.vo.*; | 3 | import cn.iocoder.yudao.adminserver.modules.activiti.controller.form.vo.*; |
| 4 | -import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 5 | import cn.iocoder.yudao.adminserver.modules.activiti.convert.form.OsFormConvert; | 4 | import cn.iocoder.yudao.adminserver.modules.activiti.convert.form.OsFormConvert; |
| 6 | import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.form.OsFormDO; | 5 | import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.form.OsFormDO; |
| 7 | import cn.iocoder.yudao.adminserver.modules.activiti.service.form.OsFormService; | 6 | import cn.iocoder.yudao.adminserver.modules.activiti.service.form.OsFormService; |
| 8 | -import org.springframework.web.bind.annotation.*; | ||
| 9 | -import javax.annotation.Resource; | ||
| 10 | -import org.springframework.validation.annotation.Validated; | ||
| 11 | -import org.springframework.security.access.prepost.PreAuthorize; | ||
| 12 | -import io.swagger.annotations.*; | ||
| 13 | -import javax.validation.*; | ||
| 14 | -import javax.servlet.http.*; | ||
| 15 | -import java.util.*; | ||
| 16 | -import java.io.IOException; | ||
| 17 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 7 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 18 | -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 8 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 19 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | 9 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
| 20 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | 10 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 21 | -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; | 11 | +import io.swagger.annotations.Api; |
| 12 | +import io.swagger.annotations.ApiImplicitParam; | ||
| 13 | +import io.swagger.annotations.ApiOperation; | ||
| 14 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 15 | +import org.springframework.validation.annotation.Validated; | ||
| 16 | +import org.springframework.web.bind.annotation.*; | ||
| 22 | 17 | ||
| 18 | +import javax.annotation.Resource; | ||
| 19 | +import javax.servlet.http.HttpServletResponse; | ||
| 20 | +import javax.validation.Valid; | ||
| 21 | +import java.io.IOException; | ||
| 22 | +import java.util.Collection; | ||
| 23 | +import java.util.List; | ||
| 23 | 24 | ||
| 25 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | ||
| 26 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | ||
| 24 | 27 | ||
| 28 | +// TODO @风里雾里: Os=》Wf,/os 改成 /wl 开头。目前这个模块,咱先定位成给工作流用的 | ||
| 25 | @Api(tags = "动态表单") | 29 | @Api(tags = "动态表单") |
| 26 | @RestController | 30 | @RestController |
| 27 | @RequestMapping("/os/form") | 31 | @RequestMapping("/os/form") |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/dataobject/form/OsFormDO.java
| 1 | package cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.form; | 1 | package cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.form; |
| 2 | 2 | ||
| 3 | -import lombok.*; | ||
| 4 | -import java.util.*; | ||
| 5 | -import com.baomidou.mybatisplus.annotation.*; | ||
| 6 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 4 | +import com.baomidou.mybatisplus.annotation.TableId; | ||
| 5 | +import com.baomidou.mybatisplus.annotation.TableName; | ||
| 6 | +import lombok.*; | ||
| 7 | 7 | ||
| 8 | +// TODO @风里雾里:切到 https://gitee.com/zhijiantianya/ruoyi-vue-pro/blob/feature/activiti/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/form/WfForm.java 。status 添加进去哈。 | ||
| 8 | /** | 9 | /** |
| 9 | * 动态表单 DO | 10 | * 动态表单 DO |
| 10 | * | 11 | * |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/form/impl/OsFormServiceImpl.java
| @@ -9,19 +9,20 @@ import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.form.OsFormD | @@ -9,19 +9,20 @@ import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.form.OsFormD | ||
| 9 | import cn.iocoder.yudao.adminserver.modules.activiti.dal.mysql.form.OsFormMapper; | 9 | import cn.iocoder.yudao.adminserver.modules.activiti.dal.mysql.form.OsFormMapper; |
| 10 | import cn.iocoder.yudao.adminserver.modules.activiti.service.form.OsFormService; | 10 | import cn.iocoder.yudao.adminserver.modules.activiti.service.form.OsFormService; |
| 11 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 11 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 12 | - | ||
| 13 | import org.springframework.stereotype.Service; | 12 | import org.springframework.stereotype.Service; |
| 14 | -import javax.annotation.Resource; | ||
| 15 | import org.springframework.validation.annotation.Validated; | 13 | import org.springframework.validation.annotation.Validated; |
| 16 | -import java.util.*; | ||
| 17 | 14 | ||
| 18 | -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 15 | +import javax.annotation.Resource; |
| 16 | +import java.util.Collection; | ||
| 17 | +import java.util.List; | ||
| 18 | + | ||
| 19 | import static cn.iocoder.yudao.adminserver.modules.activiti.enums.form.FormErrorCodeConstants.FORM_NOT_EXISTS; | 19 | import static cn.iocoder.yudao.adminserver.modules.activiti.enums.form.FormErrorCodeConstants.FORM_NOT_EXISTS; |
| 20 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | ||
| 20 | 21 | ||
| 21 | /** | 22 | /** |
| 22 | * 动态表单 Service 实现类 | 23 | * 动态表单 Service 实现类 |
| 23 | * | 24 | * |
| 24 | - * @author 芋艿 | 25 | + * @author 芋艿 // TODO @风里雾里:作者改成你自己哈 |
| 25 | */ | 26 | */ |
| 26 | @Service | 27 | @Service |
| 27 | @Validated | 28 | @Validated |