diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 785086f..7de1759 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,63 +2,106 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - + + + @@ -888,6 +931,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1665485232564 @@ -1291,86 +1362,94 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + + + + + + + + + - + - - + + - + diff --git a/logs/springboot-logback-error.log b/logs/springboot-logback-error.log new file mode 100644 index 0000000..3a9df1a --- /dev/null +++ b/logs/springboot-logback-error.log @@ -0,0 +1,36 @@ +2024-08-08 16:25:04,800 [main] ERROR org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter:40 - + +*************************** +APPLICATION FAILED TO START +*************************** + +Description: + +Field memberService in com.subsidy.controller.MemberController required a bean of type 'com.subsidy.service.MemberService' that could not be found. + +The injection point has the following annotations: + - @org.springframework.beans.factory.annotation.Autowired(required=true) + + +Action: + +Consider defining a bean of type 'com.subsidy.service.MemberService' in your configuration. + +2024-08-08 16:27:32,443 [main] ERROR org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter:40 - + +*************************** +APPLICATION FAILED TO START +*************************** + +Description: + +Field memberService in com.subsidy.controller.MemberController required a bean of type 'com.subsidy.service.MemberService' that could not be found. + +The injection point has the following annotations: + - @org.springframework.beans.factory.annotation.Autowired(required=true) + + +Action: + +Consider defining a bean of type 'com.subsidy.service.MemberService' in your configuration. + diff --git a/logs/springboot-logback-info.log b/logs/springboot-logback-info.log new file mode 100644 index 0000000..b081dd6 --- /dev/null +++ b/logs/springboot-logback-info.log @@ -0,0 +1,49 @@ +2024-08-26 10:13:31,985 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:244 - Multiple Spring Data modules found, entering strict repository configuration mode! +2024-08-26 10:13:31,991 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:126 - Bootstrapping Spring Data repositories in DEFAULT mode. +2024-08-26 10:13:32,027 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:182 - Finished Spring Data repository scanning in 24ms. Found 0 repository interfaces. +2024-08-26 10:13:32,323 [main] INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$494f2635] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2024-08-26 10:13:32,410 [main] INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'redisConfig' of type [com.subsidy.common.configure.RedisConfig$$EnhancerBySpringCGLIB$$4917313c] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2024-08-26 10:13:32,675 [main] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:90 - Tomcat initialized with port(s): 23502 (http) +2024-08-26 10:13:32,685 [main] INFO org.apache.coyote.http11.Http11NioProtocol:173 - Initializing ProtocolHandler ["http-nio-23502"] +2024-08-26 10:13:32,690 [main] INFO org.apache.catalina.core.StandardService:173 - Starting service [Tomcat] +2024-08-26 10:13:32,691 [main] INFO org.apache.catalina.core.StandardEngine:173 - Starting Servlet engine: [Apache Tomcat/9.0.22] +2024-08-26 10:13:32,695 [main] INFO org.apache.catalina.core.AprLifecycleListener:173 - Loaded APR based Apache Tomcat Native library [1.2.37] using APR version [1.7.4]. +2024-08-26 10:13:32,695 [main] INFO org.apache.catalina.core.AprLifecycleListener:173 - APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. +2024-08-26 10:13:32,695 [main] INFO org.apache.catalina.core.AprLifecycleListener:173 - APR/OpenSSL configuration: useAprConnector [false], useOpenSSL [true] +2024-08-26 10:13:32,697 [main] INFO org.apache.catalina.core.AprLifecycleListener:173 - OpenSSL successfully initialized [OpenSSL 1.1.1u 30 May 2023] +2024-08-26 10:13:32,790 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring embedded WebApplicationContext +2024-08-26 10:13:32,791 [main] INFO org.springframework.web.context.ContextLoader:284 - Root WebApplicationContext: initialization completed in 1529 ms +2024-08-26 10:13:32,871 [main] INFO com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure:56 - Init DruidDataSource +2024-08-26 10:13:33,785 [main] INFO com.alibaba.druid.pool.DruidDataSource:994 - {dataSource-1} inited +2024-08-26 10:13:34,720 [main] INFO org.quartz.impl.StdSchedulerFactory:1208 - Using default implementation for ThreadExecutor +2024-08-26 10:13:34,731 [main] INFO org.quartz.core.SchedulerSignalerImpl:61 - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl +2024-08-26 10:13:34,732 [main] INFO org.quartz.core.QuartzScheduler:229 - Quartz Scheduler v.2.3.1 created. +2024-08-26 10:13:34,735 [main] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:672 - Using db table-based data access locking (synchronization). +2024-08-26 10:13:34,736 [main] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:145 - JobStoreCMT initialized. +2024-08-26 10:13:34,737 [main] INFO org.quartz.core.QuartzScheduler:294 - Scheduler meta-data: Quartz Scheduler (v2.3.1) 'schedulerFactoryBean' with instanceId 'NON_CLUSTERED' + Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally. + NOT STARTED. + Currently in standby mode. + Number of jobs executed: 0 + Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads. + Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is not clustered. + +2024-08-26 10:13:34,737 [main] INFO org.quartz.impl.StdSchedulerFactory:1362 - Quartz scheduler 'schedulerFactoryBean' initialized from an externally provided properties instance. +2024-08-26 10:13:34,737 [main] INFO org.quartz.impl.StdSchedulerFactory:1366 - Quartz scheduler version: 2.3.1 +2024-08-26 10:13:34,737 [main] INFO org.quartz.core.QuartzScheduler:2293 - JobFactory set to: com.subsidy.common.configure.JobFactory@42b4df5a +2024-08-26 10:13:35,245 [main] INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping:69 - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)] +2024-08-26 10:13:35,400 [main] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:171 - Initializing ExecutorService 'applicationTaskExecutor' +2024-08-26 10:13:35,992 [main] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler:171 - Initializing ExecutorService 'taskScheduler' +2024-08-26 10:13:36,045 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:160 - Context refreshed +2024-08-26 10:13:36,059 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:163 - Found 1 custom documentation plugin(s) +2024-08-26 10:13:36,084 [main] INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner:41 - Scanning for api listing references +2024-08-26 10:13:36,222 [main] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:731 - Will start Quartz Scheduler [schedulerFactoryBean] in 1 seconds +2024-08-26 10:13:36,231 [main] INFO org.apache.coyote.http11.Http11NioProtocol:173 - Starting ProtocolHandler ["http-nio-23502"] +2024-08-26 10:13:36,251 [main] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:202 - Tomcat started on port(s): 23502 (http) with context path '' +2024-08-26 10:13:37,226 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:747 - Starting Quartz Scheduler now, after delay of 1 seconds +2024-08-26 10:13:37,284 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:866 - Freed 0 triggers from 'acquired' / 'blocked' state. +2024-08-26 10:13:37,302 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:876 - Recovering 0 jobs that were in-progress at the time of the last shut-down. +2024-08-26 10:13:37,302 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:889 - Recovery complete. +2024-08-26 10:13:37,310 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:896 - Removed 0 'complete' triggers. +2024-08-26 10:13:37,319 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:901 - Removed 0 stale fired job entries. +2024-08-26 10:13:37,336 [Quartz Scheduler [schedulerFactoryBean]] INFO org.quartz.core.QuartzScheduler:547 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED started. diff --git a/logs/springboot-logback/error/2024-07-30-0.log2444630791683200.tmp b/logs/springboot-logback/error/2024-07-30-0.log2444630791683200.tmp new file mode 100644 index 0000000..a471cdc --- /dev/null +++ b/logs/springboot-logback/error/2024-07-30-0.log2444630791683200.tmp @@ -0,0 +1,44 @@ +2024-07-30 10:15:04,665 [main] ERROR org.apache.catalina.util.LifecycleBase:175 - Failed to start component [Connector[HTTP/1.1-23497]] +org.apache.catalina.LifecycleException: Protocol handler start failed + at org.apache.catalina.connector.Connector.startInternal(Connector.java:1008) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) + at org.apache.catalina.core.StandardService.addConnector(StandardService.java:227) + at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.addPreviouslyRemovedConnectors(TomcatWebServer.java:263) + at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.start(TomcatWebServer.java:195) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.startWebServer(ServletWebServerApplicationContext.java:297) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.finishRefresh(ServletWebServerApplicationContext.java:163) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:552) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:141) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:743) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:390) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:312) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1214) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1203) + at com.subsidy.MeishuApplication.main(MeishuApplication.java:22) +Caused by: java.net.BindException: Address already in use: bind + at sun.nio.ch.Net.bind0(Native Method) + at sun.nio.ch.Net.bind(Net.java:433) + at sun.nio.ch.Net.bind(Net.java:425) + at sun.nio.ch.ServerSocketChannelImpl.bind(ServerSocketChannelImpl.java:223) + at sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:74) + at org.apache.tomcat.util.net.NioEndpoint.initServerSocket(NioEndpoint.java:230) + at org.apache.tomcat.util.net.NioEndpoint.bind(NioEndpoint.java:213) + at org.apache.tomcat.util.net.AbstractEndpoint.bindWithCleanup(AbstractEndpoint.java:1124) + at org.apache.tomcat.util.net.AbstractEndpoint.start(AbstractEndpoint.java:1210) + at org.apache.coyote.AbstractProtocol.start(AbstractProtocol.java:585) + at org.apache.catalina.connector.Connector.startInternal(Connector.java:1005) + ... 14 common frames omitted +2024-07-30 10:15:04,683 [main] ERROR org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter:40 - + +*************************** +APPLICATION FAILED TO START +*************************** + +Description: + +The Tomcat connector configured to listen on port 23497 failed to start. The port may already be in use or the connector may be misconfigured. + +Action: + +Verify the connector's configuration, identify and stop any process that's listening on port 23497, or configure this application to listen on another port. + diff --git a/pom.xml b/pom.xml index cb41eb0..24e53cc 100644 --- a/pom.xml +++ b/pom.xml @@ -275,7 +275,7 @@ - subsidy-interShip + subsidy-mate org.springframework.boot diff --git a/src/main/java/com/subsidy/controller/AdministerController.java b/src/main/java/com/subsidy/controller/AdministerController.java index f202862..80b7d9f 100644 --- a/src/main/java/com/subsidy/controller/AdministerController.java +++ b/src/main/java/com/subsidy/controller/AdministerController.java @@ -1,6 +1,17 @@ package com.subsidy.controller; +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.common.interceptor.LoginRequired; +import com.subsidy.common.interceptor.TimeRequired; +import com.subsidy.dto.administer.ChangeServiceDTO; +import com.subsidy.model.AdministerDO; +import com.subsidy.service.AdministerService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,7 +27,38 @@ import io.swagger.annotations.Api; */ @RestController @Api(tags = "管理平台用户") -@RequestMapping("/administer-do") +@RequestMapping("/administer") public class AdministerController { + @Autowired + private AdministerService administerService; + + @PostMapping("/login") + @ApiOperation("登录接口(非中心端登录入口) accountName password") + public ResponseVO login(@RequestBody AdministerDO administerDO) { + return ResponseData.generateCreatedResponse(0, administerService.login(administerDO)); + } + + @PostMapping("/getPermissions") + @ApiOperation("权限查询") + @LoginRequired + public ResponseVO getPermissions() { + return ResponseData.generateCreatedResponse(0, administerService.getPermissions()); + } + + @PostMapping("auth") + @ApiOperation("授权到应用端免密登录 accountName 用户名 id ") + public ResponseVO qxy(@RequestBody AdministerDO administerDO){ + return ResponseData.generateCreatedResponse(0,administerService.auth(administerDO)); + } + + @PostMapping("changeService") + @ApiOperation("查看账号下的所有伙伴 id 账号id laborServiceName pagSize pageNum") + public ResponseVO changeService(@RequestBody ChangeServiceDTO changeServiceDTO){ + return ResponseData.generateCreatedResponse(0,administerService.changeService(changeServiceDTO)); + } + + + + } diff --git a/src/main/java/com/subsidy/controller/AdministerProjectMappingController.java b/src/main/java/com/subsidy/controller/AdministerLaborMappingController.java similarity index 70% rename from src/main/java/com/subsidy/controller/AdministerProjectMappingController.java rename to src/main/java/com/subsidy/controller/AdministerLaborMappingController.java index 4187ee8..9408e10 100644 --- a/src/main/java/com/subsidy/controller/AdministerProjectMappingController.java +++ b/src/main/java/com/subsidy/controller/AdministerLaborMappingController.java @@ -8,15 +8,15 @@ import io.swagger.annotations.Api; /** *

- * 管理员-项目映射表 前端控制器 + * 管理员-伙伴映射表 前端控制器 *

* * @author Tuyp - * @since 2024-07-18 + * @since 2024-07-30 */ @RestController -@Api(tags = "管理员-项目映射表") -@RequestMapping("/administer-project-mapping-do") -public class AdministerProjectMappingController { +@Api(tags = "管理员-伙伴映射表") +@RequestMapping("/administer-labor-mapping-do") +public class AdministerLaborMappingController { } diff --git a/src/main/java/com/subsidy/controller/GroupMemberMappingController.java b/src/main/java/com/subsidy/controller/GroupMemberMappingController.java new file mode 100644 index 0000000..e4b491f --- /dev/null +++ b/src/main/java/com/subsidy/controller/GroupMemberMappingController.java @@ -0,0 +1,22 @@ +package com.subsidy.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 群组人员映射表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +@RestController +@Api(tags = "群组人员映射表") +@RequestMapping("/group-member-mapping-do") +public class GroupMemberMappingController { + +} diff --git a/src/main/java/com/subsidy/controller/LaborGroupDictController.java b/src/main/java/com/subsidy/controller/LaborGroupDictController.java new file mode 100644 index 0000000..067c482 --- /dev/null +++ b/src/main/java/com/subsidy/controller/LaborGroupDictController.java @@ -0,0 +1,59 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.model.LaborGroupDictDO; +import com.subsidy.service.LaborGroupDictService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 伙伴群组字典表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +@RestController +@Api(tags = "伙伴群组字典表") +@RequestMapping("/laborGroupDict") +public class LaborGroupDictController { + + @Autowired + private LaborGroupDictService laborGroupDictService; + + @PostMapping("allGroups") + @ApiOperation("查看所有群组+人数 laborId") + public ResponseVO allGroups(@RequestBody LaborGroupDictDO laborGroupDictDO){ + return ResponseData.generateCreatedResponse(0,laborGroupDictService.allGroups(laborGroupDictDO)); + } + + @PostMapping("addGroup") + @ApiOperation("添加群组 laborId parentId 父节点id groupName") + public ResponseVO addGroup(@RequestBody LaborGroupDictDO laborGroupDictDO){ + laborGroupDictService.addGroup(laborGroupDictDO); + return ResponseData.generateCreatedResponse(0); + } + + @PostMapping("updateGroup") + @ApiOperation("修改群组 id groupName") + public ResponseVO updateGroup(@RequestBody LaborGroupDictDO laborGroupDictDO){ + laborGroupDictService.updateGroup(laborGroupDictDO); + return ResponseData.generateCreatedResponse(0); + } + + @PostMapping("deleteGroup") + @ApiOperation("删除群组 id") + public ResponseVO deleteGroup(@RequestBody LaborGroupDictDO laborGroupDictDO){ + laborGroupDictService.deleteGroup(laborGroupDictDO); + return ResponseData.generateCreatedResponse(0); + } +} diff --git a/src/main/java/com/subsidy/controller/LaborServiceDictController.java b/src/main/java/com/subsidy/controller/LaborServiceDictController.java index 6e36697..d1d1659 100644 --- a/src/main/java/com/subsidy/controller/LaborServiceDictController.java +++ b/src/main/java/com/subsidy/controller/LaborServiceDictController.java @@ -1,27 +1,9 @@ package com.subsidy.controller; -import com.subsidy.common.ResponseData; -import com.subsidy.common.ResponseVO; -import com.subsidy.dto.labor.AbnormalRecordDTO; -import com.subsidy.dto.labor.AddProjectDTO; -import com.subsidy.dto.labor.ProjectManageDTO; -import com.subsidy.dto.labor.ProjectsDTO; -import com.subsidy.model.AdministerDO; -import com.subsidy.model.ProjectDO; -import com.subsidy.model.ProjectMemberMappingDO; -import com.subsidy.service.LaborServiceDictService; -import com.subsidy.vo.labor.ProjectManageVO; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; /** *

@@ -36,68 +18,5 @@ import io.swagger.annotations.Api; @RequestMapping("/laborServiceDict") public class LaborServiceDictController { - @Autowired - private LaborServiceDictService laborServiceDictService; - - @PostMapping("login") - @ApiOperation("登录 accountName password ") - public ResponseVO login(@RequestBody AdministerDO administerDO){ - return ResponseData.generateCreatedResponse(0,laborServiceDictService.login(administerDO)); - } - - @PostMapping("projects") - @ApiOperation("项目列表 userId 当前用户id projectName pageSize pageNum") - public ResponseVO projects(@RequestBody ProjectsDTO projectsDTO){ - return ResponseData.generateCreatedResponse(0,laborServiceDictService.projects(projectsDTO)); - } - - @PostMapping("addProject") - @ApiOperation("添加项目 userId projectName companyId laborServiceId salaryDate startDate endDate") - public ResponseVO addProject(@RequestBody AddProjectDTO addProjectDTO){ - laborServiceDictService.addProject(addProjectDTO); - return ResponseData.generateCreatedResponse(0); - } - - @PostMapping("updateProject") - @ApiOperation("修改项目 id userId projectName companyId laborServiceId salaryDate startDate endDate") - public ResponseVO updateProject(@RequestBody AddProjectDTO addProjectDTO){ - laborServiceDictService.updateProject(addProjectDTO); - return ResponseData.generateCreatedResponse(0); - } - - - @PostMapping("deleteProject") - @ApiOperation("删除项目 id userId") - public ResponseVO deleteProject(@RequestBody AddProjectDTO addProjectDTO){ - laborServiceDictService.deleteProject(addProjectDTO); - return ResponseData.generateCreatedResponse(0); - } - - @PostMapping("projectManage") - @ApiOperation("详情--项目管理 projectId 项目id userInfo 姓名或手机号") - public ResponseVO projectManage(@RequestBody ProjectManageDTO projectManageDTO){ - return ResponseData.generateCreatedResponse(0,laborServiceDictService.projectManage(projectManageDTO)); - } - - @PostMapping("updateJobName") - @ApiOperation("id : projectManage接口返回的mappingId jobName 修改职位") - public ResponseVO updateJobName(@RequestBody ProjectMemberMappingDO projectMemberMappingDO){ - laborServiceDictService.updateJobName(projectMemberMappingDO); - return ResponseData.generateCreatedResponse(0); - } - - @PostMapping("fireMember") - @ApiOperation("操作离职 id : projectManage接口返回的mappingId ") - public ResponseVO fireMember(@RequestBody ProjectMemberMappingDO projectMemberMappingDO){ - laborServiceDictService.fireMember(projectMemberMappingDO); - return ResponseData.generateCreatedResponse(0); - } - - @PostMapping("abnormalRecord") - @ApiOperation("异动记录 projectId 项目id pageSize pageNum userInfo 姓名或者手机号") - public ResponseVO abnormalRecord(@RequestBody AbnormalRecordDTO abnormalRecordDTO ){ - return ResponseData.generateCreatedResponse(0,laborServiceDictService.abnormalRecord(abnormalRecordDTO)); - } - } diff --git a/src/main/java/com/subsidy/controller/MemberController.java b/src/main/java/com/subsidy/controller/MemberController.java index e2b5943..3288ec7 100644 --- a/src/main/java/com/subsidy/controller/MemberController.java +++ b/src/main/java/com/subsidy/controller/MemberController.java @@ -1,22 +1,83 @@ package com.subsidy.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.dto.administer.DownloadFailMembersDTO; +import com.subsidy.dto.member.AddMemberDTO; +import com.subsidy.dto.member.QueryMembersDTO; +import com.subsidy.model.GroupMemberMappingDO; +import com.subsidy.model.MemberDO; +import com.subsidy.service.MemberService; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; import io.swagger.annotations.Api; +import org.springframework.web.multipart.MultipartFile; /** *

- * 前端控制器 + * 前端控制器 *

* * @author Tuyp * @since 2024-07-18 */ @RestController -@Api(tags = "") -@RequestMapping("/member-do") +@Api(tags = "人才表") +@RequestMapping("/member") public class MemberController { + @Autowired + private MemberService memberService; + + @PostMapping("addMember") + @ApiOperation("添加人才 groupId userName telephone gender idCard payrollAccount bank ") + public ResponseVO addMember(@RequestBody AddMemberDTO addMemberDTO) { + memberService.addMember(addMemberDTO); + return ResponseData.generateCreatedResponse(0); + } + + @PostMapping("updateMember") + @ApiOperation("修改 id userName telephone gender idCard payrollAccount bank ") + public ResponseVO updateMember(@RequestBody AddMemberDTO addMemberDTO) { + memberService.updateMember(addMemberDTO); + return ResponseData.generateCreatedResponse(0); + } + + @PostMapping("deleteMember") + @ApiOperation("删除 id ") + public ResponseVO deleteMember(@RequestBody MemberDO memberDO) { + memberService.deleteMember(memberDO); + return ResponseData.generateCreatedResponse(0); + } + + @PostMapping("queryMembers") + @ApiOperation("花名册 groupId 组别id userInfo pageSize pageNum ") + public ResponseVO queryMembers(@RequestBody QueryMembersDTO queryMembersDTO) { + return ResponseData.generateCreatedResponse(0, memberService.queryMembers(queryMembersDTO)); + } + + @PostMapping("detail") + @ApiOperation("花名册--详情 memberId 人才id") + public ResponseVO detail(@RequestBody GroupMemberMappingDO groupMemberMappingDO){ + return ResponseData.generateCreatedResponse(0, memberService.detail(groupMemberMappingDO)); + } + + @PostMapping("importMember") + @ApiOperation("导入学生 {groupId file}" + + "模板地址：https://ykhl-bigger.oss-cn-beijing.aliyuncs.com/%E4%BA%BA%E6%89%8D%E6%A8%A1%E6%9D%BF.xlsx") +// @LoginRequired + public ResponseVO importMember(Long groupId, @RequestParam("file") MultipartFile file) throws Exception { + return ResponseData.generateCreatedResponse(0, memberService.importMember(groupId, file)); + } + + @PostMapping("downloadFailMembers") + @ApiOperation("下载失败的学员 importMemberVOS[] 字段是导出失败的字段") + public void downloadFailMembers(@RequestBody DownloadFailMembersDTO downloadFailMembersDTO){ + memberService.downloadFailMembers(downloadFailMembersDTO); + } + } diff --git a/src/main/java/com/subsidy/controller/ProductDictController.java b/src/main/java/com/subsidy/controller/ProductDictController.java new file mode 100644 index 0000000..2c20c38 --- /dev/null +++ b/src/main/java/com/subsidy/controller/ProductDictController.java @@ -0,0 +1,48 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.dto.product.AllProductsDTO; +import com.subsidy.model.ProductDictDO; +import com.subsidy.service.ProductDictService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 产品管理字典表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@RestController +@Api(tags = "产品管理字典表") +@RequestMapping("/productDict") +public class ProductDictController { + + @Autowired + private ProductDictService productDictService; + + @PostMapping("allProducts") + @ApiOperation("查看所有产品 productName pageSize pageNum productType 0：企业产品 1：院校产品 2:伙伴产品 groundingStatus" ) + public ResponseVO allProducts(@RequestBody AllProductsDTO allProductsDTO){ + return ResponseData.generateCreatedResponse(0,productDictService.allProducts(allProductsDTO)); + } + + @PostMapping("frontPage") + @ApiOperation("首页展示产品 productType 0：企业产品 1：院校产品 2:伙伴产品 ") + public ResponseVO frontPage(@RequestBody ProductDictDO productDictDO){ + return ResponseData.generateCreatedResponse(0,productDictService.frontPage(productDictDO)); + } + + + +} diff --git a/src/main/java/com/subsidy/controller/ServiceAdministerMappingController.java b/src/main/java/com/subsidy/controller/ServiceAdministerMappingController.java new file mode 100644 index 0000000..b94b388 --- /dev/null +++ b/src/main/java/com/subsidy/controller/ServiceAdministerMappingController.java @@ -0,0 +1,41 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.model.AdministerLaborMappingDO; +import com.subsidy.service.ServiceAdministerMappingService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 应用账户-业务映射表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@RestController +@Api(tags = "应用账户-业务映射表") +@RequestMapping("/serviceAdministerMapping") +public class ServiceAdministerMappingController { + + @Autowired + private ServiceAdministerMappingService serviceAdministerMappingService; + + @PostMapping("administerServices") + @ApiOperation("查看某个人所有的服务 administerId laborId") + public ResponseVO administerServices(@RequestBody AdministerLaborMappingDO administerLaborMappingDO){ + return ResponseData.generateCreatedResponse(0,serviceAdministerMappingService.administerServices(administerLaborMappingDO)); + } + + + +} diff --git a/src/main/java/com/subsidy/controller/ServiceDictController.java b/src/main/java/com/subsidy/controller/ServiceDictController.java new file mode 100644 index 0000000..d41111f --- /dev/null +++ b/src/main/java/com/subsidy/controller/ServiceDictController.java @@ -0,0 +1,22 @@ +package com.subsidy.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 业务管理字典表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@RestController +@Api(tags = "业务管理字典表") +@RequestMapping("/service-dict-do") +public class ServiceDictController { + +} diff --git a/src/main/java/com/subsidy/dto/administer/ChangeServiceDTO.java b/src/main/java/com/subsidy/dto/administer/ChangeServiceDTO.java new file mode 100644 index 0000000..84436ca --- /dev/null +++ b/src/main/java/com/subsidy/dto/administer/ChangeServiceDTO.java @@ -0,0 +1,16 @@ +package com.subsidy.dto.administer; + +import lombok.Data; + +@Data +public class ChangeServiceDTO { + + private String laborServiceName; + + private Integer pageSize; + + private Integer pageNum; + + private Long id; + +} diff --git a/src/main/java/com/subsidy/dto/administer/DownloadFailMembersDTO.java b/src/main/java/com/subsidy/dto/administer/DownloadFailMembersDTO.java new file mode 100644 index 0000000..926ae7c --- /dev/null +++ b/src/main/java/com/subsidy/dto/administer/DownloadFailMembersDTO.java @@ -0,0 +1,12 @@ +package com.subsidy.dto.administer; + +import lombok.Data; + +import java.util.List; + +@Data +public class DownloadFailMembersDTO { + + private List importMemberVOS; + +} diff --git a/src/main/java/com/subsidy/dto/administer/ImportMemberVO.java b/src/main/java/com/subsidy/dto/administer/ImportMemberVO.java new file mode 100644 index 0000000..970ad4d --- /dev/null +++ b/src/main/java/com/subsidy/dto/administer/ImportMemberVO.java @@ -0,0 +1,30 @@ +package com.subsidy.dto.administer; + +import com.subsidy.util.excel.ExcelColumn; +import lombok.Data; + +@Data +public class ImportMemberVO { + + @ExcelColumn(value = "姓名", col = 1) + private String userName; + + @ExcelColumn(value = "手机号", col = 2) + private String telephone; + + @ExcelColumn(value = "身份证号码", col = 3) + private String idCard; + + @ExcelColumn(value = "性别（男/女）", col = 4) + private String gender; + + @ExcelColumn(value = "工资账户", col = 5) + private String payrollAccount; + + @ExcelColumn(value = "开户行", col = 6) + private String bank; + + @ExcelColumn(value = "原因", col = 7) + private String reason; + +} diff --git a/src/main/java/com/subsidy/dto/member/AddMemberDTO.java b/src/main/java/com/subsidy/dto/member/AddMemberDTO.java new file mode 100644 index 0000000..fe4f2e1 --- /dev/null +++ b/src/main/java/com/subsidy/dto/member/AddMemberDTO.java @@ -0,0 +1,52 @@ +package com.subsidy.dto.member; + +import lombok.Data; + +@Data +public class AddMemberDTO { + + private Long id; + + private Long groupId; + + /** + * 姓名 + */ + private String userName; + + /** + * 手机号 + */ + private String telephone; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 工资账户 + */ + private String payrollAccount; + + /** + * 开户行 + */ + private String bank; + + /** + * 0：学生 2：职工 3：人才 + */ + private Integer memberType; + + /** + * 微信的openId + */ + private String openId; + +} diff --git a/src/main/java/com/subsidy/dto/member/ImportMemberDTO.java b/src/main/java/com/subsidy/dto/member/ImportMemberDTO.java new file mode 100644 index 0000000..2c0563d --- /dev/null +++ b/src/main/java/com/subsidy/dto/member/ImportMemberDTO.java @@ -0,0 +1,30 @@ +package com.subsidy.dto.member; + +import com.subsidy.util.excel.ExcelColumnUtil; +import lombok.Data; + +@Data +public class ImportMemberDTO { + + + @ExcelColumnUtil(value = "姓名", col = 1) + private String userName; + + @ExcelColumnUtil(value = "手机号", col = 2) + private String telephone; + + @ExcelColumnUtil(value = "身份证号码", col = 3) + private String idCard; + + @ExcelColumnUtil(value = "性别（男/女）", col = 4) + private String gender; + + @ExcelColumnUtil(value = "工资账户", col = 5) + private String payrollAccount; + + @ExcelColumnUtil(value = "开户行", col = 6) + private String bank; + + + +} diff --git a/src/main/java/com/subsidy/dto/member/QueryMembersDTO.java b/src/main/java/com/subsidy/dto/member/QueryMembersDTO.java new file mode 100644 index 0000000..d23d0f1 --- /dev/null +++ b/src/main/java/com/subsidy/dto/member/QueryMembersDTO.java @@ -0,0 +1,15 @@ +package com.subsidy.dto.member; + +import lombok.Data; + +@Data +public class QueryMembersDTO { + + private Integer pageSize; + + private Integer pageNum; + + private Long groupId; + + private String userInfo; +} diff --git a/src/main/java/com/subsidy/dto/product/AllProductsDTO.java b/src/main/java/com/subsidy/dto/product/AllProductsDTO.java new file mode 100644 index 0000000..3c20340 --- /dev/null +++ b/src/main/java/com/subsidy/dto/product/AllProductsDTO.java @@ -0,0 +1,18 @@ +package com.subsidy.dto.product; + +import lombok.Data; + +@Data +public class AllProductsDTO { + + private Integer pageSize; + + private Integer pageNum; + + private String productName; + + private Integer productType; + + private String groundingStatus; + +} diff --git a/src/main/java/com/subsidy/mapper/AdministerLaborMappingMapper.java b/src/main/java/com/subsidy/mapper/AdministerLaborMappingMapper.java new file mode 100644 index 0000000..c1b34ec --- /dev/null +++ b/src/main/java/com/subsidy/mapper/AdministerLaborMappingMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.AdministerLaborMappingDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 管理员-伙伴映射表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ + @Repository +public interface AdministerLaborMappingMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/mapper/AdministerMapper.java b/src/main/java/com/subsidy/mapper/AdministerMapper.java index f84ef88..7ad0b3b 100644 --- a/src/main/java/com/subsidy/mapper/AdministerMapper.java +++ b/src/main/java/com/subsidy/mapper/AdministerMapper.java @@ -1,9 +1,15 @@ package com.subsidy.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.subsidy.model.AdministerDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.model.LaborServiceDictDO; +import com.subsidy.model.ServiceDictDO; +import com.subsidy.vo.administer.PermissionsVO; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* 管理平台用户 Mapper 接口 @@ -12,7 +18,14 @@ import org.springframework.stereotype.Repository; * @author Tuyp * @since 2024-07-18 */ - @Repository +@Repository public interface AdministerMapper extends BaseMapper { + List getPermissions(Long id); + + IPage administerLabors(IPage page,Long administerId,String laborServiceName); + + List administerServices(Long administerId); + + } diff --git a/src/main/java/com/subsidy/mapper/GroupMemberMappingMapper.java b/src/main/java/com/subsidy/mapper/GroupMemberMappingMapper.java new file mode 100644 index 0000000..b725bc6 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/GroupMemberMappingMapper.java @@ -0,0 +1,30 @@ +package com.subsidy.mapper; + +import com.subsidy.model.GroupMemberMappingDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.vo.labor.AllGroupsVO; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 群组人员映射表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +@Repository +public interface GroupMemberMappingMapper extends BaseMapper { + + /** + * 查群组父节点的名称和人数 + */ + AllGroupsVO parentCnt(Long laborId); + + /** + * 查群组子节点的名称和人数 + */ + List childCnt(Long laborId); +} diff --git a/src/main/java/com/subsidy/mapper/LaborGroupDictMapper.java b/src/main/java/com/subsidy/mapper/LaborGroupDictMapper.java new file mode 100644 index 0000000..f02e437 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/LaborGroupDictMapper.java @@ -0,0 +1,25 @@ +package com.subsidy.mapper; + +import com.subsidy.model.LaborGroupDictDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.vo.labor.AllGroupsVO; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 伙伴群组字典表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +@Repository +public interface LaborGroupDictMapper extends BaseMapper { + + List allGroups(Long laborId); + + Long getProjectId(Long groupId); + +} diff --git a/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java b/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java index cddac78..b7375a1 100644 --- a/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java +++ b/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java @@ -19,10 +19,4 @@ import org.springframework.stereotype.Repository; @Repository public interface LaborServiceDictMapper extends BaseMapper { - IPage projects(IPage iPage,String projectName, Long administerId); - - IPage projectManage(IPage iPage, Long projectId, String userInfo); - - IPage abnormalRecord(IPage page, Long projectId, String userInfo); - } diff --git a/src/main/java/com/subsidy/mapper/MemberMapper.java b/src/main/java/com/subsidy/mapper/MemberMapper.java index 2c3812c..fe8382d 100644 --- a/src/main/java/com/subsidy/mapper/MemberMapper.java +++ b/src/main/java/com/subsidy/mapper/MemberMapper.java @@ -1,18 +1,29 @@ package com.subsidy.mapper; -import com.subsidy.model.MemberDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.model.MemberDO; +import com.subsidy.vo.member.QueryMembersVO; import org.springframework.stereotype.Repository; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author Tuyp * @since 2024-07-18 */ - @Repository +@Repository public interface MemberMapper extends BaseMapper { + IPage queryMembers(IPage iPage, Long groupId,String userInfo); + + /** + * 查看该人才是否已经存在 + */ + int checkTalentMember(String idCard,String telephone,Long id); + + int checkMember(String idCard,String telephone); + } diff --git a/src/main/java/com/subsidy/mapper/ProductDictMapper.java b/src/main/java/com/subsidy/mapper/ProductDictMapper.java new file mode 100644 index 0000000..43c4470 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/ProductDictMapper.java @@ -0,0 +1,21 @@ +package com.subsidy.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.model.ProductDictDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 产品管理字典表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@Repository +public interface ProductDictMapper extends BaseMapper { + + IPage allProducts(IPage iPage, String productName, Integer productType,String groundingStatus); + +} diff --git a/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java b/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java index e47dc90..669112d 100644 --- a/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java +++ b/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java @@ -2,6 +2,7 @@ package com.subsidy.mapper; import com.subsidy.model.ProjectMemberMappingDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.vo.member.DetailVO; import org.springframework.stereotype.Repository; import java.util.List; @@ -17,4 +18,9 @@ import java.util.List; @Repository public interface ProjectMemberMappingMapper extends BaseMapper { + /** + * 查看某个人的入职记录 + */ + List detail(Long memberId); + } diff --git a/src/main/java/com/subsidy/mapper/ServiceAdministerMappingMapper.java b/src/main/java/com/subsidy/mapper/ServiceAdministerMappingMapper.java new file mode 100644 index 0000000..45245ba --- /dev/null +++ b/src/main/java/com/subsidy/mapper/ServiceAdministerMappingMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.ServiceAdministerMappingDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 应用账户-业务映射表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ + @Repository +public interface ServiceAdministerMappingMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/mapper/AdministerProjectMappingMapper.java b/src/main/java/com/subsidy/mapper/ServiceDictMapper.java similarity index 70% rename from src/main/java/com/subsidy/mapper/AdministerProjectMappingMapper.java rename to src/main/java/com/subsidy/mapper/ServiceDictMapper.java index 2d70e80..d0ace88 100644 --- a/src/main/java/com/subsidy/mapper/AdministerProjectMappingMapper.java +++ b/src/main/java/com/subsidy/mapper/ServiceDictMapper.java @@ -1,18 +1,18 @@ package com.subsidy.mapper; -import com.subsidy.model.AdministerProjectMappingDO; +import com.subsidy.model.ServiceDictDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; /** *

- * 管理员-项目映射表 Mapper 接口 + * 业务管理字典表 Mapper 接口 *

* * @author Tuyp - * @since 2024-07-18 + * @since 2024-07-30 */ @Repository -public interface AdministerProjectMappingMapper extends BaseMapper { +public interface ServiceDictMapper extends BaseMapper { } diff --git a/src/main/java/com/subsidy/model/AdministerDO.java b/src/main/java/com/subsidy/model/AdministerDO.java index b97295c..b865b8c 100644 --- a/src/main/java/com/subsidy/model/AdministerDO.java +++ b/src/main/java/com/subsidy/model/AdministerDO.java @@ -74,4 +74,5 @@ public class AdministerDO extends BaseModel { private String remark; + private Long laborId; } diff --git a/src/main/java/com/subsidy/model/AdministerProjectMappingDO.java b/src/main/java/com/subsidy/model/AdministerLaborMappingDO.java similarity index 80% rename from src/main/java/com/subsidy/model/AdministerProjectMappingDO.java rename to src/main/java/com/subsidy/model/AdministerLaborMappingDO.java index f0d71df..3978c20 100644 --- a/src/main/java/com/subsidy/model/AdministerProjectMappingDO.java +++ b/src/main/java/com/subsidy/model/AdministerLaborMappingDO.java @@ -9,16 +9,16 @@ import lombok.EqualsAndHashCode; /** *

- * 管理员-项目映射表 + * 管理员-伙伴映射表 *

* * @author Tuyp - * @since 2024-07-18 + * @since 2024-07-30 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("administer_project_mapping") -public class AdministerProjectMappingDO extends BaseModel { +@TableName("administer_labor_mapping") +public class AdministerLaborMappingDO extends BaseModel { private static final long serialVersionUID = 1L; @@ -27,7 +27,7 @@ public class AdministerProjectMappingDO extends BaseModel { private Long administerId; - private Long projectId; + private Long laborId; } diff --git a/src/main/java/com/subsidy/model/GroupMemberMappingDO.java b/src/main/java/com/subsidy/model/GroupMemberMappingDO.java new file mode 100644 index 0000000..f4db03d --- /dev/null +++ b/src/main/java/com/subsidy/model/GroupMemberMappingDO.java @@ -0,0 +1,33 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 群组人员映射表 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("group_member_mapping") +public class GroupMemberMappingDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long groupId; + + private Long memberId; + + +} diff --git a/src/main/java/com/subsidy/model/LaborGroupDictDO.java b/src/main/java/com/subsidy/model/LaborGroupDictDO.java new file mode 100644 index 0000000..13d43c7 --- /dev/null +++ b/src/main/java/com/subsidy/model/LaborGroupDictDO.java @@ -0,0 +1,34 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 伙伴群组字典表 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("labor_group_dict") +public class LaborGroupDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long parentId; + + private Long laborId; + + private String groupName; + +} diff --git a/src/main/java/com/subsidy/model/LaborServiceDictDO.java b/src/main/java/com/subsidy/model/LaborServiceDictDO.java index 0381bd8..7d5aa83 100644 --- a/src/main/java/com/subsidy/model/LaborServiceDictDO.java +++ b/src/main/java/com/subsidy/model/LaborServiceDictDO.java @@ -27,5 +27,10 @@ public class LaborServiceDictDO extends BaseModel { private String laborServiceName; + private String shortName; + + private String location; + + private String serviceCode; } diff --git a/src/main/java/com/subsidy/model/MemberRoleDO.java b/src/main/java/com/subsidy/model/MemberRoleDO.java new file mode 100644 index 0000000..dd673b9 --- /dev/null +++ b/src/main/java/com/subsidy/model/MemberRoleDO.java @@ -0,0 +1,36 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * + *

+ * + * @author Tuyp + * @since 2024-08-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("member_role") +public class MemberRoleDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long memberId; + + /** + * 0：学生 2：职工 3：人才 + */ + private Integer roleType; + + +} diff --git a/src/main/java/com/subsidy/model/ProductDictDO.java b/src/main/java/com/subsidy/model/ProductDictDO.java new file mode 100644 index 0000000..cc5d1f1 --- /dev/null +++ b/src/main/java/com/subsidy/model/ProductDictDO.java @@ -0,0 +1,71 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 产品管理字典表 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("product_dict") +public class ProductDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 产品名称 + */ + private String productName; + + /** + * 产品图标 + */ + private String productLogo; + + /** + * 产品描述 + */ + private String productDesc; + + /** + * 联系方式 + */ + private String contactInfo; + + private String groundingStatus; + + /** + * 高亮 + */ + private String highlightTag; + + /** + * 排序 + */ + private Integer orderNo; + + /** + * 是否展示首页 1：展示在首页，0：不展示在首页 + */ + private Integer frontPage; + + /** + * 0：企业产品 1：院校产品 + */ + private Integer productType; + + +} diff --git a/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java b/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java index 5d23f54..7adb906 100644 --- a/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java +++ b/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java @@ -41,6 +41,11 @@ public class ProjectMemberMappingDO extends BaseModel { private String jobName; /** + * 工资 + */ + private String salary; + + /** * 排序 */ private Integer orderNo; diff --git a/src/main/java/com/subsidy/model/ProjectSalaryHistoryDO.java b/src/main/java/com/subsidy/model/ProjectSalaryHistoryDO.java index b41d198..9e0f291 100644 --- a/src/main/java/com/subsidy/model/ProjectSalaryHistoryDO.java +++ b/src/main/java/com/subsidy/model/ProjectSalaryHistoryDO.java @@ -31,9 +31,9 @@ public class ProjectSalaryHistoryDO extends BaseModel { private Long memberId; /** - * 项目id + * 映射id */ - private Long projectId; + private Long projectMappingId; /** * 工资 @@ -46,6 +46,16 @@ public class ProjectSalaryHistoryDO extends BaseModel { private String salaryMark; /** + * 发放时间 + */ + private String salaryDate; + + /** + * 几月工资 + */ + private String salaryMonth; + + /** * 开户行 */ private String bank; @@ -55,5 +65,9 @@ public class ProjectSalaryHistoryDO extends BaseModel { */ private String payrollAccount; + /** + * 提交状态 1已提交 - 0未提交 + */ + private Integer commitStatus; } diff --git a/src/main/java/com/subsidy/model/ServiceAdministerMappingDO.java b/src/main/java/com/subsidy/model/ServiceAdministerMappingDO.java new file mode 100644 index 0000000..95dc91b --- /dev/null +++ b/src/main/java/com/subsidy/model/ServiceAdministerMappingDO.java @@ -0,0 +1,33 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 应用账户-业务映射表 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("service_administer_mapping") +public class ServiceAdministerMappingDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long administerId; + + private Long serviceId; + + +} diff --git a/src/main/java/com/subsidy/model/ServiceDictDO.java b/src/main/java/com/subsidy/model/ServiceDictDO.java new file mode 100644 index 0000000..1c34d63 --- /dev/null +++ b/src/main/java/com/subsidy/model/ServiceDictDO.java @@ -0,0 +1,34 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 业务管理字典表 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("service_dict") +public class ServiceDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 业务名称 + */ + private String serviceName; + + +} diff --git a/src/main/java/com/subsidy/service/AdministerLaborMappingService.java b/src/main/java/com/subsidy/service/AdministerLaborMappingService.java new file mode 100644 index 0000000..6361fd7 --- /dev/null +++ b/src/main/java/com/subsidy/service/AdministerLaborMappingService.java @@ -0,0 +1,16 @@ +package com.subsidy.service; + +import com.subsidy.model.AdministerLaborMappingDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 管理员-伙伴映射表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +public interface AdministerLaborMappingService extends IService { + +} diff --git a/src/main/java/com/subsidy/service/AdministerService.java b/src/main/java/com/subsidy/service/AdministerService.java index bd79fc1..efb12b7 100644 --- a/src/main/java/com/subsidy/service/AdministerService.java +++ b/src/main/java/com/subsidy/service/AdministerService.java @@ -1,7 +1,16 @@ package com.subsidy.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.dto.administer.ChangeServiceDTO; import com.subsidy.model.AdministerDO; import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.model.LaborServiceDictDO; +import com.subsidy.model.ServiceDictDO; +import com.subsidy.vo.administer.AdministerPermissionVO; +import com.subsidy.vo.administer.AuthVO; +import com.subsidy.vo.labor.LoginVO; + +import java.util.List; /** *

@@ -13,4 +22,12 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface AdministerService extends IService { + LoginVO login(AdministerDO administerDO); + + AdministerPermissionVO getPermissions(); + + AuthVO auth(AdministerDO administerDO); + + IPage changeService(ChangeServiceDTO changeServiceDTO); + } diff --git a/src/main/java/com/subsidy/service/GroupMemberMappingService.java b/src/main/java/com/subsidy/service/GroupMemberMappingService.java new file mode 100644 index 0000000..6ea4b7f --- /dev/null +++ b/src/main/java/com/subsidy/service/GroupMemberMappingService.java @@ -0,0 +1,16 @@ +package com.subsidy.service; + +import com.subsidy.model.GroupMemberMappingDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 群组人员映射表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +public interface GroupMemberMappingService extends IService { + +} diff --git a/src/main/java/com/subsidy/service/LaborGroupDictService.java b/src/main/java/com/subsidy/service/LaborGroupDictService.java new file mode 100644 index 0000000..7f9c951 --- /dev/null +++ b/src/main/java/com/subsidy/service/LaborGroupDictService.java @@ -0,0 +1,26 @@ +package com.subsidy.service; + +import com.subsidy.model.LaborGroupDictDO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.vo.labor.AllGroupsVO; + +import java.util.List; + +/** + *

+ * 伙伴群组字典表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +public interface LaborGroupDictService extends IService { + + AllGroupsVO allGroups(LaborGroupDictDO laborGroupDictDO); + + void addGroup(LaborGroupDictDO laborGroupDictDO); + + void updateGroup(LaborGroupDictDO laborGroupDictDO); + + void deleteGroup(LaborGroupDictDO laborGroupDictDO); +} diff --git a/src/main/java/com/subsidy/service/LaborServiceDictService.java b/src/main/java/com/subsidy/service/LaborServiceDictService.java index 4ad415a..f83311c 100644 --- a/src/main/java/com/subsidy/service/LaborServiceDictService.java +++ b/src/main/java/com/subsidy/service/LaborServiceDictService.java @@ -1,20 +1,7 @@ package com.subsidy.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.subsidy.common.configure.VODConfig; -import com.subsidy.dto.labor.AbnormalRecordDTO; -import com.subsidy.dto.labor.AddProjectDTO; -import com.subsidy.dto.labor.ProjectManageDTO; -import com.subsidy.dto.labor.ProjectsDTO; -import com.subsidy.model.AdministerDO; -import com.subsidy.model.LaborServiceDictDO; import com.baomidou.mybatisplus.extension.service.IService; -import com.subsidy.model.ProjectDO; -import com.subsidy.model.ProjectMemberMappingDO; -import com.subsidy.vo.labor.AbnormalRecordVO; -import com.subsidy.vo.labor.LoginVO; -import com.subsidy.vo.labor.ProjectManageVO; -import com.subsidy.vo.labor.ProjectsVO; +import com.subsidy.model.LaborServiceDictDO; /** *

@@ -27,21 +14,4 @@ import com.subsidy.vo.labor.ProjectsVO; public interface LaborServiceDictService extends IService { - LoginVO login(AdministerDO administerDO); - - IPage projects(ProjectsDTO projectsDTO); - - void addProject(AddProjectDTO addProjectDTO); - - void updateProject(AddProjectDTO addProjectDTO); - - void deleteProject(AddProjectDTO addProjectDTO); - - IPage projectManage(ProjectManageDTO projectManageDTO); - - void updateJobName(ProjectMemberMappingDO projectMemberMappingDO); - - void fireMember(ProjectMemberMappingDO projectMemberMappingDO); - - IPage abnormalRecord(AbnormalRecordDTO abnormalRecordDTO); } diff --git a/src/main/java/com/subsidy/service/MemberService.java b/src/main/java/com/subsidy/service/MemberService.java index 6e59925..6493d31 100644 --- a/src/main/java/com/subsidy/service/MemberService.java +++ b/src/main/java/com/subsidy/service/MemberService.java @@ -1,7 +1,18 @@ package com.subsidy.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.dto.administer.DownloadFailMembersDTO; +import com.subsidy.dto.member.AddMemberDTO; +import com.subsidy.dto.member.QueryMembersDTO; +import com.subsidy.model.GroupMemberMappingDO; import com.subsidy.model.MemberDO; import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.vo.member.DetailVO; +import com.subsidy.vo.member.ImportMemberResultVO; +import com.subsidy.vo.member.QueryMembersVO; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; /** *

@@ -13,4 +24,17 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface MemberService extends IService { + void addMember(AddMemberDTO addMemberDTO); + + void updateMember(AddMemberDTO addMemberDTO); + + void deleteMember(MemberDO memberDO); + + IPage queryMembers(QueryMembersDTO queryMembersDTO); + + List detail(GroupMemberMappingDO groupMemberMappingDO); + + ImportMemberResultVO importMember(Long companyId, MultipartFile multipartFile)throws Exception; + + void downloadFailMembers(DownloadFailMembersDTO downloadFailMembersDTO); } diff --git a/src/main/java/com/subsidy/service/ProductDictService.java b/src/main/java/com/subsidy/service/ProductDictService.java new file mode 100644 index 0000000..2ca1ff2 --- /dev/null +++ b/src/main/java/com/subsidy/service/ProductDictService.java @@ -0,0 +1,24 @@ +package com.subsidy.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.dto.product.AllProductsDTO; +import com.subsidy.model.ProductDictDO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 产品管理字典表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +public interface ProductDictService extends IService { + + IPage allProducts(AllProductsDTO allProductsDTO); + + List frontPage(ProductDictDO productDictDO); + +} diff --git a/src/main/java/com/subsidy/service/ServiceAdministerMappingService.java b/src/main/java/com/subsidy/service/ServiceAdministerMappingService.java new file mode 100644 index 0000000..a4c2cda --- /dev/null +++ b/src/main/java/com/subsidy/service/ServiceAdministerMappingService.java @@ -0,0 +1,23 @@ +package com.subsidy.service; + +import com.subsidy.model.AdministerLaborMappingDO; +import com.subsidy.model.ServiceAdministerMappingDO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.model.ServiceDictDO; +import com.subsidy.vo.administer.AdministerServicesVO; + +import java.util.List; + +/** + *

+ * 应用账户-业务映射表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +public interface ServiceAdministerMappingService extends IService { + + List administerServices(AdministerLaborMappingDO administerLaborMappingDO); + +} diff --git a/src/main/java/com/subsidy/service/AdministerProjectMappingService.java b/src/main/java/com/subsidy/service/ServiceDictService.java similarity index 66% rename from src/main/java/com/subsidy/service/AdministerProjectMappingService.java rename to src/main/java/com/subsidy/service/ServiceDictService.java index def4fd7..36db952 100644 --- a/src/main/java/com/subsidy/service/AdministerProjectMappingService.java +++ b/src/main/java/com/subsidy/service/ServiceDictService.java @@ -1,16 +1,16 @@ package com.subsidy.service; -import com.subsidy.model.AdministerProjectMappingDO; +import com.subsidy.model.ServiceDictDO; import com.baomidou.mybatisplus.extension.service.IService; /** *

- * 管理员-项目映射表 服务类 + * 业务管理字典表 服务类 *

* * @author Tuyp - * @since 2024-07-18 + * @since 2024-07-30 */ -public interface AdministerProjectMappingService extends IService { +public interface ServiceDictService extends IService { } diff --git a/src/main/java/com/subsidy/service/impl/AdministerLaborMappingServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerLaborMappingServiceImpl.java new file mode 100644 index 0000000..258e874 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/AdministerLaborMappingServiceImpl.java @@ -0,0 +1,20 @@ +package com.subsidy.service.impl; + +import com.subsidy.model.AdministerLaborMappingDO; +import com.subsidy.mapper.AdministerLaborMappingMapper; +import com.subsidy.service.AdministerLaborMappingService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 管理员-伙伴映射表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@Service +public class AdministerLaborMappingServiceImpl extends ServiceImpl implements AdministerLaborMappingService { + +} diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java index f0cccbe..3b04179 100644 --- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java @@ -1,11 +1,36 @@ package com.subsidy.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.subsidy.common.exception.HttpException; +import com.subsidy.dto.administer.ChangeServiceDTO; +import com.subsidy.mapper.LaborGroupDictMapper; +import com.subsidy.mapper.LaborServiceDictMapper; +import com.subsidy.mapper.ServiceDictMapper; import com.subsidy.model.AdministerDO; import com.subsidy.mapper.AdministerMapper; +import com.subsidy.model.LaborServiceDictDO; +import com.subsidy.model.ServiceDictDO; import com.subsidy.service.AdministerService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.util.ConstantUtils; +import com.subsidy.util.JwtUtil; +import com.subsidy.util.Localstorage; +import com.subsidy.util.SecretUtils; +import com.subsidy.vo.administer.AdministerPermissionVO; +import com.subsidy.vo.administer.AuthVO; +import com.subsidy.vo.administer.PermissionsVO; +import com.subsidy.vo.labor.LoginVO; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.impl.client.CloseableHttpClient; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** *

* 管理平台用户 服务实现类 @@ -17,4 +42,121 @@ import org.springframework.stereotype.Service; @Service public class AdministerServiceImpl extends ServiceImpl implements AdministerService { + @Autowired + private LaborServiceDictMapper laborServiceDictMapper; + + public LoginVO login(AdministerDO administerDO) { + + LoginVO loginVO = new LoginVO(); + + List integers = new ArrayList<>(); + integers.add(0); + integers.add(6); + integers.add(7); + + AdministerDO administerDO1 = this.baseMapper.selectOne(new QueryWrapper() + .lambda() + .eq(AdministerDO::getAccountName, administerDO.getAccountName()) + .in(AdministerDO::getRole, integers)); + + if (null == administerDO1) { + throw new HttpException(10012); + } + + if ("0".equals(administerDO1.getStatus())) { + throw new HttpException(10013); + } + + if (administerDO1.getPassword().equals(administerDO.getPassword())) { + String token = JwtUtil.generateToken(administerDO1.getId(), ConstantUtils.ADMINISTER_TERMINATE); + loginVO.setToken(token); + return loginVO; + }else { + throw new HttpException(10029); + } + } + + + public AdministerPermissionVO getPermissions() { + + AdministerPermissionVO administerPermissionVO = new AdministerPermissionVO(); + AdministerDO administerDO = (AdministerDO) Localstorage.getUser(); + if (administerDO == null) { + throw new HttpException(10012); + } + BeanUtils.copyProperties(administerDO, administerPermissionVO); + + List list = this.baseMapper.getPermissions(administerDO.getId()); + List treeList = new ArrayList(); + if (list != null) { + list.forEach(permission -> { + if (permission.getParentId() == null) { + treeList.add(permission); + } + + list.forEach(p -> { + if (null != p.getParentId() && p.getParentId().equals(permission.getId())) { + if (permission.getChildren() == null) { + permission.setChildren(new ArrayList<>()); + } + permission.getChildren().add(p); + } + }); + }); + } + administerPermissionVO.setPermissions(treeList); + administerPermissionVO.setTelephone(administerDO.getTelephone()); + administerPermissionVO.setAccountName(administerDO.getAccountName()); + + return administerPermissionVO; + } + + public AuthVO auth(AdministerDO administerDO){ + + CloseableHttpClient client = null; + CloseableHttpResponse response = null; + String resValue = ""; + +// long timestamp = System.currentTimeMillis(); +// String nonce = SecretUtils.getNonce(5); +// String appId = subsidyConfig.getAppId(); +// +// String appKey = subsidyConfig.getSecurityKey(); +// String accountName = administerDO.getAccountName(); + + //鉴权逻辑 对不对 + String preAuthen = "appId=qxywz5nnWMI7ABCS" + +"&id="+administerDO.getId() + +"&accountName="+administerDO.getAccountName() + + "&appSecret=626737T1-65K0-5xC2-0Y0V-2Aq9QUAJ"; + + + String signature = SecretUtils.getMD5String(preAuthen); + try { + AuthVO qxyVO = new AuthVO(); + qxyVO.setToken(signature); + return qxyVO; +// } + } catch (Exception e) { + e.printStackTrace(); + } + return new AuthVO(); + } + + public IPage changeService(ChangeServiceDTO changeServiceDTO) { + Page pager = new Page(changeServiceDTO.getPageNum(), changeServiceDTO.getPageSize()); + AdministerDO administerDO = this.baseMapper.selectById(changeServiceDTO.getId()); + if (6 == administerDO.getRole()){ + return laborServiceDictMapper.selectPage(pager,new QueryWrapper() + .lambda() + .eq(LaborServiceDictDO::getId,administerDO.getLaborId())); + }else if (0== administerDO.getRole()){ + return laborServiceDictMapper.selectPage(pager,null); + } + else { + return this.baseMapper.administerLabors(pager,changeServiceDTO.getId(),changeServiceDTO.getLaborServiceName()); + } + } + + } diff --git a/src/main/java/com/subsidy/service/impl/AdministerProjectMappingServiceImpl.java b/src/main/java/com/subsidy/service/impl/GroupMemberMappingServiceImpl.java similarity index 59% rename from src/main/java/com/subsidy/service/impl/AdministerProjectMappingServiceImpl.java rename to src/main/java/com/subsidy/service/impl/GroupMemberMappingServiceImpl.java index 92338bb..e4098e7 100644 --- a/src/main/java/com/subsidy/service/impl/AdministerProjectMappingServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/GroupMemberMappingServiceImpl.java @@ -1,20 +1,20 @@ package com.subsidy.service.impl; -import com.subsidy.model.AdministerProjectMappingDO; -import com.subsidy.mapper.AdministerProjectMappingMapper; -import com.subsidy.service.AdministerProjectMappingService; +import com.subsidy.model.GroupMemberMappingDO; +import com.subsidy.mapper.GroupMemberMappingMapper; +import com.subsidy.service.GroupMemberMappingService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** *

- * 管理员-项目映射表 服务实现类 + * 群组人员映射表 服务实现类 *

* * @author Tuyp - * @since 2024-07-18 + * @since 2024-07-23 */ @Service -public class AdministerProjectMappingServiceImpl extends ServiceImpl implements AdministerProjectMappingService { +public class GroupMemberMappingServiceImpl extends ServiceImpl implements GroupMemberMappingService { } diff --git a/src/main/java/com/subsidy/service/impl/LaborGroupDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/LaborGroupDictServiceImpl.java new file mode 100644 index 0000000..04971eb --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/LaborGroupDictServiceImpl.java @@ -0,0 +1,87 @@ +package com.subsidy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.subsidy.common.exception.HttpException; +import com.subsidy.mapper.GroupMemberMappingMapper; +import com.subsidy.model.GroupMemberMappingDO; +import com.subsidy.model.LaborGroupDictDO; +import com.subsidy.mapper.LaborGroupDictMapper; +import com.subsidy.service.GroupMemberMappingService; +import com.subsidy.service.LaborGroupDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.vo.labor.AllGroupsVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 伙伴群组字典表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-23 + */ +@Service +public class LaborGroupDictServiceImpl extends ServiceImpl implements LaborGroupDictService { + + @Autowired + private GroupMemberMappingMapper groupMemberMappingMapper; + + public AllGroupsVO allGroups(LaborGroupDictDO laborGroupDictDO) { + + //父节点的人数不包含子节点的人数 + AllGroupsVO parentCnt = groupMemberMappingMapper.parentCnt(laborGroupDictDO.getLaborId()); + + //子节点人数 + List childCnt = groupMemberMappingMapper.childCnt(laborGroupDictDO.getLaborId()); + parentCnt.setAllGroupsVOS(childCnt); + + return parentCnt; + } + + public void addGroup(LaborGroupDictDO laborGroupDictDO) { + + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(LaborGroupDictDO::getLaborId, laborGroupDictDO.getLaborId()) + .eq(LaborGroupDictDO::getGroupName, laborGroupDictDO.getGroupName())); + + if (count > 0) { + throw new HttpException(31003); + } + this.baseMapper.insert(laborGroupDictDO); + + } + + public void updateGroup(LaborGroupDictDO laborGroupDictDO) { + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(LaborGroupDictDO::getLaborId, laborGroupDictDO.getLaborId()) + .eq(LaborGroupDictDO::getGroupName, laborGroupDictDO.getGroupName()) + .ne(LaborGroupDictDO::getId, laborGroupDictDO.getId())); + + if (count > 0) { + throw new HttpException(31003); + } + this.baseMapper.updateById(laborGroupDictDO); + + } + + public void deleteGroup(LaborGroupDictDO laborGroupDictDO){ + + //删除前确认群组下是否有人 + int count = groupMemberMappingMapper.selectCount(new QueryWrapper() + .lambda() + .eq(GroupMemberMappingDO::getGroupId,laborGroupDictDO.getId())); + + if (count > 0){ + throw new HttpException(31004); + } + + this.baseMapper.deleteById(laborGroupDictDO.getId()); + } + + +} diff --git a/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java index ef5b86c..8452c28 100644 --- a/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java @@ -1,29 +1,11 @@ package com.subsidy.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.subsidy.common.exception.HttpException; -import com.subsidy.dto.labor.AbnormalRecordDTO; -import com.subsidy.dto.labor.AddProjectDTO; -import com.subsidy.dto.labor.ProjectManageDTO; -import com.subsidy.dto.labor.ProjectsDTO; -import com.subsidy.mapper.*; -import com.subsidy.model.*; -import com.subsidy.service.LaborServiceDictService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.subsidy.service.ProjectService; -import com.subsidy.vo.labor.AbnormalRecordVO; -import com.subsidy.vo.labor.LoginVO; -import com.subsidy.vo.labor.ProjectManageVO; -import com.subsidy.vo.labor.ProjectsVO; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; +import com.subsidy.mapper.LaborServiceDictMapper; +import com.subsidy.model.LaborServiceDictDO; +import com.subsidy.service.LaborServiceDictService; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; - /** *

* 劳务公司字典表 服务实现类 @@ -35,110 +17,5 @@ import java.util.List; @Service public class LaborServiceDictServiceImpl extends ServiceImpl implements LaborServiceDictService { - @Autowired - private AdministerMapper administerMapper; - - @Autowired - private ProjectMapper projectMapper; - - @Autowired - private AdministerProjectMappingMapper administerProjectMappingMapper; - - @Autowired - private ProjectMemberMappingMapper projectMemberMappingMapper; - - - public LoginVO login(AdministerDO administerDO) { - - LoginVO loginVO = new LoginVO(); - - List longs = new ArrayList<>(); - longs.add(6L); - longs.add(7L); - - AdministerDO administerDO1 = administerMapper.selectOne(new QueryWrapper() - .lambda() - .eq(AdministerDO::getAccountName, administerDO.getAccountName()) - .in(AdministerDO::getRole, longs)); - - BeanUtils.copyProperties(administerDO1, loginVO); - - return loginVO; - } - - public IPage projects(ProjectsDTO projectsDTO) { - Page page = new Page(projectsDTO.getPageNum(), projectsDTO.getPageSize()); - IPage projects = this.baseMapper.projects(page, projectsDTO.getProjectName(), projectsDTO.getUserId()); - return projects; - } - - public void addProject(AddProjectDTO addProjectDTO) { - - int count = projectMapper.selectCount(new QueryWrapper() - .lambda() - .eq(ProjectDO::getCompanyId, addProjectDTO.getCompanyId()) - .eq(ProjectDO::getLaborServiceId, addProjectDTO.getLaborServiceId()) - .eq(ProjectDO::getProjectName, addProjectDTO.getProjectName())); - - if (count > 0) { - throw new HttpException(31002); - } - - ProjectDO projectDO = new ProjectDO(); - BeanUtils.copyProperties(addProjectDTO, projectDO); - projectMapper.insert(projectDO); - - //添加管理员账户映射关系 - AdministerProjectMappingDO administerProjectMappingDO = new AdministerProjectMappingDO(); - administerProjectMappingDO.setProjectId(projectDO.getId()); - administerProjectMappingDO.setAdministerId(addProjectDTO.getUserId()); - administerProjectMappingMapper.insert(administerProjectMappingDO); - - } - - public void updateProject(AddProjectDTO addProjectDTO) { - int count = projectMapper.selectCount(new QueryWrapper() - .lambda() - .eq(ProjectDO::getCompanyId, addProjectDTO.getCompanyId()) - .eq(ProjectDO::getLaborServiceId, addProjectDTO.getLaborServiceId()) - .eq(ProjectDO::getProjectName, addProjectDTO.getProjectName()) - .ne(ProjectDO::getId, addProjectDTO.getId())); - - if (count > 0) { - throw new HttpException(31002); - } - - ProjectDO projectDO = new ProjectDO(); - BeanUtils.copyProperties(addProjectDTO, projectDO); - projectMapper.updateById(projectDO); - } - - public void deleteProject(AddProjectDTO addProjectDTO) { - projectMapper.deleteById(addProjectDTO.getId()); - - administerProjectMappingMapper.delete(new QueryWrapper() - .lambda() - .eq(AdministerProjectMappingDO::getAdministerId, addProjectDTO.getUserId()) - .eq(AdministerProjectMappingDO::getProjectId, addProjectDTO.getId())); - - } - - public IPage projectManage(ProjectManageDTO projectManageDTO) { - Page page = new Page(projectManageDTO.getPageNum(), projectManageDTO.getPageSize()); - return this.baseMapper.projectManage(page, projectManageDTO.getProjectId(), projectManageDTO.getUserInfo()); - } - - public void updateJobName(ProjectMemberMappingDO projectMemberMappingDO) { - projectMemberMappingMapper.updateById(projectMemberMappingDO); - } - - public void fireMember(ProjectMemberMappingDO projectMemberMappingDO) { - projectMemberMappingMapper.deleteById(projectMemberMappingDO.getId()); - } - - public IPage abnormalRecord(AbnormalRecordDTO abnormalRecordDTO) { - Page page = new Page(abnormalRecordDTO.getPageNum(), abnormalRecordDTO.getPageSize()); - return this.baseMapper.abnormalRecord(page,abnormalRecordDTO.getProjectId(),abnormalRecordDTO.getUserInfo()); - } } diff --git a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java index 6bd5bbc..f83c2b2 100644 --- a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java @@ -1,14 +1,43 @@ package com.subsidy.service.impl; -import com.subsidy.model.MemberDO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.common.exception.HttpException; +import com.subsidy.dto.administer.DownloadFailMembersDTO; +import com.subsidy.dto.administer.ImportMemberVO; +import com.subsidy.dto.member.AddMemberDTO; +import com.subsidy.dto.member.ImportMemberDTO; +import com.subsidy.dto.member.QueryMembersDTO; +import com.subsidy.mapper.GroupMemberMappingMapper; +import com.subsidy.mapper.LaborGroupDictMapper; import com.subsidy.mapper.MemberMapper; +import com.subsidy.mapper.ProjectMemberMappingMapper; +import com.subsidy.model.GroupMemberMappingDO; +import com.subsidy.model.LaborGroupDictDO; +import com.subsidy.model.MemberDO; +import com.subsidy.model.ProjectMemberMappingDO; import com.subsidy.service.MemberService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.util.excel.ExcelUtil; +import com.subsidy.vo.member.DetailVO; +import com.subsidy.vo.member.ImportMemberResultVO; +import com.subsidy.vo.member.QueryMembersVO; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; /** *

- * 服务实现类 + * 服务实现类 *

* * @author Tuyp @@ -17,4 +46,210 @@ import org.springframework.stereotype.Service; @Service public class MemberServiceImpl extends ServiceImpl implements MemberService { + @Autowired + private ProjectMemberMappingMapper projectMemberMappingMapper; + + @Autowired + private MemberMapper memberMapper; + + @Autowired + private GroupMemberMappingMapper groupMemberMappingMapper; + + @Autowired + private LaborGroupDictMapper laborGroupDictMapper; + + public void addMember(AddMemberDTO addMemberDTO) { + + //查看手机号是否存在 + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(MemberDO::getTelephone, addMemberDTO.getTelephone()) + .eq(MemberDO::getMemberType, 3)); + + if (count > 0) { + throw new HttpException(10027); + } + + //查看身份证号是否存在 + int count1 = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(MemberDO::getIdCard, addMemberDTO.getIdCard()) + .eq(MemberDO::getMemberType, 3)); + if (count1 > 0) { + throw new HttpException(20002); + } + MemberDO memberDO = new MemberDO(); + BeanUtils.copyProperties(addMemberDTO, memberDO); + memberDO.setMemberType(3); + this.baseMapper.insert(memberDO); + + GroupMemberMappingDO groupMemberMappingDO = new GroupMemberMappingDO(); + groupMemberMappingDO.setGroupId(addMemberDTO.getGroupId()); + groupMemberMappingDO.setMemberId(memberDO.getId()); + groupMemberMappingMapper.insert(groupMemberMappingDO); + } + + public void updateMember(AddMemberDTO addMemberDTO) { + + //查看手机号是否存在 + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(MemberDO::getTelephone, addMemberDTO.getTelephone()) + .ne(MemberDO::getId, addMemberDTO.getId()) + .eq(MemberDO::getMemberType, 3)); + + if (count > 0) { + throw new HttpException(10027); + } + + //查看身份证号是否存在 + int count1 = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(MemberDO::getIdCard, addMemberDTO.getIdCard()) + .ne(MemberDO::getId, addMemberDTO.getId()) + .eq(MemberDO::getMemberType, 3)); + if (count1 > 0) { + throw new HttpException(20002); + } + MemberDO memberDO = new MemberDO(); + BeanUtils.copyProperties(addMemberDTO, memberDO); + this.baseMapper.updateById(memberDO); + + } + + public void deleteMember(MemberDO memberDO) { + this.baseMapper.deleteById(memberDO.getId()); + } + + public IPage queryMembers(QueryMembersDTO queryMembersDTO) { + + LaborGroupDictDO laborGroupDictDO = laborGroupDictMapper.selectById(queryMembersDTO.getGroupId()); + + Page page = new Page(queryMembersDTO.getPageNum(), queryMembersDTO.getPageSize()); + + IPage queryMembers = this.baseMapper.queryMembers(page, queryMembersDTO.getGroupId(), queryMembersDTO.getUserInfo()); + + List queryMembersVOS = queryMembers.getRecords(); + for (QueryMembersVO queryMembersVO : queryMembersVOS) { + //入职状态 + List memberMappingDOS = projectMemberMappingMapper.selectList(new QueryWrapper() + .lambda() + .eq(ProjectMemberMappingDO::getMemberId, queryMembersVO.getId()) + .orderByDesc(ProjectMemberMappingDO::getId)); + + if (memberMappingDOS.size() > 0) { + if (1 == memberMappingDOS.get(0).getStatus()) { + queryMembersVO.setFireStatus("入职"); + } else { + queryMembersVO.setFireStatus("离职"); + } + } else { + queryMembersVO.setFireStatus("离职"); + } + } + return queryMembers; + } + + public List detail(GroupMemberMappingDO groupMemberMappingDO) { + return projectMemberMappingMapper.detail(groupMemberMappingDO.getMemberId()); + } + + // @Transactional(rollbackFor = Exception.class) + public ImportMemberResultVO importMember(Long groupId, MultipartFile multipartFile) throws Exception { + + ImportMemberResultVO importMemberResultVO = new ImportMemberResultVO(); + + List failMembers = new ArrayList<>(); + + int successCount = 0; + int failCount = 0; + List importMemberDTOS = ExcelUtil.readExcelWithoutTitle(null, ImportMemberDTO.class, multipartFile); + for (ImportMemberDTO s : importMemberDTOS) { + try { + + MemberDO memberDel = memberMapper.selectOne(new QueryWrapper() + .lambda() + .eq(MemberDO::getTelephone, s.getTelephone()) + .eq(MemberDO::getMemberType, 3)); + + MemberDO memberIdCard = memberMapper.selectOne(new QueryWrapper() + .lambda() + .eq(MemberDO::getIdCard, s.getIdCard()) + .eq(MemberDO::getMemberType, 3)); + + //日期格式 + SimpleDateFormat d = null; + Date date = null; + + if (StringUtils.isEmpty(s.getUserName()) || StringUtils.isEmpty(s.getTelephone()) || StringUtils.isEmpty(s.getGender()) || StringUtils.isEmpty(s.getIdCard()) || StringUtils.isEmpty(s.getPayrollAccount())) { + ImportMemberVO importMemberVO = new ImportMemberVO(); + BeanUtils.copyProperties(s, importMemberVO); + importMemberVO.setReason("必填字段"); + failMembers.add(importMemberVO); + failCount++; + } else if (null != s.getIdCard() && s.getIdCard().length() != 18) { + ImportMemberVO importMemberVO = new ImportMemberVO(); + BeanUtils.copyProperties(s, importMemberVO); + importMemberVO.setReason("身份证位数不正确"); + failMembers.add(importMemberVO); + failCount++; + } else if (null != s.getTelephone() && s.getTelephone().length() != 11) { + ImportMemberVO importMemberVO = new ImportMemberVO(); + BeanUtils.copyProperties(s, importMemberVO); + importMemberVO.setReason("手机号位数不正确"); + failMembers.add(importMemberVO); + failCount++; + } else if (null != memberDel) { + ImportMemberVO importMemberVO = new ImportMemberVO(); + BeanUtils.copyProperties(s, importMemberVO); + importMemberVO.setReason("手机号重复"); + failMembers.add(importMemberVO); + failCount++; + } else if (null != memberIdCard) { + ImportMemberVO importMemberVO = new ImportMemberVO(); + BeanUtils.copyProperties(s, importMemberVO); + importMemberVO.setReason("身份证重复"); + failMembers.add(importMemberVO); + failCount++; + } else { + MemberDO memberDO1 = new MemberDO(); + memberDO1.setUserName(s.getUserName()); + memberDO1.setGender(s.getGender()); + memberDO1.setFirstLogin(0); + memberDO1.setTelephone(s.getTelephone()); + memberDO1.setIdCard(s.getIdCard().toUpperCase()); + memberDO1.setStatus("启用"); + memberDO1.setPayrollAccount(s.getPayrollAccount()); + memberDO1.setBank(s.getBank()); + memberDO1.setMemberType(3); + memberMapper.insert(memberDO1); + + //人和群组的映射 + GroupMemberMappingDO groupMemberMappingDO = new GroupMemberMappingDO(); + groupMemberMappingDO.setMemberId(memberDO1.getId()); + groupMemberMappingDO.setGroupId(groupId); + groupMemberMappingMapper.insert(groupMemberMappingDO); + successCount++; + + } + } catch (Exception e) { + ImportMemberVO importMemberVO = new ImportMemberVO(); + BeanUtils.copyProperties(s, importMemberVO); + importMemberVO.setReason("其他原因"); + failCount++; + failMembers.add(importMemberVO); + } + } + importMemberResultVO.setImportMemberVOS(failMembers); + importMemberResultVO.setSuccessCount(successCount); + importMemberResultVO.setFailCount(failCount); + return importMemberResultVO; + } + + public void downloadFailMembers(DownloadFailMembersDTO downloadFailMembersDTO) { + List importMemberVOS = downloadFailMembersDTO.getImportMemberVOS(); + ExcelUtil.writeExcel(importMemberVOS, ImportMemberVO.class); + } + + } diff --git a/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java new file mode 100644 index 0000000..fe85032 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java @@ -0,0 +1,38 @@ +package com.subsidy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.dto.product.AllProductsDTO; +import com.subsidy.mapper.ProductDictMapper; +import com.subsidy.model.ProductDictDO; +import com.subsidy.service.ProductDictService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 产品管理字典表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@Service +public class ProductDictServiceImpl extends ServiceImpl implements ProductDictService { + + public IPage allProducts(AllProductsDTO allProductsDTO) { + Page pager = new Page(allProductsDTO.getPageNum(), allProductsDTO.getPageSize()); + return this.baseMapper.allProducts(pager, allProductsDTO.getProductName(), allProductsDTO.getProductType(),allProductsDTO.getGroundingStatus()); + } + + public List frontPage(ProductDictDO productDictDO) { + return this.baseMapper.selectList(new QueryWrapper() + .lambda() + .eq(ProductDictDO::getFrontPage, 1) + .eq(ProductDictDO::getProductType, productDictDO.getProductType()) + .orderByDesc(ProductDictDO::getCreateDate)); + } +} diff --git a/src/main/java/com/subsidy/service/impl/ServiceAdministerMappingServiceImpl.java b/src/main/java/com/subsidy/service/impl/ServiceAdministerMappingServiceImpl.java new file mode 100644 index 0000000..515294b --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/ServiceAdministerMappingServiceImpl.java @@ -0,0 +1,46 @@ +package com.subsidy.service.impl; + +import com.subsidy.mapper.AdministerMapper; +import com.subsidy.mapper.ServiceDictMapper; +import com.subsidy.model.AdministerDO; +import com.subsidy.model.AdministerLaborMappingDO; +import com.subsidy.model.ServiceAdministerMappingDO; +import com.subsidy.mapper.ServiceAdministerMappingMapper; +import com.subsidy.model.ServiceDictDO; +import com.subsidy.service.ServiceAdministerMappingService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.vo.administer.AdministerServicesVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 应用账户-业务映射表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@Service +public class ServiceAdministerMappingServiceImpl extends ServiceImpl implements ServiceAdministerMappingService { + + @Autowired + private AdministerMapper administerMapper; + + @Autowired + private ServiceDictMapper serviceDictMapper; + + public List administerServices(AdministerLaborMappingDO administerLaborMappingDO) { + List serviceDictDOS = administerMapper.administerServices(administerLaborMappingDO.getAdministerId()); + AdministerDO administerDO = administerMapper.selectById(administerLaborMappingDO.getAdministerId()); + if (administerDO.getRole()==6 || administerDO.getRole() ==7){ + //如果是伙伴账户的话，就把也返回 + ServiceDictDO serviceDictDO = serviceDictMapper.selectById(5); + serviceDictDOS.add(serviceDictDO); + } + return serviceDictDOS; + } + +} diff --git a/src/main/java/com/subsidy/service/impl/ServiceDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/ServiceDictServiceImpl.java new file mode 100644 index 0000000..4f8942f --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/ServiceDictServiceImpl.java @@ -0,0 +1,20 @@ +package com.subsidy.service.impl; + +import com.subsidy.model.ServiceDictDO; +import com.subsidy.mapper.ServiceDictMapper; +import com.subsidy.service.ServiceDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理字典表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-30 + */ +@Service +public class ServiceDictServiceImpl extends ServiceImpl implements ServiceDictService { + +} diff --git a/src/main/java/com/subsidy/vo/administer/AdministerPermissionVO.java b/src/main/java/com/subsidy/vo/administer/AdministerPermissionVO.java new file mode 100644 index 0000000..80881da --- /dev/null +++ b/src/main/java/com/subsidy/vo/administer/AdministerPermissionVO.java @@ -0,0 +1,31 @@ +package com.subsidy.vo.administer; + +import lombok.Data; + +import java.util.List; + +@Data +public class AdministerPermissionVO { + + private Long id; + + private String userName; + + private Integer role; + + private String img; + + private Boolean isRole; + + private String companyName; + + private String telephone; + + private String accountName; + + private String shortName; + + private List permissions; + +// private List getAllCompanyVOS; +} diff --git a/src/main/java/com/subsidy/vo/administer/AdministerServicesVO.java b/src/main/java/com/subsidy/vo/administer/AdministerServicesVO.java new file mode 100644 index 0000000..a5ae58f --- /dev/null +++ b/src/main/java/com/subsidy/vo/administer/AdministerServicesVO.java @@ -0,0 +1,14 @@ +package com.subsidy.vo.administer; + +import lombok.Data; + +@Data +public class AdministerServicesVO { + + private Long id; + + private String serviceName; + + private Long serviceCompanyId; + +} diff --git a/src/main/java/com/subsidy/vo/administer/AuthVO.java b/src/main/java/com/subsidy/vo/administer/AuthVO.java new file mode 100644 index 0000000..7402bd1 --- /dev/null +++ b/src/main/java/com/subsidy/vo/administer/AuthVO.java @@ -0,0 +1,10 @@ +package com.subsidy.vo.administer; + +import lombok.Data; + +@Data +public class AuthVO { + + private String token; + +} diff --git a/src/main/java/com/subsidy/vo/administer/PermissionsVO.java b/src/main/java/com/subsidy/vo/administer/PermissionsVO.java new file mode 100644 index 0000000..bda1237 --- /dev/null +++ b/src/main/java/com/subsidy/vo/administer/PermissionsVO.java @@ -0,0 +1,17 @@ +package com.subsidy.vo.administer; + +import lombok.Data; + +import java.util.List; + +@Data +public class PermissionsVO { + + private Long id; + + private Long parentId; + + private String name; + + private List children; +} diff --git a/src/main/java/com/subsidy/vo/labor/AllGroupsVO.java b/src/main/java/com/subsidy/vo/labor/AllGroupsVO.java new file mode 100644 index 0000000..9cc44d3 --- /dev/null +++ b/src/main/java/com/subsidy/vo/labor/AllGroupsVO.java @@ -0,0 +1,18 @@ +package com.subsidy.vo.labor; + +import lombok.Data; + +import java.util.List; + +@Data +public class AllGroupsVO { + + private Long id; + + private String groupName; + + private Integer cnt; + + private List allGroupsVOS; + +} diff --git a/src/main/java/com/subsidy/vo/labor/LoginVO.java b/src/main/java/com/subsidy/vo/labor/LoginVO.java index 0996cc6..c6be73d 100644 --- a/src/main/java/com/subsidy/vo/labor/LoginVO.java +++ b/src/main/java/com/subsidy/vo/labor/LoginVO.java @@ -1,57 +1,9 @@ package com.subsidy.vo.labor; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @Data public class LoginVO { - - /** - * 主键 - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 公司名称 - */ - private Long companyId; - - /** - * 账号 - */ - private String accountName; - - /** - * 手机号/企业账号 - */ - private String telephone; - - /** - * 成员名称 - */ - private String userName; - - /** - * 头像 - */ - private String img; - - /** - * 1：启用 0：禁用 - */ - private String status; - - /** - * role 0:平台运营者 1：超级管理员 2：普通成员 - */ - private Integer role; - - /** - * 备注 - */ - private String remark; - + private String token; } diff --git a/src/main/java/com/subsidy/vo/member/DetailVO.java b/src/main/java/com/subsidy/vo/member/DetailVO.java new file mode 100644 index 0000000..c313bf2 --- /dev/null +++ b/src/main/java/com/subsidy/vo/member/DetailVO.java @@ -0,0 +1,16 @@ +package com.subsidy.vo.member; + +import lombok.Data; + +@Data +public class DetailVO { + + private Long id; + + private String projectName; + + private String jobName; + + private String hireTime; + +} diff --git a/src/main/java/com/subsidy/vo/member/ImportMemberResultVO.java b/src/main/java/com/subsidy/vo/member/ImportMemberResultVO.java new file mode 100644 index 0000000..ea966bf --- /dev/null +++ b/src/main/java/com/subsidy/vo/member/ImportMemberResultVO.java @@ -0,0 +1,17 @@ +package com.subsidy.vo.member; + +import com.subsidy.dto.administer.ImportMemberVO; +import lombok.Data; + +import java.util.List; + +@Data +public class ImportMemberResultVO { + + private List importMemberVOS; + + private Integer successCount; + + private Integer failCount; + +} diff --git a/src/main/java/com/subsidy/vo/member/QueryMembersVO.java b/src/main/java/com/subsidy/vo/member/QueryMembersVO.java new file mode 100644 index 0000000..efec04a --- /dev/null +++ b/src/main/java/com/subsidy/vo/member/QueryMembersVO.java @@ -0,0 +1,27 @@ +package com.subsidy.vo.member; + +import lombok.Data; + +@Data +public class QueryMembersVO { + + private Long mappingId; + + private Long id; + + private String userName; + + private String gender; + + private String telephone; + + private String idCard; + + private String payrollAccount; + + private String bank; + + private String wechatStatus; + + private String fireStatus; +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 098d80c..ac73d71 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ # 本地环境配置 -spring.server.port=23497 +spring.server.port=23502 # 数据源配置 #spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index d56fae2..ba56839 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,5 +1,5 @@ # 生产环境配置 -spring.server.port=23497 +spring.server.port=23502 # 数据源配置 spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/subsidy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4e554b7..8f767e5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ -# 环境配置 顶岗实习 -spring.profiles.active=dev +# 环境配置 服务端 +spring.profiles.active=prod #和CPU数 spring.server.acceptorThreadCount=600 spring.server.minSpareThreads=100 diff --git a/src/main/resources/code.properties b/src/main/resources/code.properties index 7ff6610..fae04f0 100644 --- a/src/main/resources/code.properties +++ b/src/main/resources/code.properties @@ -83,3 +83,5 @@ meishu.code-message[20003]=提交时间过短，请稍后尝试 meishu.code-message[30002]=该产品已存在 meishu.code-message[31001]=该类别已存在 meishu.code-message[31002]=该项目已存在 +meishu.code-message[31003]=该群组已存在 +meishu.code-message[31004]=该群组下还有成员，无法删除 \ No newline at end of file diff --git a/src/main/resources/mapper/AdministerLaborMappingMapper.xml b/src/main/resources/mapper/AdministerLaborMappingMapper.xml new file mode 100644 index 0000000..6851515 --- /dev/null +++ b/src/main/resources/mapper/AdministerLaborMappingMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, administer_id, labor_id + + + diff --git a/src/main/resources/mapper/AdministerMapper.xml b/src/main/resources/mapper/AdministerMapper.xml index 0ce8477..31f61b5 100644 --- a/src/main/resources/mapper/AdministerMapper.xml +++ b/src/main/resources/mapper/AdministerMapper.xml @@ -2,29 +2,48 @@ - - - - - - - - - - - - - - - - + - - - create_date, - update_date, - delete_date, - id, telephone, account_name, password, company_id, user_name, img, status, role, remark - + + diff --git a/src/main/resources/mapper/GroupMemberMappingMapper.xml b/src/main/resources/mapper/GroupMemberMappingMapper.xml new file mode 100644 index 0000000..dd4645f --- /dev/null +++ b/src/main/resources/mapper/GroupMemberMappingMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + diff --git a/src/main/resources/mapper/LaborGroupDictMapper.xml b/src/main/resources/mapper/LaborGroupDictMapper.xml new file mode 100644 index 0000000..1502c27 --- /dev/null +++ b/src/main/resources/mapper/LaborGroupDictMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/src/main/resources/mapper/LaborServiceDictMapper.xml b/src/main/resources/mapper/LaborServiceDictMapper.xml index be8d2b4..fc31369 100644 --- a/src/main/resources/mapper/LaborServiceDictMapper.xml +++ b/src/main/resources/mapper/LaborServiceDictMapper.xml @@ -2,84 +2,4 @@ - - - - - - diff --git a/src/main/resources/mapper/MemberMapper.xml b/src/main/resources/mapper/MemberMapper.xml index 170dcd1..a023f99 100644 --- a/src/main/resources/mapper/MemberMapper.xml +++ b/src/main/resources/mapper/MemberMapper.xml @@ -2,47 +2,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - create_date, - update_date, - delete_date, - id, academy_id, company_id, user_name, account_name, account_name_en, email, work_no, induction_date, telephone, password, gender, image, check_image, check_time, id_card, id_card_photo, status, first_login, qq_no, wechat, practice_status, college_id, major, enrollment_year, payroll_account, bank, member_type - + + + diff --git a/src/main/resources/mapper/ProductDictMapper.xml b/src/main/resources/mapper/ProductDictMapper.xml new file mode 100644 index 0000000..d05bace --- /dev/null +++ b/src/main/resources/mapper/ProductDictMapper.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/src/main/resources/mapper/ProjectMemberMappingMapper.xml b/src/main/resources/mapper/ProjectMemberMappingMapper.xml index 9e3db86..d7d17f4 100644 --- a/src/main/resources/mapper/ProjectMemberMappingMapper.xml +++ b/src/main/resources/mapper/ProjectMemberMappingMapper.xml @@ -2,4 +2,20 @@ + + diff --git a/src/main/resources/mapper/AdministerProjectMappingMapper.xml b/src/main/resources/mapper/ServiceAdministerMappingMapper.xml similarity index 81% rename from src/main/resources/mapper/AdministerProjectMappingMapper.xml rename to src/main/resources/mapper/ServiceAdministerMappingMapper.xml index c88b840..fdeff34 100644 --- a/src/main/resources/mapper/AdministerProjectMappingMapper.xml +++ b/src/main/resources/mapper/ServiceAdministerMappingMapper.xml @@ -1,15 +1,15 @@ - + - + - + @@ -17,7 +17,7 @@ create_date, update_date, delete_date, - id, administer_id, project_id + id, administer_id, service_id diff --git a/src/main/resources/mapper/ServiceDictMapper.xml b/src/main/resources/mapper/ServiceDictMapper.xml new file mode 100644 index 0000000..2417566 --- /dev/null +++ b/src/main/resources/mapper/ServiceDictMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, service_name + + +