第三次提交

dongdingding
dongdingding 2 years ago
parent cf373589a5
commit 19fe7a6665

@ -20,7 +20,6 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.16</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.6</pagehelper.boot.version>
<fastjson.version>2.0.39</fastjson.version>
@ -66,6 +65,7 @@
<version>${pagehelper.boot.version}</version>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
@ -73,18 +73,7 @@
<version>${oshi.version}</version>
</dependency>
<!-- Swagger3依赖 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- io常用工具类 -->
<dependency>
@ -121,6 +110,12 @@
<version>${fastjson.version}</version>
</dependency>
<!--引入Knife4j的官方start包,该指南选择Spring Boot版本<3.0,开发者需要注意-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
<version>4.0.0</version>
</dependency>
<!-- Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>

@ -10,7 +10,9 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId>
<properties>
<knife4j.version>4.0.0</knife4j.version>
</properties>
<description>
web服务入口
</description>
@ -24,18 +26,12 @@
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
<!-- swagger3-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
<!-- 防止进入swagger页面报类型转换错误排除3.0.0中的引用手动增加1.6.2版本 -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.6.2</version>
</dependency>
<!-- Mysql驱动包 -->
<dependency>
@ -60,6 +56,15 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId>
<version>3.5.3.2</version>
</dependency>
</dependencies>

@ -3,6 +3,11 @@ package com.ruoyi;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.Environment;
import java.net.InetAddress;
import java.net.UnknownHostException;
/**
*
@ -12,19 +17,22 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication
{
public static void main(String[] args)
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ノ゙ 若依启动成功 ლ(´ڡ`ლ)゙ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +
" |(_ o _) / _( )_ .' \n" +
" | (_,_).' __ ___(_ o _)' \n" +
" | |\\ \\ | || |(_,_)' \n" +
" | | \\ `' /| `-' / \n" +
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
public static void main(String[] args) {
ConfigurableApplicationContext application = SpringApplication.run(RuoYiApplication.class, args);
Environment env = application.getEnvironment();
String ip = null;
try {
ip = InetAddress.getLocalHost().getHostAddress();
} catch (UnknownHostException e) {
throw new RuntimeException(e);
}
String port = env.getProperty("server.port");
String path = env.getProperty("server.servlet.context-path");
path = path.isEmpty() ? "" : path;
System.out.println("\n----------------------------------------------------------\n\t"
+ "Application is running! Access URLs:\n\t"
+ "swagger-ui: http://localhost:" + port + path + "doc.html\n\t"
+ "swagger-ui: http://" + ip + ":" + port + path + "doc.html\n\t"
+ "----------------------------------------------------------");
}
}

@ -1,44 +1,44 @@
package com.ruoyi.web.core.config;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.service.AuthorizationScope;
import springfox.documentation.service.Contact;
import springfox.documentation.service.SecurityReference;
import springfox.documentation.service.SecurityScheme;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
/**
* Swagger2
*
*
* @author ruoyi
*/
@Configuration
public class SwaggerConfig
{
/** 系统基础配置 */
@EnableSwagger2WebMvc
public class SwaggerConfig {
/**
*
*/
@Autowired
private RuoYiConfig ruoyiConfig;
/** 是否开启swagger */
/**
* swagger
*/
@Value("${swagger.enabled}")
private boolean enabled;
/** 设置请求的统一前缀 */
/**
*
*/
@Value("${swagger.pathMapping}")
private String pathMapping;
@ -46,11 +46,12 @@ public class SwaggerConfig
* API
*/
@Bean
public Docket createRestApi()
{
return new Docket(DocumentationType.OAS_30)
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
// 是否启用Swagger
.enable(enabled)
//分组名称
.groupName("木渎")
// 用来创建该API的基本信息展示在文档的页面中自定义展示的信息
.apiInfo(apiInfo())
// 设置哪些接口暴露给Swagger展示
@ -62,60 +63,24 @@ public class SwaggerConfig
// 扫描所有 .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any())
.build()
/* 设置安全模式swagger可以设置访问token */
.securitySchemes(securitySchemes())
.securityContexts(securityContexts())
//.ignoredParameterTypes(Page.class, IPage.class)
.pathMapping(pathMapping);
}
// 排除mybatis-plus的分页参数
/**
* tokenAuthorization
*/
private List<SecurityScheme> securitySchemes()
{
List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
return apiKeyList;
}
/**
*
*/
private List<SecurityContext> securityContexts()
{
List<SecurityContext> securityContexts = new ArrayList<>();
securityContexts.add(
SecurityContext.builder()
.securityReferences(defaultAuth())
.operationSelector(o -> o.requestMappingPattern().matches("/.*"))
.build());
return securityContexts;
}
/**
*
*/
private List<SecurityReference> defaultAuth()
{
AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
List<SecurityReference> securityReferences = new ArrayList<>();
securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
return securityReferences;
}
/**
*
*/
private ApiInfo apiInfo()
{
private ApiInfo apiInfo() {
// 用ApiInfoBuilder进行定制
return new ApiInfoBuilder()
// 设置标题
.title("标题:若依管理系统_接口文档")
.title("木渎管理系统_接口文档")
// 描述
.description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
.description("描述:用于木渎管理系统")
// 作者信息
.contact(new Contact(ruoyiConfig.getName(), null, null))
// 版本

@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.zhiyuanzhe.domain.BActivity;
import com.ruoyi.zhiyuanzhe.service.IBActivityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -25,24 +27,23 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* Controller
*
*
* @author ruoyi
* @date 2023-09-18
*/
@RestController
@RequestMapping("/system/activity")
public class BActivityController extends BaseController
{
@Api(tags = "活动管理")
@RequestMapping("/zhiyuanzhe/activity")
public class BActivityController extends BaseController {
@Autowired
private IBActivityService bActivityService;
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:activity:list')")
@GetMapping("/list")
public TableDataInfo list(BActivity bActivity)
{
@ApiOperation(value = "查询活动管理列表")
public TableDataInfo list(BActivity bActivity) {
startPage();
List<BActivity> list = bActivityService.selectBActivityList(bActivity);
return getDataTable(list);
@ -51,11 +52,9 @@ public class BActivityController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:activity:export')")
@Log(title = "活动管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BActivity bActivity)
{
@ApiOperation(value = "导出活动管理列表")
public void export(HttpServletResponse response, BActivity bActivity) {
List<BActivity> list = bActivityService.selectBActivityList(bActivity);
ExcelUtil<BActivity> util = new ExcelUtil<BActivity>(BActivity.class);
util.exportExcel(response, list, "活动管理数据");
@ -64,43 +63,36 @@ public class BActivityController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:activity:query')")
@ApiOperation(value = "获取活动管理详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bActivityService.selectBActivityById(id));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:activity:add')")
@Log(title = "活动管理", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增活动管理")
@PostMapping
public AjaxResult add(@RequestBody BActivity bActivity)
{
public AjaxResult add(@RequestBody BActivity bActivity) {
return toAjax(bActivityService.insertBActivity(bActivity));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:activity:edit')")
@Log(title = "活动管理", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改活动管理")
@PutMapping
public AjaxResult edit(@RequestBody BActivity bActivity)
{
public AjaxResult edit(@RequestBody BActivity bActivity) {
return toAjax(bActivityService.updateBActivity(bActivity));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:activity:remove')")
@Log(title = "活动管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
@ApiOperation(value = "删除活动管理")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bActivityService.deleteBActivityByIds(ids));
}
}

@ -4,7 +4,11 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.zhiyuanzhe.domain.BActivityPoints;
import com.ruoyi.zhiyuanzhe.domain.request.BActivityPointsRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BActivityPointsPageresponse;
import com.ruoyi.zhiyuanzhe.service.IBActivityPointsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -29,8 +33,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
* @author ruoyi
* @date 2023-09-19
*/
@Api(tags = "活动积分")
@RestController
@RequestMapping("/system/points")
@RequestMapping("/zhiyuanzhe/points")
public class BActivityPointsController extends BaseController
{
@Autowired
@ -39,7 +44,6 @@ public class BActivityPointsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:points:list')")
@GetMapping("/list")
public TableDataInfo list(BActivityPoints bActivityPoints)
{
@ -51,8 +55,7 @@ public class BActivityPointsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:points:export')")
@Log(title = "活动积分", businessType = BusinessType.EXPORT)
@ApiOperation(value = "导出活动积分列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BActivityPoints bActivityPoints)
{
@ -64,7 +67,7 @@ public class BActivityPointsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:points:query')")
@ApiOperation(value = "获取活动积分详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@ -74,8 +77,8 @@ public class BActivityPointsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:points:add')")
@Log(title = "活动积分", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增活动积分")
@PostMapping
public AjaxResult add(@RequestBody BActivityPoints bActivityPoints)
{
@ -85,8 +88,7 @@ public class BActivityPointsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:points:edit')")
@Log(title = "活动积分", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改活动积分")
@PutMapping
public AjaxResult edit(@RequestBody BActivityPoints bActivityPoints)
{
@ -96,11 +98,24 @@ public class BActivityPointsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:points:remove')")
@Log(title = "活动积分", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除活动积分")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(bActivityPointsService.deleteBActivityPointsByIds(ids));
}
/**
*
*/
@ApiOperation(value = "分页查询活动积分列表",response = BActivityPointsPageresponse.class)
@GetMapping("/selectall")
public AjaxResult selectAll(BActivityPointsRequest req)
{
return AjaxResult.success(bActivityPointsService.page(req));
}
}

@ -1,61 +1,67 @@
package com.ruoyi.zhiyuanzhe.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.zhiyuanzhe.domain.BCertificates;
import com.ruoyi.zhiyuanzhe.domain.request.BCertificatesRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BCertificatesResponse;
import com.ruoyi.zhiyuanzhe.service.IBCertificatesService;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
/**
* Controller
*
*
* @author ruoyi
* @date 2023-09-19
*/
@RestController
@RequestMapping("/system/certificates")
public class BCertificatesController extends BaseController
{
@Api(tags = "证书管理")
@RequestMapping("/zhiyuanzhe/certificates")
public class BCertificatesController extends BaseController {
@Autowired
private IBCertificatesService bCertificatesService;
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:certificates:list')")
@ApiOperation(value = "查询证书管理列表")
@GetMapping("/list")
public TableDataInfo list(BCertificates bCertificates)
{
public TableDataInfo list(BCertificates bCertificates) {
startPage();
List<BCertificates> list = bCertificatesService.selectBCertificatesList(bCertificates);
return getDataTable(list);
}
/**
*
*/
@ApiOperation(value = "根据分页条件查询一次性活动证书发放管理列表", response = BCertificatesResponse.class)
@GetMapping("/sellectall")
public AjaxResult selectAll(@Valid BCertificatesRequest req) {
return AjaxResult.success(bCertificatesService.page(req));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:certificates:export')")
@Log(title = "证书管理", businessType = BusinessType.EXPORT)
@ApiOperation(value = "导出证书管理列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BCertificates bCertificates)
{
public void export(HttpServletResponse response, BCertificates bCertificates) {
List<BCertificates> list = bCertificatesService.selectBCertificatesList(bCertificates);
ExcelUtil<BCertificates> util = new ExcelUtil<BCertificates>(BCertificates.class);
util.exportExcel(response, list, "证书管理数据");
@ -64,43 +70,36 @@ public class BCertificatesController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:certificates:query')")
@ApiOperation(value = "获取证书管理详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bCertificatesService.selectBCertificatesById(id));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:certificates:add')")
@Log(title = "证书管理", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增证书管理")
@PostMapping
public AjaxResult add(@RequestBody BCertificates bCertificates)
{
public AjaxResult add(@RequestBody BCertificates bCertificates) {
return toAjax(bCertificatesService.insertBCertificates(bCertificates));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:certificates:edit')")
@Log(title = "证书管理", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改证书管理")
@PutMapping
public AjaxResult edit(@RequestBody BCertificates bCertificates)
{
public AjaxResult edit(@RequestBody BCertificates bCertificates) {
return toAjax(bCertificatesService.updateBCertificates(bCertificates));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:certificates:remove')")
@Log(title = "证书管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
@ApiOperation(value = "删除证书管理")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bCertificatesService.deleteBCertificatesByIds(ids));
}
}

@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.zhiyuanzhe.domain.BCheckRecords;
import com.ruoyi.zhiyuanzhe.service.IBCheckRecordsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -30,7 +32,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
* @date 2023-09-19
*/
@RestController
@RequestMapping("/system/checkrecords")
@Api(tags = "物流记录")
@RequestMapping("/zhiyuanzhe/checkrecords")
public class BCheckRecordsController extends BaseController
{
@Autowired
@ -39,7 +42,7 @@ public class BCheckRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:list')")
@ApiOperation(value = "查询物流记录列表")
@GetMapping("/list")
public TableDataInfo list(BCheckRecords bCheckRecords)
{
@ -51,8 +54,7 @@ public class BCheckRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:export')")
@Log(title = "物流记录", businessType = BusinessType.EXPORT)
@ApiOperation(value = "导出物流记录列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BCheckRecords bCheckRecords)
{
@ -64,7 +66,7 @@ public class BCheckRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:query')")
@ApiOperation(value = "获取物流记录详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@ -74,8 +76,8 @@ public class BCheckRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:add')")
@Log(title = "物流记录", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增物流记录")
@PostMapping
public AjaxResult add(@RequestBody BCheckRecords bCheckRecords)
{
@ -85,8 +87,7 @@ public class BCheckRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:edit')")
@Log(title = "物流记录", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改物流记录")
@PutMapping
public AjaxResult edit(@RequestBody BCheckRecords bCheckRecords)
{
@ -96,8 +97,7 @@ public class BCheckRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:remove')")
@Log(title = "物流记录", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除物流记录")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{

@ -1,48 +1,40 @@
package com.ruoyi.zhiyuanzhe.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.zhiyuanzhe.domain.BDistributionRecords;
import com.ruoyi.zhiyuanzhe.domain.request.SubmitRequest;
import com.ruoyi.zhiyuanzhe.service.IBDistributionRecordsService;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
/**
* Controller
*
*
* @author ruoyi
* @date 2023-09-19
*/
@RestController
@RequestMapping("/system/dsbrecords")
public class BDistributionRecordsController extends BaseController
{
@Api(tags = "发放记录")
@RequestMapping("/zhiyuanzhe/dsbrecords")
public class BDistributionRecordsController extends BaseController {
@Autowired
private IBDistributionRecordsService bDistributionRecordsService;
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:list')")
@ApiModelProperty(value = "查询发放记录列表")
@GetMapping("/list")
public TableDataInfo list(BDistributionRecords bDistributionRecords)
{
public TableDataInfo list(BDistributionRecords bDistributionRecords) {
startPage();
List<BDistributionRecords> list = bDistributionRecordsService.selectBDistributionRecordsList(bDistributionRecords);
return getDataTable(list);
@ -51,11 +43,9 @@ public class BDistributionRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:export')")
@Log(title = "发放记录", businessType = BusinessType.EXPORT)
@ApiModelProperty(value = "导出发放记录列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BDistributionRecords bDistributionRecords)
{
public void export(HttpServletResponse response, BDistributionRecords bDistributionRecords) {
List<BDistributionRecords> list = bDistributionRecordsService.selectBDistributionRecordsList(bDistributionRecords);
ExcelUtil<BDistributionRecords> util = new ExcelUtil<BDistributionRecords>(BDistributionRecords.class);
util.exportExcel(response, list, "发放记录数据");
@ -64,43 +54,47 @@ public class BDistributionRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:query')")
@ApiModelProperty(value = "获取发放记录详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bDistributionRecordsService.selectBDistributionRecordsById(id));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:add')")
@Log(title = "发放记录", businessType = BusinessType.INSERT)
@ApiModelProperty(value = "新增发放记录")
@PostMapping
public AjaxResult add(@RequestBody BDistributionRecords bDistributionRecords)
{
public AjaxResult add(@RequestBody BDistributionRecords bDistributionRecords) {
return toAjax(bDistributionRecordsService.insertBDistributionRecords(bDistributionRecords));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:edit')")
@Log(title = "发放记录", businessType = BusinessType.UPDATE)
@ApiModelProperty(value = "修改发放记录")
@PutMapping
public AjaxResult edit(@RequestBody BDistributionRecords bDistributionRecords)
{
public AjaxResult edit(@RequestBody BDistributionRecords bDistributionRecords) {
return toAjax(bDistributionRecordsService.updateBDistributionRecords(bDistributionRecords));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:remove')")
@Log(title = "发放记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
@ApiModelProperty(value = "删除发放记录")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bDistributionRecordsService.deleteBDistributionRecordsByIds(ids));
}
/**
*
*/
@ApiModelProperty(value = "证书发放")
@PostMapping("/submit")
public AjaxResult submit(@RequestBody SubmitRequest req) {
return AjaxResult.success(bDistributionRecordsService.submit(req));
}
}

@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.zhiyuanzhe.domain.BExchangeRecords;
import com.ruoyi.zhiyuanzhe.service.IBExchangeRecordsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -25,24 +27,24 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* Controller
*
*
* @author ruoyi
* @date 2023-09-19
*/
@Api(tags = "兑换记录")
@RestController
@RequestMapping("/system/records")
public class BExchangeRecordsController extends BaseController
{
@RequestMapping("/zhiyuanzhe/records")
public class BExchangeRecordsController extends BaseController {
@Autowired
private IBExchangeRecordsService bExchangeRecordsService;
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:list')")
@ApiModelProperty(value = "查询兑换记录列表")
@GetMapping("/list")
public TableDataInfo list(BExchangeRecords bExchangeRecords)
{
public TableDataInfo list(BExchangeRecords bExchangeRecords) {
startPage();
List<BExchangeRecords> list = bExchangeRecordsService.selectBExchangeRecordsList(bExchangeRecords);
return getDataTable(list);
@ -51,11 +53,9 @@ public class BExchangeRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:export')")
@Log(title = "兑换记录", businessType = BusinessType.EXPORT)
@ApiModelProperty(value = "导出兑换记录列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BExchangeRecords bExchangeRecords)
{
public void export(HttpServletResponse response, BExchangeRecords bExchangeRecords) {
List<BExchangeRecords> list = bExchangeRecordsService.selectBExchangeRecordsList(bExchangeRecords);
ExcelUtil<BExchangeRecords> util = new ExcelUtil<BExchangeRecords>(BExchangeRecords.class);
util.exportExcel(response, list, "兑换记录数据");
@ -64,43 +64,36 @@ public class BExchangeRecordsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:query')")
@ApiModelProperty(value = "获取兑换记录详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bExchangeRecordsService.selectBExchangeRecordsById(id));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:add')")
@Log(title = "兑换记录", businessType = BusinessType.INSERT)
@ApiModelProperty(value = "新增兑换记录")
@PostMapping
public AjaxResult add(@RequestBody BExchangeRecords bExchangeRecords)
{
public AjaxResult add(@RequestBody BExchangeRecords bExchangeRecords) {
return toAjax(bExchangeRecordsService.insertBExchangeRecords(bExchangeRecords));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:edit')")
@Log(title = "兑换记录", businessType = BusinessType.UPDATE)
@ApiModelProperty(value = "修改兑换记录")
@PutMapping
public AjaxResult edit(@RequestBody BExchangeRecords bExchangeRecords)
{
public AjaxResult edit(@RequestBody BExchangeRecords bExchangeRecords) {
return toAjax(bExchangeRecordsService.updateBExchangeRecords(bExchangeRecords));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:records:remove')")
@Log(title = "兑换记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
@ApiModelProperty(value = "删除兑换记录")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bExchangeRecordsService.deleteBExchangeRecordsByIds(ids));
}
}

@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.zhiyuanzhe.domain.BInvite;
import com.ruoyi.zhiyuanzhe.service.IBInviteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -30,7 +32,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
* @date 2023-09-19
*/
@RestController
@RequestMapping("/system/invite")
@Api(tags = "邀请")
@RequestMapping("/zhiyuanzhe/invite")
public class BInviteController extends BaseController
{
@Autowired
@ -39,7 +42,7 @@ public class BInviteController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:invite:list')")
@ApiModelProperty(value = "查询邀请列表")
@GetMapping("/list")
public TableDataInfo list(BInvite bInvite)
{
@ -51,8 +54,7 @@ public class BInviteController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:invite:export')")
@Log(title = "邀请", businessType = BusinessType.EXPORT)
@ApiModelProperty(value = "导出邀请列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BInvite bInvite)
{
@ -64,7 +66,7 @@ public class BInviteController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:invite:query')")
@ApiModelProperty(value = "获取邀请详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@ -74,8 +76,7 @@ public class BInviteController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:invite:add')")
@Log(title = "邀请", businessType = BusinessType.INSERT)
@ApiModelProperty(value = "新增邀请")
@PostMapping
public AjaxResult add(@RequestBody BInvite bInvite)
{
@ -85,8 +86,7 @@ public class BInviteController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:invite:edit')")
@Log(title = "邀请", businessType = BusinessType.UPDATE)
@ApiModelProperty(value = "修改邀请")
@PutMapping
public AjaxResult edit(@RequestBody BInvite bInvite)
{
@ -96,8 +96,7 @@ public class BInviteController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:invite:remove')")
@Log(title = "邀请", businessType = BusinessType.DELETE)
@ApiModelProperty(value = "删除邀请")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{

@ -3,8 +3,11 @@ package com.ruoyi.zhiyuanzhe.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.zhiyuanzhe.domain.BPersonTags;
import com.ruoyi.zhiyuanzhe.service.IBPersonTagsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -29,8 +32,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
* @author ruoyi
* @date 2023-09-18
*/
@Api(tags = "人标签")
@RestController
@RequestMapping("/system/tags")
@RequestMapping("/zhiyuanzhe/tags")
public class BPersonTagsController extends BaseController
{
@Autowired
@ -39,11 +43,18 @@ public class BPersonTagsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:tags:list')")
@ApiModelProperty(value = "查询人标签列表")
@GetMapping("/list")
public TableDataInfo list(BPersonTags bPersonTags)
{
startPage();
/** 获得colors **/
String[] ages = new String[0];
if(bPersonTags.getAgeRange() != null && bPersonTags.getAgeRange() != "") {
ages = Convert.toStrArray(bPersonTags.getAgeRange());
}
bPersonTags.setAges(ages);
List<BPersonTags> list = bPersonTagsService.selectBPersonTagsList(bPersonTags);
return getDataTable(list);
}
@ -51,8 +62,7 @@ public class BPersonTagsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:tags:export')")
@Log(title = "人标签", businessType = BusinessType.EXPORT)
@ApiModelProperty(value = "导出人标签列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BPersonTags bPersonTags)
{
@ -64,7 +74,7 @@ public class BPersonTagsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:tags:query')")
@ApiModelProperty(value = "获取人标签详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@ -74,8 +84,7 @@ public class BPersonTagsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:tags:add')")
@Log(title = "人标签", businessType = BusinessType.INSERT)
@ApiModelProperty(value = "新增人标签")
@PostMapping
public AjaxResult add(@RequestBody BPersonTags bPersonTags)
{
@ -85,8 +94,7 @@ public class BPersonTagsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:tags:edit')")
@Log(title = "人标签", businessType = BusinessType.UPDATE)
@ApiModelProperty(value = "修改人标签")
@PutMapping
public AjaxResult edit(@RequestBody BPersonTags bPersonTags)
{
@ -96,8 +104,7 @@ public class BPersonTagsController extends BaseController
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:tags:remove')")
@Log(title = "人标签", businessType = BusinessType.DELETE)
@ApiModelProperty(value = "删除人标签")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{

@ -0,0 +1,91 @@
package com.ruoyi.zhiyuanzhe.controller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.zhiyuanzhe.domain.BReport;
import com.ruoyi.zhiyuanzhe.domain.request.BReportPageRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BReportPageResponse;
import com.ruoyi.zhiyuanzhe.service.IBReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* Controller
*
* @author ruoyi
* @date 2023-09-21
*/
@Api(tags = "报名")
@RestController
@RequestMapping("/zhiyuanzhe/zyzreport")
public class BReportController extends BaseController {
@Autowired
private IBReportService bReportService;
/**
*
*/
@ApiOperation(value = "分页查询查询报名列表",response = BReportPageResponse.class)
@GetMapping("/list")
public TableDataInfo list(BReportPageRequest req) {
startPage();
List<BReportPageResponse> list = bReportService.selecAll(req);
return getDataTable(list);
}
/**
*
*/
@ApiOperation(value = "导出报名列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BReport bReport) {
List<BReport> list = bReportService.selectBReportList(bReport);
ExcelUtil<BReport> util = new ExcelUtil<BReport>(BReport.class);
util.exportExcel(response, list, "报名数据");
}
/**
*
*/
@ApiOperation(value = "获取报名详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bReportService.selectBReportById(id));
}
/**
*
*/
@ApiOperation(value = "新增报名")
@PostMapping
public AjaxResult add(@RequestBody BReport bReport) {
bReport.setUId(getUserId());
return toAjax(bReportService.insertBReport(bReport));
}
/**
*
*/
@ApiOperation(value = "修改报名")
@PutMapping
public AjaxResult edit(@RequestBody BReport bReport) {
return toAjax(bReportService.updateBReport(bReport));
}
/**
*
*/
@ApiOperation(value = "删除报名")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bReportService.deleteBReportByIds(ids));
}
}

@ -1,311 +1,183 @@
package com.ruoyi.zhiyuanzhe.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* b_activity
*
*
* @author ruoyi
* @date 2023-09-18
*/
public class BActivity extends BaseEntity
{
@Data
@ApiModel("活动管理对象")
public class BActivity extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 编号 */
/**
*
*/
private Long id;
/** 活动名称 */
/**
*
*/
@ApiModelProperty(value = "活动名称")
@Excel(name = "活动名称")
private String name;
/** 活动内容 */
/**
*
*/
@ApiModelProperty(value = "活动内容")
@Excel(name = "活动内容")
private String content;
/** 活动举办方 */
/**
*
*/
@ApiModelProperty(value = "活动举办方")
@Excel(name = "活动举办方")
private String publisher;
/** 活动时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "活动时间", width = 30, dateFormat = "yyyy-MM-dd")
/**
*
*/
@ApiModelProperty(value = "活动时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "活动时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date activityTime;
/** 活动地址 */
/**
*
*/
@ApiModelProperty(value = "活动地址")
@Excel(name = "活动地址")
private String address;
/** 年龄 */
/**
*
*/
@ApiModelProperty(value = "年龄")
@Excel(name = "年龄")
private String ageRange;
/** 小区 */
/**
*
*/
@ApiModelProperty(value = "小区")
@Excel(name = "小区")
private String housingRange;
/** 文化程度 */
/**
*
*/
@ApiModelProperty(value = "文化程度")
@Excel(name = "文化程度")
private String educationRange;
/** 兴趣爱好 */
/**
*
*/
@ApiModelProperty(value = "兴趣爱好")
@Excel(name = "兴趣爱好")
private String interestRange;
/** 政治面貌 */
/**
*
*/
@ApiModelProperty(value = "政治面貌")
@Excel(name = "政治面貌")
private String politicalRange;
/** 性别 */
/**
*
*/
@ApiModelProperty(value = "性别")
@Excel(name = "性别")
private String sexRange;
/** 国籍 */
/**
*
*/
@Excel(name = "国籍")
@ApiModelProperty(value = "国籍")
private String nationalityRange;
/** 专业类型 */
/**
*
*/
@Excel(name = "专业类型")
@ApiModelProperty(value = "专业类型")
private String professionalRange;
/** 行业类型 */
/**
*
*/
@Excel(name = "行业类型")
@ApiModelProperty(value = "行业类型")
private String industryRange;
/** 院校 */
/**
*
*/
@Excel(name = "院校")
@ApiModelProperty(value = "院校")
private String schoolRange;
/** 创建者ID */
/**
*
*/
@ApiModelProperty(value = "截至时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "截至时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
* 12
*/
@ApiModelProperty(value = "活动状态1进行中2停止")
@Excel(name = " 活动状态1进行中2停止")
private Integer status;
/**
* 12
*/
@TableField(exist = false)
@ApiModelProperty(value = " 参与状态1已参与2未参与")
private Integer involveStaus;
/**
* ID
*/
@Excel(name = "创建者ID")
private Long createId;
/** 更新者ID */
/**
* ID
*/
@Excel(name = "更新者ID")
private Long updateId;
/** 用户权限id */
/**
* id
*/
@Excel(name = "用户权限id")
private Long userId;
/** 部门权限id */
/**
* id
*/
@Excel(name = "部门权限id")
private Long deptId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setContent(String content)
{
this.content = content;
}
public String getContent()
{
return content;
}
public void setPublisher(String publisher)
{
this.publisher = publisher;
}
public String getPublisher()
{
return publisher;
}
public void setActivityTime(Date activityTime)
{
this.activityTime = activityTime;
}
public Date getActivityTime()
{
return activityTime;
}
public void setAddress(String address)
{
this.address = address;
}
public String getAddress()
{
return address;
}
public void setAgeRange(String ageRange)
{
this.ageRange = ageRange;
}
public String getAgeRange()
{
return ageRange;
}
public void setHousingRange(String housingRange)
{
this.housingRange = housingRange;
}
public String getHousingRange()
{
return housingRange;
}
public void setEducationRange(String educationRange)
{
this.educationRange = educationRange;
}
public String getEducationRange()
{
return educationRange;
}
public void setInterestRange(String interestRange)
{
this.interestRange = interestRange;
}
public String getInterestRange()
{
return interestRange;
}
public void setPoliticalRange(String politicalRange)
{
this.politicalRange = politicalRange;
}
public String getPoliticalRange()
{
return politicalRange;
}
public void setSexRange(String sexRange)
{
this.sexRange = sexRange;
}
public String getSexRange()
{
return sexRange;
}
public void setNationalityRange(String nationalityRange)
{
this.nationalityRange = nationalityRange;
}
public String getNationalityRange()
{
return nationalityRange;
}
public void setProfessionalRange(String professionalRange)
{
this.professionalRange = professionalRange;
}
public String getProfessionalRange()
{
return professionalRange;
}
public void setIndustryRange(String industryRange)
{
this.industryRange = industryRange;
}
public String getIndustryRange()
{
return industryRange;
}
public void setSchoolRange(String schoolRange)
{
this.schoolRange = schoolRange;
}
public String getSchoolRange()
{
return schoolRange;
}
public void setCreateId(Long createId)
{
this.createId = createId;
}
public Long getCreateId()
{
return createId;
}
public void setUpdateId(Long updateId)
{
this.updateId = updateId;
}
public Long getUpdateId()
{
return updateId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("content", getContent())
.append("publisher", getPublisher())
.append("activityTime", getActivityTime())
.append("address", getAddress())
.append("ageRange", getAgeRange())
.append("housingRange", getHousingRange())
.append("educationRange", getEducationRange())
.append("interestRange", getInterestRange())
.append("politicalRange", getPoliticalRange())
.append("sexRange", getSexRange())
.append("nationalityRange", getNationalityRange())
.append("professionalRange", getProfessionalRange())
.append("industryRange", getIndustryRange())
.append("schoolRange", getSchoolRange())
.append("createId", getCreateId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateId", getUpdateId())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("userId", getUserId())
.append("deptId", getDeptId())
.toString();
}
}

@ -1,5 +1,8 @@
package com.ruoyi.zhiyuanzhe.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@ -11,6 +14,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2023-09-19
*/
@Data
@ApiModel("活动积分对象")
public class BActivityPoints extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -19,14 +24,17 @@ public class BActivityPoints extends BaseEntity
private Long id;
/** 活动id */
@ApiModelProperty(value = "活动id")
@Excel(name = "活动id")
private Long activityId;
/** 用户id */
@ApiModelProperty(value = "用户id")
@Excel(name = "用户id")
private Long uId;
/** 积分 */
@ApiModelProperty(value = "积分")
@Excel(name = "积分")
private String points;
@ -46,95 +54,4 @@ public class BActivityPoints extends BaseEntity
@Excel(name = "部门权限id")
private Long deptId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setActivityId(Long activityId)
{
this.activityId = activityId;
}
public Long getActivityId()
{
return activityId;
}
public void setuId(Long uId)
{
this.uId = uId;
}
public Long getuId()
{
return uId;
}
public void setPoints(String points)
{
this.points = points;
}
public String getPoints()
{
return points;
}
public void setCreateId(Long createId)
{
this.createId = createId;
}
public Long getCreateId()
{
return createId;
}
public void setUpdateId(Long updateId)
{
this.updateId = updateId;
}
public Long getUpdateId()
{
return updateId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("activityId", getActivityId())
.append("uId", getuId())
.append("points", getPoints())
.append("createId", getCreateId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateId", getUpdateId())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("userId", getUserId())
.append("deptId", getDeptId())
.toString();
}
}

@ -1,7 +1,11 @@
package com.ruoyi.zhiyuanzhe.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@ -9,177 +13,85 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* b_certificates
*
*
* @author ruoyi
* @date 2023-09-19
*/
public class BCertificates extends BaseEntity
{
@Data
@ApiModel("证书管理对象")
public class BCertificates extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 编号 */
/**
*
*/
private Long id;
/** 证书名称 */
/**
*
*/
@ApiModelProperty(value = "证书名称")
@Excel(name = "证书名称")
private String name;
/** 证书类型0个性化证书 0一次性证书 */
@Excel(name = "证书类型", readConverterExp = "0=个性化证书,0=一次性证书")
/**
* 0=,1=
*/
@ApiModelProperty(value = "证书类型,0=个性化证书,1=一次性证书")
@Excel(name = "证书类型", readConverterExp = "0=个性化证书,1=一次性证书")
private String type;
/** 证书封面 */
/**
*
*/
@ApiModelProperty(value = "证书封面")
@Excel(name = "证书封面")
private String cover;
/** 证书内容 */
/**
*
*/
@ApiModelProperty(value = "证书内容")
@Excel(name = "证书内容")
private String content;
/** 证书时间 */
/**
*
*/
@ApiModelProperty(value = "证书时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "证书时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date datetime;
/** 服务时长 */
/**
*
*/
@ApiModelProperty(value = "服务时长")
@Excel(name = "服务时长")
private Long serviceDuration;
/** 创建者ID */
/**
* ID
*/
@Excel(name = "创建者ID")
private Long createId;
/** 更新者ID */
/**
* ID
*/
@Excel(name = "更新者ID")
private Long updateId;
/** 用户权限id */
/**
* id
*/
@Excel(name = "用户权限id")
private Long userId;
/** 部门权限id */
/**
* id
*/
@Excel(name = "部门权限id")
private Long deptId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setType(String type)
{
this.type = type;
}
public String getType()
{
return type;
}
public void setCover(String cover)
{
this.cover = cover;
}
public String getCover()
{
return cover;
}
public void setContent(String content)
{
this.content = content;
}
public String getContent()
{
return content;
}
public void setDatetime(Date datetime)
{
this.datetime = datetime;
}
public Date getDatetime()
{
return datetime;
}
public void setServiceDuration(Long serviceDuration)
{
this.serviceDuration = serviceDuration;
}
public Long getServiceDuration()
{
return serviceDuration;
}
public void setCreateId(Long createId)
{
this.createId = createId;
}
public Long getCreateId()
{
return createId;
}
public void setUpdateId(Long updateId)
{
this.updateId = updateId;
}
public Long getUpdateId()
{
return updateId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("type", getType())
.append("cover", getCover())
.append("content", getContent())
.append("datetime", getDatetime())
.append("serviceDuration", getServiceDuration())
.append("createId", getCreateId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateId", getUpdateId())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("userId", getUserId())
.append("deptId", getDeptId())
.toString();
}
}

@ -1,5 +1,8 @@
package com.ruoyi.zhiyuanzhe.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@ -11,6 +14,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2023-09-19
*/
@Data
@ApiModel("物流记录对象")
public class BCheckRecords extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -19,18 +24,22 @@ public class BCheckRecords extends BaseEntity
private Long id;
/** 证书id */
@ApiModelProperty(value = "证书id")
@Excel(name = "证书id")
private Long certificateId;
/** 收件人 */
@ApiModelProperty(value = "收件人")
@Excel(name = "收件人")
private String recipient;
/** 收件地址 */
@ApiModelProperty(value = "收件地址")
@Excel(name = "收件地址")
private String shippingAddress;
/** 收件电话 */
@ApiModelProperty(value = "收件电话")
@Excel(name = "收件电话")
private String receivingPhone;
@ -50,105 +59,4 @@ public class BCheckRecords extends BaseEntity
@Excel(name = "部门权限id")
private Long deptId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setCertificateId(Long certificateId)
{
this.certificateId = certificateId;
}
public Long getCertificateId()
{
return certificateId;
}
public void setRecipient(String recipient)
{
this.recipient = recipient;
}
public String getRecipient()
{
return recipient;
}
public void setShippingAddress(String shippingAddress)
{
this.shippingAddress = shippingAddress;
}
public String getShippingAddress()
{
return shippingAddress;
}
public void setReceivingPhone(String receivingPhone)
{
this.receivingPhone = receivingPhone;
}
public String getReceivingPhone()
{
return receivingPhone;
}
public void setCreateId(Long createId)
{
this.createId = createId;
}
public Long getCreateId()
{
return createId;
}
public void setUpdateId(Long updateId)
{
this.updateId = updateId;
}
public Long getUpdateId()
{
return updateId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("certificateId", getCertificateId())
.append("recipient", getRecipient())
.append("shippingAddress", getShippingAddress())
.append("receivingPhone", getReceivingPhone())
.append("createId", getCreateId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateId", getUpdateId())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("userId", getUserId())
.append("deptId", getDeptId())
.toString();
}
}

@ -1,154 +1,92 @@
package com.ruoyi.zhiyuanzhe.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* b_distribution_records
*
*
* @author ruoyi
* @date 2023-09-19
*/
public class BDistributionRecords extends BaseEntity
{
@Data
@ApiModel("发放记录对象")
public class BDistributionRecords extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 编号 */
/**
*
*/
private Long id;
/** 活动id */
/**
* id
*/
@Excel(name = "活动id")
@ApiModelProperty(value = "活动id")
private Long activityId;
/** 证书id */
/**
* id
*/
@Excel(name = "证书id")
@ApiModelProperty(value = "证书id")
private Long certificateId;
/** 用户id */
/**
* id
*/
@ApiModelProperty(value = "用户id")
@Excel(name = "用户id")
private Long uId;
/** 证书内容 */
@Excel(name = "证书内容")
/**
*
*/
@ApiModelProperty(value = "物流信息")
@Excel(name = "物流信息")
private String content;
/** 创建者ID */
/**
* 1:2
*/
@ApiModelProperty(value = "1:已发放2未发放")
@Excel(name = "1:已发放2未发放")
private Integer type;
/**
* 1:,2
*/
@ApiModelProperty(value = "1:一次性证书发放,2个性化证书发放")
@Excel(name = "1:一次性证书发放,2个性化证书发放")
private Integer creType;
/**
* ID
*/
@Excel(name = "创建者ID")
private Long createId;
/** 更新者ID */
/**
* ID
*/
@Excel(name = "更新者ID")
private Long updateId;
/** 用户权限id */
/**
* id
*/
@Excel(name = "用户权限id")
private Long userId;
/** 部门权限id */
/**
* id
*/
@Excel(name = "部门权限id")
private Long deptId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setActivityId(Long activityId)
{
this.activityId = activityId;
}
public Long getActivityId()
{
return activityId;
}
public void setCertificateId(Long certificateId)
{
this.certificateId = certificateId;
}
public Long getCertificateId()
{
return certificateId;
}
public void setuId(Long uId)
{
this.uId = uId;
}
public Long getuId()
{
return uId;
}
public void setContent(String content)
{
this.content = content;
}
public String getContent()
{
return content;
}
public void setCreateId(Long createId)
{
this.createId = createId;
}
public Long getCreateId()
{
return createId;
}
public void setUpdateId(Long updateId)
{
this.updateId = updateId;
}
public Long getUpdateId()
{
return updateId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("activityId", getActivityId())
.append("certificateId", getCertificateId())
.append("uId", getuId())
.append("content", getContent())
.append("createId", getCreateId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateId", getUpdateId())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("userId", getUserId())
.append("deptId", getDeptId())
.toString();
}
}

@ -1,5 +1,8 @@
package com.ruoyi.zhiyuanzhe.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@ -11,6 +14,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2023-09-19
*/
@Data
@ApiModel("兑换记录对象")
public class BExchangeRecords extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -19,14 +24,17 @@ public class BExchangeRecords extends BaseEntity
private Long id;
/** 活动id */
@ApiModelProperty(value = "活动id")
@Excel(name = "活动id")
private Long activityId;
/** 证书id */
@ApiModelProperty(value = "证书id")
@Excel(name = "证书id")
private Long certificateId;
/** 用户id */
@ApiModelProperty(value = "用户id")
@Excel(name = "用户id")
private Long uId;
@ -46,95 +54,5 @@ public class BExchangeRecords extends BaseEntity
@Excel(name = "部门权限id")
private Long deptId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setActivityId(Long activityId)
{
this.activityId = activityId;
}
public Long getActivityId()
{
return activityId;
}
public void setCertificateId(Long certificateId)
{
this.certificateId = certificateId;
}
public Long getCertificateId()
{
return certificateId;
}
public void setuId(Long uId)
{
this.uId = uId;
}
public Long getuId()
{
return uId;
}
public void setCreateId(Long createId)
{
this.createId = createId;
}
public Long getCreateId()
{
return createId;
}
public void setUpdateId(Long updateId)
{
this.updateId = updateId;
}
public Long getUpdateId()
{
return updateId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("activityId", getActivityId())
.append("certificateId", getCertificateId())
.append("uId", getuId())
.append("createId", getCreateId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateId", getUpdateId())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("userId", getUserId())
.append("deptId", getDeptId())
.toString();
}
}

@ -1,5 +1,8 @@
package com.ruoyi.zhiyuanzhe.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@ -11,6 +14,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2023-09-19
*/
@Data
@ApiModel("邀请对象")
public class BInvite extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -19,10 +24,12 @@ public class BInvite extends BaseEntity
private Long id;
/** 用户id */
@ApiModelProperty(value = "用户id")
@Excel(name = "用户id")
private Long uId;
/** 活动id */
@ApiModelProperty(value = "活动id")
@Excel(name = "活动id")
private Long activityId;
@ -42,85 +49,4 @@ public class BInvite extends BaseEntity
@Excel(name = "部门权限id")
private Long deptId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setuId(Long uId)
{
this.uId = uId;
}
public Long getuId()
{
return uId;
}
public void setActivityId(Long activityId)
{
this.activityId = activityId;
}
public Long getActivityId()
{
return activityId;
}
public void setCreateId(Long createId)
{
this.createId = createId;
}
public Long getCreateId()
{
return createId;
}
public void setUpdateId(Long updateId)
{
this.updateId = updateId;
}
public Long getUpdateId()
{
return updateId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("uId", getuId())
.append("activityId", getActivityId())
.append("createId", getCreateId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateId", getUpdateId())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("userId", getUserId())
.append("deptId", getDeptId())
.toString();
}
}

@ -1,252 +1,132 @@
package com.ruoyi.zhiyuanzhe.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* b_person_tags
*
*
* @author ruoyi
* @date 2023-09-18
*/
public class BPersonTags extends BaseEntity
{
@Data
@ApiModel("人标签对象")
public class BPersonTags extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 编号 */
/**
*
*/
private Long id;
/** 用户id */
/**
* id
*/
@ApiModelProperty(value = "用户id")
@Excel(name = "用户id")
private Long uId;
/** 年龄 */
/**
*
*/
@ApiModelProperty(value = "年龄")
@Excel(name = "年龄")
private String ageRange;
/** 小区 */
/**
*
*/
@ApiModelProperty(value = "小区")
@Excel(name = "小区")
private String housingRange;
/** 文化程度 */
/**
*
*/
@ApiModelProperty(value = "文化程度")
@Excel(name = "文化程度")
private String educationRange;
/** 兴趣爱好 */
/**
*
*/
@ApiModelProperty(value = "兴趣爱好")
@Excel(name = "兴趣爱好")
private String interestRange;
/** 政治面貌 */
/**
*
*/
@ApiModelProperty(value = "政治面貌")
@Excel(name = "政治面貌")
private String politicalRange;
/** 性别 */
/**
*
*/
@ApiModelProperty(value = "性别")
@Excel(name = "性别")
private String sexRange;
/** 国籍 */
/**
*
*/
@ApiModelProperty(value = "国籍")
@Excel(name = "国籍")
private String nationalityRange;
/** 专业类型 */
/**
*
*/
@ApiModelProperty(value = "专业类型")
@Excel(name = "专业类型")
private String professionalRange;
/** 行业类型 */
/**
*
*/
@ApiModelProperty(value = "行业类型")
@Excel(name = "行业类型")
private String industryRange;
/** 院校 */
/**
*
*/
@ApiModelProperty(value = "院校")
@Excel(name = "院校")
private String schoolRange;
/** 创建者ID */
/**
* ID
*/
@Excel(name = "创建者ID")
private Long createId;
/** 更新者ID */
/**
* ID
*/
@Excel(name = "更新者ID")
private Long updateId;
/** 用户权限id */
/**
* id
*/
@Excel(name = "用户权限id")
private Long userId;
/** 部门权限id */
/**
* id
*/
@Excel(name = "部门权限id")
private Long deptId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setuId(Long uId)
{
this.uId = uId;
}
public Long getuId()
{
return uId;
}
public void setAgeRange(String ageRange)
{
this.ageRange = ageRange;
}
public String getAgeRange()
{
return ageRange;
}
public void setHousingRange(String housingRange)
{
this.housingRange = housingRange;
}
public String getHousingRange()
{
return housingRange;
}
public void setEducationRange(String educationRange)
{
this.educationRange = educationRange;
}
public String getEducationRange()
{
return educationRange;
}
public void setInterestRange(String interestRange)
{
this.interestRange = interestRange;
}
public String getInterestRange()
{
return interestRange;
}
public void setPoliticalRange(String politicalRange)
{
this.politicalRange = politicalRange;
}
public String getPoliticalRange()
{
return politicalRange;
}
public void setSexRange(String sexRange)
{
this.sexRange = sexRange;
}
public String getSexRange()
{
return sexRange;
}
public void setNationalityRange(String nationalityRange)
{
this.nationalityRange = nationalityRange;
}
public String getNationalityRange()
{
return nationalityRange;
}
public void setProfessionalRange(String professionalRange)
{
this.professionalRange = professionalRange;
}
public String getProfessionalRange()
{
return professionalRange;
}
public void setIndustryRange(String industryRange)
{
this.industryRange = industryRange;
}
public String getIndustryRange()
{
return industryRange;
}
public void setSchoolRange(String schoolRange)
{
this.schoolRange = schoolRange;
}
public String getSchoolRange()
{
return schoolRange;
}
public void setCreateId(Long createId)
{
this.createId = createId;
}
public Long getCreateId()
{
return createId;
}
public void setUpdateId(Long updateId)
{
this.updateId = updateId;
}
public Long getUpdateId()
{
return updateId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("uId", getuId())
.append("ageRange", getAgeRange())
.append("housingRange", getHousingRange())
.append("educationRange", getEducationRange())
.append("interestRange", getInterestRange())
.append("politicalRange", getPoliticalRange())
.append("sexRange", getSexRange())
.append("nationalityRange", getNationalityRange())
.append("professionalRange", getProfessionalRange())
.append("industryRange", getIndustryRange())
.append("schoolRange", getSchoolRange())
.append("createId", getCreateId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateId", getUpdateId())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("userId", getUserId())
.append("deptId", getDeptId())
.toString();
}
/**
*
*/
String[] ages;
}

@ -0,0 +1,60 @@
package com.ruoyi.zhiyuanzhe.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* b_report
*
* @author ruoyi
* @date 2023-09-21
*/
@Data
@ApiModel("报名对象")
public class BReport extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
*
*/
private Long id;
/**
* id
*/
@Excel(name = "用户id")
private Long uId;
/**
* id
*/
@Excel(name = "活动id")
private Long activityId;
/**
* ID
*/
@Excel(name = "创建者ID")
private Long createId;
/**
* ID
*/
@Excel(name = "更新者ID")
private Long updateId;
/**
* id
*/
@Excel(name = "用户权限id")
private Long userId;
/**
* id
*/
@Excel(name = "部门权限id")
private Long deptId;
}

@ -0,0 +1,41 @@
package com.ruoyi.zhiyuanzhe.domain.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
*/
@Data
@ApiModel("分页查询积分获取请求类")
public class BActivityPointsRequest {
/**
* id
*/
@ApiModelProperty("id")
private Long id;
/**
*
*/
@ApiModelProperty("活动名称")
private String name;
/**
* size
*/
@ApiModelProperty("size")
private int pageSize;
/**
* num
*/
@ApiModelProperty("num")
private int pageNum;
}

@ -0,0 +1,33 @@
package com.ruoyi.zhiyuanzhe.domain.request;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
*/
@Data
public class BCertificatesRequest {
/**
*
*/
@ApiModelProperty(value = "活动名称")
private String name;
/**
* size
*/
@ApiModelProperty("size")
private int pageSize;
/**
* num
*/
@ApiModelProperty("num")
private int pageNum;
}

@ -0,0 +1,19 @@
package com.ruoyi.zhiyuanzhe.domain.request;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
*/
@Data
public class BReportPageRequest {
/**
* id
*/
@ApiModelProperty(value = "活动id")
private Long activityId;
}

@ -0,0 +1,28 @@
package com.ruoyi.zhiyuanzhe.domain.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
*/
@Data
@ApiModel("证书发放请求类")
public class SubmitRequest {
/**
* id
*/
@ApiModelProperty(value = "用户id")
private Long uId;
/**
* id
*/
@ApiModelProperty(value = "活动id")
private String activityId;
}

@ -0,0 +1,73 @@
package com.ruoyi.zhiyuanzhe.domain.response;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@ApiModel("分页查询积分获取响应类")
public class BActivityPointsPageresponse {
/**
* id
*/
@ApiModelProperty("id")
private Long id;
/**
*
*/
@ApiModelProperty("活动名称")
private String name;
/**
*
*/
@ApiModelProperty("活动id")
private Integer activityId;
/**
* id
*/
@ApiModelProperty("用户id")
private Long uId;
/**
*
*/
@ApiModelProperty("积分")
private String points;
/**
*
*/
@ApiModelProperty("活动举办方")
private String publisher;
/**
*
*/
@ApiModelProperty(value = "活动时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "活动时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date activityTime;
}

@ -0,0 +1,90 @@
package com.ruoyi.zhiyuanzhe.domain.response;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@ApiModel("一次性活动证书发放管理列表响应类")
public class BCertificatesResponse {
/**
* id
*/
@ApiModelProperty(value = "id")
private Long id;
/**
*
*/
@ApiModelProperty(value = "活动名称")
private String name;
/**
* id
*/
@ApiModelProperty(value = "用户id")
private Long uId;
/**
*
*/
@ApiModelProperty(value = "服务时长")
private Long serviceDuration;
/**
* 1:2
*/
@ApiModelProperty(value = "是否发放1:已发放2未发放")
private Integer type;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "证书时间")
private Date datetime;
/**
* id
*/
@Excel(name = "活动id")
@ApiModelProperty(value = "活动id")
private Long activityId;
/**
* id
*/
@Excel(name = "证书id")
@ApiModelProperty(value = "证书id")
private Long certificateId;
/**
*
*/
@ApiModelProperty(value = "物流信息")
@Excel(name = "物流信息")
private String content;
/**
* 1:,2
*/
@ApiModelProperty(value = "1:一次性证书发放,2个性化证书发放")
private Integer creType;
}

@ -0,0 +1,123 @@
package com.ruoyi.zhiyuanzhe.domain.response;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
*/
@Data
public class BReportPageResponse {
/**
*
*/
private Long id;
/**
* id
*/
@ApiModelProperty(value = "用户id")
@Excel(name = "用户id")
private Long uId;
/**
*
*/
@ApiModelProperty(value = "年龄")
@Excel(name = "年龄")
private String ageRange;
/**
*
*/
@ApiModelProperty(value = "小区")
@Excel(name = "小区")
private String housingRange;
/**
*
*/
@ApiModelProperty(value = "文化程度")
@Excel(name = "文化程度")
private String educationRange;
/**
*
*/
@ApiModelProperty(value = "兴趣爱好")
@Excel(name = "兴趣爱好")
private String interestRange;
/**
*
*/
@ApiModelProperty(value = "政治面貌")
@Excel(name = "政治面貌")
private String politicalRange;
/**
*
*/
@ApiModelProperty(value = "性别")
@Excel(name = "性别")
private String sexRange;
/**
*
*/
@ApiModelProperty(value = "国籍")
@Excel(name = "国籍")
private String nationalityRange;
/**
*
*/
@ApiModelProperty(value = "专业类型")
@Excel(name = "专业类型")
private String professionalRange;
/**
*
*/
@ApiModelProperty(value = "行业类型")
@Excel(name = "行业类型")
private String industryRange;
/**
*
*/
@ApiModelProperty(value = "院校")
@Excel(name = "院校")
private String schoolRange;
/**
* ID
*/
@Excel(name = "创建者ID")
private Long createId;
/**
* ID
*/
@Excel(name = "更新者ID")
private Long updateId;
/**
* id
*/
@Excel(name = "用户权限id")
private Long userId;
/**
* id
*/
@Excel(name = "部门权限id")
private Long deptId;
}

@ -1,21 +1,23 @@
package com.ruoyi.zhiyuanzhe.mapper;
import com.ruoyi.zhiyuanzhe.domain.BActivityPoints;
import com.ruoyi.zhiyuanzhe.domain.request.BActivityPointsRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BActivityPointsPageresponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* Mapper
*
*
* @author ruoyi
* @date 2023-09-19
*/
public interface BActivityPointsMapper
{
public interface BActivityPointsMapper {
/**
*
*
*
* @param id
* @return
*/
@ -23,7 +25,7 @@ public interface BActivityPointsMapper
/**
*
*
*
* @param bActivityPoints
* @return
*/
@ -31,7 +33,7 @@ public interface BActivityPointsMapper
/**
*
*
*
* @param bActivityPoints
* @return
*/
@ -39,7 +41,7 @@ public interface BActivityPointsMapper
/**
*
*
*
* @param bActivityPoints
* @return
*/
@ -47,7 +49,7 @@ public interface BActivityPointsMapper
/**
*
*
*
* @param id
* @return
*/
@ -55,9 +57,18 @@ public interface BActivityPointsMapper
/**
*
*
*
* @param ids
* @return
*/
public int deleteBActivityPointsByIds(Long[] ids);
/**
*
*
* @param req
* @return
*/
List<BActivityPointsPageresponse> page(@Param("req") BActivityPointsRequest req);
}

@ -1,6 +1,10 @@
package com.ruoyi.zhiyuanzhe.mapper;
import com.github.pagehelper.Page;
import com.ruoyi.zhiyuanzhe.domain.BCertificates;
import com.ruoyi.zhiyuanzhe.domain.request.BCertificatesRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BCertificatesResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -60,4 +64,14 @@ public interface BCertificatesMapper
* @return
*/
public int deleteBCertificatesByIds(Long[] ids);
/**
*
*
*
* @return
*/
List<BCertificatesResponse> page( @Param("req") BCertificatesRequest req);
}

@ -1,6 +1,8 @@
package com.ruoyi.zhiyuanzhe.mapper;
import com.ruoyi.zhiyuanzhe.domain.BDistributionRecords;
import com.ruoyi.zhiyuanzhe.domain.request.SubmitRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -60,4 +62,12 @@ public interface BDistributionRecordsMapper
* @return
*/
public int deleteBDistributionRecordsByIds(Long[] ids);
/**
*
*
* @param req
*/
int submit(@Param("req") SubmitRequest req);
}

@ -0,0 +1,74 @@
package com.ruoyi.zhiyuanzhe.mapper;
import java.util.List;
import com.ruoyi.zhiyuanzhe.domain.BReport;
import com.ruoyi.zhiyuanzhe.domain.request.BReportPageRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BReportPageResponse;
import org.apache.ibatis.annotations.Param;
/**
* Mapper
*
* @author ruoyi
* @date 2023-09-21
*/
public interface BReportMapper
{
/**
*
*
* @param id
* @return
*/
public BReport selectBReportById(Long id);
/**
*
*
* @param bReport
* @return
*/
public List<BReport> selectBReportList(BReport bReport);
/**
*
*
* @param bReport
* @return
*/
public int insertBReport(BReport bReport);
/**
*
*
* @param bReport
* @return
*/
public int updateBReport(BReport bReport);
/**
*
*
* @param id
* @return
*/
public int deleteBReportById(Long id);
/**
*
*
* @param ids
* @return
*/
public int deleteBReportByIds(Long[] ids);
/**
*
*
* @param req
* @return
*/
public List<BReportPageResponse> selecAll(@Param("req") BReportPageRequest req);
}

@ -1,8 +1,11 @@
package com.ruoyi.zhiyuanzhe.service;
import com.ruoyi.zhiyuanzhe.domain.BActivityPoints;
import com.ruoyi.zhiyuanzhe.domain.request.BActivityPointsRequest;
import com.ruoyi.zhiyuanzhe.domain.request.BCertificatesRequest;
import java.util.List;
import java.util.Map;
/**
@ -60,4 +63,10 @@ public interface IBActivityPointsService
* @return
*/
public int deleteBActivityPointsById(Long id);
/**
*
*/
Map<String, Object> page(BActivityPointsRequest req);
}

@ -1,8 +1,13 @@
package com.ruoyi.zhiyuanzhe.service;
import com.ruoyi.zhiyuanzhe.domain.BCertificates;
import com.ruoyi.zhiyuanzhe.domain.request.BCertificatesRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BCertificatesResponse;
import org.springframework.data.domain.Page;
import java.util.List;
import java.util.Map;
/**
@ -60,4 +65,14 @@ public interface IBCertificatesService
* @return
*/
public int deleteBCertificatesById(Long id);
/**
*
*
*
* @return
*/
Map<String, Object> page(BCertificatesRequest req);
}

@ -1,21 +1,21 @@
package com.ruoyi.zhiyuanzhe.service;
import com.ruoyi.zhiyuanzhe.domain.BDistributionRecords;
import com.ruoyi.zhiyuanzhe.domain.request.SubmitRequest;
import java.util.List;
/**
* Service
*
*
* @author ruoyi
* @date 2023-09-19
*/
public interface IBDistributionRecordsService
{
public interface IBDistributionRecordsService {
/**
*
*
*
* @param id
* @return
*/
@ -23,7 +23,7 @@ public interface IBDistributionRecordsService
/**
*
*
*
* @param bDistributionRecords
* @return
*/
@ -31,7 +31,7 @@ public interface IBDistributionRecordsService
/**
*
*
*
* @param bDistributionRecords
* @return
*/
@ -39,7 +39,7 @@ public interface IBDistributionRecordsService
/**
*
*
*
* @param bDistributionRecords
* @return
*/
@ -47,7 +47,7 @@ public interface IBDistributionRecordsService
/**
*
*
*
* @param ids
* @return
*/
@ -55,9 +55,16 @@ public interface IBDistributionRecordsService
/**
*
*
*
* @param id
* @return
*/
public int deleteBDistributionRecordsById(Long id);
/**
*
*
* @param req
*/
int submit(SubmitRequest req);
}

@ -0,0 +1,74 @@
package com.ruoyi.zhiyuanzhe.service;
import com.ruoyi.zhiyuanzhe.domain.BReport;
import com.ruoyi.zhiyuanzhe.domain.request.BReportPageRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BReportPageResponse;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @date 2023-09-21
*/
public interface IBReportService {
/**
*
*
* @param id
* @return
*/
public BReport selectBReportById(Long id);
/**
*
*
* @param req
* @return
*/
public List<BReport> selectBReportList(BReport req);
/**
*
*
* @param bReport
* @return
*/
public int insertBReport(BReport bReport);
/**
*
*
* @param bReport
* @return
*/
public int updateBReport(BReport bReport);
/**
*
*
* @param ids
* @return
*/
public int deleteBReportByIds(Long[] ids);
/**
*
*
* @param id
* @return
*/
public int deleteBReportById(Long id);
/**
*
*
* @param req
* @return
*/
public List<BReportPageResponse> selecAll(BReportPageRequest req);
}

@ -1,8 +1,16 @@
package com.ruoyi.zhiyuanzhe.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.zhiyuanzhe.domain.BActivityPoints;
import com.ruoyi.zhiyuanzhe.domain.request.BActivityPointsRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BActivityPointsPageresponse;
import com.ruoyi.zhiyuanzhe.domain.response.BCertificatesResponse;
import com.ruoyi.zhiyuanzhe.mapper.BActivityPointsMapper;
import com.ruoyi.zhiyuanzhe.service.IBActivityPointsService;
import org.springframework.beans.factory.annotation.Autowired;
@ -94,4 +102,15 @@ public class BActivityPointsServiceImpl implements IBActivityPointsService
{
return bActivityPointsMapper.deleteBActivityPointsById(id);
}
@Override
public Map<String, Object> page(BActivityPointsRequest req) {
List<BActivityPointsPageresponse> bActivityPointsPageresponses = bActivityPointsMapper.page(req);
PageHelper.startPage(req.getPageNum(),req.getPageSize());
PageInfo<BActivityPointsPageresponse> pageInfo = new PageInfo<>(bActivityPointsPageresponses);
Map<String, Object> result =new HashMap<>();
result.put("total",pageInfo.getTotal());
result.put("list",pageInfo.getList());
return result;
}
}

@ -1,96 +1,113 @@
package com.ruoyi.zhiyuanzhe.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.zhiyuanzhe.domain.BActivity;
import com.ruoyi.zhiyuanzhe.domain.BReport;
import com.ruoyi.zhiyuanzhe.mapper.BActivityMapper;
import com.ruoyi.zhiyuanzhe.mapper.BReportMapper;
import com.ruoyi.zhiyuanzhe.service.IBActivityService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import static com.ruoyi.common.utils.SecurityUtils.getUserId;
/**
* Service
*
*
* @author ruoyi
* @date 2023-09-18
*/
@Service("bActivityService")
public class BActivityServiceImpl implements IBActivityService
{
public class BActivityServiceImpl implements IBActivityService {
@Autowired
private BActivityMapper bActivityMapper;
@Autowired
private BReportMapper bReportMapper;
/**
*
*
*
* @param id
* @return
*/
@Override
public BActivity selectBActivityById(Long id)
{
public BActivity selectBActivityById(Long id) {
return bActivityMapper.selectBActivityById(id);
}
/**
*
*
*
* @param bActivity
* @return
*/
@Override
public List<BActivity> selectBActivityList(BActivity bActivity)
{
return bActivityMapper.selectBActivityList(bActivity);
public List<BActivity> selectBActivityList(BActivity bActivity) {
List<BActivity> list = bActivityMapper.selectBActivityList(bActivity);
List newList=new ArrayList<>();
BReport bReport = new BReport();
for (BActivity a : list) {
bReport.setUId(getUserId());
bReport.setActivityId(a.getId());
List<BReport> reportList = bReportMapper.selectBReportList(bReport);
if (!reportList.isEmpty()){
a.setInvolveStaus(1);
}else {
a.setInvolveStaus(2);
}
newList.add(a);
}
return newList;
}
/**
*
*
*
* @param bActivity
* @return
*/
@Override
public int insertBActivity(BActivity bActivity)
{
public int insertBActivity(BActivity bActivity) {
bActivity.setCreateTime(DateUtils.getNowDate());
return bActivityMapper.insertBActivity(bActivity);
}
/**
*
*
*
* @param bActivity
* @return
*/
@Override
public int updateBActivity(BActivity bActivity)
{
public int updateBActivity(BActivity bActivity) {
bActivity.setUpdateTime(DateUtils.getNowDate());
return bActivityMapper.updateBActivity(bActivity);
}
/**
*
*
*
* @param ids
* @return
*/
@Override
public int deleteBActivityByIds(Long[] ids)
{
public int deleteBActivityByIds(Long[] ids) {
return bActivityMapper.deleteBActivityByIds(ids);
}
/**
*
*
*
* @param id
* @return
*/
@Override
public int deleteBActivityById(Long id)
{
public int deleteBActivityById(Long id) {
return bActivityMapper.deleteBActivityById(id);
}
}

@ -1,8 +1,16 @@
package com.ruoyi.zhiyuanzhe.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.zhiyuanzhe.domain.BCertificates;
import com.ruoyi.zhiyuanzhe.domain.request.BCertificatesRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BCertificatesResponse;
import com.ruoyi.zhiyuanzhe.mapper.BCertificatesMapper;
import com.ruoyi.zhiyuanzhe.service.IBCertificatesService;
import org.springframework.beans.factory.annotation.Autowired;
@ -94,4 +102,15 @@ public class BCertificatesServiceImpl implements IBCertificatesService
{
return bCertificatesMapper.deleteBCertificatesById(id);
}
@Override
public Map<String, Object> page(BCertificatesRequest req) {
List<BCertificatesResponse> bCertificatesResponses = bCertificatesMapper.page(req);
PageHelper.startPage(req.getPageNum(),req.getPageSize());
PageInfo<BCertificatesResponse> pageInfo = new PageInfo<>(bCertificatesResponses);
Map<String, Object> result =new HashMap<>();
result.put("total",pageInfo.getTotal());
result.put("list",pageInfo.getList());
return result;
}
}

@ -3,6 +3,7 @@ package com.ruoyi.zhiyuanzhe.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.zhiyuanzhe.domain.BDistributionRecords;
import com.ruoyi.zhiyuanzhe.domain.request.SubmitRequest;
import com.ruoyi.zhiyuanzhe.mapper.BDistributionRecordsMapper;
import com.ruoyi.zhiyuanzhe.service.IBDistributionRecordsService;
import org.springframework.beans.factory.annotation.Autowired;
@ -94,4 +95,9 @@ public class BDistributionRecordsServiceImpl implements IBDistributionRecordsSer
{
return bDistributionRecordsMapper.deleteBDistributionRecordsById(id);
}
@Override
public int submit(SubmitRequest req) {
return bDistributionRecordsMapper.submit(req);
}
}

@ -0,0 +1,103 @@
package com.ruoyi.zhiyuanzhe.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.zhiyuanzhe.domain.request.BReportPageRequest;
import com.ruoyi.zhiyuanzhe.domain.response.BReportPageResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.zhiyuanzhe.mapper.BReportMapper;
import com.ruoyi.zhiyuanzhe.domain.BReport;
import com.ruoyi.zhiyuanzhe.service.IBReportService;
/**
* Service
*
* @author ruoyi
* @date 2023-09-21
*/
@Service
public class BReportServiceImpl implements IBReportService
{
@Autowired
private BReportMapper bReportMapper;
/**
*
*
* @param id
* @return
*/
@Override
public BReport selectBReportById(Long id)
{
return bReportMapper.selectBReportById(id);
}
/**
*
*
* @param bReport
* @return
*/
@Override
public List<BReport> selectBReportList(BReport bReport)
{
return bReportMapper.selectBReportList(bReport);
}
/**
*
*
* @param bReport
* @return
*/
@Override
public int insertBReport(BReport bReport)
{
bReport.setCreateTime(DateUtils.getNowDate());
return bReportMapper.insertBReport(bReport);
}
/**
*
*
* @param bReport
* @return
*/
@Override
public int updateBReport(BReport bReport)
{
bReport.setUpdateTime(DateUtils.getNowDate());
return bReportMapper.updateBReport(bReport);
}
/**
*
*
* @param ids
* @return
*/
@Override
public int deleteBReportByIds(Long[] ids)
{
return bReportMapper.deleteBReportByIds(ids);
}
/**
*
*
* @param id
* @return
*/
@Override
public int deleteBReportById(Long id)
{
return bReportMapper.deleteBReportById(id);
}
@Override
public List<BReportPageResponse> selecAll(BReportPageRequest req) {
return bReportMapper.selecAll(req);
}
}

@ -119,7 +119,7 @@ pagehelper:
# Swagger配置
swagger:
# 是否开启swagger
enabled: true
enabled: false
# 请求前缀
pathMapping: /dev-api

@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers("/login", "/register", "/captchaImage").permitAll()
// 静态资源,可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/zhiyuanzhe/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated()
.and()

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BActivityMapper">
<mapper namespace="com.ruoyi.zhiyuanzhe.mapper.BActivityMapper">
<resultMap type="BActivity" id="BActivityResult">
<result property="id" column="id" />
@ -30,10 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
<result property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
<result property="endTime" column="end_time" />
<result property="status" column="status" />
</resultMap>
<sql id="selectBActivityVo">
select id, name, content, publisher, activity_time, address, age_range, housing_range, education_range, interest_range, political_range, sex_range, nationality_range, professional_range, industry_range, school_range, create_id, create_by, create_time, update_id, update_by, update_time, remark, user_id, dept_id from b_activity
select id, name, content, publisher, activity_time,end_time, status,address, age_range, housing_range, education_range, interest_range, political_range, sex_range, nationality_range, professional_range, industry_range, school_range, create_id, create_by, create_time, update_id, update_by, update_time, remark, user_id, dept_id from b_activity
</sql>
<select id="selectBActivityList" parameterType="BActivity" resultMap="BActivityResult">
@ -54,10 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="professionalRange != null and professionalRange != ''"> and professional_range = #{professionalRange}</if>
<if test="industryRange != null and industryRange != ''"> and industry_range = #{industryRange}</if>
<if test="schoolRange != null and schoolRange != ''"> and school_range = #{schoolRange}</if>
<if test="createId != null "> and create_id = #{createId}</if>
<if test="updateId != null "> and update_id = #{updateId}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="endTime != null and endTime != ''"> and end_time = #{endTime}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
</where>
</select>
@ -93,7 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark,</if>
<if test="userId != null">user_id,</if>
<if test="deptId != null">dept_id,</if>
</trim>
<if test="endTime != null ">end_time</if>
<if test="status != null ">status</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="content != null">#{content},</if>
@ -119,7 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">#{remark},</if>
<if test="userId != null">#{userId},</if>
<if test="deptId != null">#{deptId},</if>
</trim>
<if test="endTime != null ">#{endTime}</if>
<if test="status != null ">#{status}</if>
</trim>
</insert>
<update id="updateBActivity" parameterType="BActivity">
@ -149,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark = #{remark},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="endTime != null ">end_time=#{endTime}</if>
<if test="status != null ">status=#{status}</if>
</trim>
where id = #{id}
</update>

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BActivityPointsMapper">
<mapper namespace="com.ruoyi.zhiyuanzhe.mapper.BActivityPointsMapper">
<resultMap type="BActivityPoints" id="BActivityPointsResult">
<result property="id" column="id" />
@ -41,7 +41,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBActivityPointsVo"/>
where id = #{id}
</select>
<select id="page" resultType="com.ruoyi.zhiyuanzhe.domain.response.BActivityPointsPageresponse">
select a.id, a.activity_id as activityId, a.u_id as uId, a.points, b.name,b.publisher,b.activity_time as activityTime
from b_activity_points a
left join b_activity b on a.activity_id = b.id
<where>
<if test="req.name != null "> and b.name = #{req.name}</if>
<if test="req.id != null "> and a.id = #{req.id}</if>
</where>
</select>
<insert id="insertBActivityPoints" parameterType="BActivityPoints" useGeneratedKeys="true" keyProperty="id">
insert into b_activity_points
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BCertificatesMapper">
<mapper namespace="com.ruoyi.zhiyuanzhe.mapper.BCertificatesMapper">
<resultMap type="BCertificates" id="BCertificatesResult">
<result property="id" column="id" />
@ -47,7 +47,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBCertificatesVo"/>
where id = #{id}
</select>
<select id="page" resultType="com.ruoyi.zhiyuanzhe.domain.response.BCertificatesResponse">
select a.activity_id as activityId,a.id, a.cre_type as creType,b.name,a.certificate_id as certificateId, a.u_id as uId, a.type, c.datetime, c.service_duration as serviceDuration
from b_distribution_records a
left join b_activity b on a.activity_id = b.id
left join b_certificates c on a.certificate_id = c.id
<where>
<if test="req.name !='' and req.name !=null ">
and b.name=#{req.name}
</if>
</where>
</select>
<insert id="insertBCertificates" parameterType="BCertificates" useGeneratedKeys="true" keyProperty="id">
insert into b_certificates
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BCheckRecordsMapper">
<mapper namespace="com.ruoyi.zhiyuanzhe.mapper.BCheckRecordsMapper">
<resultMap type="BCheckRecords" id="BCheckRecordsResult">
<result property="id" column="id" />

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BDistributionRecordsMapper">
<mapper namespace="com.ruoyi.zhiyuanzhe.mapper.BDistributionRecordsMapper">
<resultMap type="BDistributionRecords" id="BDistributionRecordsResult">
<result property="id" column="id" />
@ -19,10 +19,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
<result property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
<result property="type" column="type" />
<result property="creType" column="cre_type" />
</resultMap>
<sql id="selectBDistributionRecordsVo">
select id, activity_id, certificate_id, u_id, content, create_id, create_by, create_time, update_id, update_by, update_time, remark, user_id, dept_id from b_distribution_records
select id,
activity_id,
certificate_id,
u_id,
type,
cre_type,
content,
create_id,
create_by,
create_time,
update_id,
update_by,
update_time,
remark,
user_id,
dept_id
from b_distribution_records
</sql>
<select id="selectBDistributionRecordsList" parameterType="BDistributionRecords" resultMap="BDistributionRecordsResult">
@ -36,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateId != null "> and update_id = #{updateId}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="type != null "> and type = #{type}</if>
<if test="creType != null "> and cre_type = #{creType}</if>
</where>
</select>
@ -43,7 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBDistributionRecordsVo"/>
where id = #{id}
</select>
<insert id="insertBDistributionRecords" parameterType="BDistributionRecords" useGeneratedKeys="true" keyProperty="id">
insert into b_distribution_records
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -60,7 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark,</if>
<if test="userId != null">user_id,</if>
<if test="deptId != null">dept_id,</if>
</trim>
<if test="type != null ">type,</if>
<if test="creType != null ">cre_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="activityId != null">#{activityId},</if>
<if test="certificateId != null">#{certificateId},</if>
@ -75,7 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">#{remark},</if>
<if test="userId != null">#{userId},</if>
<if test="deptId != null">#{deptId},</if>
</trim>
<if test="type != null ">#{type},</if>
<if test="creType != null ">#{creType},</if>
</trim>
</insert>
<update id="updateBDistributionRecords" parameterType="BDistributionRecords">
@ -94,9 +119,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark = #{remark},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="type != null ">type = #{type},</if>
<if test="creType != null ">cre_type = #{creType},</if>
</trim>
where id = #{id}
</update>
<update id="submit">
update b_distribution_records
set type=1
where u_id = #{req.uId}
and activity_id = #{req.activityId}
</update>
<delete id="deleteBDistributionRecordsById" parameterType="Long">
delete from b_distribution_records where id = #{id}

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BExchangeRecordsMapper">
<mapper namespace="com.ruoyi.zhiyuanzhe.mapper.BExchangeRecordsMapper">
<resultMap type="BExchangeRecords" id="BExchangeRecordsResult">
<result property="id" column="id" />

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BInviteMapper">
<mapper namespace="com.ruoyi.zhiyuanzhe.mapper.BInviteMapper">
<resultMap type="BInvite" id="BInviteResult">
<result property="id" column="id" />

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BPersonTagsMapper">
<mapper namespace="com.ruoyi.zhiyuanzhe.mapper.BPersonTagsMapper">
<resultMap type="BPersonTags" id="BPersonTagsResult">
<result property="id" column="id" />
@ -36,7 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBPersonTagsVo"/>
<where>
<if test="uId != null "> and u_id = #{uId}</if>
<if test="ageRange != null and ageRange != ''"> and age_range = #{ageRange}</if>
<if test="ages != null and ages.length>0">
and age_range in
<foreach item="item"
collection="ages" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="housingRange != null and housingRange != ''"> and housing_range = #{housingRange}</if>
<if test="educationRange != null and educationRange != ''"> and education_range = #{educationRange}</if>
<if test="interestRange != null and interestRange != ''"> and interest_range = #{interestRange}</if>
@ -46,10 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="professionalRange != null and professionalRange != ''"> and professional_range = #{professionalRange}</if>
<if test="industryRange != null and industryRange != ''"> and industry_range = #{industryRange}</if>
<if test="schoolRange != null and schoolRange != ''"> and school_range = #{schoolRange}</if>
<if test="createId != null "> and create_id = #{createId}</if>
<if test="updateId != null "> and update_id = #{updateId}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
</where>
</select>

@ -0,0 +1,115 @@
<?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.ruoyi.zhiyuanzhe.mapper.BReportMapper">
<resultMap type="BReport" id="BReportResult">
<result property="id" column="id" />
<result property="uId" column="u_id" />
<result property="activityId" column="activity_id" />
<result property="createId" column="create_id" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateId" column="update_id" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
</resultMap>
<sql id="selectBReportVo">
select id, u_id, activity_id, create_id, create_by, create_time, update_id, update_by, update_time, remark, user_id, dept_id from b_report
</sql>
<select id="selectBReportList" parameterType="BReport" resultMap="BReportResult">
<include refid="selectBReportVo"/>
<where>
<if test="uId != null "> and u_id = #{uId}</if>
<if test="activityId != null "> and activity_id = #{activityId}</if>
</where>
</select>
<select id="selectBReportById" parameterType="Long" resultMap="BReportResult">
<include refid="selectBReportVo"/>
where id = #{id}
</select>
<select id="selecAll" resultType="com.ruoyi.zhiyuanzhe.domain.response.BReportPageResponse">
select a.id,
b.age_range as ageRange,
b.housing_range as housingRange,
b.education_range as educationRange,
b.interest_range as interestRange,
b.political_range as politicalRange,
b.sex_range as sexRange,
b.nationality_range as nationalityRange,
b.professional_range as professionalRange,
b.industry_range as industryRange,
b.school_range as schoolRange,
b.u_id as uid
from b_report a
left join b_person_tags b on a.u_id = b.u_id
where a.activity_id = #{req.activityId}
</select>
<insert id="insertBReport" parameterType="BReport" useGeneratedKeys="true" keyProperty="id">
insert into b_report
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="uId != null">u_id,</if>
<if test="activityId != null">activity_id,</if>
<if test="createId != null">create_id,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateId != null">update_id,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="userId != null">user_id,</if>
<if test="deptId != null">dept_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="uId != null">#{uId},</if>
<if test="activityId != null">#{activityId},</if>
<if test="createId != null">#{createId},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateId != null">#{updateId},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="userId != null">#{userId},</if>
<if test="deptId != null">#{deptId},</if>
</trim>
</insert>
<update id="updateBReport" parameterType="BReport">
update b_report
<trim prefix="SET" suffixOverrides=",">
<if test="uId != null">u_id = #{uId},</if>
<if test="activityId != null">activity_id = #{activityId},</if>
<if test="createId != null">create_id = #{createId},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateId != null">update_id = #{updateId},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBReportById" parameterType="Long">
delete from b_report where id = #{id}
</delete>
<delete id="deleteBReportByIds" parameterType="String">
delete from b_report where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
Loading…
Cancel
Save