wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: wangliwen:6f394a3f99e0be614343a2242f17068218d4413f
Branches Tags
wangliwen:master
wangliwen:docker_package
wangliwen:dev
wangliwen:show
wangliwen:release
wangliwen:wangliwen
wangliwen:千万不要合并这个分支
wangliwen:缺陷修复版本
wangliwen:能力申请V3
wangliwen:v0.8.1.5.release(市局问题修复)
wangliwen:v0.8.1.4.release(市局问题修复)
wangliwen:v0.8.1.dev
wangliwen:v0.8.1.3.release（市局部署修复）
wangliwen:v0.8.1.2.release（西海岸部署修复）
wangliwen:v0.8.1.1.release(本地测试环境测试)
wangliwen:v0.8.0.1
wangliwen:v0.8.0
wangliwen:docker打包分支不要轻易合并本分支
..
compare: wangliwen:40ccd4e356a67b7ee2fe5de3b9f0902d91fe687c
Branches Tags
wangliwen:docker_package
wangliwen:master
wangliwen:dev
wangliwen:show
wangliwen:release
wangliwen:wangliwen
wangliwen:千万不要合并这个分支
wangliwen:缺陷修复版本
wangliwen:能力申请V3
wangliwen:v0.8.1.5.release(市局问题修复)
wangliwen:v0.8.1.4.release(市局问题修复)
wangliwen:v0.8.1.dev
wangliwen:v0.8.1.3.release（市局部署修复）
wangliwen:v0.8.1.2.release（西海岸部署修复）
wangliwen:v0.8.1.1.release(本地测试环境测试)
wangliwen:v0.8.0.1
wangliwen:v0.8.0
wangliwen:docker打包分支不要轻易合并本分支

No commits in common. "6f394a3f99e0be614343a2242f17068218d4413f" and "40ccd4e356a67b7ee2fe5de3b9f0902d91fe687c" have entirely different histories.
6f394a3f99 ... 40ccd4e356

27 changed files with 43 additions and 1270 deletions
Show Stats Expand all files Collapse all files

5
renren-admin/src/main/java/io/renren/modules/demandComment/dto/TDemandCommentDTO.java
View File

@ -1,6 +1,5 @@
package io.renren.modules.demandComment.dto;
import io.renren.common.dto.AuditingBaseDTO;
import io.renren.modules.demanData.dto.TDemandDataDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -17,7 +16,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "需求评论")
public class TDemandCommentDTO extends AuditingBaseDTO implements Serializable {
public class TDemandCommentDTO implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
@ -43,8 +42,6 @@ public class TDemandCommentDTO extends AuditingBaseDTO implements Serializable {
private String note4;
@ApiModelProperty(value = "备用字段")
private String note5;
@ApiModelProperty(value = "删除标志：0:正常；1:已删除；2:待审核；3:审核中；9其他")
private Integer delFlag;
@ApiModelProperty(value = "评论所属需求主题")
private TDemandDataDTO demandDataDTO;

86
renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntity.java
View File

@ -1,9 +1,10 @@
package io.renren.modules.demandComment.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.renren.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.*;
import java.util.Date;
import io.renren.common.entity.BaseEntity;
/**
* 需求评论
@ -12,50 +13,45 @@ import lombok.EqualsAndHashCode;
* @since 1.0 2022-04-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
@EqualsAndHashCode(callSuper=false)
@TableName("t_demand_comment")
public class TDemandCommentEntity extends BaseEntity {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
/**
* 评论人部门名称
*/
private String createDeptName;
/**
* 评论人姓名
*/
private String name;
/**
* 评论内容
*/
private String comment;
/**
* 评论主题id
*/
private Long targetId;
/**
* 备用字段
*/
private String note1;
/**
* 备用字段
*/
private String note2;
/**
* 备用字段
*/
private String note3;
/**
* 备用字段
*/
private String note4;
/**
* 备用字段
*/
private String note5;
/**
* 删除标志：0:正常；1:已删除；2:待审核；3:审核中；9其他
*/
private Integer delFlag;
/**
* 评论人部门名称
*/
private String createDeptName;
/**
* 评论人姓名
*/
private String name;
/**
* 评论内容
*/
private String comment;
/**
* 评论主题id
*/
private Long targetId;
/**
* 备用字段
*/
private String note1;
/**
* 备用字段
*/
private String note2;
/**
* 备用字段
*/
private String note3;
/**
* 备用字段
*/
private String note4;
/**
* 备用字段
*/
private String note5;
}

116
renren-admin/src/main/java/io/renren/modules/project/controller/TbProjectContribController.java
View File

@ -1,116 +0,0 @@
package io.renren.modules.project.controller;
import io.renren.common.annotation.LogOperation;
import io.renren.common.constant.Constant;
import io.renren.common.page.PageData;
import io.renren.common.utils.ExcelUtils;
import io.renren.common.utils.Result;
import io.renren.common.validator.AssertUtils;
import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.DefaultGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.modules.project.dto.TbProjectContribDTO;
import io.renren.modules.project.excel.TbProjectContribExcel;
import io.renren.modules.project.service.TbProjectContribService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 项目贡献表
*
* @author qs
* @since 3.0 2022-06-22
*/
@RestController
@RequestMapping("projectcontrib")
@Api(tags="项目贡献表")
public class TbProjectContribController {
@Autowired
private TbProjectContribService tbProjectContribService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
})
@RequiresPermissions("project:tbprojectcontrib:page")
public Result<PageData<TbProjectContribDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<TbProjectContribDTO> page = tbProjectContribService.page(params);
return new Result<PageData<TbProjectContribDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
@RequiresPermissions("project:tbprojectcontrib:info")
public Result<TbProjectContribDTO> get(@PathVariable("id") Long id){
TbProjectContribDTO data = tbProjectContribService.get(id);
return new Result<TbProjectContribDTO>().ok(data);
}
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
@RequiresPermissions("project:tbprojectcontrib:save")
public Result save(@RequestBody TbProjectContribDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
tbProjectContribService.save(dto);
return new Result();
}
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
@RequiresPermissions("project:tbprojectcontrib:update")
public Result update(@RequestBody TbProjectContribDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
tbProjectContribService.update(dto);
return new Result();
}
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
@RequiresPermissions("project:tbprojectcontrib:delete")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
tbProjectContribService.delete(ids);
return new Result();
}
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
@RequiresPermissions("project:tbprojectcontrib:export")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<TbProjectContribDTO> list = tbProjectContribService.list(params);
ExcelUtils.exportExcelToTarget(response, null, "项目贡献表", list, TbProjectContribExcel.class);
}
}

116
renren-admin/src/main/java/io/renren/modules/project/controller/TbProjectController.java
View File

@ -1,116 +0,0 @@
package io.renren.modules.project.controller;
import io.renren.common.annotation.LogOperation;
import io.renren.common.constant.Constant;
import io.renren.common.page.PageData;
import io.renren.common.utils.ExcelUtils;
import io.renren.common.utils.Result;
import io.renren.common.validator.AssertUtils;
import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.DefaultGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.modules.project.dto.TbProjectDTO;
import io.renren.modules.project.excel.TbProjectExcel;
import io.renren.modules.project.service.TbProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 项目表
*
* @author qiaosen
* @since 3.0 2022-06-22
*/
@RestController
@RequestMapping("project")
@Api(tags="项目表")
public class TbProjectController {
@Autowired
private TbProjectService tbProjectService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
})
@RequiresPermissions("project:tbproject:page")
public Result<PageData<TbProjectDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<TbProjectDTO> page = tbProjectService.page(params);
return new Result<PageData<TbProjectDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
@RequiresPermissions("project:tbproject:info")
public Result<TbProjectDTO> get(@PathVariable("id") Long id){
TbProjectDTO data = tbProjectService.get(id);
return new Result<TbProjectDTO>().ok(data);
}
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
@RequiresPermissions("project:tbproject:save")
public Result save(@RequestBody TbProjectDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
tbProjectService.save(dto);
return new Result();
}
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
@RequiresPermissions("project:tbproject:update")
public Result update(@RequestBody TbProjectDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
tbProjectService.update(dto);
return new Result();
}
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
@RequiresPermissions("project:tbproject:delete")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
tbProjectService.delete(ids);
return new Result();
}
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
@RequiresPermissions("project:tbproject:export")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<TbProjectDTO> list = tbProjectService.list(params);
ExcelUtils.exportExcelToTarget(response, null, "项目表", list, TbProjectExcel.class);
}
}

116
renren-admin/src/main/java/io/renren/modules/project/controller/TbProjectUseController.java
View File

@ -1,116 +0,0 @@
package io.renren.modules.project.controller;
import io.renren.common.annotation.LogOperation;
import io.renren.common.constant.Constant;
import io.renren.common.page.PageData;
import io.renren.common.utils.ExcelUtils;
import io.renren.common.utils.Result;
import io.renren.common.validator.AssertUtils;
import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.DefaultGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.modules.project.dto.TbProjectUseDTO;
import io.renren.modules.project.excel.TbProjectUseExcel;
import io.renren.modules.project.service.TbProjectUseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 项目使用表
*
* @author qs sunlightcs@gmail.com
* @since 3.0 2022-06-22
*/
@RestController
@RequestMapping("projectuse")
@Api(tags="项目使用表")
public class TbProjectUseController {
@Autowired
private TbProjectUseService tbProjectUseService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
})
@RequiresPermissions("project:tbprojectuse:page")
public Result<PageData<TbProjectUseDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<TbProjectUseDTO> page = tbProjectUseService.page(params);
return new Result<PageData<TbProjectUseDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
@RequiresPermissions("project:tbprojectuse:info")
public Result<TbProjectUseDTO> get(@PathVariable("id") Long id){
TbProjectUseDTO data = tbProjectUseService.get(id);
return new Result<TbProjectUseDTO>().ok(data);
}
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
@RequiresPermissions("project:tbprojectuse:save")
public Result save(@RequestBody TbProjectUseDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
tbProjectUseService.save(dto);
return new Result();
}
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
@RequiresPermissions("project:tbprojectuse:update")
public Result update(@RequestBody TbProjectUseDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
tbProjectUseService.update(dto);
return new Result();
}
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
@RequiresPermissions("project:tbprojectuse:delete")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
tbProjectUseService.delete(ids);
return new Result();
}
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
@RequiresPermissions("project:tbprojectuse:export")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<TbProjectUseDTO> list = tbProjectUseService.list(params);
ExcelUtils.exportExcelToTarget(response, null, "项目使用表", list, TbProjectUseExcel.class);
}
}

16
renren-admin/src/main/java/io/renren/modules/project/dao/TbProjectContribDao.java
View File

@ -1,16 +0,0 @@
package io.renren.modules.project.dao;
import io.renren.common.dao.BaseDao;
import io.renren.modules.project.entity.TbProjectContribEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 项目贡献表
*
* @author qs
* @since 3.0 2022-06-22
*/
@Mapper
public interface TbProjectContribDao extends BaseDao<TbProjectContribEntity> {
}

16
renren-admin/src/main/java/io/renren/modules/project/dao/TbProjectDao.java
View File

@ -1,16 +0,0 @@
package io.renren.modules.project.dao;
import io.renren.common.dao.BaseDao;
import io.renren.modules.project.entity.TbProjectEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 项目表
*
* @author qiaosen
* @since 3.0 2022-06-22
*/
@Mapper
public interface TbProjectDao extends BaseDao<TbProjectEntity> {
}

16
renren-admin/src/main/java/io/renren/modules/project/dao/TbProjectUseDao.java
View File

@ -1,16 +0,0 @@
package io.renren.modules.project.dao;
import io.renren.common.dao.BaseDao;
import io.renren.modules.project.entity.TbProjectUseEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 项目使用表
*
* @author qs sunlightcs@gmail.com
* @since 3.0 2022-06-22
*/
@Mapper
public interface TbProjectUseDao extends BaseDao<TbProjectUseEntity> {
}

56
renren-admin/src/main/java/io/renren/modules/project/dto/TbProjectContribDTO.java
View File

@ -1,56 +0,0 @@
package io.renren.modules.project.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 项目贡献表
*
* @author qs
* @since 3.0 2022-06-22
*/
@Data
@ApiModel(value = "项目贡献表")
public class TbProjectContribDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "项目名称")
private String projectName;
@ApiModelProperty(value = "应用名称")
private String resourceName;
@ApiModelProperty(value = "能力名称")
private String abilityName;
@ApiModelProperty(value = "能力类型")
private String abilityType;
@ApiModelProperty(value = "上架时间")
private Date applyTime;
@ApiModelProperty(value = "申请次数")
private String applyNum;
@ApiModelProperty(value = "浏览次数")
private String browseNum;
@ApiModelProperty(value = "创建人")
private Long creator;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "修改人")
private Long updater;
@ApiModelProperty(value = "修改时间")
private Date updateDate;
@ApiModelProperty(value = "备用字段")
private String note1;
@ApiModelProperty(value = "备用字段")
private String note2;
@ApiModelProperty(value = "备用字段")
private String note3;
@ApiModelProperty(value = "备用字段")
private String note4;
@ApiModelProperty(value = "备用字段")
private String note5;
}

62
renren-admin/src/main/java/io/renren/modules/project/dto/TbProjectDTO.java
View File

@ -1,62 +0,0 @@
package io.renren.modules.project.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 项目表
*
* @author qiaosen
* @since 3.0 2022-06-22
*/
@Data
@ApiModel(value = "项目表")
public class TbProjectDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "项目名称")
private String projectName;
@ApiModelProperty(value = "申请单位")
private String applyDep;
@ApiModelProperty(value = "申请人")
private String applyUser;
@ApiModelProperty(value = "申请时间")
private Date applyTime;
@ApiModelProperty(value = "所属区市")
private String regionName;
@ApiModelProperty(value = "责任处室")
private String respDep;
@ApiModelProperty(value = "业务联系人")
private String businessUser;
@ApiModelProperty(value = "业务联系电话")
private String businessPhone;
@ApiModelProperty(value = "技术联系人")
private String techUser;
@ApiModelProperty(value = "技术联系电话")
private String techPhone;
@ApiModelProperty(value = "创建人")
private Long creator;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "修改人")
private Long updater;
@ApiModelProperty(value = "修改时间")
private Date updateDate;
@ApiModelProperty(value = "备用字段")
private String note1;
@ApiModelProperty(value = "备用字段")
private String note2;
@ApiModelProperty(value = "备用字段")
private String note3;
@ApiModelProperty(value = "备用字段")
private String note4;
@ApiModelProperty(value = "备用字段")
private String note5;
}

56
renren-admin/src/main/java/io/renren/modules/project/dto/TbProjectUseDTO.java
View File

@ -1,56 +0,0 @@
package io.renren.modules.project.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 项目使用表
*
* @author qs sunlightcs@gmail.com
* @since 3.0 2022-06-22
*/
@Data
@ApiModel(value = "项目使用表")
public class TbProjectUseDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "项目名称")
private String projectName;
@ApiModelProperty(value = "应用名称")
private String resourceName;
@ApiModelProperty(value = "能力名称")
private String abilityName;
@ApiModelProperty(value = "能力类型")
private String abilityType;
@ApiModelProperty(value = "上架时间")
private Date applyTime;
@ApiModelProperty(value = "申请次数")
private String applyNum;
@ApiModelProperty(value = "浏览次数")
private String browseNum;
@ApiModelProperty(value = "创建人")
private Long creator;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "修改人")
private Long updater;
@ApiModelProperty(value = "修改时间")
private Date updateDate;
@ApiModelProperty(value = "备用字段")
private String note1;
@ApiModelProperty(value = "备用字段")
private String note2;
@ApiModelProperty(value = "备用字段")
private String note3;
@ApiModelProperty(value = "备用字段")
private String note4;
@ApiModelProperty(value = "备用字段")
private String note5;
}

79
renren-admin/src/main/java/io/renren/modules/project/entity/TbProjectContribEntity.java
View File

@ -1,79 +0,0 @@
package io.renren.modules.project.entity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.*;
import java.util.Date;
import io.renren.common.entity.BaseEntity;
/**
* 项目贡献表
*
* @author qs
* @since 3.0 2022-06-22
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("tb_project_contrib")
public class TbProjectContribEntity extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 项目名称
*/
private String projectName;
/**
* 应用名称
*/
private String resourceName;
/**
* 能力名称
*/
private String abilityName;
/**
* 能力类型
*/
private String abilityType;
/**
* 上架时间
*/
private Date applyTime;
/**
* 申请次数
*/
private String applyNum;
/**
* 浏览次数
*/
private String browseNum;
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updater;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateDate;
/**
* 备用字段
*/
private String note1;
/**
* 备用字段
*/
private String note2;
/**
* 备用字段
*/
private String note3;
/**
* 备用字段
*/
private String note4;
/**
* 备用字段
*/
private String note5;
}

91
renren-admin/src/main/java/io/renren/modules/project/entity/TbProjectEntity.java
View File

@ -1,91 +0,0 @@
package io.renren.modules.project.entity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.*;
import java.util.Date;
import io.renren.common.entity.BaseEntity;
/**
* 项目表
*
* @author qiaosen
* @since 3.0 2022-06-22
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("tb_project")
public class TbProjectEntity extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 项目名称
*/
private String projectName;
/**
* 申请单位
*/
private String applyDep;
/**
* 申请人
*/
private String applyUser;
/**
* 申请时间
*/
private Date applyTime;
/**
* 所属区市
*/
private String regionName;
/**
* 责任处室
*/
private String respDep;
/**
* 业务联系人
*/
private String businessUser;
/**
* 业务联系电话
*/
private String businessPhone;
/**
* 技术联系人
*/
private String techUser;
/**
* 技术联系电话
*/
private String techPhone;
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updater;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateDate;
/**
* 备用字段
*/
private String note1;
/**
* 备用字段
*/
private String note2;
/**
* 备用字段
*/
private String note3;
/**
* 备用字段
*/
private String note4;
/**
* 备用字段
*/
private String note5;
}

79
renren-admin/src/main/java/io/renren/modules/project/entity/TbProjectUseEntity.java
View File

@ -1,79 +0,0 @@
package io.renren.modules.project.entity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.*;
import java.util.Date;
import io.renren.common.entity.BaseEntity;
/**
* 项目使用表
*
* @author qs sunlightcs@gmail.com
* @since 3.0 2022-06-22
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("tb_project_use")
public class TbProjectUseEntity extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 项目名称
*/
private String projectName;
/**
* 应用名称
*/
private String resourceName;
/**
* 能力名称
*/
private String abilityName;
/**
* 能力类型
*/
private String abilityType;
/**
* 上架时间
*/
private Date applyTime;
/**
* 申请次数
*/
private String applyNum;
/**
* 浏览次数
*/
private String browseNum;
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updater;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateDate;
/**
* 备用字段
*/
private String note1;
/**
* 备用字段
*/
private String note2;
/**
* 备用字段
*/
private String note3;
/**
* 备用字段
*/
private String note4;
/**
* 备用字段
*/
private String note5;
}

55
renren-admin/src/main/java/io/renren/modules/project/excel/TbProjectContribExcel.java
View File

@ -1,55 +0,0 @@
package io.renren.modules.project.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import java.util.Date;
/**
* 项目贡献表
*
* @author qs
* @since 3.0 2022-06-22
*/
@Data
@ContentRowHeight(20)
@HeadRowHeight(20)
@ColumnWidth(25)
public class TbProjectContribExcel {
@ExcelProperty(value = "主键", index = 0)
private Long id;
@ExcelProperty(value = "项目名称", index = 1)
private String projectName;
@ExcelProperty(value = "应用名称", index = 2)
private String resourceName;
@ExcelProperty(value = "能力名称", index = 3)
private String abilityName;
@ExcelProperty(value = "能力类型", index = 4)
private String abilityType;
@ExcelProperty(value = "上架时间", index = 5)
private Date applyTime;
@ExcelProperty(value = "申请次数", index = 6)
private String applyNum;
@ExcelProperty(value = "浏览次数", index = 7)
private String browseNum;
@ExcelProperty(value = "创建人", index = 8)
private Long creator;
@ExcelProperty(value = "创建时间", index = 9)
private Date createDate;
@ExcelProperty(value = "修改人", index = 10)
private Long updater;
@ExcelProperty(value = "修改时间", index = 11)
private Date updateDate;
@ExcelProperty(value = "备用字段", index = 12)
private String note1;
@ExcelProperty(value = "备用字段", index = 13)
private String note2;
@ExcelProperty(value = "备用字段", index = 14)
private String note3;
@ExcelProperty(value = "备用字段", index = 15)
private String note4;
@ExcelProperty(value = "备用字段", index = 16)
private String note5;
}

61
renren-admin/src/main/java/io/renren/modules/project/excel/TbProjectExcel.java
View File

@ -1,61 +0,0 @@
package io.renren.modules.project.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import java.util.Date;
/**
* 项目表
*
* @author qiaosen
* @since 3.0 2022-06-22
*/
@Data
@ContentRowHeight(20)
@HeadRowHeight(20)
@ColumnWidth(25)
public class TbProjectExcel {
@ExcelProperty(value = "主键", index = 0)
private Long id;
@ExcelProperty(value = "项目名称", index = 1)
private String projectName;
@ExcelProperty(value = "申请单位", index = 2)
private String applyDep;
@ExcelProperty(value = "申请人", index = 3)
private String applyUser;
@ExcelProperty(value = "申请时间", index = 4)
private Date applyTime;
@ExcelProperty(value = "所属区市", index = 5)
private String regionName;
@ExcelProperty(value = "责任处室", index = 6)
private String respDep;
@ExcelProperty(value = "业务联系人", index = 7)
private String businessUser;
@ExcelProperty(value = "业务联系电话", index = 8)
private String businessPhone;
@ExcelProperty(value = "技术联系人", index = 9)
private String techUser;
@ExcelProperty(value = "技术联系电话", index = 10)
private String techPhone;
@ExcelProperty(value = "创建人", index = 11)
private Long creator;
@ExcelProperty(value = "创建时间", index = 12)
private Date createDate;
@ExcelProperty(value = "修改人", index = 13)
private Long updater;
@ExcelProperty(value = "修改时间", index = 14)
private Date updateDate;
@ExcelProperty(value = "备用字段", index = 15)
private String note1;
@ExcelProperty(value = "备用字段", index = 16)
private String note2;
@ExcelProperty(value = "备用字段", index = 17)
private String note3;
@ExcelProperty(value = "备用字段", index = 18)
private String note4;
@ExcelProperty(value = "备用字段", index = 19)
private String note5;
}

55
renren-admin/src/main/java/io/renren/modules/project/excel/TbProjectUseExcel.java
View File

@ -1,55 +0,0 @@
package io.renren.modules.project.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import java.util.Date;
/**
* 项目使用表
*
* @author qs sunlightcs@gmail.com
* @since 3.0 2022-06-22
*/
@Data
@ContentRowHeight(20)
@HeadRowHeight(20)
@ColumnWidth(25)
public class TbProjectUseExcel {
@ExcelProperty(value = "主键", index = 0)
private Long id;
@ExcelProperty(value = "项目名称", index = 1)
private String projectName;
@ExcelProperty(value = "应用名称", index = 2)
private String resourceName;
@ExcelProperty(value = "能力名称", index = 3)
private String abilityName;
@ExcelProperty(value = "能力类型", index = 4)
private String abilityType;
@ExcelProperty(value = "上架时间", index = 5)
private Date applyTime;
@ExcelProperty(value = "申请次数", index = 6)
private String applyNum;
@ExcelProperty(value = "浏览次数", index = 7)
private String browseNum;
@ExcelProperty(value = "创建人", index = 8)
private Long creator;
@ExcelProperty(value = "创建时间", index = 9)
private Date createDate;
@ExcelProperty(value = "修改人", index = 10)
private Long updater;
@ExcelProperty(value = "修改时间", index = 11)
private Date updateDate;
@ExcelProperty(value = "备用字段", index = 12)
private String note1;
@ExcelProperty(value = "备用字段", index = 13)
private String note2;
@ExcelProperty(value = "备用字段", index = 14)
private String note3;
@ExcelProperty(value = "备用字段", index = 15)
private String note4;
@ExcelProperty(value = "备用字段", index = 16)
private String note5;
}

15
renren-admin/src/main/java/io/renren/modules/project/service/TbProjectContribService.java
View File

@ -1,15 +0,0 @@
package io.renren.modules.project.service;
import io.renren.common.service.CrudService;
import io.renren.modules.project.dto.TbProjectContribDTO;
import io.renren.modules.project.entity.TbProjectContribEntity;
/**
* 项目贡献表
*
* @author qs
* @since 3.0 2022-06-22
*/
public interface TbProjectContribService extends CrudService<TbProjectContribEntity, TbProjectContribDTO> {
}

15
renren-admin/src/main/java/io/renren/modules/project/service/TbProjectService.java
View File

@ -1,15 +0,0 @@
package io.renren.modules.project.service;
import io.renren.common.service.CrudService;
import io.renren.modules.project.dto.TbProjectDTO;
import io.renren.modules.project.entity.TbProjectEntity;
/**
* 项目表
*
* @author qiaosen
* @since 3.0 2022-06-22
*/
public interface TbProjectService extends CrudService<TbProjectEntity, TbProjectDTO> {
}

15
renren-admin/src/main/java/io/renren/modules/project/service/TbProjectUseService.java
View File

@ -1,15 +0,0 @@
package io.renren.modules.project.service;
import io.renren.common.service.CrudService;
import io.renren.modules.project.dto.TbProjectUseDTO;
import io.renren.modules.project.entity.TbProjectUseEntity;
/**
* 项目使用表
*
* @author qs sunlightcs@gmail.com
* @since 3.0 2022-06-22
*/
public interface TbProjectUseService extends CrudService<TbProjectUseEntity, TbProjectUseDTO> {
}

34
renren-admin/src/main/java/io/renren/modules/project/service/impl/TbProjectContribServiceImpl.java
View File

@ -1,34 +0,0 @@
package io.renren.modules.project.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.renren.common.service.impl.CrudServiceImpl;
import io.renren.common.constant.Constant;
import io.renren.modules.project.dao.TbProjectContribDao;
import io.renren.modules.project.dto.TbProjectContribDTO;
import io.renren.modules.project.entity.TbProjectContribEntity;
import io.renren.modules.project.service.TbProjectContribService;
import io.renren.modules.security.user.SecurityUser;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* 项目贡献表
*
* @author qs
* @since 3.0 2022-06-22
*/
@Service
public class TbProjectContribServiceImpl extends CrudServiceImpl<TbProjectContribDao, TbProjectContribEntity, TbProjectContribDTO> implements TbProjectContribService {
@Override
public QueryWrapper<TbProjectContribEntity> getWrapper(Map<String, Object> params){
QueryWrapper<TbProjectContribEntity> wrapper = new QueryWrapper<>();
return wrapper;
}
}

34
renren-admin/src/main/java/io/renren/modules/project/service/impl/TbProjectServiceImpl.java
View File

@ -1,34 +0,0 @@
package io.renren.modules.project.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.renren.common.service.impl.CrudServiceImpl;
import io.renren.common.constant.Constant;
import io.renren.modules.project.dao.TbProjectDao;
import io.renren.modules.project.dto.TbProjectDTO;
import io.renren.modules.project.entity.TbProjectEntity;
import io.renren.modules.project.service.TbProjectService;
import io.renren.modules.security.user.SecurityUser;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* 项目表
*
* @author qiaosen
* @since 3.0 2022-06-22
*/
@Service
public class TbProjectServiceImpl extends CrudServiceImpl<TbProjectDao, TbProjectEntity, TbProjectDTO> implements TbProjectService {
@Override
public QueryWrapper<TbProjectEntity> getWrapper(Map<String, Object> params){
QueryWrapper<TbProjectEntity> wrapper = new QueryWrapper<>();
return wrapper;
}
}

34
renren-admin/src/main/java/io/renren/modules/project/service/impl/TbProjectUseServiceImpl.java
View File

@ -1,34 +0,0 @@
package io.renren.modules.project.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.renren.common.service.impl.CrudServiceImpl;
import io.renren.common.constant.Constant;
import io.renren.modules.project.dao.TbProjectUseDao;
import io.renren.modules.project.dto.TbProjectUseDTO;
import io.renren.modules.project.entity.TbProjectUseEntity;
import io.renren.modules.project.service.TbProjectUseService;
import io.renren.modules.security.user.SecurityUser;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* 项目使用表
*
* @author qs sunlightcs@gmail.com
* @since 3.0 2022-06-22
*/
@Service
public class TbProjectUseServiceImpl extends CrudServiceImpl<TbProjectUseDao, TbProjectUseEntity, TbProjectUseDTO> implements TbProjectUseService {
@Override
public QueryWrapper<TbProjectUseEntity> getWrapper(Map<String, Object> params){
QueryWrapper<TbProjectUseEntity> wrapper = new QueryWrapper<>();
return wrapper;
}
}

6
renren-admin/src/main/resources/application-dev.yml
View File

@ -51,11 +51,7 @@ spring:
wall:
config:
multi-statement-allow: true
flyway:
enabled: true
validate-on-migrate: false
# 允许乱序执行
out-of-order: true
#上传的静态资源配置
resource:
root_url: 15.2.21.238

1
renren-admin/src/main/resources/application.yml
View File

@ -61,7 +61,6 @@ spring:
locations: filesystem:config/db
baseline-on-migrate: true
baseline-version: 0
validate-on-migrate: true
fdfs:

77
renren-admin/src/main/resources/db/V1.8__project_add_table.sql
View File

@ -1,77 +0,0 @@
CREATE TABLE `tb_project` (
`id` bigint(20) NOT NULL COMMENT '主键',
`project_name` varchar(128) DEFAULT NULL COMMENT '项目名称',
`apply_dep` varchar(128) DEFAULT NULL COMMENT '申请单位',
`apply_user` varchar(128) DEFAULT NULL COMMENT '申请人',
`apply_time` datetime DEFAULT NULL COMMENT '申请时间',
`region_name` varchar(128) DEFAULT NULL COMMENT '所属区市',
`resp_dep` varchar(128) DEFAULT NULL COMMENT '责任处室',
`business_user` varchar(128) DEFAULT NULL COMMENT '业务联系人',
`business_phone` varchar(32) DEFAULT NULL COMMENT '业务联系电话',
`tech_user` varchar(128) DEFAULT NULL COMMENT '技术联系人',
`tech_phone` varchar(32) DEFAULT NULL COMMENT '技术联系电话',
`creator` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`updater` bigint(20) DEFAULT NULL COMMENT '修改人',
`update_date` datetime DEFAULT NULL COMMENT '修改时间',
`note1` longtext COMMENT '备用字段',
`note2` varchar(200) DEFAULT NULL COMMENT '备用字段',
`note3` varchar(500) DEFAULT NULL COMMENT '备用字段',
`note4` varchar(1000) DEFAULT NULL COMMENT '备用字段',
`note5` varchar(2000) DEFAULT NULL COMMENT '备用字段',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='项目表';
CREATE TABLE `tb_project_contrib` (
`id` bigint(20) NOT NULL COMMENT '主键',
`project_name` varchar(128) DEFAULT NULL COMMENT '项目名称',
`resource_name` varchar(128) DEFAULT NULL COMMENT '应用名称',
`ability_name` varchar(128) DEFAULT NULL COMMENT '能力名称',
`ability_type` varchar(64) DEFAULT NULL COMMENT '能力类型',
`apply_time` datetime DEFAULT NULL COMMENT '上架时间',
`apply_num` varchar(10) DEFAULT NULL COMMENT '申请次数',
`browse_num` varchar(10) DEFAULT NULL COMMENT '浏览次数',
`creator` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`updater` bigint(20) DEFAULT NULL COMMENT '修改人',
`update_date` datetime DEFAULT NULL COMMENT '修改时间',
`note1` longtext COMMENT '备用字段',
`note2` varchar(200) DEFAULT NULL COMMENT '备用字段',
`note3` varchar(500) DEFAULT NULL COMMENT '备用字段',
`note4` varchar(1000) DEFAULT NULL COMMENT '备用字段',
`note5` varchar(2000) DEFAULT NULL COMMENT '备用字段',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='项目贡献表';
CREATE TABLE `tb_project_use` (
`id` bigint(20) NOT NULL COMMENT '主键',
`project_name` varchar(128) DEFAULT NULL COMMENT '项目名称',
`resource_name` varchar(128) DEFAULT NULL COMMENT '应用名称',
`ability_name` varchar(128) DEFAULT NULL COMMENT '能力名称',
`ability_type` varchar(64) DEFAULT NULL COMMENT '能力类型',
`apply_time` datetime DEFAULT NULL COMMENT '上架时间',
`apply_num` varchar(10) DEFAULT NULL COMMENT '申请次数',
`browse_num` varchar(10) DEFAULT NULL COMMENT '浏览次数',
`creator` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`updater` bigint(20) DEFAULT NULL COMMENT '修改人',
`update_date` datetime DEFAULT NULL COMMENT '修改时间',
`note1` longtext COMMENT '备用字段',
`note2` varchar(200) DEFAULT NULL COMMENT '备用字段',
`note3` varchar(500) DEFAULT NULL COMMENT '备用字段',
`note4` varchar(1000) DEFAULT NULL COMMENT '备用字段',
`note5` varchar(2000) DEFAULT NULL COMMENT '备用字段',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='项目使用表';
CREATE TABLE `tb_data_resource_rel` (
`key_id` bigint(20) DEFAULT NULL COMMENT '应用资源id',
`reference_id` bigint(20) DEFAULT NULL COMMENT '关联id',
`del_flag` int(11) DEFAULT '0' COMMENT '删除标志：\r\n0:正常；\r\n1:已删除；\r\n2:待审核；\r\n3:审核中；\r\n9其他',
`creator` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`updater` bigint(20) DEFAULT NULL COMMENT '修改人',
`update_date` datetime DEFAULT NULL COMMENT '修改时间',
`id` bigint(20) NOT NULL COMMENT 'id',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='组件-应用资源关系表';

1
renren-admin/src/main/resources/db/V1.9__comment_add_col.sql
View File

@ -1 +0,0 @@
ALTER TABLE `t_demand_comment` ADD COLUMN `del_flag` int(11) NULL COMMENT '删除标志：\r\n0:正常；\r\n1:已删除；\r\n2:待审核；\r\n3:审核中；\r\n9其他';