diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..45f0be9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/PointLion/target/ +/pointlion-admin/target/ +/pointlion-common/target/ +/pointlion-framework/target/ +/pointlion-generator/target/ +/pointlion-quartz/target/ +/pointlion-system/target/ diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..ad38804 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Zeppelin ignored files +/ZeppelinRemoteNotebooks/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b11e154 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..f8e9d96 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..6d471b0 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d5cd614 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/PointLion/pom.xml b/PointLion/pom.xml index f9a20a3..00edea4 100644 --- a/PointLion/pom.xml +++ b/PointLion/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + pointlion + com.pointlion 3.8.3 4.0.0 @@ -14,8 +14,8 @@ - com.ruoyi - ruoyi-framework + com.pointlion + pointlion-framework @@ -31,8 +31,8 @@ - com.ruoyi - ruoyi-common + com.pointlion + pointlion-common diff --git a/PointLion/src/main/java/com/ruoyi/back/home/controller/PointLionHomeController.java b/PointLion/src/main/java/com/pointlion/back/home/controller/PointLionHomeController.java similarity index 73% rename from PointLion/src/main/java/com/ruoyi/back/home/controller/PointLionHomeController.java rename to PointLion/src/main/java/com/pointlion/back/home/controller/PointLionHomeController.java index fda8b17..f7b9919 100644 --- a/PointLion/src/main/java/com/ruoyi/back/home/controller/PointLionHomeController.java +++ b/PointLion/src/main/java/com/pointlion/back/home/controller/PointLionHomeController.java @@ -1,9 +1,8 @@ -package com.ruoyi.back.home.controller; +package com.pointlion.back.home.controller; -import com.itextpdf.text.BaseColor; -import com.ruoyi.back.home.service.HomeService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; +import com.pointlion.back.home.service.HomeService; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/PointLion/src/main/java/com/ruoyi/back/home/mapper/HomeMapper.java b/PointLion/src/main/java/com/pointlion/back/home/mapper/HomeMapper.java similarity index 80% rename from PointLion/src/main/java/com/ruoyi/back/home/mapper/HomeMapper.java rename to PointLion/src/main/java/com/pointlion/back/home/mapper/HomeMapper.java index fcb3944..67f6ffe 100644 --- a/PointLion/src/main/java/com/ruoyi/back/home/mapper/HomeMapper.java +++ b/PointLion/src/main/java/com/pointlion/back/home/mapper/HomeMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.home.mapper; +package com.pointlion.back.home.mapper; import java.util.Map; diff --git a/PointLion/src/main/java/com/ruoyi/back/home/service/HomeService.java b/PointLion/src/main/java/com/pointlion/back/home/service/HomeService.java similarity index 80% rename from PointLion/src/main/java/com/ruoyi/back/home/service/HomeService.java rename to PointLion/src/main/java/com/pointlion/back/home/service/HomeService.java index 85c9ada..1ec97f4 100644 --- a/PointLion/src/main/java/com/ruoyi/back/home/service/HomeService.java +++ b/PointLion/src/main/java/com/pointlion/back/home/service/HomeService.java @@ -1,6 +1,6 @@ -package com.ruoyi.back.home.service; +package com.pointlion.back.home.service; -import com.ruoyi.back.home.mapper.HomeMapper; +import com.pointlion.back.home.mapper.HomeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/config/FlowableConfig.java b/PointLion/src/main/java/com/pointlion/back/oa/config/FlowableConfig.java similarity index 91% rename from PointLion/src/main/java/com/ruoyi/back/oa/config/FlowableConfig.java rename to PointLion/src/main/java/com/pointlion/back/oa/config/FlowableConfig.java index 4e72934..67bfa64 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/config/FlowableConfig.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/config/FlowableConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.back.oa.config; +package com.pointlion.back.oa.config; -import com.ruoyi.back.oa.service.flowImg.CustomProcessDiagramGenerator; +import com.pointlion.back.oa.service.flowImg.CustomProcessDiagramGenerator; import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl; import org.flowable.spring.SpringProcessEngineConfiguration; import org.flowable.spring.boot.ProcessEngineConfigurationConfigurer; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/config/FlowableGlobListenerConfig.java b/PointLion/src/main/java/com/pointlion/back/oa/config/FlowableGlobListenerConfig.java similarity index 90% rename from PointLion/src/main/java/com/ruoyi/back/oa/config/FlowableGlobListenerConfig.java rename to PointLion/src/main/java/com/pointlion/back/oa/config/FlowableGlobListenerConfig.java index 17e011b..918cc54 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/config/FlowableGlobListenerConfig.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/config/FlowableGlobListenerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.back.oa.config; +package com.pointlion.back.oa.config; -import com.ruoyi.back.oa.listener.GlobalProcessStartedListener; -import com.ruoyi.back.oa.listener.GlobalProcistEndListener; +import com.pointlion.back.oa.listener.GlobalProcessStartedListener; +import com.pointlion.back.oa.listener.GlobalProcistEndListener; import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType; import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher; import org.flowable.spring.SpringProcessEngineConfiguration; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/constant/WorkflowConstants.java b/PointLion/src/main/java/com/pointlion/back/oa/constant/WorkflowConstants.java similarity index 99% rename from PointLion/src/main/java/com/ruoyi/back/oa/constant/WorkflowConstants.java rename to PointLion/src/main/java/com/pointlion/back/oa/constant/WorkflowConstants.java index 60ba71b..cffbc9a 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/constant/WorkflowConstants.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/constant/WorkflowConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.constant; +package com.pointlion.back.oa.constant; import java.awt.*; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActHiTaskinstController.java b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowHiTaskinstController.java similarity index 87% rename from PointLion/src/main/java/com/ruoyi/back/oa/controller/ActHiTaskinstController.java rename to PointLion/src/main/java/com/pointlion/back/oa/controller/FlowHiTaskinstController.java index a12ac6a..3a6fde3 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActHiTaskinstController.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowHiTaskinstController.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.controller; +package com.pointlion.back.oa.controller; import java.util.List; import java.util.Map; @@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.ActHiTaskinst; -import com.ruoyi.back.oa.service.ActHiTaskinstService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.back.oa.domain.ActHiTaskinst; +import com.pointlion.back.oa.service.ActHiTaskinstService; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.common.core.page.TableDataInfo; /** * 历史任务Controller @@ -30,7 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo; */ @RestController @RequestMapping("/oa/actHiTaskInst") -public class ActHiTaskinstController extends BaseController +public class FlowHiTaskinstController extends BaseController { @Autowired private ActHiTaskinstService actHiTaskinstService; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/FlowImgController.java b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowImgController.java similarity index 85% rename from PointLion/src/main/java/com/ruoyi/back/oa/controller/FlowImgController.java rename to PointLion/src/main/java/com/pointlion/back/oa/controller/FlowImgController.java index 168f1c4..91f2c3d 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/FlowImgController.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowImgController.java @@ -1,10 +1,10 @@ -package com.ruoyi.back.oa.controller; +package com.pointlion.back.oa.controller; -import com.ruoyi.back.oa.domain.FlowProcessInstance; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.back.oa.service.FlowImgService; +import com.pointlion.back.oa.domain.FlowProcessInstance; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.back.oa.service.FlowImgService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowProcessInsController.java b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowProcessInsController.java new file mode 100644 index 0000000..1d97fa7 --- /dev/null +++ b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowProcessInsController.java @@ -0,0 +1,57 @@ +package com.pointlion.back.oa.controller; + +import com.pointlion.back.oa.domain.FlowProcessInstance; +import com.pointlion.back.oa.service.FlowProcessInstanceService; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/*** + * @des + * @author Ly + * @date 2023/5/31 + */ +@RestController +@RequestMapping("/oa/processInstance") +public class FlowProcessInsController extends BaseController { + + @Autowired + private FlowProcessInstanceService flowProcessInstanceService; + + @RequestMapping("/deleteAllProcessInstance") + public AjaxResult deleteAllProcessInstance(){ + flowProcessInstanceService.deleteAllProcessInstance(); + return success(); + } + + + + + /***** + * 提交流程 + * @param ins + * @return + * @throws Exception + */ + @RequestMapping("/submitFlow") + public AjaxResult submitFlow(@RequestBody FlowProcessInstance ins) throws Exception { + flowProcessInstanceService.submitFlow(ins); + return success(); + } + + + /***** + * 取回流程 + * @param ins + * @return + * @throws Exception + */ + @RequestMapping("/cancleFlow") + public AjaxResult cancleFlow(@RequestBody FlowProcessInstance ins) throws Exception { + flowProcessInstanceService.cancleFlow(ins); + return success(); + } +} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActReModelController.java b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowReModelController.java similarity index 89% rename from PointLion/src/main/java/com/ruoyi/back/oa/controller/ActReModelController.java rename to PointLion/src/main/java/com/pointlion/back/oa/controller/FlowReModelController.java index e3fb54f..f057a1c 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActReModelController.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowReModelController.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.controller; +package com.pointlion.back.oa.controller; import java.util.LinkedHashMap; import java.util.List; @@ -6,20 +6,18 @@ import java.util.Map; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.Page; -import com.ruoyi.back.oa.service.ActReModelService; +import com.pointlion.back.oa.service.ActReModelService; import org.flowable.engine.RepositoryService; import org.flowable.engine.impl.persistence.entity.ModelEntityImpl; import org.flowable.engine.repository.Model; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -//import com.ruoyi.oa.domain.ActReModel; -//import com.ruoyi.oa.service.IActReModelService; -import com.ruoyi.common.core.page.TableDataInfo; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.core.page.TableDataInfo; /** * 流程图Controller @@ -29,7 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo; */ @RestController @RequestMapping("/oa/model") -public class ActReModelController extends BaseController +public class FlowReModelController extends BaseController { @Autowired @@ -42,6 +40,7 @@ public class ActReModelController extends BaseController @PreAuthorize("@ss.hasPermi('oa:model:list')") @GetMapping("/list") public TableDataInfo list(ModelEntityImpl modelEntity) { + startPage(); Page list = actReModelService.list(modelEntity); return getDataTable(list); } diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActReProcdefController.java b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowReProcdefController.java similarity index 90% rename from PointLion/src/main/java/com/ruoyi/back/oa/controller/ActReProcdefController.java rename to PointLion/src/main/java/com/pointlion/back/oa/controller/FlowReProcdefController.java index 8d106e7..4e2a339 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActReProcdefController.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/controller/FlowReProcdefController.java @@ -1,13 +1,13 @@ -package com.ruoyi.back.oa.controller; +package com.pointlion.back.oa.controller; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.back.oa.domain.ActReProcdef; -import com.ruoyi.back.erp.service.ActReProcdefService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; +import com.pointlion.back.oa.domain.ActReProcdef; +import com.pointlion.back.oa.service.ActReProcdefService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; import org.flowable.engine.RepositoryService; import org.flowable.engine.repository.ProcessDefinitionQuery; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +28,7 @@ import java.util.List; */ @RestController @RequestMapping("/oa/definition") -public class ActReProcdefController extends BaseController +public class FlowReProcdefController extends BaseController { @Autowired private ActReProcdefService actReProcdefService; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/VTasklistController.java b/PointLion/src/main/java/com/pointlion/back/oa/controller/VTasklistController.java similarity index 76% rename from PointLion/src/main/java/com/ruoyi/back/oa/controller/VTasklistController.java rename to PointLion/src/main/java/com/pointlion/back/oa/controller/VTasklistController.java index 414acb7..5107457 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/VTasklistController.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/controller/VTasklistController.java @@ -1,23 +1,23 @@ -package com.ruoyi.back.oa.controller; +package com.pointlion.back.oa.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.back.oa.domain.CommitTask; -import com.ruoyi.back.oa.domain.FlowProcessInstance; -import com.ruoyi.back.oa.service.VTasklistService; -import com.ruoyi.back.oa.domain.OaCustomFormApply; -import com.ruoyi.back.oa.service.OaTaskService; +import com.pointlion.back.oa.domain.CommitTask; +import com.pointlion.back.oa.domain.FlowProcessInstance; +import com.pointlion.back.oa.service.VTasklistService; +//import com.pointlion.back.oa.domain.OaCustomFormApply; +//import com.pointlion.back.oa.service.OaTaskService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.VTasklist; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.back.oa.domain.VTasklist; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.common.core.page.TableDataInfo; /** * 我的待办Controller @@ -31,8 +31,8 @@ public class VTasklistController extends BaseController { @Autowired private VTasklistService vTasklistService; - @Autowired - private OaTaskService oaTaskService; + //@Autowired + //private OaTaskService oaTaskService; /** @@ -110,14 +110,14 @@ public class VTasklistController extends BaseController /** * 获取我的待办详细信息 */ - @GetMapping(value = "/getCustomFormByTaskId/{taskId}") - public AjaxResult getCustomFormByTaskId(@PathVariable("taskId") String taskId) - { - - OaCustomFormApply oaCustomFormApply = oaTaskService.getCustomFormByTaskId(taskId); - - return AjaxResult.success(oaCustomFormApply); - } + //@GetMapping(value = "/getCustomFormByTaskId/{taskId}") + //public AjaxResult getCustomFormByTaskId(@PathVariable("taskId") String taskId) + //{ + // + // OaCustomFormApply oaCustomFormApply = oaTaskService.getCustomFormByTaskId(taskId); + // + // return AjaxResult.success(oaCustomFormApply); + //} /****** diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/ActHiTaskinst.java b/PointLion/src/main/java/com/pointlion/back/oa/domain/ActHiTaskinst.java similarity index 96% rename from PointLion/src/main/java/com/ruoyi/back/oa/domain/ActHiTaskinst.java rename to PointLion/src/main/java/com/pointlion/back/oa/domain/ActHiTaskinst.java index ac12101..3bcd7fa 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/ActHiTaskinst.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/domain/ActHiTaskinst.java @@ -1,12 +1,12 @@ -package com.ruoyi.back.oa.domain; +package com.pointlion.back.oa.domain; import lombok.Data; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; /** * 历史任务对象 act_hi_taskinst diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/ActReProcdef.java b/PointLion/src/main/java/com/pointlion/back/oa/domain/ActReProcdef.java similarity index 86% rename from PointLion/src/main/java/com/ruoyi/back/oa/domain/ActReProcdef.java rename to PointLion/src/main/java/com/pointlion/back/oa/domain/ActReProcdef.java index 141ac37..57761b8 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/ActReProcdef.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/domain/ActReProcdef.java @@ -1,7 +1,7 @@ -package com.ruoyi.back.oa.domain; +package com.pointlion.back.oa.domain; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/CommitTask.java b/PointLion/src/main/java/com/pointlion/back/oa/domain/CommitTask.java similarity index 85% rename from PointLion/src/main/java/com/ruoyi/back/oa/domain/CommitTask.java rename to PointLion/src/main/java/com/pointlion/back/oa/domain/CommitTask.java index 7225f91..eda3247 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/CommitTask.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/domain/CommitTask.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.domain; +package com.pointlion.back.oa.domain; import lombok.Data; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/FlowProcessInstance.java b/PointLion/src/main/java/com/pointlion/back/oa/domain/FlowProcessInstance.java similarity index 68% rename from PointLion/src/main/java/com/ruoyi/back/oa/domain/FlowProcessInstance.java rename to PointLion/src/main/java/com/pointlion/back/oa/domain/FlowProcessInstance.java index 2404b59..f2e08f9 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/FlowProcessInstance.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/domain/FlowProcessInstance.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.domain; +package com.pointlion.back.oa.domain; import lombok.Data; @@ -12,7 +12,7 @@ public class FlowProcessInstance { private String billType; - private String businessId; + private Long businessId; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdCar.java b/PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdCar.java similarity index 91% rename from PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdCar.java rename to PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdCar.java index 9e0a99e..9f21649 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdCar.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdCar.java @@ -1,10 +1,10 @@ -package com.ruoyi.back.oa.domain; +package com.pointlion.back.oa.domain; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; /** * 车辆管理对象 oa_bd_car diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdMeetingroom.java b/PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdMeetingroom.java similarity index 89% rename from PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdMeetingroom.java rename to PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdMeetingroom.java index 69dcc68..692ed52 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdMeetingroom.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdMeetingroom.java @@ -1,10 +1,10 @@ -package com.ruoyi.back.oa.domain; +package com.pointlion.back.oa.domain; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; /** * 会议室管理对象 oa_bd_meetingroom diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdSeal.java b/PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdSeal.java similarity index 88% rename from PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdSeal.java rename to PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdSeal.java index 3e81f48..1c9483a 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdSeal.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdSeal.java @@ -1,10 +1,10 @@ -package com.ruoyi.back.oa.domain; +package com.pointlion.back.oa.domain; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; /** * 公章管理对象 oa_bd_seal diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/VTasklist.java b/PointLion/src/main/java/com/pointlion/back/oa/domain/VTasklist.java similarity index 95% rename from PointLion/src/main/java/com/ruoyi/back/oa/domain/VTasklist.java rename to PointLion/src/main/java/com/pointlion/back/oa/domain/VTasklist.java index 3cf923c..f89bd59 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/VTasklist.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/domain/VTasklist.java @@ -1,10 +1,10 @@ -package com.ruoyi.back.oa.domain; +package com.pointlion.back.oa.domain; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; /** * 我的待办对象 v_tasklist diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/listener/GlobalProcessStartedListener.java b/PointLion/src/main/java/com/pointlion/back/oa/listener/GlobalProcessStartedListener.java similarity index 98% rename from PointLion/src/main/java/com/ruoyi/back/oa/listener/GlobalProcessStartedListener.java rename to PointLion/src/main/java/com/pointlion/back/oa/listener/GlobalProcessStartedListener.java index 843c13a..d67fe68 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/listener/GlobalProcessStartedListener.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/listener/GlobalProcessStartedListener.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.listener; +package com.pointlion.back.oa.listener; import org.flowable.engine.delegate.event.impl.FlowableEntityEventImpl; import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/listener/GlobalProcistEndListener.java b/PointLion/src/main/java/com/pointlion/back/oa/listener/GlobalProcistEndListener.java similarity index 96% rename from PointLion/src/main/java/com/ruoyi/back/oa/listener/GlobalProcistEndListener.java rename to PointLion/src/main/java/com/pointlion/back/oa/listener/GlobalProcistEndListener.java index 02cb668..7201ad1 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/listener/GlobalProcistEndListener.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/listener/GlobalProcistEndListener.java @@ -1,9 +1,9 @@ -package com.ruoyi.back.oa.listener; +package com.pointlion.back.oa.listener; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.back.oa.mapper.FlowProcessMapper; -import com.ruoyi.common.constant.CommonConstants; +import com.pointlion.back.oa.mapper.FlowProcessMapper; +import com.pointlion.common.constant.CommonConstants; import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener; import org.flowable.engine.delegate.event.impl.FlowableEntityEventImpl; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/ActHiTaskinstMapper.java b/PointLion/src/main/java/com/pointlion/back/oa/mapper/ActHiTaskinstMapper.java similarity index 93% rename from PointLion/src/main/java/com/ruoyi/back/oa/mapper/ActHiTaskinstMapper.java rename to PointLion/src/main/java/com/pointlion/back/oa/mapper/ActHiTaskinstMapper.java index 52bb111..2a33009 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/ActHiTaskinstMapper.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/mapper/ActHiTaskinstMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.back.oa.mapper; +package com.pointlion.back.oa.mapper; import java.util.List; import java.util.Map; -import com.ruoyi.back.oa.domain.ActHiTaskinst; +import com.pointlion.back.oa.domain.ActHiTaskinst; /** * 历史任务Mapper接口 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/ActReProcdefMapper.java b/PointLion/src/main/java/com/pointlion/back/oa/mapper/ActReProcdefMapper.java similarity index 75% rename from PointLion/src/main/java/com/ruoyi/back/oa/mapper/ActReProcdefMapper.java rename to PointLion/src/main/java/com/pointlion/back/oa/mapper/ActReProcdefMapper.java index f9d41df..f2e87f7 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/ActReProcdefMapper.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/mapper/ActReProcdefMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.back.oa.mapper; +package com.pointlion.back.oa.mapper; -import com.ruoyi.back.oa.domain.ActReProcdef; +import com.pointlion.back.oa.domain.ActReProcdef; import java.util.List; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/FlowProcessMapper.java b/PointLion/src/main/java/com/pointlion/back/oa/mapper/FlowProcessMapper.java similarity index 81% rename from PointLion/src/main/java/com/ruoyi/back/oa/mapper/FlowProcessMapper.java rename to PointLion/src/main/java/com/pointlion/back/oa/mapper/FlowProcessMapper.java index 2ef48e6..ed24659 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/FlowProcessMapper.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/mapper/FlowProcessMapper.java @@ -1,10 +1,7 @@ -package com.ruoyi.back.oa.mapper; +package com.pointlion.back.oa.mapper; -import com.ruoyi.back.oa.domain.VTasklist; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * 流程实例 * diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdCarMapper.java b/PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdCarMapper.java similarity index 93% rename from PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdCarMapper.java rename to PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdCarMapper.java index c8835a5..06f1713 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdCarMapper.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdCarMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.back.oa.mapper; +package com.pointlion.back.oa.mapper; import java.util.List; -import com.ruoyi.back.oa.domain.OaBdCar; +import com.pointlion.back.oa.domain.OaBdCar; /** * 车辆管理Mapper接口 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdMeetingroomMapper.java b/PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdMeetingroomMapper.java similarity index 93% rename from PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdMeetingroomMapper.java rename to PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdMeetingroomMapper.java index ba730d6..fad9efa 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdMeetingroomMapper.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdMeetingroomMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.back.oa.mapper; +package com.pointlion.back.oa.mapper; import java.util.List; -import com.ruoyi.back.oa.domain.OaBdMeetingroom; +import com.pointlion.back.oa.domain.OaBdMeetingroom; /** * 会议室管理Mapper接口 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdSealMapper.java b/PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdSealMapper.java similarity index 93% rename from PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdSealMapper.java rename to PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdSealMapper.java index 39c3aec..0b38486 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdSealMapper.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdSealMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.back.oa.mapper; +package com.pointlion.back.oa.mapper; import java.util.List; -import com.ruoyi.back.oa.domain.OaBdSeal; +import com.pointlion.back.oa.domain.OaBdSeal; /** * 公章管理Mapper接口 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/VTasklistMapper.java b/PointLion/src/main/java/com/pointlion/back/oa/mapper/VTasklistMapper.java similarity index 90% rename from PointLion/src/main/java/com/ruoyi/back/oa/mapper/VTasklistMapper.java rename to PointLion/src/main/java/com/pointlion/back/oa/mapper/VTasklistMapper.java index d5be070..fcaaf6b 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/VTasklistMapper.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/mapper/VTasklistMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.back.oa.mapper; +package com.pointlion.back.oa.mapper; import java.util.List; -import com.ruoyi.back.oa.domain.VTasklist; +import com.pointlion.back.oa.domain.VTasklist; /** * 我的待办Mapper接口 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/ActHiTaskinstService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/ActHiTaskinstService.java similarity index 93% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/ActHiTaskinstService.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/ActHiTaskinstService.java index 8e46db3..7894705 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/ActHiTaskinstService.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/ActHiTaskinstService.java @@ -1,12 +1,12 @@ -package com.ruoyi.back.oa.service; +package com.pointlion.back.oa.service; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.back.oa.mapper.ActHiTaskinstMapper; -import com.ruoyi.back.oa.domain.ActHiTaskinst; +import com.pointlion.back.oa.mapper.ActHiTaskinstMapper; +import com.pointlion.back.oa.domain.ActHiTaskinst; /** * 历史任务Service业务层处理 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/ActReModelService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/ActReModelService.java similarity index 94% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/ActReModelService.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/ActReModelService.java index ff17bd8..a1a255b 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/ActReModelService.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/ActReModelService.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.service; +package com.pointlion.back.oa.service; import cn.hutool.core.lang.UUID; import cn.hutool.json.JSONObject; @@ -6,14 +6,14 @@ import cn.hutool.json.JSONUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.pagehelper.Page; -import com.ruoyi.back.erp.service.BaseService; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; +import com.pointlion.common.service.base.BaseService; +import com.pointlion.common.annotation.DataScope; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.page.PageDomain; +import com.pointlion.common.core.page.TableSupport; +import com.pointlion.system.mapper.SysRoleMapper; +import com.pointlion.system.mapper.SysUserMapper; import org.apache.batik.transcoder.TranscoderInput; import org.apache.batik.transcoder.TranscoderOutput; import org.apache.batik.transcoder.image.PNGTranscoder; @@ -61,13 +61,13 @@ public class ActReModelService extends BaseService { ModelQuery modelQuery = repositoryService.createModelQuery(); modelQuery.orderByLastUpdateTime().desc(); // 条件过滤 - if (com.ruoyi.common.utils.StringUtils.isNotBlank(modelEntity.getKey())) { + if (com.pointlion.common.utils.StringUtils.isNotBlank(modelEntity.getKey())) { modelQuery.modelKey(modelEntity.getKey()); } - if (com.ruoyi.common.utils.StringUtils.isNotBlank(modelEntity.getName())) { + if (com.pointlion.common.utils.StringUtils.isNotBlank(modelEntity.getName())) { modelQuery.modelNameLike("%" + modelEntity.getName() + "%"); } - if (com.ruoyi.common.utils.StringUtils.isNotBlank(modelEntity.getCategory())) { + if (com.pointlion.common.utils.StringUtils.isNotBlank(modelEntity.getCategory())) { modelQuery.modelCategory(modelEntity.getCategory()); } PageDomain pageDomain = TableSupport.buildPageRequest(); diff --git a/PointLion/src/main/java/com/pointlion/back/oa/service/ActReProcdefService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/ActReProcdefService.java new file mode 100644 index 0000000..a55b816 --- /dev/null +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/ActReProcdefService.java @@ -0,0 +1,219 @@ +package com.pointlion.back.oa.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.github.pagehelper.Page; +import com.pointlion.back.oa.domain.ActReProcdef; +import com.pointlion.back.oa.mapper.ActReProcdefMapper; +import com.pointlion.common.core.page.PageDomain; +import com.pointlion.common.core.page.TableSupport; +import com.pointlion.common.core.text.Convert; +import com.pointlion.common.util.Base64Util; +import com.pointlion.common.utils.StringUtils; +import org.flowable.bpmn.converter.BpmnXMLConverter; +import org.flowable.bpmn.model.BpmnModel; +import org.flowable.editor.constants.ModelDataJsonConstants; +import org.flowable.editor.language.json.converter.BpmnJsonConverter; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.RuntimeService; +import org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntityImpl; +import org.flowable.engine.repository.Deployment; +import org.flowable.engine.repository.Model; +import org.flowable.engine.repository.ProcessDefinition; +import org.flowable.engine.repository.ProcessDefinitionQuery; +import org.flowable.engine.runtime.ProcessInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import java.io.*; +import java.util.List; +import java.util.zip.ZipInputStream; + +@Transactional +@Service +public class ActReProcdefService { + + @Autowired + private RuntimeService runtimeService; + @Autowired + private RepositoryService repositoryService; + @Autowired + private ActReProcdefMapper actReProcdefMapper; + + + /** + * 分页查询流程定义文件 + * @return + */ + public Page listProcessDefinition(ActReProcdef actReProcdef) { + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + + Page list = new Page<>(); + ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); + processDefinitionQuery.orderByProcessDefinitionId().orderByProcessDefinitionVersion().desc(); + if (StringUtils.isNotBlank(actReProcdef.getName())) { + processDefinitionQuery.processDefinitionNameLike("%" + actReProcdef.getName() + "%"); + } + if (StringUtils.isNotBlank(actReProcdef.getKey())) { + processDefinitionQuery.processDefinitionKeyLike("%" + actReProcdef.getKey() + "%"); + } + if (StringUtils.isNotBlank(actReProcdef.getCategory())) { + processDefinitionQuery.processDefinitionCategoryLike("%" + actReProcdef.getCategory() + "%"); + } + + List processDefinitionList; + if (pageNum != null && pageSize != null) { + processDefinitionList = processDefinitionQuery.listPage((pageNum - 1) * pageSize, pageSize); + list.setTotal(processDefinitionQuery.count()); + list.setPageNum(pageNum); + list.setPageSize(pageSize); + } else { + processDefinitionList = processDefinitionQuery.list(); + } + for (ProcessDefinition definition: processDefinitionList) { + ProcessDefinitionEntityImpl entityImpl = (ProcessDefinitionEntityImpl) definition; + ActReProcdef entity = new ActReProcdef(); + entity.setId(definition.getId()); + entity.setKey(definition.getKey()); + entity.setName(definition.getName()); + entity.setCategory(definition.getCategory()); + entity.setVersion(definition.getVersion()); + entity.setDescription("null".equals(definition.getDescription())?"":definition.getDescription()); + entity.setDeploymentId(definition.getDeploymentId()); + Deployment deployment = repositoryService.createDeploymentQuery() + .deploymentId(definition.getDeploymentId()) + .singleResult(); + entity.setDeploymentTime(deployment.getDeploymentTime()); + //repositoryService.getDeploymentResourceNames(definition.getDeploymentId());//获取所有资源的名称 + entity.setDiagramResourceName(definition.getDiagramResourceName()); + entity.setResourceName(definition.getResourceName()); + entity.setSuspendState(entityImpl.getSuspensionState() + ""); + if (entityImpl.getSuspensionState() == 1) { + entity.setSuspendStateName("已激活"); + } else { + entity.setSuspendStateName("已挂起"); + } + list.add(entity); + } + return list; + } + + public void deployProcessDefinition(String filePath) throws FileNotFoundException { + if (StringUtils.isNotBlank(filePath)) { + if (filePath.endsWith(".zip")) { + ZipInputStream inputStream = new ZipInputStream(new FileInputStream(filePath)); + repositoryService.createDeployment() + .addZipInputStream(inputStream) + .deploy(); + } else if (filePath.endsWith(".bpmn")) { + repositoryService.createDeployment() + .addInputStream(filePath, new FileInputStream(filePath)) + .deploy(); + } + } + } + + /***** + * 删除 + * @param deploymentIds + * @return + * @throws Exception + */ + public int deleteProcessDeploymentByIds(String deploymentIds) throws Exception { + String[] deploymentIdsArr = Convert.toStrArray(deploymentIds); + int counter = 0; + for (String deploymentId: deploymentIdsArr) { + List instanceList = runtimeService.createProcessInstanceQuery() + .deploymentId(deploymentId) + .list(); + if (!CollectionUtils.isEmpty(instanceList)) { + // 存在流程实例的流程定义 + throw new Exception("删除失败，存在运行中的流程实例"); + } + repositoryService.deleteDeployment(deploymentId, true); // true 表示级联删除引用，比如 act_ru_execution 数据 + counter++; + } + return counter; + } + + /**** + * 挂起和激活 + * @param id + * @param suspendState + */ + public void suspendOrActiveApply(String id, String suspendState) { + if ("1".equals(suspendState)) { + // 当流程定义被挂起时，已经发起的该流程定义的流程实例不受影响（如果选择级联挂起则流程实例也会被挂起）。 + // 当流程定义被挂起时，无法发起新的该流程定义的流程实例。 + // 直观变化：act_re_procdef 的 SUSPENSION_STATE_ 为 2 + repositoryService.suspendProcessDefinitionById(id); + } else if ("2".equals(suspendState)) { + repositoryService.activateProcessDefinitionById(id); + } + } + + /**** + * 读取流程资源 + * @param processDefinitionId + * @param resourceName + * @return + */ + public String readResourceImg(String processDefinitionId, String resourceName) throws IOException { + ProcessDefinitionQuery pdq = repositoryService.createProcessDefinitionQuery(); + ProcessDefinition pd = pdq.processDefinitionId(processDefinitionId).singleResult(); + // 通过接口读取 + InputStream resourceAsStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), resourceName); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + // 输出资源内容到相应对象 + byte[] b = new byte[1024]; + int len = -1; + while ((len = resourceAsStream.read(b, 0, 1024)) != -1) { + output.write(b, 0, len); + } + return Base64Util.byte2Base64(output.toByteArray()); + } + + /*** + * 转化为模型 + * @param processDefinitionId + * @throws UnsupportedEncodingException + * @throws XMLStreamException + */ + public void convertToModel(String processDefinitionId) throws UnsupportedEncodingException, XMLStreamException { + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() + .processDefinitionId(processDefinitionId).singleResult(); + InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), + processDefinition.getResourceName()); + XMLInputFactory xif = XMLInputFactory.newInstance(); + InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8"); + XMLStreamReader xtr = xif.createXMLStreamReader(in); + BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr); + BpmnJsonConverter converter = new BpmnJsonConverter(); + ObjectNode modelNode = converter.convertToJson(bpmnModel); + Model modelData = repositoryService.newModel(); + modelData.setKey(processDefinition.getKey()); + modelData.setName(processDefinition.getName()); + modelData.setCategory(processDefinition.getCategory());//.getDeploymentId()); + modelData.setDeploymentId(processDefinition.getDeploymentId()); + modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1))); + ObjectNode modelObjectNode = new ObjectMapper().createObjectNode(); + modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName()); + modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion()); + modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription()); + modelData.setMetaInfo(modelObjectNode.toString()); + repositoryService.saveModel(modelData); + repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8")); + } + + + public List selectAllFlowList(){ + return actReProcdefMapper.selectAllFlowList(); + } +} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/FlowImgService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/FlowImgService.java similarity index 97% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/FlowImgService.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/FlowImgService.java index 4f7cf5a..98d7a22 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/FlowImgService.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/FlowImgService.java @@ -1,10 +1,9 @@ -package com.ruoyi.back.oa.service; +package com.pointlion.back.oa.service; -import com.ruoyi.back.erp.service.ActReProcdefService; -import com.ruoyi.back.erp.service.BaseService; -import com.ruoyi.common.constant.BillTypeEnum; -import com.ruoyi.common.util.Base64Util; -import com.ruoyi.back.oa.service.flowImg.CustomProcessDiagramGenerator; +import com.pointlion.common.service.base.BaseService; +import com.pointlion.common.constant.BillTypeEnum; +import com.pointlion.common.util.Base64Util; +import com.pointlion.back.oa.service.flowImg.CustomProcessDiagramGenerator; import org.apache.commons.lang3.StringUtils; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.FlowElement; @@ -17,7 +16,6 @@ import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.Execution; -import org.flowable.engine.runtime.ProcessInstance; import org.flowable.image.ProcessDiagramGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -329,7 +327,7 @@ public class FlowImgService extends BaseService { * @param billType * @return */ - public String getDefImgByBusinessId(String businessId,String billType) throws IOException { + public String getDefImgByBusinessId(Long businessId,String billType) throws IOException { String imgStr = ""; String businessKey = billType+":"+BillTypeEnum.getTableName(billType)+":"+businessId; List list = historyService.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey).orderByProcessInstanceStartTime().desc().list(); diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/FlowProcessInstanceService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/FlowProcessInstanceService.java similarity index 52% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/FlowProcessInstanceService.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/FlowProcessInstanceService.java index 08a777d..f45aff5 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/FlowProcessInstanceService.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/FlowProcessInstanceService.java @@ -1,15 +1,16 @@ -package com.ruoyi.back.oa.service; +package com.pointlion.back.oa.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import com.ruoyi.back.oa.mapper.FlowProcessMapper; -import com.ruoyi.common.constant.BillTypeEnum; -import com.ruoyi.common.constant.CommonConstants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.util.FlowUtil; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.system.mapper.SysUserMapper; +import com.pointlion.back.oa.domain.FlowProcessInstance; +import com.pointlion.back.oa.mapper.FlowProcessMapper; +import com.pointlion.common.constant.BillTypeEnum; +import com.pointlion.common.constant.CommonConstants; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.util.FlowUtil; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.system.mapper.SysUserMapper; import org.flowable.bpmn.model.EndEvent; import org.flowable.bpmn.model.FlowElement; import org.flowable.bpmn.model.Process; @@ -20,7 +21,6 @@ import org.flowable.engine.TaskService; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.runtime.Execution; import org.flowable.engine.runtime.ProcessInstance; -import org.flowable.task.api.Task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,6 +48,104 @@ public class FlowProcessInstanceService { private FlowProcessMapper flowProcessMapper; @Autowired private SysUserMapper sysUserMapper; + //@Autowired + //private OaDutyApplyService oaDutyApplyService; + //@Autowired + //private OaReimburseApplyService oaReimburseApplyService; + //@Autowired + //private OaCustomFormApplyService oaCustomFormApplyService; + // + // + //@Autowired + //private OaHotelApplyService oaHotelApplyService; + //@Autowired + //private OaMeetingroomApplyService oaMeetingroomApplyService; + //@Autowired + //private OaTicketApplyService oaTicketApplyService; + //@Autowired + //private OaCarApplyService oaCarApplyService; + //@Autowired + //private OaSealApplyService oaSealApplyService; + + + + + + + /***** + * 启动流程---入口，调用其他单据类型服务 + * @param ins + */ + public void submitFlow(FlowProcessInstance ins ){ + //假勤申请 + //if(BillTypeEnum.DUTY_LEAVE.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OTHERCITYWORK.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OUT.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OVERTIME.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_REST.getBillType().equals(ins.getBillType())){ + // oaDutyApplyService.submitFlow(ins.getBusinessId()); + //} + //else if(BillTypeEnum.REIMBURSE.getBillType().equals(ins.getBillType())|| BillTypeEnum.REIMBURSE_BUS.getBillType().equals(ins.getBillType())){ + // oaReimburseApplyService.submitFlow(ins.getBusinessId()); + //} + //else if(BillTypeEnum.CUSTOM_FORM.getBillType().equals(ins.getBillType())){ + // oaCustomFormApplyService.submitApply(ins.getBusinessId()); + //} + //else if(BillTypeEnum.CAR_APPLY.getBillType().equals(ins.getBillType())){ + // oaCarApplyService.submitFlow(ins.getBusinessId()); + //} + // + //else if(BillTypeEnum.HOTEL_APPLY.getBillType().equals(ins.getBillType())){ + // oaHotelApplyService.submitFlow(ins.getBusinessId()); + //} + //else if(BillTypeEnum.MEETINGROOM_APPLY.getBillType().equals(ins.getBillType())){ + // oaMeetingroomApplyService.submitFlow(ins.getBusinessId()); + //} + //else if(BillTypeEnum.TICKET_APPLY.getBillType().equals(ins.getBillType())){ + // oaTicketApplyService.submitFlow(ins.getBusinessId()); + //} + //else if(BillTypeEnum.SEAL_APPLY.getBillType().equals(ins.getBillType())){ + // oaSealApplyService.submitFlow(ins.getBusinessId()); + //} + + //else{ + // throw new RuntimeException("未匹配到流程，请检查单据类型"); + //} + + + + } + + + /**** + * 取回流程---入口调用其他单据类型服务 + * @param ins + */ + public void cancleFlow(FlowProcessInstance ins ){ + //假勤申请 + //if(BillTypeEnum.DUTY_LEAVE.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OTHERCITYWORK.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OUT.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OVERTIME.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_REST.getBillType().equals(ins.getBillType())){ + // oaDutyApplyService.cancleFlow(ins.getBusinessId()); + //}else if(BillTypeEnum.REIMBURSE.getBillType().equals(ins.getBillType())|| BillTypeEnum.REIMBURSE_BUS.getBillType().equals(ins.getBillType())){ + // oaReimburseApplyService.cancleFlow(ins.getBusinessId()); + //}else if(BillTypeEnum.CUSTOM_FORM.getBillType().equals(ins.getBillType())){ + // oaCustomFormApplyService.cancleFlow(ins.getBusinessId()); + //}else if(BillTypeEnum.CAR_APPLY.getBillType().equals(ins.getBillType())){ + // oaCarApplyService.cancleFlow(ins.getBusinessId()); + //} + // + //else if(BillTypeEnum.HOTEL_APPLY.getBillType().equals(ins.getBillType())){ + // oaHotelApplyService.cancleFlow(ins.getBusinessId()); + //} + //else if(BillTypeEnum.MEETINGROOM_APPLY.getBillType().equals(ins.getBillType())){ + // oaMeetingroomApplyService.cancleFlow(ins.getBusinessId()); + //} + //else if(BillTypeEnum.TICKET_APPLY.getBillType().equals(ins.getBillType())){ + // oaTicketApplyService.cancleFlow(ins.getBusinessId()); + //} + //else if(BillTypeEnum.SEAL_APPLY.getBillType().equals(ins.getBillType())){ + // oaSealApplyService.cancleFlow(ins.getBusinessId()); + //} + //else{ + // throw new RuntimeException("未匹配到流程，请检查单据类型"); + //} + } + /**** @@ -146,4 +244,8 @@ public class FlowProcessInstanceService { } + + + + } diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdCarService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/OaBdCarService.java similarity index 89% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdCarService.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/OaBdCarService.java index 56480c1..8eac8d9 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdCarService.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/OaBdCarService.java @@ -1,12 +1,11 @@ -package com.ruoyi.back.oa.service; +package com.pointlion.back.oa.service; import java.util.List; -import com.ruoyi.common.utils.DateUtils; +import com.pointlion.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.back.oa.mapper.OaBdCarMapper; -import com.ruoyi.back.oa.domain.OaBdCar; -import com.ruoyi.back.oa.service.OaBdCarService; +import com.pointlion.back.oa.mapper.OaBdCarMapper; +import com.pointlion.back.oa.domain.OaBdCar; /** * 车辆管理Service业务层处理 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdMeetingroomService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/OaBdMeetingroomService.java similarity index 90% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdMeetingroomService.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/OaBdMeetingroomService.java index 3ef1a33..f7ace54 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdMeetingroomService.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/OaBdMeetingroomService.java @@ -1,12 +1,11 @@ -package com.ruoyi.back.oa.service; +package com.pointlion.back.oa.service; import java.util.List; -import com.ruoyi.common.utils.DateUtils; +import com.pointlion.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.back.oa.mapper.OaBdMeetingroomMapper; -import com.ruoyi.back.oa.domain.OaBdMeetingroom; -import com.ruoyi.back.oa.service.OaBdMeetingroomService; +import com.pointlion.back.oa.mapper.OaBdMeetingroomMapper; +import com.pointlion.back.oa.domain.OaBdMeetingroom; /** * 会议室管理Service业务层处理 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdSealService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/OaBdSealService.java similarity index 89% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdSealService.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/OaBdSealService.java index 3d12e87..f863616 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdSealService.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/OaBdSealService.java @@ -1,12 +1,11 @@ -package com.ruoyi.back.oa.service; +package com.pointlion.back.oa.service; import java.util.List; -import com.ruoyi.common.utils.DateUtils; +import com.pointlion.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.back.oa.mapper.OaBdSealMapper; -import com.ruoyi.back.oa.domain.OaBdSeal; -import com.ruoyi.back.oa.service.OaBdSealService; +import com.pointlion.back.oa.mapper.OaBdSealMapper; +import com.pointlion.back.oa.domain.OaBdSeal; /** * 公章管理Service业务层处理 diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/VTasklistService.java b/PointLion/src/main/java/com/pointlion/back/oa/service/VTasklistService.java similarity index 89% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/VTasklistService.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/VTasklistService.java index 1d403fe..05ef962 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/VTasklistService.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/VTasklistService.java @@ -1,17 +1,16 @@ -package com.ruoyi.back.oa.service; +package com.pointlion.back.oa.service; import java.util.ArrayList; import java.util.List; -import com.ruoyi.back.oa.domain.VTasklist; -import com.ruoyi.back.erp.service.BaseService; -import com.ruoyi.back.oa.mapper.VTasklistMapper; -import com.ruoyi.common.constant.BillTypeEnum; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.back.oa.domain.VTasklist; +import com.pointlion.common.service.base.BaseService; +import com.pointlion.back.oa.mapper.VTasklistMapper; +import com.pointlion.common.constant.BillTypeEnum; +import com.pointlion.common.utils.StringUtils; import org.flowable.engine.HistoryService; import org.flowable.engine.TaskService; import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.task.api.Task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -82,7 +81,7 @@ public class VTasklistService extends BaseService * @param billType * @return */ - public List getHisByBusinessId(String businessId,String billType){ + public List getHisByBusinessId(Long businessId,String billType){ List result = new ArrayList<>(); String businessKey = billType+":"+ BillTypeEnum.getTableName(billType)+":"+businessId; List list = historyService.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey).orderByProcessInstanceStartTime().asc().list(); diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/flowImg/CustomProcessDiagramCanvas.java b/PointLion/src/main/java/com/pointlion/back/oa/service/flowImg/CustomProcessDiagramCanvas.java similarity index 99% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/flowImg/CustomProcessDiagramCanvas.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/flowImg/CustomProcessDiagramCanvas.java index 1f0c0bb..eb9b8b7 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/flowImg/CustomProcessDiagramCanvas.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/flowImg/CustomProcessDiagramCanvas.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.service.flowImg; +package com.pointlion.back.oa.service.flowImg; import org.flowable.bpmn.model.AssociationDirection; diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/flowImg/CustomProcessDiagramGenerator.java b/PointLion/src/main/java/com/pointlion/back/oa/service/flowImg/CustomProcessDiagramGenerator.java similarity index 99% rename from PointLion/src/main/java/com/ruoyi/back/oa/service/flowImg/CustomProcessDiagramGenerator.java rename to PointLion/src/main/java/com/pointlion/back/oa/service/flowImg/CustomProcessDiagramGenerator.java index e8fd07a..fffbdda 100644 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/flowImg/CustomProcessDiagramGenerator.java +++ b/PointLion/src/main/java/com/pointlion/back/oa/service/flowImg/CustomProcessDiagramGenerator.java @@ -1,4 +1,4 @@ -package com.ruoyi.back.oa.service.flowImg; +package com.pointlion.back.oa.service.flowImg; import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.*; diff --git a/PointLion/src/main/java/com/ruoyi/common/constant/BillTypeEnum.java b/PointLion/src/main/java/com/pointlion/common/constant/BillTypeEnum.java similarity index 81% rename from PointLion/src/main/java/com/ruoyi/common/constant/BillTypeEnum.java rename to PointLion/src/main/java/com/pointlion/common/constant/BillTypeEnum.java index d9214eb..97970b5 100644 --- a/PointLion/src/main/java/com/ruoyi/common/constant/BillTypeEnum.java +++ b/PointLion/src/main/java/com/pointlion/common/constant/BillTypeEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.pointlion.common.constant; /** * @author Ly * @Description 单据类型枚举类 @@ -21,11 +21,18 @@ public enum BillTypeEnum { ,SELL_OUT("sell_out","销售出库","pl_depot_bill","sell_out") ,SELL_BACK("sell_back","销售退货","pl_depot_bill","sell_back") - ,DUTY_LEAVE("duty_leave","销售退货","oa_duty_apply","duty_leave") - ,DUTY_REST("duty_rest","销售退货","oa_duty_apply","duty_rest") - ,DUTY_OUT("duty_out","销售退货","oa_duty_apply","duty_out") - ,DUTY_OVERTIME("duty_overtime","销售退货","oa_duty_apply","duty_overtime") - ,DUTY_OTHERCITYWORK("duty_otherCityWork","销售退货","oa_duty_apply","duty_otherCityWork") + ,DUTY_LEAVE("duty_leave","请假申请","oa_duty_apply","duty_leave") + ,DUTY_REST("duty_rest","调休申请","oa_duty_apply","duty_rest") + ,DUTY_OUT("duty_out","外出申请","oa_duty_apply","duty_out") + ,DUTY_OVERTIME("duty_overtime","加班申请","oa_duty_apply","duty_overtime") + ,DUTY_OTHERCITYWORK("duty_otherCityWork","出差申请","oa_duty_apply","duty_otherCityWork") + ,CAR_APPLY("car_apply","车辆申请","oa_car_apply","car_apply") + + + ,HOTEL_APPLY("hotel_apply","酒店申请","oa_hotel_apply","hotel_apply") + ,MEETINGROOM_APPLY("meetingroom_apply","会议室申请","oa_meetingroom_apply","meetingroom_apply") + ,TICKET_APPLY("ticket_apply","车票申请","oa_ticket_apply","ticket_apply") + ,SEAL_APPLY("seal_apply","公章申请","oa_seal_apply","seal_apply") , CUSTOM_FORM("custom_form","自定义申请表单","oa_custom_form_apply","custom_form"); /** diff --git a/PointLion/src/main/java/com/ruoyi/common/constant/CommonConstants.java b/PointLion/src/main/java/com/pointlion/common/constant/CommonConstants.java similarity index 86% rename from PointLion/src/main/java/com/ruoyi/common/constant/CommonConstants.java rename to PointLion/src/main/java/com/pointlion/common/constant/CommonConstants.java index c38306b..70ef962 100644 --- a/PointLion/src/main/java/com/ruoyi/common/constant/CommonConstants.java +++ b/PointLion/src/main/java/com/pointlion/common/constant/CommonConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.pointlion.common.constant; /*** * @des @@ -45,10 +45,19 @@ public class CommonConstants { public static final String FLOW_FINISH_TYPE_REJECT = "reject"; - + /*** + * 通用是、否 + */ public static final String YES = "Y"; public static final String NO = "N"; + /*** + * 通用可用、不可用 + */ + public static final String ABLE = "0"; + + public static final String DISABLE = "1"; + } diff --git a/PointLion/src/main/java/com/ruoyi/common/controller/PointLionCommonController.java b/PointLion/src/main/java/com/pointlion/common/controller/PointLionCommonController.java similarity index 80% rename from PointLion/src/main/java/com/ruoyi/common/controller/PointLionCommonController.java rename to PointLion/src/main/java/com/pointlion/common/controller/PointLionCommonController.java index 1f28006..5171702 100644 --- a/PointLion/src/main/java/com/ruoyi/common/controller/PointLionCommonController.java +++ b/PointLion/src/main/java/com/pointlion/common/controller/PointLionCommonController.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.controller; +package com.pointlion.common.controller; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.service.ISysConfigService; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.system.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; diff --git a/PointLion/src/main/java/com/pointlion/common/controller/SerialController.java b/PointLion/src/main/java/com/pointlion/common/controller/SerialController.java new file mode 100644 index 0000000..4fa7efc --- /dev/null +++ b/PointLion/src/main/java/com/pointlion/common/controller/SerialController.java @@ -0,0 +1,118 @@ +package com.pointlion.common.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.domain.Serial; +import com.pointlion.common.service.SerialService; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.common.core.page.TableDataInfo; + +/** + * 编号规则Controller + * + * @author pointLion + * @date 2022-10-29 + */ +@RestController +@RequestMapping("/common/serial") +public class SerialController extends BaseController +{ + @Autowired + private SerialService serialService; + + /** + * 查询编号规则列表 + */ + @PreAuthorize("@ss.hasPermi('common:serial:list')") + @GetMapping("/list") + public TableDataInfo list(Serial serial) + { + startPage(); + List list = serialService.selectSerialList(serial); + return getDataTable(list); + } + + /** + * 导出编号规则列表 + */ + @PreAuthorize("@ss.hasPermi('common:serial:export')") + @Log(title = "编号规则", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Serial serial) + { + List list = serialService.selectSerialList(serial); + ExcelUtil util = new ExcelUtil(Serial.class); + util.exportExcel(response, list, "编号规则数据"); + } + + /** + * 获取编号规则详细信息 + */ + @PreAuthorize("@ss.hasPermi('common:serial:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(serialService.selectSerialById(id)); + } + + /** + * 新增编号规则 + */ + @PreAuthorize("@ss.hasPermi('common:serial:add')") + @Log(title = "编号规则", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Serial serial) + { + return toAjax(serialService.insertSerial(serial)); + } + + /** + * 修改编号规则 + */ + @PreAuthorize("@ss.hasPermi('common:serial:edit')") + @Log(title = "编号规则", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Serial serial) + { + return toAjax(serialService.updateSerial(serial)); + } + + /** + * 删除编号规则 + */ + @PreAuthorize("@ss.hasPermi('common:serial:remove')") + @Log(title = "编号规则", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(serialService.deleteSerialByIds(ids)); + } + + + /**** + * + * @param key + * @return + */ + @GetMapping("getSerialByKey/{key}") + public AjaxResult getSerialByKey(@PathVariable("key") String key){ + return AjaxResult.success(serialService.getSerialByKey(key)); + } + + + +} diff --git a/PointLion/src/main/java/com/pointlion/common/domain/Serial.java b/PointLion/src/main/java/com/pointlion/common/domain/Serial.java new file mode 100644 index 0000000..fc3e639 --- /dev/null +++ b/PointLion/src/main/java/com/pointlion/common/domain/Serial.java @@ -0,0 +1,63 @@ +package com.pointlion.common.domain; + +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; + +/** + * 编号规则对象 pl_serial + * + * @author pointLion + * @date 2022-10-29 + */ +@Data +public class Serial extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 单据类型 */ + @Excel(name = "单据类型") + private String billType; + + /** 序号 */ + @Excel(name = "序号") + private Long serialNum; + + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; + + /** 编号前缀 */ + @Excel(name = "编号前缀") + private String prefix; + + /** 是否包含日期 */ + @Excel(name = "是否包含日期") + private String ifHaveDate; + + /** 长度 */ + @Excel(name = "长度") + private Long codeLength; + + /** 最新的日期 **/ + private String codeDate; + + private String date; + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("billType", getBillType()) + .append("serialNum", getSerialNum()) + .append("tenantId", getTenantId()) + .append("prefix", getPrefix()) + .append("ifHaveDate", getIfHaveDate()) + .toString(); + } +} diff --git a/PointLion/src/main/java/com/pointlion/common/mapper/SerialMapper.java b/PointLion/src/main/java/com/pointlion/common/mapper/SerialMapper.java new file mode 100644 index 0000000..0bfeca9 --- /dev/null +++ b/PointLion/src/main/java/com/pointlion/common/mapper/SerialMapper.java @@ -0,0 +1,69 @@ +package com.pointlion.common.mapper; + +import java.util.List; +import com.pointlion.common.domain.Serial; + +/** + * 编号规则Mapper接口 + * + * @author pointLion + * @date 2022-10-29 + */ +public interface SerialMapper +{ + /** + * 查询编号规则 + * + * @param id 编号规则主键 + * @return 编号规则 + */ + public Serial selectSerialById(Long id); + + + /**** + * 根据key获取编码规则 + * @param key + * @return + */ + public Serial getSerialByKey(String key); + + /** + * 查询编号规则列表 + * + * @param serial 编号规则 + * @return 编号规则集合 + */ + public List selectSerialList(Serial serial); + + /** + * 新增编号规则 + * + * @param serial 编号规则 + * @return 结果 + */ + public int insertSerial(Serial serial); + + /** + * 修改编号规则 + * + * @param serial 编号规则 + * @return 结果 + */ + public int updateSerial(Serial serial); + + /** + * 删除编号规则 + * + * @param id 编号规则主键 + * @return 结果 + */ + public int deleteSerialById(Long id); + + /** + * 批量删除编号规则 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSerialByIds(Long[] ids); +} diff --git a/PointLion/src/main/java/com/pointlion/common/service/SerialService.java b/PointLion/src/main/java/com/pointlion/common/service/SerialService.java new file mode 100644 index 0000000..7815325 --- /dev/null +++ b/PointLion/src/main/java/com/pointlion/common/service/SerialService.java @@ -0,0 +1,167 @@ +package com.pointlion.common.service; + +import java.util.Date; +import java.util.List; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.util.StrUtil; +import com.pointlion.common.constant.BillTypeEnum; +import com.pointlion.common.constant.CommonConstants; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.pointlion.common.mapper.SerialMapper; +import com.pointlion.common.domain.Serial; +import org.springframework.transaction.annotation.Transactional; + +/** + * 编号规则Service业务层处理 + * + * @author pointLion + * @date 2022-10-29 + */ +@Service +public class SerialService +{ + @Autowired + private SerialMapper serialMapper; + + /** + * 查询编号规则 + * + * @param id 编号规则主键 + * @return 编号规则 + */ + public Serial selectSerialById(Long id) + { + return serialMapper.selectSerialById(id); + } + + /** + * 查询编号规则列表 + * + * @param serial 编号规则 + * @return 编号规则 + */ + public List selectSerialList(Serial serial) + { + return serialMapper.selectSerialList(serial); + } + + /** + * 新增编号规则 + * + * @param serial 编号规则 + * @return 结果 + */ + public int insertSerial(Serial serial) + { + return serialMapper.insertSerial(serial); + } + + + + /** + * 修改编号规则 + * + * @param serial 编号规则 + * @return 结果 + */ + public int updateSerial(Serial serial) + { + return serialMapper.updateSerial(serial); + } + + /** + * 批量删除编号规则 + * + * @param ids 需要删除的编号规则主键 + * @return 结果 + */ + public int deleteSerialByIds(Long[] ids) + { + return serialMapper.deleteSerialByIds(ids); + } + + /** + * 删除编号规则信息 + * + * @param id 编号规则主键 + * @return 结果 + */ + public int deleteSerialById(Long id) + { + return serialMapper.deleteSerialById(id); + } + + + + public void addSerialNum(String maxBarcode){ + //更新 + Serial serial = serialMapper.getSerialByKey(BillTypeEnum.MATERIAL.getBillType()); + if(StrUtil.isNotBlank(maxBarcode)){ + //判断是否有日期---截取日期的话，有可能会有问题 + //if(CommonConstants.YES.equals(serial.getIfHaveDate())){ + // + //} + String tail = maxBarcode.replace(serial.getPrefix(),""); + //用长度可能会改长度，会报错 + String ret = tail.substring(tail.length()-serial.getCodeLength().intValue()); + Long max = Long.parseLong(ret); + if(max>serial.getSerialNum()){ + serial.setSerialNum(max); + serialMapper.updateSerial(serial); + } + } + } + + /**** + * 根据key获取编码规则 + * @param key + * @return + */ + public Serial getSerialByKey(String key){ + Serial serial = serialMapper.getSerialByKey(key); + if(CommonConstants.YES.equals(serial.getIfHaveDate())){ + String date = DatePattern.PURE_DATE_FORMAT.format(new Date()); + serial.setDate(date); + } + return serial; + } + + /**** + * 获取新的编号，并新增序号 + * @param key + * @return + */ + @Transactional + public String generateBillCodeByBillType(String key){ + Serial serial = serialMapper.getSerialByKey(key); + String code = ""; + if(serial==null){ + throw new RuntimeException("没有配置单据编码生成规则"); + } + if(CommonConstants.YES.equals(serial.getIfHaveDate())){ + //如果有日期，且日期不相同，则重置序号 + String date = DatePattern.PURE_DATE_FORMAT.format(new Date()); + if(StrUtil.isBlank(serial.getCodeDate()) && !date.equals(serial.getCodeDate())){ + //重置序号 + code = StrUtil.fillBefore("1", '0',serial.getCodeLength().intValue()); + //设置下一个序号 + serial.setSerialNum(new Long(2)); + }else{ + code = StrUtil.fillBefore(serial.getSerialNum()+"", '0',serial.getCodeLength().intValue()); + //设置下一个序号 + serial.setSerialNum(serial.getSerialNum()+1); + } + code = serial.getPrefix() + date + code.substring(date.length()); + //更新最新日期 + serial.setCodeDate(date); + }else{ + code = serial.getPrefix() + StrUtil.fillBefore(serial.getSerialNum()+"", '0',serial.getCodeLength().intValue()); + serial.setSerialNum(serial.getSerialNum()+1); + } + + serialMapper.updateSerial(serial); + return code; + } +} diff --git a/PointLion/src/main/java/com/pointlion/common/service/base/BaseService.java b/PointLion/src/main/java/com/pointlion/common/service/base/BaseService.java new file mode 100644 index 0000000..341829c --- /dev/null +++ b/PointLion/src/main/java/com/pointlion/common/service/base/BaseService.java @@ -0,0 +1,14 @@ +package com.pointlion.common.service.base; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/*** + * @des + * @author Ly + * @date 2022/7/8 + */ + +public class BaseService { + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); +} diff --git a/PointLion/src/main/java/com/ruoyi/common/util/Base64Util.java b/PointLion/src/main/java/com/pointlion/common/util/Base64Util.java similarity index 89% rename from PointLion/src/main/java/com/ruoyi/common/util/Base64Util.java rename to PointLion/src/main/java/com/pointlion/common/util/Base64Util.java index 7ee9c6c..90683cd 100644 --- a/PointLion/src/main/java/com/ruoyi/common/util/Base64Util.java +++ b/PointLion/src/main/java/com/pointlion/common/util/Base64Util.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.util; +package com.pointlion.common.util; import java.util.Base64; diff --git a/PointLion/src/main/java/com/ruoyi/common/util/CustomXMLWorkerFontProvider.java b/PointLion/src/main/java/com/pointlion/common/util/CustomXMLWorkerFontProvider.java similarity index 96% rename from PointLion/src/main/java/com/ruoyi/common/util/CustomXMLWorkerFontProvider.java rename to PointLion/src/main/java/com/pointlion/common/util/CustomXMLWorkerFontProvider.java index af85d70..0d15c81 100644 --- a/PointLion/src/main/java/com/ruoyi/common/util/CustomXMLWorkerFontProvider.java +++ b/PointLion/src/main/java/com/pointlion/common/util/CustomXMLWorkerFontProvider.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.util; +package com.pointlion.common.util; import com.itextpdf.text.BaseColor; diff --git a/PointLion/src/main/java/com/ruoyi/common/util/FlowUtil.java b/PointLion/src/main/java/com/pointlion/common/util/FlowUtil.java similarity index 86% rename from PointLion/src/main/java/com/ruoyi/common/util/FlowUtil.java rename to PointLion/src/main/java/com/pointlion/common/util/FlowUtil.java index b435e9a..a45badd 100644 --- a/PointLion/src/main/java/com/ruoyi/common/util/FlowUtil.java +++ b/PointLion/src/main/java/com/pointlion/common/util/FlowUtil.java @@ -1,9 +1,7 @@ -package com.ruoyi.common.util; +package com.pointlion.common.util; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; -import com.ruoyi.common.constant.CommonConstants; -import org.flowable.engine.runtime.ProcessInstance; +import com.pointlion.common.constant.CommonConstants; import java.util.HashMap; import java.util.Map; diff --git a/PointLion/src/main/java/com/ruoyi/common/util/OfficeUtil.java b/PointLion/src/main/java/com/pointlion/common/util/OfficeUtil.java similarity index 98% rename from PointLion/src/main/java/com/ruoyi/common/util/OfficeUtil.java rename to PointLion/src/main/java/com/pointlion/common/util/OfficeUtil.java index b4c3c60..1a2db7f 100644 --- a/PointLion/src/main/java/com/ruoyi/common/util/OfficeUtil.java +++ b/PointLion/src/main/java/com/pointlion/common/util/OfficeUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.util; +package com.pointlion.common.util; import com.itextpdf.text.Document; import com.itextpdf.text.pdf.PdfWriter; diff --git a/PointLion/src/main/java/com/ruoyi/common/util/RenameFileMain.java b/PointLion/src/main/java/com/pointlion/common/util/RenameFileMain.java similarity index 85% rename from PointLion/src/main/java/com/ruoyi/common/util/RenameFileMain.java rename to PointLion/src/main/java/com/pointlion/common/util/RenameFileMain.java index 6c12b9a..b0448aa 100644 --- a/PointLion/src/main/java/com/ruoyi/common/util/RenameFileMain.java +++ b/PointLion/src/main/java/com/pointlion/common/util/RenameFileMain.java @@ -1,12 +1,8 @@ -package com.ruoyi.common.util; +package com.pointlion.common.util; import cn.hutool.core.io.FileUtil; import java.io.File; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; /*** * @des diff --git a/PointLion/src/main/java/com/ruoyi/back/ct/controller/CtAgreementController.java b/PointLion/src/main/java/com/ruoyi/back/ct/controller/CtAgreementController.java deleted file mode 100644 index cf4bd2d..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/ct/controller/CtAgreementController.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.ruoyi.back.ct.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.ct.domain.CtAgreement; -import com.ruoyi.back.ct.service.CtAgreementService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 补充协议Controller - * - * @author pointLion - * @date 2023-05-13 - */ -@RestController -@RequestMapping("/ct/agreement") -public class CtAgreementController extends BaseController -{ - @Autowired - private CtAgreementService ctAgreementService; - - /** - * 查询补充协议列表 - */ - @PreAuthorize("@ss.hasPermi('ct:agreement:list')") - @GetMapping("/list") - public TableDataInfo list(CtAgreement ctAgreement) - { - startPage(); - List list = ctAgreementService.selectCtAgreementList(ctAgreement); - return getDataTable(list); - } - - /** - * 导出补充协议列表 - */ - @PreAuthorize("@ss.hasPermi('ct:agreement:export')") - @Log(title = "补充协议", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, CtAgreement ctAgreement) - { - List list = ctAgreementService.selectCtAgreementList(ctAgreement); - ExcelUtil util = new ExcelUtil(CtAgreement.class); - util.exportExcel(response, list, "补充协议数据"); - } - - /** - * 获取补充协议详细信息 - */ - @PreAuthorize("@ss.hasPermi('ct:agreement:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(ctAgreementService.selectCtAgreementById(id)); - } - - /** - * 新增补充协议 - */ - @PreAuthorize("@ss.hasPermi('ct:agreement:add')") - @Log(title = "补充协议", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody CtAgreement ctAgreement) - { - ctAgreement.setCreateBy(getLoginUser().getUsername()); - return toAjax(ctAgreementService.insertCtAgreement(ctAgreement)); - } - - /** - * 修改补充协议 - */ - @PreAuthorize("@ss.hasPermi('ct:agreement:edit')") - @Log(title = "补充协议", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody CtAgreement ctAgreement) - { - ctAgreement.setUpdateBy(getLoginUser().getUsername()); - return toAjax(ctAgreementService.updateCtAgreement(ctAgreement)); - } - - /** - * 删除补充协议 - */ - @PreAuthorize("@ss.hasPermi('ct:agreement:remove')") - @Log(title = "补充协议", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(ctAgreementService.deleteCtAgreementByIds(ids)); - } - - - /***** - * 预览 - * @param id - * @return - */ - @RequestMapping("/previewAgreemwnt") - public AjaxResult previewAgreemwnt(@RequestParam(name = "id")Long id){ - String content = ctAgreementService.buildAgreementContent(id); - return success("成功",content); - } - - /**** - * 生成文件 - * @param id - * @return - * @throws Exception - */ - @RequestMapping("/buildFile/{id}") - public AjaxResult buildFile(@PathVariable("id")Long id) throws Exception { - ctAgreementService.buildFile(id); - return success(); - } - - - /***** - * 提交流程 - * @param id - * @return - * @throws Exception - */ - @RequestMapping("/submitFlow/{id}") - public AjaxResult submitFlow(@PathVariable("id")Long id) throws Exception { - ctAgreementService.submitFlow(id); - return success(); - } - - - /***** - * 取回流程 - * @param id - * @return - * @throws Exception - */ - @RequestMapping("/cancleFlow/{id}") - public AjaxResult cancleFlow(@PathVariable("id")Long id) throws Exception { - ctAgreementService.cancleFlow(id); - return success(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/ct/controller/CtAgreementTplController.java b/PointLion/src/main/java/com/ruoyi/back/ct/controller/CtAgreementTplController.java deleted file mode 100644 index f344723..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/ct/controller/CtAgreementTplController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.back.ct.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.ct.domain.CtAgreementTpl; -import com.ruoyi.back.ct.service.CtAgreementTplService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 协议模版Controller - * - * @author pointLion - * @date 2023-05-13 - */ -@RestController -@RequestMapping("/ct/agreementTpl") -public class CtAgreementTplController extends BaseController -{ - @Autowired - private CtAgreementTplService ctAgreementTplService; - - /** - * 查询协议模版列表 - */ - @PreAuthorize("@ss.hasPermi('ct:agreementTpl:list')") - @GetMapping("/list") - public TableDataInfo list(CtAgreementTpl ctAgreementTpl) - { - startPage(); - List list = ctAgreementTplService.selectCtAgreementTplList(ctAgreementTpl); - return getDataTable(list); - } - - /** - * 导出协议模版列表 - */ - @PreAuthorize("@ss.hasPermi('ct:agreementTpl:export')") - @Log(title = "协议模版", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, CtAgreementTpl ctAgreementTpl) - { - List list = ctAgreementTplService.selectCtAgreementTplList(ctAgreementTpl); - ExcelUtil util = new ExcelUtil(CtAgreementTpl.class); - util.exportExcel(response, list, "协议模版数据"); - } - - /** - * 获取协议模版详细信息 - */ - @PreAuthorize("@ss.hasPermi('ct:agreementTpl:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(ctAgreementTplService.selectCtAgreementTplById(id)); - } - - /** - * 新增协议模版 - */ - @PreAuthorize("@ss.hasPermi('ct:agreementTpl:add')") - @Log(title = "协议模版", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody CtAgreementTpl ctAgreementTpl) - { - return toAjax(ctAgreementTplService.insertCtAgreementTpl(ctAgreementTpl)); - } - - /** - * 修改协议模版 - */ - @PreAuthorize("@ss.hasPermi('ct:agreementTpl:edit')") - @Log(title = "协议模版", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody CtAgreementTpl ctAgreementTpl) - { - return toAjax(ctAgreementTplService.updateCtAgreementTpl(ctAgreementTpl)); - } - - /** - * 删除协议模版 - */ - @PreAuthorize("@ss.hasPermi('ct:agreementTpl:remove')") - @Log(title = "协议模版", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(ctAgreementTplService.deleteCtAgreementTplByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/ct/domain/CtAgreement.java b/PointLion/src/main/java/com/ruoyi/back/ct/domain/CtAgreement.java deleted file mode 100644 index 511d78f..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/ct/domain/CtAgreement.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.ruoyi.back.ct.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 补充协议对象 ct_agreement - * - * @author pointLion - * @date 2023-05-13 - */ -@Data -public class CtAgreement extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 合同编号 */ - @Excel(name = "合同编号") - private String contractNo; - - /** 协议名称 */ - @Excel(name = "协议名称") - private String contractName; - - /** 签约地点 */ - @Excel(name = "签约地点") - private String signAddr; - - /** 最低保证金 */ - @Excel(name = "最低保证金") - private BigDecimal lowBond; - - /** 挂账方式 */ - @Excel(name = "挂账方式") - private String gzType; - - /** 支付方式 */ - @Excel(name = "支付方式") - private String payType; - - /** 应付款 */ - @Excel(name = "应付款") - private BigDecimal needCharge; - - /** 预付款 */ - @Excel(name = "预付款") - private BigDecimal advanceCharge; - - /** 协议价格 */ - @Excel(name = "协议价格") - private BigDecimal agreementAmt; - - /** 材质 */ - @Excel(name = "材质") - private String material; - - /** 参考价 */ - @Excel(name = "参考价") - private BigDecimal referencePrice; - - /** 定价基准 */ - @Excel(name = "定价基准") - private String pricingBenchmark; - - /** 补充 */ - @Excel(name = "补充") - private String other; - - /** 甲方编码 */ - @Excel(name = "甲方编码") - private String orgNo; - - /** 甲方名称 */ - @Excel(name = "甲方名称") - private String orgName; - - /** 甲方法人 */ - @Excel(name = "甲方法人") - private String orgFr; - - /** 甲方地址 */ - @Excel(name = "甲方地址") - private String orgAddr; - - /** 甲方委托代理人 */ - @Excel(name = "甲方委托代理人") - private String orgWtr; - - /** 甲方电话 */ - @Excel(name = "甲方电话") - private String orgTel; - - /** 甲方签证 */ - @Excel(name = "甲方签证") - private String okDt; - - /** 乙方编码 */ - @Excel(name = "乙方编码") - private String supplyNo; - - /** 乙方名称 */ - @Excel(name = "乙方名称") - private String supplyName; - - /** 乙方法人 */ - @Excel(name = "乙方法人") - private String spFr; - - /** 乙方地址 */ - @Excel(name = "乙方地址") - private String spAddr; - - /** 乙方委托人 */ - @Excel(name = "乙方委托人") - private String spWtr; - - /** 乙方电话 */ - @Excel(name = "乙方电话") - private String spTel; - - /** 乙方签证 */ - private String spOkDt; - - - - /** 申请流程 */ - @Excel(name = "申请流程") - private String flowKey; - - /** 流程名称 */ - @Excel(name = "流程名称") - private String flowName; - - /** 流程实例id */ - @Excel(name = "流程实例id") - private String flowInsId; - - - /** 状态 */ - @Excel(name = "状态", readConverterExp = "0=未提交,1=已提交,2=已完成") - private String status; - - /** 提交时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date submitTime; - - - private Long tplId; - - private String tplName; - - private String url; - - private Date byTime; - - //是否预警 - private Integer ifNotice; - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("contractNo", getContractNo()) - .append("contractName", getContractName()) - .append("signAddr", getSignAddr()) - .append("lowBond", getLowBond()) - .append("gzType", getGzType()) - .append("payType", getPayType()) - .append("needCharge", getNeedCharge()) - .append("advanceCharge", getAdvanceCharge()) - .append("agreementAmt", getAgreementAmt()) - .append("material", getMaterial()) - .append("referencePrice", getReferencePrice()) - .append("pricingBenchmark", getPricingBenchmark()) - .append("other", getOther()) - .append("orgNo", getOrgNo()) - .append("orgName", getOrgName()) - .append("orgFr", getOrgFr()) - .append("orgAddr", getOrgAddr()) - .append("orgWtr", getOrgWtr()) - .append("orgTel", getOrgTel()) - .append("okDt", getOkDt()) - .append("supplyNo", getSupplyNo()) - .append("supplyName", getSupplyName()) - .append("spFr", getSpFr()) - .append("spAddr", getSpAddr()) - .append("spWtr", getSpWtr()) - .append("spTel", getSpTel()) - .append("spOkDt", getSpOkDt()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/ct/domain/CtAgreementTpl.java b/PointLion/src/main/java/com/ruoyi/back/ct/domain/CtAgreementTpl.java deleted file mode 100644 index b971686..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/ct/domain/CtAgreementTpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ruoyi.back.ct.domain; - -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 协议模版对象 ct_agreement_tpl - * - * @author pointLion - * @date 2023-05-13 - */ -@Data -public class CtAgreementTpl extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 模版名称 */ - @Excel(name = "模版名称") - private String name; - - /** 模版内容 */ - private String content; - - /** 文件地址 */ - @Excel(name = "文件地址") - private String url; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("content", getContent()) - .append("url", getUrl()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/ct/mapper/CtAgreementMapper.java b/PointLion/src/main/java/com/ruoyi/back/ct/mapper/CtAgreementMapper.java deleted file mode 100644 index 5e73f8a..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/ct/mapper/CtAgreementMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.back.ct.mapper; - -import java.util.List; -import com.ruoyi.back.ct.domain.CtAgreement; - -/** - * 补充协议Mapper接口 - * - * @author pointLion - * @date 2023-05-13 - */ -public interface CtAgreementMapper -{ - /** - * 查询补充协议 - * - * @param id 补充协议主键 - * @return 补充协议 - */ - public CtAgreement selectCtAgreementById(Long id); - - /** - * 查询补充协议列表 - * - * @param ctAgreement 补充协议 - * @return 补充协议集合 - */ - public List selectCtAgreementList(CtAgreement ctAgreement); - - /** - * 新增补充协议 - * - * @param ctAgreement 补充协议 - * @return 结果 - */ - public int insertCtAgreement(CtAgreement ctAgreement); - - /** - * 修改补充协议 - * - * @param ctAgreement 补充协议 - * @return 结果 - */ - public int updateCtAgreement(CtAgreement ctAgreement); - - /** - * 删除补充协议 - * - * @param id 补充协议主键 - * @return 结果 - */ - public int deleteCtAgreementById(Long id); - - /** - * 批量删除补充协议 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteCtAgreementByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/ct/mapper/CtAgreementTplMapper.java b/PointLion/src/main/java/com/ruoyi/back/ct/mapper/CtAgreementTplMapper.java deleted file mode 100644 index 385c261..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/ct/mapper/CtAgreementTplMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.back.ct.mapper; - -import java.util.List; -import com.ruoyi.back.ct.domain.CtAgreementTpl; - -/** - * 协议模版Mapper接口 - * - * @author pointLion - * @date 2023-05-13 - */ -public interface CtAgreementTplMapper -{ - /** - * 查询协议模版 - * - * @param id 协议模版主键 - * @return 协议模版 - */ - public CtAgreementTpl selectCtAgreementTplById(Long id); - - /** - * 查询协议模版列表 - * - * @param ctAgreementTpl 协议模版 - * @return 协议模版集合 - */ - public List selectCtAgreementTplList(CtAgreementTpl ctAgreementTpl); - - /** - * 新增协议模版 - * - * @param ctAgreementTpl 协议模版 - * @return 结果 - */ - public int insertCtAgreementTpl(CtAgreementTpl ctAgreementTpl); - - /** - * 修改协议模版 - * - * @param ctAgreementTpl 协议模版 - * @return 结果 - */ - public int updateCtAgreementTpl(CtAgreementTpl ctAgreementTpl); - - /** - * 删除协议模版 - * - * @param id 协议模版主键 - * @return 结果 - */ - public int deleteCtAgreementTplById(Long id); - - /** - * 批量删除协议模版 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteCtAgreementTplByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/ct/service/CtAgreementService.java b/PointLion/src/main/java/com/ruoyi/back/ct/service/CtAgreementService.java deleted file mode 100644 index a70a796..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/ct/service/CtAgreementService.java +++ /dev/null @@ -1,234 +0,0 @@ -package com.ruoyi.back.ct.service; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.ruoyi.back.ct.domain.CtAgreementTpl; -import com.ruoyi.back.ct.mapper.CtAgreementTplMapper; -import com.ruoyi.back.oa.domain.OaCustomFormApply; -import com.ruoyi.back.oa.service.FlowProcessInstanceService; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.BillTypeEnum; -import com.ruoyi.common.constant.CommonConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.util.FlowUtil; -import com.ruoyi.common.util.OfficeUtil; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.system.mapper.SysUserMapper; -import org.flowable.engine.HistoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.runtime.ProcessInstance; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.back.ct.mapper.CtAgreementMapper; -import com.ruoyi.back.ct.domain.CtAgreement; -import org.springframework.transaction.annotation.Transactional; - -/** - * 补充协议Service业务层处理 - * - * @author pointLion - * @date 2023-05-13 - */ -@Service -public class CtAgreementService -{ - @Autowired - private CtAgreementMapper ctAgreementMapper; - @Autowired - private CtAgreementTplMapper ctAgreementTplMapper; - @Autowired - private RuntimeService runtimeService; - @Autowired - private HistoryService historyService; - @Autowired - private FlowProcessInstanceService flowProcessInstanceService; - @Autowired - private SysUserMapper sysUserMapper; - @Autowired - private CtAgreementService ctAgreementService; - - /** - * 查询补充协议 - * - * @param id 补充协议主键 - * @return 补充协议 - */ - public CtAgreement selectCtAgreementById(Long id) - { - return ctAgreementMapper.selectCtAgreementById(id); - } - - /** - * 查询补充协议列表 - * - * @param ctAgreement 补充协议 - * @return 补充协议 - */ - public List selectCtAgreementList(CtAgreement ctAgreement) - { - List list = ctAgreementMapper.selectCtAgreementList(ctAgreement); - for(CtAgreement a:list){ - a.setIfNotice(DateUtil.compare(a.getByTime(),DateUtils.parseDate(DateUtils.getDate()))); - } - return list; - } - - /** - * 新增补充协议 - * - * @param ctAgreement 补充协议 - * @return 结果 - */ - public int insertCtAgreement(CtAgreement ctAgreement) - { - ctAgreement.setCreateTime(DateUtils.getNowDate()); - return ctAgreementMapper.insertCtAgreement(ctAgreement); - } - - /** - * 修改补充协议 - * - * @param ctAgreement 补充协议 - * @return 结果 - */ - public int updateCtAgreement(CtAgreement ctAgreement) - { - ctAgreement.setUpdateTime(DateUtils.getNowDate()); - return ctAgreementMapper.updateCtAgreement(ctAgreement); - } - - /** - * 批量删除补充协议 - * - * @param ids 需要删除的补充协议主键 - * @return 结果 - */ - public int deleteCtAgreementByIds(Long[] ids) - { - return ctAgreementMapper.deleteCtAgreementByIds(ids); - } - - /** - * 删除补充协议信息 - * - * @param id 补充协议主键 - * @return 结果 - */ - public int deleteCtAgreementById(Long id) - { - return ctAgreementMapper.deleteCtAgreementById(id); - } - - - /***** - * 预览 - * @param id - * @return - */ - public String buildAgreementContent(Long id){ - CtAgreement agreement = ctAgreementMapper.selectCtAgreementById(id); - - String content = buildContent(agreement); - - return content; - } - - private String buildContent(CtAgreement agreement ){ - String content = ""; - CtAgreementTpl tpl = ctAgreementTplMapper.selectCtAgreementTplById(agreement.getTplId()); - if(tpl!=null){ - content = tpl.getContent(); - Field[] fields = agreement.getClass().getDeclaredFields(); - for(Field f:fields){ - String fieldName = f.getName(); - String name = fieldName.substring(0,1).toUpperCase()+fieldName.substring(1); - try { - if(!"serialVersionUID".equals(fieldName)){ - Method m = agreement.getClass().getMethod("get"+name); - Object obj = m.invoke(agreement); - if(obj!=null){ - content = content.replace("{{"+f.getName()+"}}",obj.toString()); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - return content; - } - - /***** - * 生成文件 - */ - public void buildFile(Long id) throws Exception { - CtAgreement agreement = ctAgreementMapper.selectCtAgreementById(id); - String content = buildContent(agreement); - String path = RuoYiConfig.getProfile()+"/office/ct"; - File folder = new File(path); - if(!folder.exists()){ - folder.mkdirs(); - } - String rPath = "/office/ct/"+agreement.getContractName()+".doc"; - String realPath = RuoYiConfig.getProfile()+rPath; - OfficeUtil.createWordByHtml(content,realPath); - agreement.setUrl(Constants.RESOURCE_PREFIX+rPath); - ctAgreementMapper.updateCtAgreement(agreement); - } - - - /**** - * 提交流程 - * @param id - */ - @Transactional - public void submitFlow(Long id){ - CtAgreement agreement = ctAgreementMapper.selectCtAgreementById(id); - ProcessInstance procIns = flowProcessInstanceService.startProcess(id,agreement.getContractName(), BillTypeEnum.AGREEMENT.getBillType()); - CtAgreement updateAgreement = new CtAgreement(); - updateAgreement.setId(agreement.getId()); - updateAgreement.setFlowInsId(procIns.getId()); - updateAgreement.setFlowKey(BillTypeEnum.AGREEMENT.getDefKey()); - updateAgreement.setFlowName(procIns.getProcessDefinitionName()); - updateAgreement.setStatus(CommonConstants.FLOW_STATUS_SUBMIT);//更新状态 - updateAgreement.setUpdateTime(new Date()); - updateAgreement.setSubmitTime(new Date()); - ctAgreementMapper.updateCtAgreement(updateAgreement); - } - - - - - - /**** - * 取回流程 - * @param id - */ - public void cancleFlow(Long id){ - CtAgreement agreement = ctAgreementMapper.selectCtAgreementById(id); - String insId = agreement.getFlowInsId(); - if(StrUtil.isNotBlank(insId)){ - flowProcessInstanceService.cancleProcesInstance(insId,"用户撤销"); - } - CtAgreement updateAgreement = new CtAgreement(); - updateAgreement.setId(id); - updateAgreement.setStatus(CommonConstants.FLOW_STATUS_START); - updateAgreement.setFlowInsId(""); - updateAgreement.setFlowKey(""); - updateAgreement.setFlowName(""); - updateAgreement.setUpdateTime(new Date()); - ctAgreementMapper.updateCtAgreement(updateAgreement); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/ct/service/CtAgreementTplService.java b/PointLion/src/main/java/com/ruoyi/back/ct/service/CtAgreementTplService.java deleted file mode 100644 index 7629ca8..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/ct/service/CtAgreementTplService.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.ruoyi.back.ct.service; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.back.ct.mapper.CtAgreementTplMapper; -import com.ruoyi.back.ct.domain.CtAgreementTpl; - -/** - * 协议模版Service业务层处理 - * - * @author pointLion - * @date 2023-05-13 - */ -@Service -public class CtAgreementTplService -{ - @Autowired - private CtAgreementTplMapper ctAgreementTplMapper; - - /** - * 查询协议模版 - * - * @param id 协议模版主键 - * @return 协议模版 - */ - public CtAgreementTpl selectCtAgreementTplById(Long id) - { - return ctAgreementTplMapper.selectCtAgreementTplById(id); - } - - /** - * 查询协议模版列表 - * - * @param ctAgreementTpl 协议模版 - * @return 协议模版 - */ - public List selectCtAgreementTplList(CtAgreementTpl ctAgreementTpl) - { - return ctAgreementTplMapper.selectCtAgreementTplList(ctAgreementTpl); - } - - /** - * 新增协议模版 - * - * @param ctAgreementTpl 协议模版 - * @return 结果 - */ - public int insertCtAgreementTpl(CtAgreementTpl ctAgreementTpl) - { - ctAgreementTpl.setCreateTime(DateUtils.getNowDate()); - return ctAgreementTplMapper.insertCtAgreementTpl(ctAgreementTpl); - } - - /** - * 修改协议模版 - * - * @param ctAgreementTpl 协议模版 - * @return 结果 - */ - public int updateCtAgreementTpl(CtAgreementTpl ctAgreementTpl) - { - ctAgreementTpl.setUpdateTime(DateUtils.getNowDate()); - return ctAgreementTplMapper.updateCtAgreementTpl(ctAgreementTpl); - } - - /** - * 批量删除协议模版 - * - * @param ids 需要删除的协议模版主键 - * @return 结果 - */ - public int deleteCtAgreementTplByIds(Long[] ids) - { - return ctAgreementTplMapper.deleteCtAgreementTplByIds(ids); - } - - /** - * 删除协议模版信息 - * - * @param id 协议模版主键 - * @return 结果 - */ - public int deleteCtAgreementTplById(Long id) - { - return ctAgreementTplMapper.deleteCtAgreementTplById(id); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActProcessInsController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActProcessInsController.java deleted file mode 100644 index 63d2733..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/ActProcessInsController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import com.ruoyi.back.oa.service.FlowProcessInstanceService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/*** - * @des - * @author Ly - * @date 2023/5/31 - */ -@RestController -@RequestMapping("/oa/processInstance") -public class ActProcessInsController extends BaseController { - - @Autowired - private FlowProcessInstanceService flowProcessInstanceService; - - @RequestMapping("/deleteAllProcessInstance") - public AjaxResult deleteAllProcessInstance(){ - flowProcessInstanceService.deleteAllProcessInstance(); - return success(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdCarController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdCarController.java deleted file mode 100644 index 0ed6881..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdCarController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaBdCar; -import com.ruoyi.back.oa.service.OaBdCarService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 车辆管理Controller - * - * @author pointLion - * @date 2023-05-29 - */ -@RestController -@RequestMapping("/oa/car") -public class OaBdCarController extends BaseController -{ - @Autowired - private OaBdCarService oaBdCarService; - - /** - * 查询车辆管理列表 - */ - @PreAuthorize("@ss.hasPermi('oa:car:list')") - @GetMapping("/list") - public TableDataInfo list(OaBdCar oaBdCar) - { - startPage(); - List list = oaBdCarService.selectOaBdCarList(oaBdCar); - return getDataTable(list); - } - - /** - * 导出车辆管理列表 - */ - @PreAuthorize("@ss.hasPermi('oa:car:export')") - @Log(title = "车辆管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaBdCar oaBdCar) - { - List list = oaBdCarService.selectOaBdCarList(oaBdCar); - ExcelUtil util = new ExcelUtil(OaBdCar.class); - util.exportExcel(response, list, "车辆管理数据"); - } - - /** - * 获取车辆管理详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:car:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaBdCarService.selectOaBdCarById(id)); - } - - /** - * 新增车辆管理 - */ - @PreAuthorize("@ss.hasPermi('oa:car:add')") - @Log(title = "车辆管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaBdCar oaBdCar) - { - return toAjax(oaBdCarService.insertOaBdCar(oaBdCar)); - } - - /** - * 修改车辆管理 - */ - @PreAuthorize("@ss.hasPermi('oa:car:edit')") - @Log(title = "车辆管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaBdCar oaBdCar) - { - return toAjax(oaBdCarService.updateOaBdCar(oaBdCar)); - } - - /** - * 删除车辆管理 - */ - @PreAuthorize("@ss.hasPermi('oa:car:remove')") - @Log(title = "车辆管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaBdCarService.deleteOaBdCarByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdMeetingroomController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdMeetingroomController.java deleted file mode 100644 index b06ffe7..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdMeetingroomController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaBdMeetingroom; -import com.ruoyi.back.oa.service.OaBdMeetingroomService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 会议室管理Controller - * - * @author pointLion - * @date 2023-05-29 - */ -@RestController -@RequestMapping("/oa/meetingroom") -public class OaBdMeetingroomController extends BaseController -{ - @Autowired - private OaBdMeetingroomService oaBdMeetingroomService; - - /** - * 查询会议室管理列表 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroom:list')") - @GetMapping("/list") - public TableDataInfo list(OaBdMeetingroom oaBdMeetingroom) - { - startPage(); - List list = oaBdMeetingroomService.selectOaBdMeetingroomList(oaBdMeetingroom); - return getDataTable(list); - } - - /** - * 导出会议室管理列表 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroom:export')") - @Log(title = "会议室管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaBdMeetingroom oaBdMeetingroom) - { - List list = oaBdMeetingroomService.selectOaBdMeetingroomList(oaBdMeetingroom); - ExcelUtil util = new ExcelUtil(OaBdMeetingroom.class); - util.exportExcel(response, list, "会议室管理数据"); - } - - /** - * 获取会议室管理详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroom:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaBdMeetingroomService.selectOaBdMeetingroomById(id)); - } - - /** - * 新增会议室管理 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroom:add')") - @Log(title = "会议室管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaBdMeetingroom oaBdMeetingroom) - { - return toAjax(oaBdMeetingroomService.insertOaBdMeetingroom(oaBdMeetingroom)); - } - - /** - * 修改会议室管理 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroom:edit')") - @Log(title = "会议室管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaBdMeetingroom oaBdMeetingroom) - { - return toAjax(oaBdMeetingroomService.updateOaBdMeetingroom(oaBdMeetingroom)); - } - - /** - * 删除会议室管理 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroom:remove')") - @Log(title = "会议室管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaBdMeetingroomService.deleteOaBdMeetingroomByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdSealController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdSealController.java deleted file mode 100644 index f675f97..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdSealController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaBdSeal; -import com.ruoyi.back.oa.service.OaBdSealService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 公章管理Controller - * - * @author pointLion - * @date 2023-05-29 - */ -@RestController -@RequestMapping("/oa/seal") -public class OaBdSealController extends BaseController -{ - @Autowired - private OaBdSealService oaBdSealService; - - /** - * 查询公章管理列表 - */ - @PreAuthorize("@ss.hasPermi('oa:seal:list')") - @GetMapping("/list") - public TableDataInfo list(OaBdSeal oaBdSeal) - { - startPage(); - List list = oaBdSealService.selectOaBdSealList(oaBdSeal); - return getDataTable(list); - } - - /** - * 导出公章管理列表 - */ - @PreAuthorize("@ss.hasPermi('oa:seal:export')") - @Log(title = "公章管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaBdSeal oaBdSeal) - { - List list = oaBdSealService.selectOaBdSealList(oaBdSeal); - ExcelUtil util = new ExcelUtil(OaBdSeal.class); - util.exportExcel(response, list, "公章管理数据"); - } - - /** - * 获取公章管理详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:seal:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaBdSealService.selectOaBdSealById(id)); - } - - /** - * 新增公章管理 - */ - @PreAuthorize("@ss.hasPermi('oa:seal:add')") - @Log(title = "公章管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaBdSeal oaBdSeal) - { - return toAjax(oaBdSealService.insertOaBdSeal(oaBdSeal)); - } - - /** - * 修改公章管理 - */ - @PreAuthorize("@ss.hasPermi('oa:seal:edit')") - @Log(title = "公章管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaBdSeal oaBdSeal) - { - return toAjax(oaBdSealService.updateOaBdSeal(oaBdSeal)); - } - - /** - * 删除公章管理 - */ - @PreAuthorize("@ss.hasPermi('oa:seal:remove')") - @Log(title = "公章管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaBdSealService.deleteOaBdSealByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaCustomFormApplyController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaCustomFormApplyController.java deleted file mode 100644 index 88e4152..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaCustomFormApplyController.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaCustomFormApply; -import com.ruoyi.back.oa.service.OaCustomFormApplyService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 自定义表单申请Controller - * - * @author pointLion - * @date 2022-07-09 - */ -@RestController -@RequestMapping("/oa/myApply") -public class OaCustomFormApplyController extends BaseController -{ - @Autowired - private OaCustomFormApplyService oaCustomFormApplyService; - - /** - * 查询自定义表单申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:myApply:list')") - @GetMapping("/list") - public TableDataInfo list(OaCustomFormApply oaCustomFormApply) - { - startPage(); - List list = oaCustomFormApplyService.selectOaCustomFormApplyList(oaCustomFormApply); - return getDataTable(list); - } - - /** - * 导出自定义表单申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:myApply:export')") - @Log(title = "自定义表单申请", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaCustomFormApply oaCustomFormApply) - { - List list = oaCustomFormApplyService.selectOaCustomFormApplyList(oaCustomFormApply); - ExcelUtil util = new ExcelUtil(OaCustomFormApply.class); - util.exportExcel(response, list, "自定义表单申请数据"); - } - - /** - * 获取自定义表单申请详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:myApply:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaCustomFormApplyService.selectOaCustomFormApplyById(id)); - } - - /** - * 新增自定义表单申请 - */ - @PreAuthorize("@ss.hasPermi('oa:myApply:add')") - @Log(title = "自定义表单申请", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaCustomFormApply oaCustomFormApply) - { - return AjaxResult.success("保存成功", oaCustomFormApplyService.insertOaCustomFormApply(oaCustomFormApply,getLoginUser())); - } - - /** - * 修改自定义表单申请 - */ - @PreAuthorize("@ss.hasPermi('oa:myApply:edit')") - @Log(title = "自定义表单申请", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaCustomFormApply oaCustomFormApply) - { - return toAjax(oaCustomFormApplyService.updateOaCustomFormApply(oaCustomFormApply, getLoginUser())); - } - - /** - * 删除自定义表单申请 - */ - @PreAuthorize("@ss.hasPermi('oa:myApply:remove')") - @Log(title = "自定义表单申请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaCustomFormApplyService.deleteOaCustomFormApplyByIds(ids)); - } - - - /**** - * 撤销申请 - * @param id - * @return - */ - @PreAuthorize("@ss.hasPermi('oa:myApply:remove')") - @Log(title = "撤销申请", businessType = BusinessType.DELETE) - @PostMapping("/cancelApplyInsId/{id}") - public AjaxResult cancelApplyInsId(@PathVariable("id") Long id){ - oaCustomFormApplyService.cancelApplyInsId(id,"用户撤销"); - return success(); - } - - - /**** - * 撤销申请 - * @param id - * @return - */ - @PreAuthorize("@ss.hasPermi('oa:myApply:edit')") - @Log(title = "提交申请", businessType = BusinessType.SUBMIT) - @PostMapping("/submitApply/{id}") - public AjaxResult submitApply(@PathVariable("id") Long id){ - oaCustomFormApplyService.submitApply(id); - return success(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaCustomFormController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaCustomFormController.java deleted file mode 100644 index c9ab868..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaCustomFormController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.ruoyi.back.oa.domain.OaCustomForm; -import com.ruoyi.back.oa.service.OaCustomFormService; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 自定义表单Controller - * - * @author pointLion - * @date 2022-07-05 - */ -@RestController -@RequestMapping("/oa/customForm") -public class OaCustomFormController extends BaseController -{ - @Autowired - private OaCustomFormService oaCustomFormService; - - /** - * 查询自定义表单列表 - */ - @PreAuthorize("@ss.hasPermi('oa:customForm:list')") - @GetMapping("/list") - public TableDataInfo list(OaCustomForm oaCustomForm) - { - startPage(); - List list = oaCustomFormService.selectOaCustomFormList(oaCustomForm); - return getDataTable(list); - } - - /** - * 查询自定义表单列表 - */ - @PreAuthorize("@ss.hasPermi('oa:customForm:list')") - @GetMapping("/listAll") - public AjaxResult listAll(OaCustomForm oaCustomForm) - { - List list = oaCustomFormService.selectOaCustomFormList(oaCustomForm); - return success("查询成功",list); - } - - /** - * 导出自定义表单列表 - */ - @PreAuthorize("@ss.hasPermi('oa:customForm:export')") - @Log(title = "自定义表单", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaCustomForm oaCustomForm) - { - List list = oaCustomFormService.selectOaCustomFormList(oaCustomForm); - ExcelUtil util = new ExcelUtil(OaCustomForm.class); - util.exportExcel(response, list, "自定义表单数据"); - } - - /** - * 获取自定义表单详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:customForm:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaCustomFormService.selectOaCustomFormById(id)); - } - - /** - * 新增自定义表单 - */ - @PreAuthorize("@ss.hasPermi('oa:customForm:add')") - @Log(title = "自定义表单", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaCustomForm oaCustomForm) - { - return toAjax(oaCustomFormService.insertOaCustomForm(oaCustomForm)); - } - - /** - * 修改自定义表单 - */ - @PreAuthorize("@ss.hasPermi('oa:customForm:edit')") - @Log(title = "自定义表单", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaCustomForm oaCustomForm) - { - return toAjax(oaCustomFormService.updateOaCustomForm(oaCustomForm)); - } - - /** - * 删除自定义表单 - */ - @PreAuthorize("@ss.hasPermi('oa:customForm:remove')") - @Log(title = "自定义表单", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaCustomFormService.deleteOaCustomFormByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaDutyApplyController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaDutyApplyController.java deleted file mode 100644 index 4a7c0e7..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaDutyApplyController.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaDutyApply; -import com.ruoyi.back.oa.service.OaDutyApplyService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 假勤申请Controller - * - * @author pointLion - * @date 2023-06-01 - */ -@RestController -@RequestMapping("/oa/dutyApply") -public class OaDutyApplyController extends BaseController -{ - @Autowired - private OaDutyApplyService oaDutyApplyService; - - /** - * 查询假勤申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:dutyApply:list')") - @GetMapping("/list") - public TableDataInfo list(OaDutyApply oaDutyApply) - { - startPage(); - List list = oaDutyApplyService.selectOaDutyApplyList(oaDutyApply); - return getDataTable(list); - } - - /** - * 导出假勤申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:dutyApply:export')") - @Log(title = "假勤申请", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaDutyApply oaDutyApply) - { - List list = oaDutyApplyService.selectOaDutyApplyList(oaDutyApply); - ExcelUtil util = new ExcelUtil(OaDutyApply.class); - util.exportExcel(response, list, "假勤申请数据"); - } - - /** - * 获取假勤申请详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:dutyApply:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaDutyApplyService.selectOaDutyApplyById(id)); - } - - /** - * 新增假勤申请 - */ - @PreAuthorize("@ss.hasPermi('oa:dutyApply:add')") - @Log(title = "假勤申请", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaDutyApply oaDutyApply) - { - return toAjax(oaDutyApplyService.insertOaDutyApply(oaDutyApply)); - } - - /** - * 修改假勤申请 - */ - @PreAuthorize("@ss.hasPermi('oa:dutyApply:edit')") - @Log(title = "假勤申请", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaDutyApply oaDutyApply) - { - return toAjax(oaDutyApplyService.updateOaDutyApply(oaDutyApply)); - } - - /** - * 删除假勤申请 - */ - @PreAuthorize("@ss.hasPermi('oa:dutyApply:remove')") - @Log(title = "假勤申请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaDutyApplyService.deleteOaDutyApplyByIds(ids)); - } - - - - /***** - * 提交流程 - * @param id - * @return - * @throws Exception - */ - @RequestMapping("/submitFlow/{id}") - public AjaxResult submitFlow(@PathVariable("id")Long id) throws Exception { - oaDutyApplyService.submitFlow(id); - return success(); - } - - - /***** - * 取回流程 - * @param id - * @return - * @throws Exception - */ - @RequestMapping("/cancleFlow/{id}") - public AjaxResult cancleFlow(@PathVariable("id")Long id) throws Exception { - oaDutyApplyService.cancleFlow(id); - return success(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaHotelApplyController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaHotelApplyController.java deleted file mode 100644 index 3f5ac6d..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaHotelApplyController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaHotelApply; -import com.ruoyi.back.oa.service.OaHotelApplyService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 酒店申请Controller - * - * @author pointLion - * @date 2023-05-29 - */ -@RestController -@RequestMapping("/oa/hotelApply") -public class OaHotelApplyController extends BaseController -{ - @Autowired - private OaHotelApplyService oaHotelApplyService; - - /** - * 查询酒店申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:hotelApply:list')") - @GetMapping("/list") - public TableDataInfo list(OaHotelApply oaHotelApply) - { - startPage(); - List list = oaHotelApplyService.selectOaHotelApplyList(oaHotelApply); - return getDataTable(list); - } - - /** - * 导出酒店申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:hotelApply:export')") - @Log(title = "酒店申请", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaHotelApply oaHotelApply) - { - List list = oaHotelApplyService.selectOaHotelApplyList(oaHotelApply); - ExcelUtil util = new ExcelUtil(OaHotelApply.class); - util.exportExcel(response, list, "酒店申请数据"); - } - - /** - * 获取酒店申请详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:hotelApply:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaHotelApplyService.selectOaHotelApplyById(id)); - } - - /** - * 新增酒店申请 - */ - @PreAuthorize("@ss.hasPermi('oa:hotelApply:add')") - @Log(title = "酒店申请", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaHotelApply oaHotelApply) - { - return toAjax(oaHotelApplyService.insertOaHotelApply(oaHotelApply)); - } - - /** - * 修改酒店申请 - */ - @PreAuthorize("@ss.hasPermi('oa:hotelApply:edit')") - @Log(title = "酒店申请", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaHotelApply oaHotelApply) - { - return toAjax(oaHotelApplyService.updateOaHotelApply(oaHotelApply)); - } - - /** - * 删除酒店申请 - */ - @PreAuthorize("@ss.hasPermi('oa:hotelApply:remove')") - @Log(title = "酒店申请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaHotelApplyService.deleteOaHotelApplyByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaMeetingroomApplyController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaMeetingroomApplyController.java deleted file mode 100644 index eb726a7..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaMeetingroomApplyController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaMeetingroomApply; -import com.ruoyi.back.oa.service.OaMeetingroomApplyService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 会议室申请Controller - * - * @author pointLion - * @date 2023-05-29 - */ -@RestController -@RequestMapping("/oa/meetingroomApply") -public class OaMeetingroomApplyController extends BaseController -{ - @Autowired - private OaMeetingroomApplyService oaMeetingroomApplyService; - - /** - * 查询会议室申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroomApply:list')") - @GetMapping("/list") - public TableDataInfo list(OaMeetingroomApply oaMeetingroomApply) - { - startPage(); - List list = oaMeetingroomApplyService.selectOaMeetingroomApplyList(oaMeetingroomApply); - return getDataTable(list); - } - - /** - * 导出会议室申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroomApply:export')") - @Log(title = "会议室申请", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaMeetingroomApply oaMeetingroomApply) - { - List list = oaMeetingroomApplyService.selectOaMeetingroomApplyList(oaMeetingroomApply); - ExcelUtil util = new ExcelUtil(OaMeetingroomApply.class); - util.exportExcel(response, list, "会议室申请数据"); - } - - /** - * 获取会议室申请详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroomApply:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaMeetingroomApplyService.selectOaMeetingroomApplyById(id)); - } - - /** - * 新增会议室申请 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroomApply:add')") - @Log(title = "会议室申请", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaMeetingroomApply oaMeetingroomApply) - { - return toAjax(oaMeetingroomApplyService.insertOaMeetingroomApply(oaMeetingroomApply)); - } - - /** - * 修改会议室申请 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroomApply:edit')") - @Log(title = "会议室申请", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaMeetingroomApply oaMeetingroomApply) - { - return toAjax(oaMeetingroomApplyService.updateOaMeetingroomApply(oaMeetingroomApply)); - } - - /** - * 删除会议室申请 - */ - @PreAuthorize("@ss.hasPermi('oa:meetingroomApply:remove')") - @Log(title = "会议室申请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaMeetingroomApplyService.deleteOaMeetingroomApplyByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaReimburseApplyController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaReimburseApplyController.java deleted file mode 100644 index 504e552..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaReimburseApplyController.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaReimburseApply; -import com.ruoyi.back.oa.service.OaReimburseApplyService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 报销申请Controller - * - * @author pointLion - * @date 2023-05-29 - */ -@RestController -@RequestMapping("/oa/reimburseApply") -public class OaReimburseApplyController extends BaseController -{ - @Autowired - private OaReimburseApplyService oaReimburseApplyService; - - /** - * 查询报销申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:reimburseApply:list')") - @GetMapping("/list") - public TableDataInfo list(OaReimburseApply oaReimburseApply) - { - startPage(); - List list = oaReimburseApplyService.selectOaReimburseApplyList(oaReimburseApply); - return getDataTable(list); - } - - /** - * 导出报销申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:reimburseApply:export')") - @Log(title = "报销申请", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaReimburseApply oaReimburseApply) - { - List list = oaReimburseApplyService.selectOaReimburseApplyList(oaReimburseApply); - ExcelUtil util = new ExcelUtil(OaReimburseApply.class); - util.exportExcel(response, list, "报销申请数据"); - } - - /** - * 获取报销申请详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:reimburseApply:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaReimburseApplyService.selectOaReimburseApplyById(id)); - } - - /** - * 新增报销申请 - */ - @PreAuthorize("@ss.hasPermi('oa:reimburseApply:add')") - @Log(title = "报销申请", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaReimburseApply oaReimburseApply) - { - return toAjax(oaReimburseApplyService.insertOaReimburseApply(oaReimburseApply)); - } - - /** - * 修改报销申请 - */ - @PreAuthorize("@ss.hasPermi('oa:reimburseApply:edit')") - @Log(title = "报销申请", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaReimburseApply oaReimburseApply) - { - return toAjax(oaReimburseApplyService.updateOaReimburseApply(oaReimburseApply)); - } - - /** - * 删除报销申请 - */ - @PreAuthorize("@ss.hasPermi('oa:reimburseApply:remove')") - @Log(title = "报销申请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaReimburseApplyService.deleteOaReimburseApplyByIds(ids)); - } - - - - - /***** - * 提交流程 - * @param id - * @return - * @throws Exception - */ - @RequestMapping("/submitFlow/{id}") - public AjaxResult submitFlow(@PathVariable("id")Long id) throws Exception { - oaReimburseApplyService.submitFlow(id); - return success(); - } - - - /***** - * 取回流程 - * @param id - * @return - * @throws Exception - */ - @RequestMapping("/cancleFlow/{id}") - public AjaxResult cancleFlow(@PathVariable("id")Long id) throws Exception { - oaReimburseApplyService.cancleFlow(id); - return success(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaSealApplyController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaSealApplyController.java deleted file mode 100644 index 60ecaae..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaSealApplyController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaSealApply; -import com.ruoyi.back.oa.service.OaSealApplyService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 公章使用Controller - * - * @author pointLion - * @date 2023-05-29 - */ -@RestController -@RequestMapping("/oa/sealApply") -public class OaSealApplyController extends BaseController -{ - @Autowired - private OaSealApplyService oaSealApplyService; - - /** - * 查询公章使用列表 - */ - @PreAuthorize("@ss.hasPermi('oa:sealApply:list')") - @GetMapping("/list") - public TableDataInfo list(OaSealApply oaSealApply) - { - startPage(); - List list = oaSealApplyService.selectOaSealApplyList(oaSealApply); - return getDataTable(list); - } - - /** - * 导出公章使用列表 - */ - @PreAuthorize("@ss.hasPermi('oa:sealApply:export')") - @Log(title = "公章使用", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaSealApply oaSealApply) - { - List list = oaSealApplyService.selectOaSealApplyList(oaSealApply); - ExcelUtil util = new ExcelUtil(OaSealApply.class); - util.exportExcel(response, list, "公章使用数据"); - } - - /** - * 获取公章使用详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:sealApply:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaSealApplyService.selectOaSealApplyById(id)); - } - - /** - * 新增公章使用 - */ - @PreAuthorize("@ss.hasPermi('oa:sealApply:add')") - @Log(title = "公章使用", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaSealApply oaSealApply) - { - return toAjax(oaSealApplyService.insertOaSealApply(oaSealApply)); - } - - /** - * 修改公章使用 - */ - @PreAuthorize("@ss.hasPermi('oa:sealApply:edit')") - @Log(title = "公章使用", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaSealApply oaSealApply) - { - return toAjax(oaSealApplyService.updateOaSealApply(oaSealApply)); - } - - /** - * 删除公章使用 - */ - @PreAuthorize("@ss.hasPermi('oa:sealApply:remove')") - @Log(title = "公章使用", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaSealApplyService.deleteOaSealApplyByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaTicketApplyController.java b/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaTicketApplyController.java deleted file mode 100644 index 7cb8199..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/controller/OaTicketApplyController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.back.oa.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.back.oa.domain.OaTicketApply; -import com.ruoyi.back.oa.service.OaTicketApplyService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 车票申请Controller - * - * @author pointLion - * @date 2023-05-29 - */ -@RestController -@RequestMapping("/oa/ticketApply") -public class OaTicketApplyController extends BaseController -{ - @Autowired - private OaTicketApplyService oaTicketApplyService; - - /** - * 查询车票申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:ticketApply:list')") - @GetMapping("/list") - public TableDataInfo list(OaTicketApply oaTicketApply) - { - startPage(); - List list = oaTicketApplyService.selectOaTicketApplyList(oaTicketApply); - return getDataTable(list); - } - - /** - * 导出车票申请列表 - */ - @PreAuthorize("@ss.hasPermi('oa:ticketApply:export')") - @Log(title = "车票申请", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, OaTicketApply oaTicketApply) - { - List list = oaTicketApplyService.selectOaTicketApplyList(oaTicketApply); - ExcelUtil util = new ExcelUtil(OaTicketApply.class); - util.exportExcel(response, list, "车票申请数据"); - } - - /** - * 获取车票申请详细信息 - */ - @PreAuthorize("@ss.hasPermi('oa:ticketApply:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(oaTicketApplyService.selectOaTicketApplyById(id)); - } - - /** - * 新增车票申请 - */ - @PreAuthorize("@ss.hasPermi('oa:ticketApply:add')") - @Log(title = "车票申请", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody OaTicketApply oaTicketApply) - { - return toAjax(oaTicketApplyService.insertOaTicketApply(oaTicketApply)); - } - - /** - * 修改车票申请 - */ - @PreAuthorize("@ss.hasPermi('oa:ticketApply:edit')") - @Log(title = "车票申请", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody OaTicketApply oaTicketApply) - { - return toAjax(oaTicketApplyService.updateOaTicketApply(oaTicketApply)); - } - - /** - * 删除车票申请 - */ - @PreAuthorize("@ss.hasPermi('oa:ticketApply:remove')") - @Log(title = "车票申请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(oaTicketApplyService.deleteOaTicketApplyByIds(ids)); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaCustomForm.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaCustomForm.java deleted file mode 100644 index fe29fc8..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaCustomForm.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 自定义表单对象 oa_custom_form - * - * @author pointLion - * @date 2022-07-07 - */ -@Data -public class OaCustomForm extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 表单名称 */ - @Excel(name = "表单名称") - private String name; - - /** 表单分类 */ - @Excel(name = "表单分类") - private String category; - - /** 表单规则 */ - @Excel(name = "表单规则") - private String rules; - - /** 表单配置 */ - @Excel(name = "表单配置") - private String options; - - /** 表单代码 */ - @Excel(name = "表单代码") - private String formKey; - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("category", getCategory()) - .append("rules", getRules()) - .append("options", getOptions()) - .append("formKey", getFormKey()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaCustomFormApply.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaCustomFormApply.java deleted file mode 100644 index 24ce4f7..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaCustomFormApply.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 自定义表单申请对象 oa_custom_form_apply - * - * @author pointLion - * @date 2022-07-09 - */ -@Data -public class OaCustomFormApply extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - @Excel(name = "主键") - private Long id; - - /** 表单名称 */ - @Excel(name = "表单名称") - private String name; - - /** 表单分类 */ - @Excel(name = "表单分类") - private String category; - - /** 表单规则 */ - @Excel(name = "表单规则") - private String rules; - - /** 表单配置 */ - @Excel(name = "表单配置") - private String options; - - /** 表单数据 */ - @Excel(name = "表单数据") - private String formData; - - /** 表单代码 */ - @Excel(name = "表单代码") - private String formKey; - - /** 申请流程 */ - @Excel(name = "申请流程") - private String flowKey; - - /** 流程名称 */ - @Excel(name = "流程名称") - private String flowName; - - /** 流程实例id */ - @Excel(name = "流程实例id") - private String flowInsId; - - /** 申请标题 */ - @Excel(name = "申请标题") - private String applyTitle; - - /** 状态 */ - @Excel(name = "状态", readConverterExp = "0=未提交,1=已提交,2=已完成") - private String status; - - /** 提交时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date submitTime; - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("category", getCategory()) - .append("rules", getRules()) - .append("options", getOptions()) - .append("formData", getFormData()) - .append("formKey", getFormKey()) - .append("flowKey", getFlowKey()) - .append("flowName", getFlowName()) - .append("flowInsId", getFlowInsId()) - .append("applyTitle", getApplyTitle()) - .append("submitTime", getSubmitTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("status", getStatus()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaDutyApply.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaDutyApply.java deleted file mode 100644 index 781125d..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaDutyApply.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 假勤申请对象 oa_duty_apply - * - * @author pointLion - * @date 2023-06-01 - */ -@Data -public class OaDutyApply extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 单据类型 */ - @Excel(name = "单据类型") - private String billType; - - /** 申请类型 */ - @Excel(name = "申请类型") - private String leaveType; - - /** 单据编号 */ - @Excel(name = "单据编号") - private String billCode; - - /** 申请流程 */ - @Excel(name = "申请流程") - private String flowKey; - - /** 流程实例id */ - @Excel(name = "流程实例id") - private String flowInsId; - - /** 申请标题 */ - @Excel(name = "申请标题") - private String applyTitle; - - /** 提交时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date submitTime; - - /** 流程状态。0：未提交。1：审批中。2：已完成 */ - @Excel(name = "流程状态。0：未提交。1：审批中。2：已完成") - private String status; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; - - /** 天数 */ - @Excel(name = "天数") - private BigDecimal days; - - /** 事由 */ - @Excel(name = "事由") - private String reason; - - /** 用户ID（单据 拥有者） */ - @Excel(name = "用户ID", readConverterExp = "单=据,拥=有者") - private Long userId; - - /** 部门ID（单据拥有部门） */ - @Excel(name = "部门ID", readConverterExp = "单=据拥有部门") - private Long deptId; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("billType", getBillType()) - .append("leaveType", getLeaveType()) - .append("billCode", getBillCode()) - .append("flowKey", getFlowKey()) - .append("flowInsId", getFlowInsId()) - .append("applyTitle", getApplyTitle()) - .append("submitTime", getSubmitTime()) - .append("status", getStatus()) - .append("remark", getRemark()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("days", getDays()) - .append("reason", getReason()) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaHotelApply.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaHotelApply.java deleted file mode 100644 index 71089bd..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaHotelApply.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 酒店申请对象 oa_hotel_apply - * - * @author pointLion - * @date 2023-05-29 - */ -@Data -public class OaHotelApply extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 用户ID（单据 拥有者） */ - private Long userId; - - /** 部门ID（单据拥有部门） */ - private Long deptId; - - /** 流程状态 */ - @Excel(name = "流程状态") - private String status; - - /** 申请流程 */ - private String flowKey; - - /** 流程实例id */ - private String flowInsId; - - /** 申请标题 */ - private String applyTitle; - - /** 提交时间 */ - private Date submitTime; - - /** 单据编号 */ - @Excel(name = "单据编号") - private String billcode; - - /** 使用城市 */ - @Excel(name = "使用城市") - private String applyCity; - - /** 所在街道 */ - @Excel(name = "所在街道") - private String street; - - /** 酒店名称 */ - @Excel(name = "酒店名称") - private String hotelName; - - /** 预计金额 */ - @Excel(name = "预计金额") - private BigDecimal totalAmt; - - /** 房间类型 */ - @Excel(name = "房间类型") - private String roomType; - - /** 房间数量 */ - @Excel(name = "房间数量") - private Long roomCount; - - /** 房间等级 */ - @Excel(name = "房间等级") - private String roomLevel; - - /** 入住人数 */ - @Excel(name = "入住人数") - private Long userCount; - - /** 入住时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "入住时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date useTime; - - /** 事项描述 */ - @Excel(name = "事项描述") - private String reasonDes; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("status", getStatus()) - .append("flowKey", getFlowKey()) - .append("flowInsId", getFlowInsId()) - .append("applyTitle", getApplyTitle()) - .append("submitTime", getSubmitTime()) - .append("billcode", getBillcode()) - .append("remark", getRemark()) - .append("applyCity", getApplyCity()) - .append("street", getStreet()) - .append("hotelName", getHotelName()) - .append("totalAmt", getTotalAmt()) - .append("roomType", getRoomType()) - .append("roomCount", getRoomCount()) - .append("roomLevel", getRoomLevel()) - .append("userCount", getUserCount()) - .append("useTime", getUseTime()) - .append("reasonDes", getReasonDes()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaMeetingroomApply.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaMeetingroomApply.java deleted file mode 100644 index 9918a5b..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaMeetingroomApply.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import lombok.Data; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 会议室申请对象 oa_meetingroom_apply - * - * @author pointLion - * @date 2023-05-29 - */ -@Data -public class OaMeetingroomApply extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 用户ID（单据 拥有者） */ - @Excel(name = "用户ID", readConverterExp = "单=据,拥=有者") - private Long userId; - - /** 部门ID（单据拥有部门） */ - @Excel(name = "部门ID", readConverterExp = "单=据拥有部门") - private Long deptId; - - /** 流程状态 */ - @Excel(name = "流程状态") - private String status; - - /** 申请流程 */ - private String flowKey; - - /** 流程实例id */ - private String flowInsId; - - /** 申请标题 */ - private String applyTitle; - - /** 提交时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date submitTime; - - /** 单据编号 */ - @Excel(name = "单据编号") - private String billcode; - - /** 使用时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; - - /** 房间号 */ - @Excel(name = "房间号") - private String roomNum; - - /** 使用人数 */ - @Excel(name = "使用人数") - private Long userCount; - - /** 会议题目 */ - @Excel(name = "会议题目") - private String meetingTitle; - - /** 会议纪要 */ - private String meetingDes; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("status", getStatus()) - .append("flowKey", getFlowKey()) - .append("flowInsId", getFlowInsId()) - .append("applyTitle", getApplyTitle()) - .append("submitTime", getSubmitTime()) - .append("billcode", getBillcode()) - .append("remark", getRemark()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("roomNum", getRoomNum()) - .append("userCount", getUserCount()) - .append("meetingTitle", getMeetingTitle()) - .append("meetingDes", getMeetingDes()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaReimburseApply.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaReimburseApply.java deleted file mode 100644 index 9d37939..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaReimburseApply.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import lombok.Data; -import java.math.BigDecimal; -import java.util.List; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 报销申请对象 oa_reimburse_apply - * - * @author pointLion - * @date 2023-05-29 - */ -@Data -public class OaReimburseApply extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 用户ID（单据 拥有者） */ - @Excel(name = "用户ID", readConverterExp = "单=据,拥=有者") - private Long userId; - - /** 部门ID（单据拥有部门） */ - @Excel(name = "部门ID", readConverterExp = "单=据拥有部门") - private Long deptId; - - /** 流程状态 */ - @Excel(name = "流程状态") - private String status; - - /** 申请流程 */ - @Excel(name = "申请流程") - private String flowKey; - - /** 流程实例id */ - private String flowInsId; - - /** 申请标题 */ - @Excel(name = "申请标题") - private String applyTitle; - - /** 提交时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date submitTime; - - /** 单据编号 */ - @Excel(name = "单据编号") - private String billcode; - - /** 总金额 */ - @Excel(name = "总金额") - private BigDecimal totalAmt; - - /** 单据类型 */ - @Excel(name = "单据类型") - private String billType; - - /** 月度 */ - @Excel(name = "月度") - private String month; - - /** 描述信息 */ - @Excel(name = "描述信息") - private String des; - - /** 出差地点 */ - @Excel(name = "出差地点") - private String city; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; - - /** 票据总数 */ - @Excel(name = "票据总数") - private Long billCount; - - /**** - * 票据快照 - */ - private String imgUrl; - - /***** - * 补贴标准 - */ - private BigDecimal standardSubsidy; - - /**** - * 出差天数 - */ - private Long days; - - /**** - * 补贴总金额 - */ - private BigDecimal subsidyAmt; - - - /**** - * 票据总金额 - */ - private BigDecimal billAmt; - - - /** 报销费用明细信息 */ - private List oaReimburseFeeitemList; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("status", getStatus()) - .append("flowKey", getFlowKey()) - .append("flowInsId", getFlowInsId()) - .append("applyTitle", getApplyTitle()) - .append("submitTime", getSubmitTime()) - .append("billcode", getBillcode()) - .append("remark", getRemark()) - .append("totalAmt", getTotalAmt()) - .append("billType", getBillType()) - .append("month", getMonth()) - .append("des", getDes()) - .append("city", getCity()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("billCount", getBillCount()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaReimburseFeeitem.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaReimburseFeeitem.java deleted file mode 100644 index dc99d36..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaReimburseFeeitem.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 报销费用明细对象 oa_reimburse_feeitem - * - * @author pointLion - * @date 2023-05-29 - */ -public class OaReimburseFeeitem extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 报销单id */ - @Excel(name = "报销单id") - private Long reimburseId; - - /** 款项金额 */ - @Excel(name = "款项金额") - private BigDecimal itemAmt; - - /** 年份 */ - @Excel(name = "年份") - private String year; - - /** 月份 */ - @Excel(name = "月份") - private String month; - - /** 票据类型 */ - @Excel(name = "票据类型") - private String billType; - - /** 票据张数 */ - @Excel(name = "票据张数") - private Long billCount; - - /** 起始地 */ - @Excel(name = "起始地") - private String startCity; - - /** 目的地 */ - @Excel(name = "目的地") - private String endCity; - - /** 票据日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "票据日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date billDate; - - /** 天数 */ - @Excel(name = "天数") - private BigDecimal dayCount; - - /** 补贴标准 */ - @Excel(name = "补贴标准") - private BigDecimal standardSubsidy; - - /** 费用类型 */ - @Excel(name = "费用类型") - private String itemType; - - /** 住宿地点 */ - @Excel(name = "住宿地点") - private String stayCity; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setReimburseId(Long reimburseId) - { - this.reimburseId = reimburseId; - } - - public Long getReimburseId() - { - return reimburseId; - } - public void setItemAmt(BigDecimal itemAmt) - { - this.itemAmt = itemAmt; - } - - public BigDecimal getItemAmt() - { - return itemAmt; - } - public void setYear(String year) - { - this.year = year; - } - - public String getYear() - { - return year; - } - public void setMonth(String month) - { - this.month = month; - } - - public String getMonth() - { - return month; - } - public void setBillType(String billType) - { - this.billType = billType; - } - - public String getBillType() - { - return billType; - } - public void setBillCount(Long billCount) - { - this.billCount = billCount; - } - - public Long getBillCount() - { - return billCount; - } - public void setStartCity(String startCity) - { - this.startCity = startCity; - } - - public String getStartCity() - { - return startCity; - } - public void setEndCity(String endCity) - { - this.endCity = endCity; - } - - public String getEndCity() - { - return endCity; - } - public void setBillDate(Date billDate) - { - this.billDate = billDate; - } - - public Date getBillDate() - { - return billDate; - } - public void setDayCount(BigDecimal dayCount) - { - this.dayCount = dayCount; - } - - public BigDecimal getDayCount() - { - return dayCount; - } - public void setStandardSubsidy(BigDecimal standardSubsidy) - { - this.standardSubsidy = standardSubsidy; - } - - public BigDecimal getStandardSubsidy() - { - return standardSubsidy; - } - public void setItemType(String itemType) - { - this.itemType = itemType; - } - - public String getItemType() - { - return itemType; - } - public void setStayCity(String stayCity) - { - this.stayCity = stayCity; - } - - public String getStayCity() - { - return stayCity; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("reimburseId", getReimburseId()) - .append("itemAmt", getItemAmt()) - .append("year", getYear()) - .append("month", getMonth()) - .append("billType", getBillType()) - .append("billCount", getBillCount()) - .append("startCity", getStartCity()) - .append("endCity", getEndCity()) - .append("billDate", getBillDate()) - .append("dayCount", getDayCount()) - .append("standardSubsidy", getStandardSubsidy()) - .append("itemType", getItemType()) - .append("stayCity", getStayCity()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaSealApply.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaSealApply.java deleted file mode 100644 index 9ab407f..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaSealApply.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import lombok.Data; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 公章使用对象 oa_seal_apply - * - * @author pointLion - * @date 2023-05-29 - */ -@Data -public class OaSealApply extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 用户ID（单据 拥有者） */ - private Long userId; - - /** 部门ID（单据拥有部门） */ - private Long deptId; - - /** 流程状态 */ - @Excel(name = "流程状态") - private String status; - - /** 申请流程 */ - private String flowKey; - - /** 流程实例id */ - private String flowInsId; - - /** 申请标题 */ - private String applyTitle; - - /** 提交时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date submitTime; - - /** 单据编号 */ - @Excel(name = "单据编号") - private String billcode; - - /** 公章 */ - @Excel(name = "公章") - private String sealType; - - /** 使用时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date useTime; - - /** 归还时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date backTime; - - /** 使用描述 */ - @Excel(name = "使用描述") - private String useInfo; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("status", getStatus()) - .append("flowKey", getFlowKey()) - .append("flowInsId", getFlowInsId()) - .append("applyTitle", getApplyTitle()) - .append("submitTime", getSubmitTime()) - .append("billcode", getBillcode()) - .append("remark", getRemark()) - .append("sealType", getSealType()) - .append("useTime", getUseTime()) - .append("backTime", getBackTime()) - .append("useInfo", getUseInfo()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaTicketApply.java b/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaTicketApply.java deleted file mode 100644 index ec832c7..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/domain/OaTicketApply.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.ruoyi.back.oa.domain; - -import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 车票申请对象 oa_ticket_apply - * - * @author pointLion - * @date 2023-05-29 - */ -@Data -public class OaTicketApply extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 用户ID */ - private Long userId; - - /** 部门ID */ - private Long deptId; - - /** 流程状态 */ - @Excel(name = "流程状态") - private String status; - - /** 申请流程 */ - private String flowKey; - - /** 流程实例id */ - private String flowInsId; - - /** 申请标题 */ - private String applyTitle; - - /** 提交时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date submitTime; - - /** 单据编号 */ - @Excel(name = "单据编号") - private String billcode; - - /** 目的地 */ - @Excel(name = "目的地") - private String destination; - - /** 出发地 */ - @Excel(name = "出发地") - private String departure; - - /** 预计金额 */ - @Excel(name = "预计金额") - private BigDecimal totalAmt; - - /** 启程时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "启程时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date goTime; - - /** 车次/架次 */ - @Excel(name = "车次/架次") - private Long carNum; - - /** 真实姓名 */ - @Excel(name = "真实姓名") - private String applyRealname; - - /** 身份证号 */ - @Excel(name = "身份证号") - private String idNum; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("status", getStatus()) - .append("flowKey", getFlowKey()) - .append("flowInsId", getFlowInsId()) - .append("applyTitle", getApplyTitle()) - .append("submitTime", getSubmitTime()) - .append("billcode", getBillcode()) - .append("remark", getRemark()) - .append("destination", getDestination()) - .append("departure", getDeparture()) - .append("totalAmt", getTotalAmt()) - .append("goTime", getGoTime()) - .append("carNum", getCarNum()) - .append("applyRealname", getApplyRealname()) - .append("idNum", getIdNum()) - .toString(); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaCustomFormApplyMapper.java b/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaCustomFormApplyMapper.java deleted file mode 100644 index e816ea9..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaCustomFormApplyMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.ruoyi.back.oa.mapper; - -import java.util.List; -import com.ruoyi.back.oa.domain.OaCustomFormApply; -import org.apache.ibatis.annotations.Param; - -/** - * 自定义表单申请Mapper接口 - * - * @author pointLion - * @date 2022-07-09 - */ -public interface OaCustomFormApplyMapper -{ - /** - * 查询自定义表单申请 - * - * @param id 自定义表单申请主键 - * @return 自定义表单申请 - */ - public OaCustomFormApply selectOaCustomFormApplyById(Long id); - - - - /** - * 查询自定义表单申请 - * - * @param id 自定义表单申请主键 - * @return 自定义表单申请 - */ - public OaCustomFormApply selectOaCustomFormApplyByInsId(@Param("insId") String insId); - - /** - * 查询自定义表单申请列表 - * - * @param oaCustomFormApply 自定义表单申请 - * @return 自定义表单申请集合 - */ - public List selectOaCustomFormApplyList(OaCustomFormApply oaCustomFormApply); - - /** - * 新增自定义表单申请 - * - * @param oaCustomFormApply 自定义表单申请 - * @return 结果 - */ - public int insertOaCustomFormApply(OaCustomFormApply oaCustomFormApply); - - /** - * 修改自定义表单申请 - * - * @param oaCustomFormApply 自定义表单申请 - * @return 结果 - */ - public int updateOaCustomFormApply(OaCustomFormApply oaCustomFormApply); - - /** - * 删除自定义表单申请 - * - * @param id 自定义表单申请主键 - * @return 结果 - */ - public int deleteOaCustomFormApplyById(Long id); - - /** - * 批量删除自定义表单申请 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteOaCustomFormApplyByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaCustomFormMapper.java b/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaCustomFormMapper.java deleted file mode 100644 index 2c1a3f7..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaCustomFormMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.back.oa.mapper; - -import java.util.List; -import com.ruoyi.back.oa.domain.OaCustomForm; - -/** - * 自定义单Mapper接口 - * - * @author pointLion - * @date 2022-07-05 - */ -public interface OaCustomFormMapper -{ - /** - * 查询自定义单 - * - * @param id 自定义单主键 - * @return 自定义单 - */ - public OaCustomForm selectOaCustomFormById(Long id); - - /** - * 查询自定义单列表 - * - * @param oaCustomForm 自定义单 - * @return 自定义单集合 - */ - public List selectOaCustomFormList(OaCustomForm oaCustomForm); - - /** - * 新增自定义单 - * - * @param oaCustomForm 自定义单 - * @return 结果 - */ - public int insertOaCustomForm(OaCustomForm oaCustomForm); - - /** - * 修改自定义单 - * - * @param oaCustomForm 自定义单 - * @return 结果 - */ - public int updateOaCustomForm(OaCustomForm oaCustomForm); - - /** - * 删除自定义单 - * - * @param id 自定义单主键 - * @return 结果 - */ - public int deleteOaCustomFormById(Long id); - - /** - * 批量删除自定义单 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteOaCustomFormByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaDutyApplyMapper.java b/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaDutyApplyMapper.java deleted file mode 100644 index a8b444e..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaDutyApplyMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.back.oa.mapper; - -import java.util.List; -import com.ruoyi.back.oa.domain.OaDutyApply; - -/** - * 假勤申请Mapper接口 - * - * @author pointLion - * @date 2023-06-01 - */ -public interface OaDutyApplyMapper -{ - /** - * 查询假勤申请 - * - * @param id 假勤申请主键 - * @return 假勤申请 - */ - public OaDutyApply selectOaDutyApplyById(Long id); - - /** - * 查询假勤申请列表 - * - * @param oaDutyApply 假勤申请 - * @return 假勤申请集合 - */ - public List selectOaDutyApplyList(OaDutyApply oaDutyApply); - - /** - * 新增假勤申请 - * - * @param oaDutyApply 假勤申请 - * @return 结果 - */ - public int insertOaDutyApply(OaDutyApply oaDutyApply); - - /** - * 修改假勤申请 - * - * @param oaDutyApply 假勤申请 - * @return 结果 - */ - public int updateOaDutyApply(OaDutyApply oaDutyApply); - - /** - * 删除假勤申请 - * - * @param id 假勤申请主键 - * @return 结果 - */ - public int deleteOaDutyApplyById(Long id); - - /** - * 批量删除假勤申请 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteOaDutyApplyByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaHotelApplyMapper.java b/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaHotelApplyMapper.java deleted file mode 100644 index e5589ae..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaHotelApplyMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.back.oa.mapper; - -import java.util.List; -import com.ruoyi.back.oa.domain.OaHotelApply; - -/** - * 酒店申请Mapper接口 - * - * @author pointLion - * @date 2023-05-29 - */ -public interface OaHotelApplyMapper -{ - /** - * 查询酒店申请 - * - * @param id 酒店申请主键 - * @return 酒店申请 - */ - public OaHotelApply selectOaHotelApplyById(Long id); - - /** - * 查询酒店申请列表 - * - * @param oaHotelApply 酒店申请 - * @return 酒店申请集合 - */ - public List selectOaHotelApplyList(OaHotelApply oaHotelApply); - - /** - * 新增酒店申请 - * - * @param oaHotelApply 酒店申请 - * @return 结果 - */ - public int insertOaHotelApply(OaHotelApply oaHotelApply); - - /** - * 修改酒店申请 - * - * @param oaHotelApply 酒店申请 - * @return 结果 - */ - public int updateOaHotelApply(OaHotelApply oaHotelApply); - - /** - * 删除酒店申请 - * - * @param id 酒店申请主键 - * @return 结果 - */ - public int deleteOaHotelApplyById(Long id); - - /** - * 批量删除酒店申请 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteOaHotelApplyByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaMeetingroomApplyMapper.java b/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaMeetingroomApplyMapper.java deleted file mode 100644 index 89664f5..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaMeetingroomApplyMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.back.oa.mapper; - -import java.util.List; -import com.ruoyi.back.oa.domain.OaMeetingroomApply; - -/** - * 会议室申请Mapper接口 - * - * @author pointLion - * @date 2023-05-29 - */ -public interface OaMeetingroomApplyMapper -{ - /** - * 查询会议室申请 - * - * @param id 会议室申请主键 - * @return 会议室申请 - */ - public OaMeetingroomApply selectOaMeetingroomApplyById(Long id); - - /** - * 查询会议室申请列表 - * - * @param oaMeetingroomApply 会议室申请 - * @return 会议室申请集合 - */ - public List selectOaMeetingroomApplyList(OaMeetingroomApply oaMeetingroomApply); - - /** - * 新增会议室申请 - * - * @param oaMeetingroomApply 会议室申请 - * @return 结果 - */ - public int insertOaMeetingroomApply(OaMeetingroomApply oaMeetingroomApply); - - /** - * 修改会议室申请 - * - * @param oaMeetingroomApply 会议室申请 - * @return 结果 - */ - public int updateOaMeetingroomApply(OaMeetingroomApply oaMeetingroomApply); - - /** - * 删除会议室申请 - * - * @param id 会议室申请主键 - * @return 结果 - */ - public int deleteOaMeetingroomApplyById(Long id); - - /** - * 批量删除会议室申请 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteOaMeetingroomApplyByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaReimburseApplyMapper.java b/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaReimburseApplyMapper.java deleted file mode 100644 index 0ed595b..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaReimburseApplyMapper.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.ruoyi.back.oa.mapper; - -import java.util.List; -import com.ruoyi.back.oa.domain.OaReimburseApply; -import com.ruoyi.back.oa.domain.OaReimburseFeeitem; - -/** - * 报销申请Mapper接口 - * - * @author pointLion - * @date 2023-05-29 - */ -public interface OaReimburseApplyMapper -{ - /** - * 查询报销申请 - * - * @param id 报销申请主键 - * @return 报销申请 - */ - public OaReimburseApply selectOaReimburseApplyById(Long id); - - /** - * 查询报销申请列表 - * - * @param oaReimburseApply 报销申请 - * @return 报销申请集合 - */ - public List selectOaReimburseApplyList(OaReimburseApply oaReimburseApply); - - /** - * 新增报销申请 - * - * @param oaReimburseApply 报销申请 - * @return 结果 - */ - public int insertOaReimburseApply(OaReimburseApply oaReimburseApply); - - /** - * 修改报销申请 - * - * @param oaReimburseApply 报销申请 - * @return 结果 - */ - public int updateOaReimburseApply(OaReimburseApply oaReimburseApply); - - /** - * 删除报销申请 - * - * @param id 报销申请主键 - * @return 结果 - */ - public int deleteOaReimburseApplyById(Long id); - - /** - * 批量删除报销申请 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteOaReimburseApplyByIds(Long[] ids); - - /** - * 批量删除报销费用明细 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteoaReimburseFeeitemByReimburseIds(Long[] ids); - - /** - * 批量新增报销费用明细 - * - * @param oaReimburseFeeitemList 报销费用明细列表 - * @return 结果 - */ - public int batchoaReimburseFeeitem(List oaReimburseFeeitemList); - - - /** - * 通过报销申请主键删除报销费用明细信息 - * - * @param id 报销申请ID - * @return 结果 - */ - public int deleteoaReimburseFeeitemByReimburseId(Long id); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaSealApplyMapper.java b/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaSealApplyMapper.java deleted file mode 100644 index 09a68d1..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaSealApplyMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.back.oa.mapper; - -import java.util.List; -import com.ruoyi.back.oa.domain.OaSealApply; - -/** - * 公章使用Mapper接口 - * - * @author pointLion - * @date 2023-05-29 - */ -public interface OaSealApplyMapper -{ - /** - * 查询公章使用 - * - * @param id 公章使用主键 - * @return 公章使用 - */ - public OaSealApply selectOaSealApplyById(Long id); - - /** - * 查询公章使用列表 - * - * @param oaSealApply 公章使用 - * @return 公章使用集合 - */ - public List selectOaSealApplyList(OaSealApply oaSealApply); - - /** - * 新增公章使用 - * - * @param oaSealApply 公章使用 - * @return 结果 - */ - public int insertOaSealApply(OaSealApply oaSealApply); - - /** - * 修改公章使用 - * - * @param oaSealApply 公章使用 - * @return 结果 - */ - public int updateOaSealApply(OaSealApply oaSealApply); - - /** - * 删除公章使用 - * - * @param id 公章使用主键 - * @return 结果 - */ - public int deleteOaSealApplyById(Long id); - - /** - * 批量删除公章使用 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteOaSealApplyByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaTicketApplyMapper.java b/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaTicketApplyMapper.java deleted file mode 100644 index fb1695c..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaTicketApplyMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.back.oa.mapper; - -import java.util.List; -import com.ruoyi.back.oa.domain.OaTicketApply; - -/** - * 车票申请Mapper接口 - * - * @author pointLion - * @date 2023-05-29 - */ -public interface OaTicketApplyMapper -{ - /** - * 查询车票申请 - * - * @param id 车票申请主键 - * @return 车票申请 - */ - public OaTicketApply selectOaTicketApplyById(Long id); - - /** - * 查询车票申请列表 - * - * @param oaTicketApply 车票申请 - * @return 车票申请集合 - */ - public List selectOaTicketApplyList(OaTicketApply oaTicketApply); - - /** - * 新增车票申请 - * - * @param oaTicketApply 车票申请 - * @return 结果 - */ - public int insertOaTicketApply(OaTicketApply oaTicketApply); - - /** - * 修改车票申请 - * - * @param oaTicketApply 车票申请 - * @return 结果 - */ - public int updateOaTicketApply(OaTicketApply oaTicketApply); - - /** - * 删除车票申请 - * - * @param id 车票申请主键 - * @return 结果 - */ - public int deleteOaTicketApplyById(Long id); - - /** - * 批量删除车票申请 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteOaTicketApplyByIds(Long[] ids); -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaCustomFormApplyService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaCustomFormApplyService.java deleted file mode 100644 index 52116d9..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaCustomFormApplyService.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.ruoyi.back.oa.service; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.ruoyi.back.erp.service.BaseService; -import com.ruoyi.common.constant.BillTypeEnum; -import com.ruoyi.common.constant.CommonConstants; -import com.ruoyi.back.oa.domain.OaCustomFormApply; -import com.ruoyi.back.oa.mapper.OaCustomFormApplyMapper; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.util.FlowUtil; -import com.ruoyi.system.mapper.SysUserMapper; -import org.flowable.engine.HistoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.runtime.ProcessInstance; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 自定义表单申请Service业务层处理 - * - * @author pointLion - * @date 2022-07-09 - */ -@Service -public class OaCustomFormApplyService extends BaseService -{ - @Autowired - private OaCustomFormApplyMapper oaCustomFormApplyMapper; - @Autowired - private OaCustomFormApplyService oaCustomFormApplyService; - @Autowired - private RuntimeService runtimeService; - @Autowired - private HistoryService historyService; - @Autowired - private FlowProcessInstanceService flowProcessInstanceService; - @Autowired - private SysUserMapper sysUserMapper; - - /** - * 查询自定义表单申请 - * - * @param id 自定义表单申请主键 - * @return 自定义表单申请 - */ - public OaCustomFormApply selectOaCustomFormApplyById(Long id) - { - return oaCustomFormApplyMapper.selectOaCustomFormApplyById(id); - } - - /** - * 查询自定义表单申请列表 - * - * @param oaCustomFormApply 自定义表单申请 - * @return 自定义表单申请 - */ - public List selectOaCustomFormApplyList(OaCustomFormApply oaCustomFormApply) - { - return oaCustomFormApplyMapper.selectOaCustomFormApplyList(oaCustomFormApply); - } - - /** - * 新增自定义表单申请 - * - * @param oaCustomFormApply 自定义表单申请 - * @return 结果 - */ - @Transactional - public Long insertOaCustomFormApply(OaCustomFormApply oaCustomFormApply, LoginUser loginUser) - { - oaCustomFormApply.setCreateBy(loginUser.getUsername()); - oaCustomFormApply.setApplyTitle("用户【"+loginUser.getUser().getNickName()+"】申请的【"+oaCustomFormApply.getName()+"单】"); - oaCustomFormApply.setCreateTime(DateUtils.getNowDate()); - String status = oaCustomFormApply.getStatus();//前台传过来的参数 - oaCustomFormApply.setStatus("0");//为了避开校验，提交成功后，后面再进行更新 - int i = oaCustomFormApplyMapper.insertOaCustomFormApply(oaCustomFormApply); - String insId = ""; - if("1".equals(status)){ - SysUser user = sysUserMapper.selectUserByUserName(oaCustomFormApply.getCreateBy()); - Map vars = FlowUtil.buildFlowVars(oaCustomFormApply.getApplyTitle(),oaCustomFormApply.getCreateBy(),user.getNickName(), - DateUtil.formatDateTime(oaCustomFormApply.getCreateTime()), CommonConstants.YES); - String businessKey = BillTypeEnum.CUSTOM_FORM.getBillType()+":"+BillTypeEnum.CUSTOM_FORM.getTableName()+":"+oaCustomFormApply.getId(); - insId = oaCustomFormApplyService.submitApply(oaCustomFormApply.getFlowKey(),businessKey ,vars); - oaCustomFormApply.setFlowInsId(insId); - OaCustomFormApply updateApply = new OaCustomFormApply(); - updateApply.setId(oaCustomFormApply.getId()); - updateApply.setFlowInsId(insId); - updateApply.setStatus("1");//更新状态 - oaCustomFormApplyMapper.updateOaCustomFormApply(updateApply); - } - return oaCustomFormApply.getId(); - } - - /** - * 修改自定义表单申请 - * - * @param oaCustomFormApply 自定义表单申请 - * @return 结果 - */ - @Transactional - public int updateOaCustomFormApply(OaCustomFormApply oaCustomFormApply, LoginUser loginUser) - { - oaCustomFormApply.setUpdateBy(loginUser.getUsername()); - oaCustomFormApply.setApplyTitle("用户【"+loginUser.getUser().getNickName()+"】申请的【"+oaCustomFormApply.getName()+"单】"); - oaCustomFormApply.setUpdateTime(DateUtils.getNowDate()); - String insId = ""; - if("1".equals(oaCustomFormApply.getStatus())){ - String businessKey = BillTypeEnum.CUSTOM_FORM.getBillType()+":"+BillTypeEnum.CUSTOM_FORM.getTableName()+":"+oaCustomFormApply.getId(); - Map vars = FlowUtil.buildFlowVars(oaCustomFormApply.getApplyTitle(),oaCustomFormApply.getCreateBy(), - loginUser.getUser().getNickName(), DateUtil.formatDateTime(oaCustomFormApply.getCreateTime()), CommonConstants.YES); - insId = oaCustomFormApplyService.submitApply(oaCustomFormApply.getFlowKey(),businessKey,vars); - oaCustomFormApply.setFlowInsId(insId); - } - int i = oaCustomFormApplyMapper.updateOaCustomFormApply(oaCustomFormApply); - return i; - } - - /**** - * 提交 - * @param id - * @return - */ - public void submitApply(Long id){ - OaCustomFormApply apply = oaCustomFormApplyService.selectOaCustomFormApplyById(id); - SysUser user = sysUserMapper.selectUserByUserName(apply.getCreateBy()); - Map vars = FlowUtil.buildFlowVars(apply.getApplyTitle(),apply.getCreateBy(),user.getNickName(), - DateUtil.formatDateTime(apply.getCreateTime()), CommonConstants.YES); - String businessKey = BillTypeEnum.CUSTOM_FORM.getBillType()+":"+BillTypeEnum.CUSTOM_FORM.getTableName()+":"+id; - String insId = oaCustomFormApplyService.submitApply(apply.getFlowKey(),businessKey,vars); - OaCustomFormApply updateApply = new OaCustomFormApply(); - updateApply.setId(id); - updateApply.setStatus(CommonConstants.FLOW_STATUS_SUBMIT); - updateApply.setFlowInsId(insId); - oaCustomFormApplyMapper.updateOaCustomFormApply(updateApply); - } - - /**** - * 提交 - * @param defKey - * @param businessKey - * @param var - * @return - */ - public String submitApply(String defKey, String businessKey, Map var){ - // 提交校验，可能在单据页面中提交后，再其他打开的页面的列表页中再次点击【提交】按钮，会导致重复流程实例。需要添加【提交前校验】 - Long id = Long.valueOf(businessKey.split(":")[2]); - OaCustomFormApply apply = oaCustomFormApplyMapper.selectOaCustomFormApplyById(id); - if("1".equals(apply.getStatus())){//如果已经提交过了 - throw new RuntimeException("流程已经提交"); - } - ProcessInstance procIns = runtimeService.startProcessInstanceByKey(defKey,businessKey,var); - if(procIns!=null){ - return procIns.getId(); - }else{ - return ""; - } - } - - /** - * 批量删除自定义表单申请 - * - * @param ids 需要删除的自定义表单申请主键 - * @return 结果 - */ - public int deleteOaCustomFormApplyByIds(Long[] ids) - { - return oaCustomFormApplyMapper.deleteOaCustomFormApplyByIds(ids); - } - - /**** - * 撤销申请 - * @param id - * @param deleteReason - */ - public void cancelApplyInsId(Long id,String deleteReason){ - OaCustomFormApply apply = oaCustomFormApplyService.selectOaCustomFormApplyById(id); - String insId = apply.getFlowInsId(); - if(StrUtil.isNotBlank(insId)){ - flowProcessInstanceService.cancleProcesInstance(insId,deleteReason); - } - OaCustomFormApply updateApply = new OaCustomFormApply(); - updateApply.setId(id); - updateApply.setStatus(CommonConstants.FLOW_STATUS_START); - updateApply.setFlowInsId(""); - updateApply.setUpdateTime(new Date()); - oaCustomFormApplyMapper.updateOaCustomFormApply(updateApply); - } - - /** - * 删除自定义表单申请信息 - * - * @param id 自定义表单申请主键 - * @return 结果 - */ - public int deleteOaCustomFormApplyById(Long id) - { - return oaCustomFormApplyMapper.deleteOaCustomFormApplyById(id); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaCustomFormService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaCustomFormService.java deleted file mode 100644 index 6ab90c0..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaCustomFormService.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.ruoyi.back.oa.service; - -import com.ruoyi.back.erp.service.BaseService; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.back.oa.domain.OaCustomForm; -import com.ruoyi.back.oa.mapper.OaCustomFormMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 自定义单Service业务层处理 - * - * @author pointLion - * @date 2022-07-05 - */ -@Service -public class OaCustomFormService extends BaseService -{ - @Autowired - private OaCustomFormMapper oaCustomFormMapper; - - /** - * 查询自定义单 - * - * @param id 自定义单主键 - * @return 自定义单 - */ - public OaCustomForm selectOaCustomFormById(Long id) - { - return oaCustomFormMapper.selectOaCustomFormById(id); - } - - /** - * 查询自定义单列表 - * - * @param oaCustomForm 自定义单 - * @return 自定义单 - */ - public List selectOaCustomFormList(OaCustomForm oaCustomForm) - { - return oaCustomFormMapper.selectOaCustomFormList(oaCustomForm); - } - - /** - * 新增自定义单 - * - * @param oaCustomForm 自定义单 - * @return 结果 - */ - public int insertOaCustomForm(OaCustomForm oaCustomForm) - { - oaCustomForm.setCreateTime(DateUtils.getNowDate()); - return oaCustomFormMapper.insertOaCustomForm(oaCustomForm); - } - - /** - * 修改自定义单 - * - * @param oaCustomForm 自定义单 - * @return 结果 - */ - public int updateOaCustomForm(OaCustomForm oaCustomForm) - { - oaCustomForm.setUpdateTime(DateUtils.getNowDate()); - return oaCustomFormMapper.updateOaCustomForm(oaCustomForm); - } - - /** - * 批量删除自定义单 - * - * @param ids 需要删除的自定义单主键 - * @return 结果 - */ - public int deleteOaCustomFormByIds(Long[] ids) - { - return oaCustomFormMapper.deleteOaCustomFormByIds(ids); - } - - /** - * 删除自定义单信息 - * - * @param id 自定义单主键 - * @return 结果 - */ - public int deleteOaCustomFormById(Long id) - { - return oaCustomFormMapper.deleteOaCustomFormById(id); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaDutyApplyService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaDutyApplyService.java deleted file mode 100644 index 75eb1cd..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaDutyApplyService.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.ruoyi.back.oa.service; - -import cn.hutool.core.util.StrUtil; -import com.ruoyi.back.erp.service.SerialService; -import com.ruoyi.back.oa.domain.OaDutyApply; -import com.ruoyi.back.oa.domain.OaReimburseApply; -import com.ruoyi.back.oa.mapper.OaDutyApplyMapper; -import com.ruoyi.common.constant.CommonConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import org.flowable.engine.runtime.ProcessInstance; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * 假勤申请Service业务层处理 - * - * @author pointLion - * @date 2023-06-01 - */ -@Service -public class OaDutyApplyService -{ - @Autowired - private OaDutyApplyMapper oaDutyApplyMapper; - @Autowired - private SerialService serialService; - @Autowired - private FlowProcessInstanceService flowProcessInstanceService; - - /** - * 查询假勤申请 - * - * @param id 假勤申请主键 - * @return 假勤申请 - */ - public OaDutyApply selectOaDutyApplyById(Long id) - { - return oaDutyApplyMapper.selectOaDutyApplyById(id); - } - - /** - * 查询假勤申请列表 - * - * @param oaDutyApply 假勤申请 - * @return 假勤申请 - */ - public List selectOaDutyApplyList(OaDutyApply oaDutyApply) - { - return oaDutyApplyMapper.selectOaDutyApplyList(oaDutyApply); - } - - /** - * 新增假勤申请 - * - * @param oaDutyApply 假勤申请 - * @return 结果 - */ - public int insertOaDutyApply(OaDutyApply oaDutyApply) - { - oaDutyApply.setCreateTime(DateUtils.getNowDate()); - //生成订单编号 - String billCode = serialService.generateBillCodeByBillType(oaDutyApply.getBillType()); - oaDutyApply.setBillCode(billCode); - oaDutyApply.setCreateBy(SecurityUtils.getLoginUser().getUsername()); - return oaDutyApplyMapper.insertOaDutyApply(oaDutyApply); - } - - /** - * 修改假勤申请 - * - * @param oaDutyApply 假勤申请 - * @return 结果 - */ - public int updateOaDutyApply(OaDutyApply oaDutyApply) - { - oaDutyApply.setUpdateTime(DateUtils.getNowDate()); - return oaDutyApplyMapper.updateOaDutyApply(oaDutyApply); - } - - /** - * 批量删除假勤申请 - * - * @param ids 需要删除的假勤申请主键 - * @return 结果 - */ - public int deleteOaDutyApplyByIds(Long[] ids) - { - return oaDutyApplyMapper.deleteOaDutyApplyByIds(ids); - } - - /** - * 删除假勤申请信息 - * - * @param id 假勤申请主键 - * @return 结果 - */ - public int deleteOaDutyApplyById(Long id) - { - return oaDutyApplyMapper.deleteOaDutyApplyById(id); - } - - - - - /**** - * 提交流程 - * @param id - */ - @Transactional - public void submitFlow(Long id){ - OaDutyApply apply = oaDutyApplyMapper.selectOaDutyApplyById(id); - String billType = apply.getBillType(); - if(StrUtil.isBlank(billType)){ - throw new RuntimeException("单据类型为空，无法提交相应流程"); - } - //单据类型对应流程编码 - String defKey = billType; - //启动流程 - ProcessInstance procIns = flowProcessInstanceService.startProcess(id,apply.getReason(),billType); - //更新单据状态 - OaDutyApply updateApply = new OaDutyApply(); - updateApply.setId(apply.getId()); - updateApply.setFlowInsId(procIns.getId()); - updateApply.setFlowKey(defKey); - updateApply.setStatus(CommonConstants.FLOW_STATUS_SUBMIT);//更新状态 - updateApply.setUpdateTime(new Date()); - updateApply.setSubmitTime(new Date()); - oaDutyApplyMapper.updateOaDutyApply(updateApply); - } - - - - - - /**** - * 取回流程 - * @param id - */ - public void cancleFlow(Long id){ - OaDutyApply apply = oaDutyApplyMapper.selectOaDutyApplyById(id); - String insId = apply.getFlowInsId(); - if(StrUtil.isNotBlank(insId)){ - flowProcessInstanceService.cancleProcesInstance(insId,"用户撤销"); - } - OaDutyApply updateApply = new OaDutyApply(); - updateApply.setId(id); - updateApply.setStatus("0"); - updateApply.setFlowInsId(""); - updateApply.setFlowKey(""); - updateApply.setUpdateTime(new Date()); - oaDutyApplyMapper.updateOaDutyApply(updateApply); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaHotelApplyService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaHotelApplyService.java deleted file mode 100644 index a139241..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaHotelApplyService.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ruoyi.back.oa.service; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.back.oa.mapper.OaHotelApplyMapper; -import com.ruoyi.back.oa.domain.OaHotelApply; -import com.ruoyi.back.oa.service.OaHotelApplyService; - -/** - * 酒店申请Service业务层处理 - * - * @author pointLion - * @date 2023-05-29 - */ -@Service -public class OaHotelApplyService -{ - @Autowired - private OaHotelApplyMapper oaHotelApplyMapper; - - /** - * 查询酒店申请 - * - * @param id 酒店申请主键 - * @return 酒店申请 - */ - public OaHotelApply selectOaHotelApplyById(Long id) - { - return oaHotelApplyMapper.selectOaHotelApplyById(id); - } - - /** - * 查询酒店申请列表 - * - * @param oaHotelApply 酒店申请 - * @return 酒店申请 - */ - public List selectOaHotelApplyList(OaHotelApply oaHotelApply) - { - return oaHotelApplyMapper.selectOaHotelApplyList(oaHotelApply); - } - - /** - * 新增酒店申请 - * - * @param oaHotelApply 酒店申请 - * @return 结果 - */ - public int insertOaHotelApply(OaHotelApply oaHotelApply) - { - oaHotelApply.setCreateTime(DateUtils.getNowDate()); - return oaHotelApplyMapper.insertOaHotelApply(oaHotelApply); - } - - /** - * 修改酒店申请 - * - * @param oaHotelApply 酒店申请 - * @return 结果 - */ - public int updateOaHotelApply(OaHotelApply oaHotelApply) - { - oaHotelApply.setUpdateTime(DateUtils.getNowDate()); - return oaHotelApplyMapper.updateOaHotelApply(oaHotelApply); - } - - /** - * 批量删除酒店申请 - * - * @param ids 需要删除的酒店申请主键 - * @return 结果 - */ - public int deleteOaHotelApplyByIds(Long[] ids) - { - return oaHotelApplyMapper.deleteOaHotelApplyByIds(ids); - } - - /** - * 删除酒店申请信息 - * - * @param id 酒店申请主键 - * @return 结果 - */ - public int deleteOaHotelApplyById(Long id) - { - return oaHotelApplyMapper.deleteOaHotelApplyById(id); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaMeetingroomApplyService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaMeetingroomApplyService.java deleted file mode 100644 index 1223ab4..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaMeetingroomApplyService.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ruoyi.back.oa.service; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.back.oa.mapper.OaMeetingroomApplyMapper; -import com.ruoyi.back.oa.domain.OaMeetingroomApply; -import com.ruoyi.back.oa.service.OaMeetingroomApplyService; - -/** - * 会议室申请Service业务层处理 - * - * @author pointLion - * @date 2023-05-29 - */ -@Service -public class OaMeetingroomApplyService -{ - @Autowired - private OaMeetingroomApplyMapper oaMeetingroomApplyMapper; - - /** - * 查询会议室申请 - * - * @param id 会议室申请主键 - * @return 会议室申请 - */ - public OaMeetingroomApply selectOaMeetingroomApplyById(Long id) - { - return oaMeetingroomApplyMapper.selectOaMeetingroomApplyById(id); - } - - /** - * 查询会议室申请列表 - * - * @param oaMeetingroomApply 会议室申请 - * @return 会议室申请 - */ - public List selectOaMeetingroomApplyList(OaMeetingroomApply oaMeetingroomApply) - { - return oaMeetingroomApplyMapper.selectOaMeetingroomApplyList(oaMeetingroomApply); - } - - /** - * 新增会议室申请 - * - * @param oaMeetingroomApply 会议室申请 - * @return 结果 - */ - public int insertOaMeetingroomApply(OaMeetingroomApply oaMeetingroomApply) - { - oaMeetingroomApply.setCreateTime(DateUtils.getNowDate()); - return oaMeetingroomApplyMapper.insertOaMeetingroomApply(oaMeetingroomApply); - } - - /** - * 修改会议室申请 - * - * @param oaMeetingroomApply 会议室申请 - * @return 结果 - */ - public int updateOaMeetingroomApply(OaMeetingroomApply oaMeetingroomApply) - { - oaMeetingroomApply.setUpdateTime(DateUtils.getNowDate()); - return oaMeetingroomApplyMapper.updateOaMeetingroomApply(oaMeetingroomApply); - } - - /** - * 批量删除会议室申请 - * - * @param ids 需要删除的会议室申请主键 - * @return 结果 - */ - public int deleteOaMeetingroomApplyByIds(Long[] ids) - { - return oaMeetingroomApplyMapper.deleteOaMeetingroomApplyByIds(ids); - } - - /** - * 删除会议室申请信息 - * - * @param id 会议室申请主键 - * @return 结果 - */ - public int deleteOaMeetingroomApplyById(Long id) - { - return oaMeetingroomApplyMapper.deleteOaMeetingroomApplyById(id); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaReimburseApplyService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaReimburseApplyService.java deleted file mode 100644 index eedab22..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaReimburseApplyService.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.ruoyi.back.oa.service; - -import cn.hutool.core.util.StrUtil; -import com.ruoyi.back.erp.service.SerialService; -import com.ruoyi.back.oa.domain.OaReimburseApply; -import com.ruoyi.back.oa.domain.OaReimburseFeeitem; -import com.ruoyi.back.oa.mapper.OaReimburseApplyMapper; -import com.ruoyi.common.constant.BillTypeEnum; -import com.ruoyi.common.constant.CommonConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import org.flowable.engine.HistoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.runtime.ProcessInstance; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 报销申请Service业务层处理 - * - * @author pointLion - * @date 2023-05-29 - */ -@Service -public class OaReimburseApplyService -{ - @Autowired - private OaReimburseApplyMapper oaReimburseApplyMapper; - @Autowired - private SerialService serialService; - @Autowired - private RuntimeService runtimeService; - @Autowired - private HistoryService historyService; - @Autowired - private FlowProcessInstanceService flowProcessInstanceService; - - - /** - * 查询报销申请 - * - * @param id 报销申请主键 - * @return 报销申请 - */ - public OaReimburseApply selectOaReimburseApplyById(Long id) - { - return oaReimburseApplyMapper.selectOaReimburseApplyById(id); - } - - /** - * 查询报销申请列表 - * - * @param oaReimburseApply 报销申请 - * @return 报销申请 - */ - public List selectOaReimburseApplyList(OaReimburseApply oaReimburseApply) - { - return oaReimburseApplyMapper.selectOaReimburseApplyList(oaReimburseApply); - } - - /** - * 新增报销申请 - * - * @param oaReimburseApply 报销申请 - * @return 结果 - */ - @Transactional - public int insertOaReimburseApply(OaReimburseApply oaReimburseApply) - { - oaReimburseApply.setCreateTime(DateUtils.getNowDate()); - //生成订单编号 - String billCode = serialService.generateBillCodeByBillType(oaReimburseApply.getBillType()); - oaReimburseApply.setBillcode(billCode); - oaReimburseApply.setCreateBy(SecurityUtils.getLoginUser().getUsername()); - int rows = oaReimburseApplyMapper.insertOaReimburseApply(oaReimburseApply); - insertoaReimburseFeeitem(oaReimburseApply); - return rows; - } - - /** - * 修改报销申请 - * - * @param oaReimburseApply 报销申请 - * @return 结果 - */ - @Transactional - public int updateOaReimburseApply(OaReimburseApply oaReimburseApply) - { - oaReimburseApply.setUpdateTime(DateUtils.getNowDate()); - oaReimburseApplyMapper.deleteoaReimburseFeeitemByReimburseId(oaReimburseApply.getId()); - insertoaReimburseFeeitem(oaReimburseApply); - return oaReimburseApplyMapper.updateOaReimburseApply(oaReimburseApply); - } - - /** - * 批量删除报销申请 - * - * @param ids 需要删除的报销申请主键 - * @return 结果 - */ - @Transactional - public int deleteOaReimburseApplyByIds(Long[] ids) - { - oaReimburseApplyMapper.deleteoaReimburseFeeitemByReimburseIds(ids); - return oaReimburseApplyMapper.deleteOaReimburseApplyByIds(ids); - } - - /** - * 删除报销申请信息 - * - * @param id 报销申请主键 - * @return 结果 - */ - @Transactional - public int deleteOaReimburseApplyById(Long id) - { - oaReimburseApplyMapper.deleteoaReimburseFeeitemByReimburseId(id); - return oaReimburseApplyMapper.deleteOaReimburseApplyById(id); - } - - /** - * 新增报销费用明细信息 - * - * @param oaReimburseApply 报销申请对象 - */ - public void insertoaReimburseFeeitem(OaReimburseApply oaReimburseApply) - { - List oaReimburseFeeitemList = oaReimburseApply.getOaReimburseFeeitemList(); - Long id = oaReimburseApply.getId(); - if (StringUtils.isNotNull(oaReimburseFeeitemList)) - { - List list = new ArrayList(); - for (OaReimburseFeeitem oaReimburseFeeitem : oaReimburseFeeitemList) - { - oaReimburseFeeitem.setReimburseId(id); - list.add(oaReimburseFeeitem); - } - if (list.size() > 0) - { - oaReimburseApplyMapper.batchoaReimburseFeeitem(list); - } - } - } - - - - - /**** - * 提交流程 - * @param id - */ - @Transactional - public void submitFlow(Long id){ - OaReimburseApply apply = oaReimburseApplyMapper.selectOaReimburseApplyById(id); - String billType = apply.getBillType(); - if(StrUtil.isBlank(billType)){ - throw new RuntimeException("单据类型为空，无法提交相应流程"); - } - //单据类型对应流程编码 - String defKey = billType; - //启动流程 - ProcessInstance procIns = flowProcessInstanceService.startProcess(id,apply.getDes(),billType); - //更新单据状态 - OaReimburseApply updateApply = new OaReimburseApply(); - updateApply.setId(apply.getId()); - updateApply.setFlowInsId(procIns.getId()); - updateApply.setFlowKey(defKey); - updateApply.setStatus(CommonConstants.FLOW_STATUS_SUBMIT);//更新状态 - updateApply.setUpdateTime(new Date()); - updateApply.setSubmitTime(new Date()); - oaReimburseApplyMapper.updateOaReimburseApply(updateApply); - } - - - - - - /**** - * 取回流程 - * @param id - */ - public void cancleFlow(Long id){ - OaReimburseApply apply = oaReimburseApplyMapper.selectOaReimburseApplyById(id); - String insId = apply.getFlowInsId(); - if(StrUtil.isNotBlank(insId)){ - flowProcessInstanceService.cancleProcesInstance(insId,"用户撤销"); - } - OaReimburseApply updateApply = new OaReimburseApply(); - updateApply.setId(id); - updateApply.setStatus("0"); - updateApply.setFlowInsId(""); - updateApply.setFlowKey(""); - updateApply.setUpdateTime(new Date()); - oaReimburseApplyMapper.updateOaReimburseApply(updateApply); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaSealApplyService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaSealApplyService.java deleted file mode 100644 index 87424bc..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaSealApplyService.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ruoyi.back.oa.service; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.back.oa.mapper.OaSealApplyMapper; -import com.ruoyi.back.oa.domain.OaSealApply; -import com.ruoyi.back.oa.service.OaSealApplyService; - -/** - * 公章使用Service业务层处理 - * - * @author pointLion - * @date 2023-05-29 - */ -@Service -public class OaSealApplyService -{ - @Autowired - private OaSealApplyMapper oaSealApplyMapper; - - /** - * 查询公章使用 - * - * @param id 公章使用主键 - * @return 公章使用 - */ - public OaSealApply selectOaSealApplyById(Long id) - { - return oaSealApplyMapper.selectOaSealApplyById(id); - } - - /** - * 查询公章使用列表 - * - * @param oaSealApply 公章使用 - * @return 公章使用 - */ - public List selectOaSealApplyList(OaSealApply oaSealApply) - { - return oaSealApplyMapper.selectOaSealApplyList(oaSealApply); - } - - /** - * 新增公章使用 - * - * @param oaSealApply 公章使用 - * @return 结果 - */ - public int insertOaSealApply(OaSealApply oaSealApply) - { - oaSealApply.setCreateTime(DateUtils.getNowDate()); - return oaSealApplyMapper.insertOaSealApply(oaSealApply); - } - - /** - * 修改公章使用 - * - * @param oaSealApply 公章使用 - * @return 结果 - */ - public int updateOaSealApply(OaSealApply oaSealApply) - { - oaSealApply.setUpdateTime(DateUtils.getNowDate()); - return oaSealApplyMapper.updateOaSealApply(oaSealApply); - } - - /** - * 批量删除公章使用 - * - * @param ids 需要删除的公章使用主键 - * @return 结果 - */ - public int deleteOaSealApplyByIds(Long[] ids) - { - return oaSealApplyMapper.deleteOaSealApplyByIds(ids); - } - - /** - * 删除公章使用信息 - * - * @param id 公章使用主键 - * @return 结果 - */ - public int deleteOaSealApplyById(Long id) - { - return oaSealApplyMapper.deleteOaSealApplyById(id); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaTaskService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaTaskService.java deleted file mode 100644 index aa7c760..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaTaskService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ruoyi.back.oa.service; - -import com.ruoyi.back.oa.domain.VTasklist; -import com.ruoyi.back.oa.mapper.VTasklistMapper; -import com.ruoyi.back.oa.domain.OaCustomFormApply; -import com.ruoyi.back.oa.mapper.OaCustomFormApplyMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/*** - * @des - * @author Ly - * @date 2023/5/11 - */ - -@Service -public class OaTaskService { - - - @Autowired - private OaCustomFormApplyMapper oaCustomFormApplyMapper; - @Autowired - private VTasklistMapper vTasklistMapper; - - - /**** - * 根据taskId，查询自定表单信息 - * @param taskId - * @return - */ - public OaCustomFormApply getCustomFormByTaskId(String taskId){ - VTasklist task = vTasklistMapper.selectVTasklistByTaskid(taskId); - String insId = task.getInsid(); - OaCustomFormApply customFormApply = oaCustomFormApplyMapper.selectOaCustomFormApplyByInsId(insId); - return customFormApply; - } -} diff --git a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaTicketApplyService.java b/PointLion/src/main/java/com/ruoyi/back/oa/service/OaTicketApplyService.java deleted file mode 100644 index a4a67e5..0000000 --- a/PointLion/src/main/java/com/ruoyi/back/oa/service/OaTicketApplyService.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ruoyi.back.oa.service; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.back.oa.mapper.OaTicketApplyMapper; -import com.ruoyi.back.oa.domain.OaTicketApply; -import com.ruoyi.back.oa.service.OaTicketApplyService; - -/** - * 车票申请Service业务层处理 - * - * @author pointLion - * @date 2023-05-29 - */ -@Service -public class OaTicketApplyService -{ - @Autowired - private OaTicketApplyMapper oaTicketApplyMapper; - - /** - * 查询车票申请 - * - * @param id 车票申请主键 - * @return 车票申请 - */ - public OaTicketApply selectOaTicketApplyById(Long id) - { - return oaTicketApplyMapper.selectOaTicketApplyById(id); - } - - /** - * 查询车票申请列表 - * - * @param oaTicketApply 车票申请 - * @return 车票申请 - */ - public List selectOaTicketApplyList(OaTicketApply oaTicketApply) - { - return oaTicketApplyMapper.selectOaTicketApplyList(oaTicketApply); - } - - /** - * 新增车票申请 - * - * @param oaTicketApply 车票申请 - * @return 结果 - */ - public int insertOaTicketApply(OaTicketApply oaTicketApply) - { - oaTicketApply.setCreateTime(DateUtils.getNowDate()); - return oaTicketApplyMapper.insertOaTicketApply(oaTicketApply); - } - - /** - * 修改车票申请 - * - * @param oaTicketApply 车票申请 - * @return 结果 - */ - public int updateOaTicketApply(OaTicketApply oaTicketApply) - { - oaTicketApply.setUpdateTime(DateUtils.getNowDate()); - return oaTicketApplyMapper.updateOaTicketApply(oaTicketApply); - } - - /** - * 批量删除车票申请 - * - * @param ids 需要删除的车票申请主键 - * @return 结果 - */ - public int deleteOaTicketApplyByIds(Long[] ids) - { - return oaTicketApplyMapper.deleteOaTicketApplyByIds(ids); - } - - /** - * 删除车票申请信息 - * - * @param id 车票申请主键 - * @return 结果 - */ - public int deleteOaTicketApplyById(Long id) - { - return oaTicketApplyMapper.deleteOaTicketApplyById(id); - } -} diff --git a/PointLion/src/main/java/com/ruoyi/common/domain/PTreeSelect.java b/PointLion/src/main/java/com/ruoyi/common/domain/PTreeSelect.java deleted file mode 100644 index 65546c7..0000000 --- a/PointLion/src/main/java/com/ruoyi/common/domain/PTreeSelect.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.ruoyi.common.domain; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.back.cms.domain.CmsCatalog; -import com.ruoyi.back.cms.domain.CmsContent; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.stream.Collectors; - -/** - * Treeselect树结构实体类 - * - * @author ruoyi - */ -@Data -public class PTreeSelect implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 节点ID */ - private Long id; - - /** 节点名称 */ - private String label; - - private List contentList; - - /** 子节点 */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; - - public PTreeSelect() - { - - } - - public PTreeSelect(CmsCatalog catalog) - { - this.id = catalog.getId(); - this.label = catalog.getName(); - this.children = catalog.getChildren().stream().map(PTreeSelect::new).collect(Collectors.toList()); - } - - public PTreeSelect(Object o) { - CmsCatalog catalog = (CmsCatalog)o; - this.id = catalog.getId(); - this.label = catalog.getName(); - this.children = catalog.getChildren().stream().map(PTreeSelect::new).collect(Collectors.toList()); - } - - -} diff --git a/PointLion/src/main/resources/fonts/1685933089203.jpg b/PointLion/src/main/resources/fonts/1685933089203.jpg deleted file mode 100644 index afd5006..0000000 Binary files a/PointLion/src/main/resources/fonts/1685933089203.jpg and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/2d9e324a66727fb01cbdaac898f3363.jpg b/PointLion/src/main/resources/fonts/2d9e324a66727fb01cbdaac898f3363.jpg deleted file mode 100644 index 6e5e826..0000000 Binary files a/PointLion/src/main/resources/fonts/2d9e324a66727fb01cbdaac898f3363.jpg and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/image.png b/PointLion/src/main/resources/fonts/image.png deleted file mode 100644 index d2b45c9..0000000 Binary files a/PointLion/src/main/resources/fonts/image.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/假勤申请.png b/PointLion/src/main/resources/fonts/假勤申请.png deleted file mode 100644 index 98035f9..0000000 Binary files a/PointLion/src/main/resources/fonts/假勤申请.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/入职登记卡片.png b/PointLion/src/main/resources/fonts/入职登记卡片.png deleted file mode 100644 index beb146f..0000000 Binary files a/PointLion/src/main/resources/fonts/入职登记卡片.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/办理任务.png b/PointLion/src/main/resources/fonts/办理任务.png deleted file mode 100644 index f43902d..0000000 Binary files a/PointLion/src/main/resources/fonts/办理任务.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/合同补充协议模版.png b/PointLion/src/main/resources/fonts/合同补充协议模版.png deleted file mode 100644 index 955768e..0000000 Binary files a/PointLion/src/main/resources/fonts/合同补充协议模版.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/员工入职登记.png b/PointLion/src/main/resources/fonts/员工入职登记.png deleted file mode 100644 index d5adb9c..0000000 Binary files a/PointLion/src/main/resources/fonts/员工入职登记.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/待办.png b/PointLion/src/main/resources/fonts/待办.png deleted file mode 100644 index b432139..0000000 Binary files a/PointLion/src/main/resources/fonts/待办.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/报销申请.png b/PointLion/src/main/resources/fonts/报销申请.png deleted file mode 100644 index ffe118b..0000000 Binary files a/PointLion/src/main/resources/fonts/报销申请.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/流程信息展示.png b/PointLion/src/main/resources/fonts/流程信息展示.png deleted file mode 100644 index 4cae46d..0000000 Binary files a/PointLion/src/main/resources/fonts/流程信息展示.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/流程图管理.png b/PointLion/src/main/resources/fonts/流程图管理.png deleted file mode 100644 index 01bad38..0000000 Binary files a/PointLion/src/main/resources/fonts/流程图管理.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/流程图设计器.png b/PointLion/src/main/resources/fonts/流程图设计器.png deleted file mode 100644 index 3121f4c..0000000 Binary files a/PointLion/src/main/resources/fonts/流程图设计器.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/自定义表单.png b/PointLion/src/main/resources/fonts/自定义表单.png deleted file mode 100644 index d7ee964..0000000 Binary files a/PointLion/src/main/resources/fonts/自定义表单.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/自定义表单申请.png b/PointLion/src/main/resources/fonts/自定义表单申请.png deleted file mode 100644 index 93fb036..0000000 Binary files a/PointLion/src/main/resources/fonts/自定义表单申请.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/自定义表单设计器.png b/PointLion/src/main/resources/fonts/自定义表单设计器.png deleted file mode 100644 index 81a23b5..0000000 Binary files a/PointLion/src/main/resources/fonts/自定义表单设计器.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/补充协议.png b/PointLion/src/main/resources/fonts/补充协议.png deleted file mode 100644 index 7098899..0000000 Binary files a/PointLion/src/main/resources/fonts/补充协议.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/设置审批人.png b/PointLion/src/main/resources/fonts/设置审批人.png deleted file mode 100644 index 136b9cb..0000000 Binary files a/PointLion/src/main/resources/fonts/设置审批人.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/运行中的流程管理.png b/PointLion/src/main/resources/fonts/运行中的流程管理.png deleted file mode 100644 index 1a0304a..0000000 Binary files a/PointLion/src/main/resources/fonts/运行中的流程管理.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/酒店申请.png b/PointLion/src/main/resources/fonts/酒店申请.png deleted file mode 100644 index 5cbd47a..0000000 Binary files a/PointLion/src/main/resources/fonts/酒店申请.png and /dev/null differ diff --git a/PointLion/src/main/resources/fonts/首页通知.png b/PointLion/src/main/resources/fonts/首页通知.png deleted file mode 100644 index 27fe941..0000000 Binary files a/PointLion/src/main/resources/fonts/首页通知.png and /dev/null differ diff --git a/PointLion/src/main/resources/mapper/cam/CamMessageNoticeMapper.xml b/PointLion/src/main/resources/mapper/cam/CamMessageNoticeMapper.xml deleted file mode 100644 index d0a2464..0000000 --- a/PointLion/src/main/resources/mapper/cam/CamMessageNoticeMapper.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - select id, title, type, message, voice_file from cam_message_notice - - - - - - - - insert into cam_message_notice - - id, - title, - type, - message, - voice_file, - - - #{id}, - #{title}, - #{type}, - #{message}, - #{voiceFile}, - - - - - update cam_message_notice - - title = #{title}, - type = #{type}, - message = #{message}, - voice_file = #{voiceFile}, - - where id = #{id} - - - - delete from cam_message_notice where id = #{id} - - - - delete from cam_message_notice where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/cms/CmsCatalogMapper.xml b/PointLion/src/main/resources/mapper/cms/CmsCatalogMapper.xml deleted file mode 100644 index b9e5a49..0000000 --- a/PointLion/src/main/resources/mapper/cms/CmsCatalogMapper.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - select id, name, url, open_type, type, parent_id, cover, visible from cms_catalog - - - - - - - - insert into cms_catalog - - id, - name, - url, - open_type, - type, - parent_id, - cover, - visible, - - - #{id}, - #{name}, - #{url}, - #{openType}, - #{type}, - #{parentId}, - #{cover}, - #{visible}, - - - - - update cms_catalog - - name = #{name}, - url = #{url}, - open_type = #{openType}, - type = #{type}, - parent_id = #{parentId}, - cover = #{cover}, - visible = #{visible}, - - where id = #{id} - - - - delete from cms_catalog where id = #{id} - - - - delete from cms_catalog where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/cms/CmsContentMapper.xml b/PointLion/src/main/resources/mapper/cms/CmsContentMapper.xml deleted file mode 100644 index 0aca98c..0000000 --- a/PointLion/src/main/resources/mapper/cms/CmsContentMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - select id, title, content, create_time, update_time, visible, cover, catalog_id from cms_content - - - - - - - - insert into cms_content - - id, - title, - content, - create_time, - update_time, - visible, - cover, - catalog_id, - - - #{id}, - #{title}, - #{content}, - #{createTime}, - #{updateTime}, - #{visible}, - #{cover}, - #{catalogId}, - - - - - update cms_content - - title = #{title}, - content = #{content}, - create_time = #{createTime}, - update_time = #{updateTime}, - visible = #{visible}, - cover = #{cover}, - catalog_id = #{catalogId}, - - where id = #{id} - - - - delete from cms_content where id = #{id} - - - - delete from cms_content where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/common/SerialMapper.xml b/PointLion/src/main/resources/mapper/common/SerialMapper.xml index 0d75053..8537b30 100644 --- a/PointLion/src/main/resources/mapper/common/SerialMapper.xml +++ b/PointLion/src/main/resources/mapper/common/SerialMapper.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, bill_type, serial_num, tenant_id, prefix, if_have_date, code_length,code_date from pl_serial + select id, bill_type, serial_num, tenant_id, prefix, if_have_date, code_length,code_date from sys_serial - insert into pl_serial + insert into sys_serial id, bill_type, @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update pl_serial + update sys_serial bill_type = #{billType}, serial_num = #{serialNum}, @@ -75,11 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from pl_serial where id = #{id} + delete from sys_serial where id = #{id} - delete from pl_serial where id in + delete from sys_serial where id in #{id} diff --git a/PointLion/src/main/resources/mapper/common/UnitMapper.xml b/PointLion/src/main/resources/mapper/common/UnitMapper.xml deleted file mode 100644 index 6e1a1c5..0000000 --- a/PointLion/src/main/resources/mapper/common/UnitMapper.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, name, basic_unit, other_unit_one, other_unit_two, other_unit_three, other_unit_four, other_unit_five, other_unit_six, ratio_one, ratio_two, ratio_three, ratio_four, ratio_five, ratio_six, status, tenant_id, delete_flag from pl_unit - - - - - - - - insert into pl_unit - - name, - basic_unit, - other_unit_one, - other_unit_two, - other_unit_three, - other_unit_four, - other_unit_five, - other_unit_six, - ratio_one, - ratio_two, - ratio_three, - ratio_four, - ratio_five, - ratio_six, - status, - tenant_id, - delete_flag, - - - #{name}, - #{basicUnit}, - #{otherUnitOne}, - #{otherUnitTwo}, - #{otherUnitThree}, - #{otherUnitFour}, - #{otherUnitFive}, - #{otherUnitSix}, - #{ratioOne}, - #{ratioTwo}, - #{ratioThree}, - #{ratioFour}, - #{ratioFive}, - #{ratioSix}, - #{status}, - #{tenantId}, - #{deleteFlag}, - - - - - update pl_unit - - name = #{name}, - basic_unit = #{basicUnit}, - other_unit_one = #{otherUnitOne}, - other_unit_two = #{otherUnitTwo}, - other_unit_three = #{otherUnitThree}, - other_unit_four = #{otherUnitFour}, - other_unit_five = #{otherUnitFive}, - other_unit_six = #{otherUnitSix}, - ratio_one = #{ratioOne}, - ratio_two = #{ratioTwo}, - ratio_three = #{ratioThree}, - ratio_four = #{ratioFour}, - ratio_five = #{ratioFive}, - ratio_six = #{ratioSix}, - status = #{status}, - tenant_id = #{tenantId}, - delete_flag = #{deleteFlag}, - - where id = #{id} - - - - delete from pl_unit where id = #{id} - - - - delete from pl_unit where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/ct/CtAgreementMapper.xml b/PointLion/src/main/resources/mapper/ct/CtAgreementMapper.xml deleted file mode 100644 index 964230c..0000000 --- a/PointLion/src/main/resources/mapper/ct/CtAgreementMapper.xml +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, contract_no, contract_name, sign_addr, low_bond, gz_type, pay_type, need_charge, advance_charge, agreement_amt, material, reference_price, pricing_benchmark, - other, org_no, org_name, org_fr, org_addr, org_wtr, org_tel, ok_dt, supply_no, supply_name, sp_fr, sp_addr, sp_wtr, sp_tel, sp_ok_dt, create_by, create_time, - update_by, update_time , - flow_key,flow_name,flow_ins_id,submit_time,status, - tpl_id,tpl_name,url,by_time - from ct_agreement - - - - - - - - insert into ct_agreement - - contract_no, - contract_name, - sign_addr, - low_bond, - gz_type, - pay_type, - need_charge, - advance_charge, - agreement_amt, - material, - reference_price, - pricing_benchmark, - other, - org_no, - org_name, - org_fr, - org_addr, - org_wtr, - org_tel, - ok_dt, - supply_no, - supply_name, - sp_fr, - sp_addr, - sp_wtr, - sp_tel, - sp_ok_dt, - create_by, - create_time, - update_by, - update_time, - - flow_key, - flow_name, - flow_ins_id, - submit_time, - status, - - tpl_id, - tpl_name, - - url, - by_time, - - - #{contractNo}, - #{contractName}, - #{signAddr}, - #{lowBond}, - #{gzType}, - #{payType}, - #{needCharge}, - #{advanceCharge}, - #{agreementAmt}, - #{material}, - #{referencePrice}, - #{pricingBenchmark}, - #{other}, - #{orgNo}, - #{orgName}, - #{orgFr}, - #{orgAddr}, - #{orgWtr}, - #{orgTel}, - #{okDt}, - #{supplyNo}, - #{supplyName}, - #{spFr}, - #{spAddr}, - #{spWtr}, - #{spTel}, - #{spOkDt}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - #{flowKey}, - #{flowName}, - #{flowInsId}, - #{submitTime}, - #{status}, - - #{tplId}, - #{tplName}, - - #{url}, - #{byTime}, - - - - - update ct_agreement - - contract_no = #{contractNo}, - contract_name = #{contractName}, - sign_addr = #{signAddr}, - low_bond = #{lowBond}, - gz_type = #{gzType}, - pay_type = #{payType}, - need_charge = #{needCharge}, - advance_charge = #{advanceCharge}, - agreement_amt = #{agreementAmt}, - material = #{material}, - reference_price = #{referencePrice}, - pricing_benchmark = #{pricingBenchmark}, - other = #{other}, - org_no = #{orgNo}, - org_name = #{orgName}, - org_fr = #{orgFr}, - org_addr = #{orgAddr}, - org_wtr = #{orgWtr}, - org_tel = #{orgTel}, - ok_dt = #{okDt}, - supply_no = #{supplyNo}, - supply_name = #{supplyName}, - sp_fr = #{spFr}, - sp_addr = #{spAddr}, - sp_wtr = #{spWtr}, - sp_tel = #{spTel}, - sp_ok_dt = #{spOkDt}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - flow_key = #{flowKey}, - flow_name = #{flowName}, - flow_ins_id = #{flowInsId}, - submit_time = #{submitTime}, - status = #{status}, - - tpl_id = #{tplId}, - tpl_name = #{tplName}, - - url = #{url}, - - by_time = #{byTime}, - - where id = #{id} - - - - delete from ct_agreement where id = #{id} - - - - delete from ct_agreement where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/ct/CtAgreementTplMapper.xml b/PointLion/src/main/resources/mapper/ct/CtAgreementTplMapper.xml deleted file mode 100644 index 653d4f5..0000000 --- a/PointLion/src/main/resources/mapper/ct/CtAgreementTplMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - select id, name, content, url, create_by, create_time, update_by, update_time from ct_agreement_tpl - - - - - - - - insert into ct_agreement_tpl - - name, - content, - url, - create_by, - create_time, - update_by, - update_time, - - - #{name}, - #{content}, - #{url}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update ct_agreement_tpl - - name = #{name}, - content = #{content}, - url = #{url}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from ct_agreement_tpl where id = #{id} - - - - delete from ct_agreement_tpl where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/customer/CustomerContactsMapper.xml b/PointLion/src/main/resources/mapper/customer/CustomerContactsMapper.xml deleted file mode 100644 index 0a3474c..0000000 --- a/PointLion/src/main/resources/mapper/customer/CustomerContactsMapper.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, remark, customer_id, customer_name, sex, position, phone, tel, qq, wchat, email, last_contact_time from pl_customer_contacts - - - - - - - - insert into pl_customer_contacts - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - remark, - customer_id, - customer_name, - sex, - position, - phone, - tel, - qq, - wchat, - email, - last_contact_time, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{customerId}, - #{customerName}, - #{sex}, - #{position}, - #{phone}, - #{tel}, - #{qq}, - #{wchat}, - #{email}, - #{lastContactTime}, - - - - - update pl_customer_contacts - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - customer_id = #{customerId}, - customer_name = #{customerName}, - sex = #{sex}, - position = #{position}, - phone = #{phone}, - tel = #{tel}, - qq = #{qq}, - wchat = #{wchat}, - email = #{email}, - last_contact_time = #{lastContactTime}, - - where id = #{id} - - - - delete from pl_customer_contacts where id = #{id} - - - - delete from pl_customer_contacts where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/customer/CustomerFlowupMapper.xml b/PointLion/src/main/resources/mapper/customer/CustomerFlowupMapper.xml deleted file mode 100644 index e548157..0000000 --- a/PointLion/src/main/resources/mapper/customer/CustomerFlowupMapper.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, remark, customer_id, contacts_id, contacts_name, customer_name, followup_time, followup_type, contact_content, sales_stage, chance_id, next_contact_time from pl_customer_flowup - - - - - - - - insert into pl_customer_flowup - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - remark, - customer_id, - contacts_id, - contacts_name, - customer_name, - followup_time, - followup_type, - contact_content, - sales_stage, - chance_id, - next_contact_time, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{customerId}, - #{contactsId}, - #{contactsName}, - #{customerName}, - #{followupTime}, - #{followupType}, - #{contactContent}, - #{salesStage}, - #{chanceId}, - #{nextContactTime}, - - - - - update pl_customer_flowup - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - customer_id = #{customerId}, - contacts_id = #{contactsId}, - contacts_name = #{contactsName}, - customer_name = #{customerName}, - followup_time = #{followupTime}, - followup_type = #{followupType}, - contact_content = #{contactContent}, - sales_stage = #{salesStage}, - chance_id = #{chanceId}, - next_contact_time = #{nextContactTime}, - - where id = #{id} - - - - delete from pl_customer_flowup where id = #{id} - - - - delete from pl_customer_flowup where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/customer/CustomerMapper.xml b/PointLion/src/main/resources/mapper/customer/CustomerMapper.xml deleted file mode 100644 index 494a9d6..0000000 --- a/PointLion/src/main/resources/mapper/customer/CustomerMapper.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, remark, customer_name, customer_industry, customer_level, customer_status, customer_source_type, customer_economy, phone, qq, wchat, mail, address, clue, des, purpose, sales_stage, owner_userid, last_flowup_time, last_service_time, last_chance_time from pl_customer - - - - - - - - insert into pl_customer - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - remark, - customer_name, - customer_industry, - customer_level, - customer_status, - customer_source_type, - customer_economy, - phone, - qq, - wchat, - mail, - address, - clue, - des, - purpose, - sales_stage, - owner_userid, - last_flowup_time, - last_service_time, - last_chance_time, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{customerName}, - #{customerIndustry}, - #{customerLevel}, - #{customerStatus}, - #{customerSourceType}, - #{customerEconomy}, - #{phone}, - #{qq}, - #{wchat}, - #{mail}, - #{address}, - #{clue}, - #{des}, - #{purpose}, - #{salesStage}, - #{ownerUserid}, - #{lastFlowupTime}, - #{lastServiceTime}, - #{lastChanceTime}, - - - - - update pl_customer - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - customer_name = #{customerName}, - customer_industry = #{customerIndustry}, - customer_level = #{customerLevel}, - customer_status = #{customerStatus}, - customer_source_type = #{customerSourceType}, - customer_economy = #{customerEconomy}, - phone = #{phone}, - qq = #{qq}, - wchat = #{wchat}, - mail = #{mail}, - address = #{address}, - clue = #{clue}, - des = #{des}, - purpose = #{purpose}, - sales_stage = #{salesStage}, - owner_userid = #{ownerUserid}, - last_flowup_time = #{lastFlowupTime}, - last_service_time = #{lastServiceTime}, - last_chance_time = #{lastChanceTime}, - - where id = #{id} - - - - delete from pl_customer where id = #{id} - - - - delete from pl_customer where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/customer/CustomerSalechanceMapper.xml b/PointLion/src/main/resources/mapper/customer/CustomerSalechanceMapper.xml deleted file mode 100644 index 2441e87..0000000 --- a/PointLion/src/main/resources/mapper/customer/CustomerSalechanceMapper.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, remark, customer_id, customer_name, chance_title, find_time, chance_dec, expect_signtime, expect_amt, belong_userid from pl_customer_salechance - - - - - - - - insert into pl_customer_salechance - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - remark, - customer_id, - customer_name, - chance_title, - find_time, - chance_dec, - expect_signtime, - expect_amt, - belong_userid, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{customerId}, - #{customerName}, - #{chanceTitle}, - #{findTime}, - #{chanceDec}, - #{expectSigntime}, - #{expectAmt}, - #{belongUserid}, - - - - - update pl_customer_salechance - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - customer_id = #{customerId}, - customer_name = #{customerName}, - chance_title = #{chanceTitle}, - find_time = #{findTime}, - chance_dec = #{chanceDec}, - expect_signtime = #{expectSigntime}, - expect_amt = #{expectAmt}, - belong_userid = #{belongUserid}, - - where id = #{id} - - - - delete from pl_customer_salechance where id = #{id} - - - - delete from pl_customer_salechance where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/depot/DepotBillItemMapper.xml b/PointLion/src/main/resources/mapper/depot/DepotBillItemMapper.xml deleted file mode 100644 index c61d33e..0000000 --- a/PointLion/src/main/resources/mapper/depot/DepotBillItemMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id,head_id,material_id,material_code,material_unit,material_name,material_standard,material_model,sku,original_count,oper_count,unit_price,purchase_unit_price,tax_unit_price,all_price,remark,depot_id,another_depot_id,tax_rate,tax_money,tax_last_money,expiration_date,link_id,tenant_id,delete_flag - from pl_depot_item - - - - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/depot/DepotBillMapper.xml b/PointLion/src/main/resources/mapper/depot/DepotBillMapper.xml deleted file mode 100644 index 1e0b27f..0000000 --- a/PointLion/src/main/resources/mapper/depot/DepotBillMapper.xml +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, bill_type, bill_code, type, supplier_id, supplier_name, account_id, change_amt, back_amt, total_amt, pay_type, remark, sales_man, discount, discount_amt, discount_lastamt, deposit, status, purchase_status, link_id, link_billcode, tenant_id, delete_flag, oper_time, create_time, create_by, update_by, update_time from pl_depot_bill - - - - - - - - insert into pl_depot_bill - - bill_type, - bill_code, - type, - supplier_id, - supplier_name, - account_id, - change_amt, - back_amt, - total_amt, - pay_type, - remark, - sales_man, - discount, - discount_amt, - discount_lastamt, - deposit, - status, - purchase_status, - link_id, - link_billcode, - tenant_id, - delete_flag, - oper_time, - create_time, - create_by, - update_by, - update_time, - - - #{billType}, - #{billCode}, - #{type}, - #{supplierId}, - #{supplierName}, - #{accountId}, - #{changeAmt}, - #{backAmt}, - #{totalAmt}, - #{payType}, - #{remark}, - #{salesMan}, - #{discount}, - #{discountAmt}, - #{discountLastamt}, - #{deposit}, - #{status}, - #{purchaseStatus}, - #{linkId}, - #{linkBillcode}, - #{tenantId}, - #{deleteFlag}, - #{operTime}, - #{createTime}, - #{createBy}, - #{updateBy}, - #{updateTime}, - - - - - update pl_depot_bill - - bill_type = #{billType}, - bill_code = #{billCode}, - type = #{type}, - supplier_id = #{supplierId}, - supplier_name = #{supplierName}, - account_id = #{accountId}, - change_amt = #{changeAmt}, - back_amt = #{backAmt}, - total_amt = #{totalAmt}, - pay_type = #{payType}, - remark = #{remark}, - sales_man = #{salesMan}, - discount = #{discount}, - discount_amt = #{discountAmt}, - discount_lastamt = #{discountLastamt}, - deposit = #{deposit}, - status = #{status}, - purchase_status = #{purchaseStatus}, - link_id = #{linkId}, - link_billcode = #{linkBillcode}, - tenant_id = #{tenantId}, - delete_flag = #{deleteFlag}, - oper_time = #{operTime}, - create_time = #{createTime}, - create_by = #{createBy}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from pl_depot_bill where id = #{id} - - - - delete from pl_depot_bill where id in - - #{id} - - - - - delete from pl_depot_item where head_id in - - #{headId} - - - - - delete from pl_depot_item where head_id = #{headId} - - - - insert into pl_depot_item( id, head_id, material_id,material_code,material_name,material_standard,material_model, material_unit, sku,original_count, oper_count, unit_price, purchase_unit_price, tax_unit_price, all_price, remark, depot_id, another_depot_id, tax_rate, tax_money, tax_last_money, expiration_date, link_id, tenant_id, delete_flag) values - - ( #{item.id}, #{item.headId}, #{item.materialId},#{item.materialCode},#{item.materialName},#{item.materialStandard},#{item.materialModel}, #{item.materialUnit}, #{item.sku},#{item.originalCount}, #{item.operCount}, #{item.unitPrice}, #{item.purchaseUnitPrice}, #{item.taxUnitPrice}, #{item.allPrice}, #{item.remark}, #{item.depotId}, #{item.anotherDepotId}, #{item.taxRate}, #{item.taxMoney}, #{item.taxLastMoney}, #{item.expirationDate}, #{item.linkId}, #{item.tenantId}, #{item.deleteFlag}) - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/depot/DepotMapper.xml b/PointLion/src/main/resources/mapper/depot/DepotMapper.xml deleted file mode 100644 index c7d3e80..0000000 --- a/PointLion/src/main/resources/mapper/depot/DepotMapper.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select id, name, address, warehousing, truckage, type, sort, remark, principal, enabled, tenant_id, delete_Flag, is_default from pl_depot - - - - - - - - insert into pl_depot - - name, - address, - warehousing, - truckage, - type, - sort, - remark, - principal, - enabled, - tenant_id, - delete_Flag, - is_default, - - - #{name}, - #{address}, - #{warehousing}, - #{truckage}, - #{type}, - #{sort}, - #{remark}, - #{principal}, - #{enabled}, - #{tenantId}, - #{deleteFlag}, - #{isDefault}, - - - - - update pl_depot - - name = #{name}, - address = #{address}, - warehousing = #{warehousing}, - truckage = #{truckage}, - type = #{type}, - sort = #{sort}, - remark = #{remark}, - principal = #{principal}, - enabled = #{enabled}, - tenant_id = #{tenantId}, - delete_Flag = #{deleteFlag}, - is_default = #{isDefault}, - - where id = #{id} - - - - delete from pl_depot where id = #{id} - - - - delete from pl_depot where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/finance/AccountMapper.xml b/PointLion/src/main/resources/mapper/finance/AccountMapper.xml deleted file mode 100644 index 24891c5..0000000 --- a/PointLion/src/main/resources/mapper/finance/AccountMapper.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, name, code, initial_amount, current_amount, remark, enabled, sort, is_default, tenant_id, delete_flag, card_holder, bank_name, bank_num, bank_address, bank_rv_phone, create_time, create_by from pl_account - - - - - - - - insert into pl_account - - name, - code, - initial_amount, - current_amount, - remark, - enabled, - sort, - is_default, - tenant_id, - delete_flag, - card_holder, - bank_name, - bank_num, - bank_address, - bank_rv_phone, - create_time, - create_by, - - - #{name}, - #{code}, - #{initialAmount}, - #{currentAmount}, - #{remark}, - #{enabled}, - #{sort}, - #{isDefault}, - #{tenantId}, - #{deleteFlag}, - #{cardHolder}, - #{bankName}, - #{bankNum}, - #{bankAddress}, - #{bankRvPhone}, - #{createTime}, - #{createBy}, - - - - - update pl_account - - name = #{name}, - code = #{code}, - initial_amount = #{initialAmount}, - current_amount = #{currentAmount}, - remark = #{remark}, - enabled = #{enabled}, - sort = #{sort}, - is_default = #{isDefault}, - tenant_id = #{tenantId}, - delete_flag = #{deleteFlag}, - card_holder = #{cardHolder}, - bank_name = #{bankName}, - bank_num = #{bankNum}, - bank_address = #{bankAddress}, - bank_rv_phone = #{bankRvPhone}, - create_time = #{createTime}, - create_by = #{createBy}, - - where id = #{id} - - - - delete from pl_account where id = #{id} - - - - delete from pl_account where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/home/HomeMapper.xml b/PointLion/src/main/resources/mapper/home/HomeMapper.xml index 2aa6606..8fa7285 100644 --- a/PointLion/src/main/resources/mapper/home/HomeMapper.xml +++ b/PointLion/src/main/resources/mapper/home/HomeMapper.xml @@ -2,20 +2,16 @@ - + diff --git a/PointLion/src/main/resources/mapper/material/MaterialAttrMapper.xml b/PointLion/src/main/resources/mapper/material/MaterialAttrMapper.xml deleted file mode 100644 index a3a44de..0000000 --- a/PointLion/src/main/resources/mapper/material/MaterialAttrMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - select id, attribute_name, attribute_value, tenant_id, delete_flag from pl_material_attr - - - - - - - - insert into pl_material_attr - - attribute_name, - attribute_value, - tenant_id, - delete_flag, - - - #{attributeName}, - #{attributeValue}, - #{tenantId}, - #{deleteFlag}, - - - - - update pl_material_attr - - attribute_name = #{attributeName}, - attribute_value = #{attributeValue}, - tenant_id = #{tenantId}, - delete_flag = #{deleteFlag}, - - where id = #{id} - - - - delete from pl_material_attr where id = #{id} - - - - delete from pl_material_attr where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/material/MaterialAttritemMapper.xml b/PointLion/src/main/resources/mapper/material/MaterialAttritemMapper.xml deleted file mode 100644 index 6cc7a34..0000000 --- a/PointLion/src/main/resources/mapper/material/MaterialAttritemMapper.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - select id, item_name,sort, attr_id, tenant_id, remark, delete_flag from pl_material_attritem - - - - - - - - insert into pl_material_attritem - - item_name, - sort, - attr_id, - tenant_id, - remark, - delete_flag, - - - #{itemName}, - #{sort}, - #{attrId}, - #{tenantId}, - #{remark}, - #{deleteFlag}, - - - - - update pl_material_attritem - - item_name = #{itemName}, - sort = #{sort}, - attr_id = #{attrId}, - tenant_id = #{tenantId}, - remark = #{remark}, - delete_flag = #{deleteFlag}, - - where id = #{id} - - - - delete from pl_material_attritem where id = #{id} - - - - delete from pl_material_attritem where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/material/MaterialCategoryMapper.xml b/PointLion/src/main/resources/mapper/material/MaterialCategoryMapper.xml deleted file mode 100644 index bbcc9c9..0000000 --- a/PointLion/src/main/resources/mapper/material/MaterialCategoryMapper.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select id, code, name, parent_id, category_level, sort, remark, tenant_id, delete_flag, user_id, dept_id, create_by, create_time, update_by, update_time from pl_material_category - - - - - - - - insert into pl_material_category - - code, - name, - parent_id, - category_level, - sort, - remark, - tenant_id, - delete_flag, - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - - - #{code}, - #{name}, - #{parentId}, - #{categoryLevel}, - #{sort}, - #{remark}, - #{tenantId}, - #{deleteFlag}, - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update pl_material_category - - code = #{code}, - name = #{name}, - parent_id = #{parentId}, - category_level = #{categoryLevel}, - sort = #{sort}, - remark = #{remark}, - tenant_id = #{tenantId}, - delete_flag = #{deleteFlag}, - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from pl_material_category where id = #{id} - - - - delete from pl_material_category where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/material/MaterialMapper.xml b/PointLion/src/main/resources/mapper/material/MaterialMapper.xml deleted file mode 100644 index 1c7a033..0000000 --- a/PointLion/src/main/resources/mapper/material/MaterialMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, material_id, bar_code, commodity_unit, sku, purchase_decimal, commodity_decimal, wholesale_decimal, low_decimal, default_flag, create_time, create_by, update_by, update_time, tenant_id, delete_Flag from pl_material - - - - - - - - insert into pl_material - - material_id, - bar_code, - commodity_unit, - sku, - purchase_decimal, - commodity_decimal, - wholesale_decimal, - low_decimal, - default_flag, - create_time, - create_by, - update_by, - update_time, - tenant_id, - delete_Flag, - - - #{materialId}, - #{barCode}, - #{commodityUnit}, - #{sku}, - #{purchaseDecimal}, - #{commodityDecimal}, - #{wholesaleDecimal}, - #{lowDecimal}, - #{defaultFlag}, - #{createTime}, - #{createBy}, - #{updateBy}, - #{updateTime}, - #{tenantId}, - #{deleteFlag}, - - - - - insert into pl_material - (id, material_id, bar_code, commodity_unit, sku, purchase_decimal, commodity_decimal, - wholesale_decimal, low_decimal, create_time, create_by, update_by, update_time, tenant_id) - values - - ( - #{item.id }, - #{item.materialId }, - #{item.barCode }, - #{item.commodityUnit }, - #{item.sku }, - #{item.purchaseDecimal }, - #{item.commodityDecimal}, - #{item.wholesaleDecimal }, - #{item.lowDecimal }, - #{item.createTime }, - #{item.createBy }, - #{item.updateBy }, - #{item.updateTime }, - #{item.tenantId} - ) - - - - - update pl_material - - material_id = #{materialId}, - bar_code = #{barCode}, - commodity_unit = #{commodityUnit}, - sku = #{sku}, - purchase_decimal = #{purchaseDecimal}, - commodity_decimal = #{commodityDecimal}, - wholesale_decimal = #{wholesaleDecimal}, - low_decimal = #{lowDecimal}, - default_flag = #{defaultFlag}, - create_time = #{createTime}, - create_by = #{createBy}, - update_by = #{updateBy}, - update_time = #{updateTime}, - tenant_id = #{tenantId}, - delete_Flag = #{deleteFlag}, - - where id = #{id} - - - - delete from pl_material where id = #{id} - - - - delete from pl_material where id in - - #{id} - - - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/material/MaterialSourceMapper.xml b/PointLion/src/main/resources/mapper/material/MaterialSourceMapper.xml deleted file mode 100644 index 477b03a..0000000 --- a/PointLion/src/main/resources/mapper/material/MaterialSourceMapper.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, category_id, name, manufacturer, model, standard, color, unit, remark, img_url, unit_id, expiry_num, weight, enabled, other_field1, other_field2, other_field3, enable_serial_number, enable_batch_number, tenant_id, delete_flag, mul_attr from pl_material_source - - - - - - - - insert into pl_material_source - - category_id, - name, - manufacturer, - model, - standard, - color, - unit, - remark, - img_url, - unit_id, - expiry_num, - weight, - enabled, - other_field1, - other_field2, - other_field3, - enable_serial_number, - enable_batch_number, - tenant_id, - delete_flag, - mul_attr, - - - #{categoryId}, - #{name}, - #{manufacturer}, - #{model}, - #{standard}, - #{color}, - #{unit}, - #{remark}, - #{imgUrl}, - #{unitId}, - #{expiryNum}, - #{weight}, - #{enabled}, - #{otherField1}, - #{otherField2}, - #{otherField3}, - #{enableSerialNumber}, - #{enableBatchNumber}, - #{tenantId}, - #{deleteFlag}, - #{mul_attr}, - - - - - update pl_material_source - - category_id = #{categoryId}, - name = #{name}, - manufacturer = #{manufacturer}, - model = #{model}, - standard = #{standard}, - color = #{color}, - unit = #{unit}, - remark = #{remark}, - img_url = #{imgUrl}, - unit_id = #{unitId}, - expiry_num = #{expiryNum}, - weight = #{weight}, - enabled = #{enabled}, - other_field1 = #{otherField1}, - other_field2 = #{otherField2}, - other_field3 = #{otherField3}, - enable_serial_number = #{enableSerialNumber}, - enable_batch_number = #{enableBatchNumber}, - tenant_id = #{tenantId}, - delete_flag = #{deleteFlag}, - mul_attr = #{mulAttr}, - - where id = #{id} - - - - delete from pl_material_source where id = #{id} - - - - delete from pl_material_source where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/note/NoteCollectMapper.xml b/PointLion/src/main/resources/mapper/note/NoteCollectMapper.xml deleted file mode 100644 index ecc685a..0000000 --- a/PointLion/src/main/resources/mapper/note/NoteCollectMapper.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - select id, user_id, doc_id, create_time from note_collect - - - - - - - - insert into note_collect - - user_id, - doc_id, - create_time, - - - #{userId}, - #{docId}, - #{createTime}, - - - - - update note_collect - - user_id = #{userId}, - doc_id = #{docId}, - create_time = #{createTime}, - - where id = #{id} - - - - delete from note_collect where id = #{id} - - - - delete from note_collect where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/note/NoteDocMapper.xml b/PointLion/src/main/resources/mapper/note/NoteDocMapper.xml deleted file mode 100644 index 1ca1ed1..0000000 --- a/PointLion/src/main/resources/mapper/note/NoteDocMapper.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - select id, title, content, user_id, create_time, if_del,folder_id from note_doc - - - - - - - - - - - - insert into note_doc - - title, - content, - user_id, - create_time, - if_del, - folder_id, - - - #{title}, - #{content}, - #{userId}, - #{createTime}, - #{ifDel}, - #{folderId}, - - - - - update note_doc - - title = #{title}, - content = #{content}, - user_id = #{userId}, - create_time = #{createTime}, - if_del = #{ifDel}, - folder_id = #{folderId}, - - where id = #{id} - - - - delete from note_doc where id = #{id} - - - - delete from note_doc where id in - - #{id} - - - - - - - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/note/NoteDocTagMapper.xml b/PointLion/src/main/resources/mapper/note/NoteDocTagMapper.xml deleted file mode 100644 index 77011bc..0000000 --- a/PointLion/src/main/resources/mapper/note/NoteDocTagMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - select id, user_id, tag_id, doc_id from note_doc_tag - - - - - - - - insert into note_doc_tag - - user_id, - tag_id, - doc_id, - - - #{userId}, - #{tagId}, - #{docId}, - - - - - update note_doc_tag - - user_id = #{userId}, - tag_id = #{tagId}, - doc_id = #{docId}, - - where id = #{id} - - - - delete from note_doc_tag where id = #{id} - - - - delete from note_doc_tag where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/note/NoteFolderMapper.xml b/PointLion/src/main/resources/mapper/note/NoteFolderMapper.xml deleted file mode 100644 index 0edc52d..0000000 --- a/PointLion/src/main/resources/mapper/note/NoteFolderMapper.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - select id, name, parent_id, user_id, create_time, if_del from note_folder - - - - - - - - insert into note_folder - - name, - parent_id, - user_id, - create_time, - if_del, - - - #{name}, - #{parentId}, - #{userId}, - #{createTime}, - #{ifDel}, - - - - - update note_folder - - name = #{name}, - parent_id = #{parentId}, - user_id = #{userId}, - create_time = #{createTime}, - if_del = #{ifDel}, - - where id = #{id} - - - - delete from note_folder where id = #{id} - - - - delete from note_folder where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/note/NoteTagMapper.xml b/PointLion/src/main/resources/mapper/note/NoteTagMapper.xml deleted file mode 100644 index 5db6b3b..0000000 --- a/PointLion/src/main/resources/mapper/note/NoteTagMapper.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - select id, name, user_id, create_time from note_tag - - - - - - - - insert into note_tag - - name, - user_id, - create_time, - - - #{name}, - #{userId}, - #{createTime}, - - - - - update note_tag - - name = #{name}, - user_id = #{userId}, - create_time = #{createTime}, - - where id = #{id} - - - - delete from note_tag where id = #{id} - - - - delete from note_tag where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/ActHiTaskinstMapper.xml b/PointLion/src/main/resources/mapper/oa/ActHiTaskinstMapper.xml index 81119c1..f62ddb7 100644 --- a/PointLion/src/main/resources/mapper/oa/ActHiTaskinstMapper.xml +++ b/PointLion/src/main/resources/mapper/oa/ActHiTaskinstMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/PointLion/src/main/resources/mapper/oa/ActReProcdefMapper.xml b/PointLion/src/main/resources/mapper/oa/ActReProcdefMapper.xml index 14f5ccd..e012aa9 100644 --- a/PointLion/src/main/resources/mapper/oa/ActReProcdefMapper.xml +++ b/PointLion/src/main/resources/mapper/oa/ActReProcdefMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/PointLion/src/main/resources/mapper/oa/FlowProcessMapper.xml b/PointLion/src/main/resources/mapper/oa/FlowProcessMapper.xml index 000c776..eb303f4 100644 --- a/PointLion/src/main/resources/mapper/oa/FlowProcessMapper.xml +++ b/PointLion/src/main/resources/mapper/oa/FlowProcessMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/PointLion/src/main/resources/mapper/oa/OaBdCarMapper.xml b/PointLion/src/main/resources/mapper/oa/OaBdCarMapper.xml index c7de1b1..b8a8781 100644 --- a/PointLion/src/main/resources/mapper/oa/OaBdCarMapper.xml +++ b/PointLion/src/main/resources/mapper/oa/OaBdCarMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/PointLion/src/main/resources/mapper/oa/OaBdMeetingroomMapper.xml b/PointLion/src/main/resources/mapper/oa/OaBdMeetingroomMapper.xml index 6fafc75..66e274d 100644 --- a/PointLion/src/main/resources/mapper/oa/OaBdMeetingroomMapper.xml +++ b/PointLion/src/main/resources/mapper/oa/OaBdMeetingroomMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/PointLion/src/main/resources/mapper/oa/OaBdSealMapper.xml b/PointLion/src/main/resources/mapper/oa/OaBdSealMapper.xml index 1fafeaf..2573871 100644 --- a/PointLion/src/main/resources/mapper/oa/OaBdSealMapper.xml +++ b/PointLion/src/main/resources/mapper/oa/OaBdSealMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/PointLion/src/main/resources/mapper/oa/OaCustomFormApplyMapper.xml b/PointLion/src/main/resources/mapper/oa/OaCustomFormApplyMapper.xml deleted file mode 100644 index a818b4b..0000000 --- a/PointLion/src/main/resources/mapper/oa/OaCustomFormApplyMapper.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, name, category, rules, options, form_data, form_key, flow_key, flow_name, flow_ins_id, apply_title, submit_time, create_by, create_time, update_by, update_time, remark, status from oa_custom_form_apply - - - - - - - - - insert into oa_custom_form_apply - - name, - category, - rules, - options, - form_data, - form_key, - flow_key, - flow_name, - flow_ins_id, - apply_title, - submit_time, - create_by, - create_time, - update_by, - update_time, - remark, - status, - - - #{name}, - #{category}, - #{rules}, - #{options}, - #{formData}, - #{formKey}, - #{flowKey}, - #{flowName}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{status}, - - - - - update oa_custom_form_apply - - name = #{name}, - category = #{category}, - rules = #{rules}, - options = #{options}, - form_data = #{formData}, - form_key = #{formKey}, - flow_key = #{flowKey}, - flow_name = #{flowName}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - status = #{status}, - - where id = #{id} - - - - delete from oa_custom_form_apply where id = #{id} - - - - delete from oa_custom_form_apply where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/OaCustomFormMapper.xml b/PointLion/src/main/resources/mapper/oa/OaCustomFormMapper.xml deleted file mode 100644 index 56338f1..0000000 --- a/PointLion/src/main/resources/mapper/oa/OaCustomFormMapper.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, name, category, rules, options, form_key, create_by, create_time, update_by, update_time, remark from oa_custom_form - - - - - - - - insert into oa_custom_form - - name, - category, - rules, - options, - form_key, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{name}, - #{category}, - #{rules}, - #{options}, - #{formKey}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update oa_custom_form - - name = #{name}, - category = #{category}, - rules = #{rules}, - options = #{options}, - form_key = #{formKey}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from oa_custom_form where id = #{id} - - - - delete from oa_custom_form where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/OaDutyApplyMapper.xml b/PointLion/src/main/resources/mapper/oa/OaDutyApplyMapper.xml deleted file mode 100644 index 1a43005..0000000 --- a/PointLion/src/main/resources/mapper/oa/OaDutyApplyMapper.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, bill_type, leave_type, bill_code, flow_key, flow_ins_id, apply_title, submit_time, status, remark, start_time, end_time, days, reason, user_id, dept_id, create_by, create_time, update_by, update_time from oa_duty_apply - - - - - - - - insert into oa_duty_apply - - id, - bill_type, - leave_type, - bill_code, - flow_key, - flow_ins_id, - apply_title, - submit_time, - status, - remark, - start_time, - end_time, - days, - reason, - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - - - #{id}, - #{billType}, - #{leaveType}, - #{billCode}, - #{flowKey}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{status}, - #{remark}, - #{startTime}, - #{endTime}, - #{days}, - #{reason}, - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update oa_duty_apply - - bill_type = #{billType}, - leave_type = #{leaveType}, - bill_code = #{billCode}, - flow_key = #{flowKey}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - status = #{status}, - remark = #{remark}, - start_time = #{startTime}, - end_time = #{endTime}, - days = #{days}, - reason = #{reason}, - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from oa_duty_apply where id = #{id} - - - - delete from oa_duty_apply where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/OaHotelApplyMapper.xml b/PointLion/src/main/resources/mapper/oa/OaHotelApplyMapper.xml deleted file mode 100644 index 8bf0c29..0000000 --- a/PointLion/src/main/resources/mapper/oa/OaHotelApplyMapper.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, status, flow_key, flow_ins_id, apply_title, submit_time, billcode, remark, apply_city, street, hotel_name, total_amt, room_type, room_count, room_level, user_count, use_time, reason_des from oa_hotel_apply - - - - - - - - insert into oa_hotel_apply - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - status, - flow_key, - flow_ins_id, - apply_title, - submit_time, - billcode, - remark, - apply_city, - street, - hotel_name, - total_amt, - room_type, - room_count, - room_level, - user_count, - use_time, - reason_des, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{status}, - #{flowKey}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{billcode}, - #{remark}, - #{applyCity}, - #{street}, - #{hotelName}, - #{totalAmt}, - #{roomType}, - #{roomCount}, - #{roomLevel}, - #{userCount}, - #{useTime}, - #{reasonDes}, - - - - - update oa_hotel_apply - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - status = #{status}, - flow_key = #{flowKey}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - billcode = #{billcode}, - remark = #{remark}, - apply_city = #{applyCity}, - street = #{street}, - hotel_name = #{hotelName}, - total_amt = #{totalAmt}, - room_type = #{roomType}, - room_count = #{roomCount}, - room_level = #{roomLevel}, - user_count = #{userCount}, - use_time = #{useTime}, - reason_des = #{reasonDes}, - - where id = #{id} - - - - delete from oa_hotel_apply where id = #{id} - - - - delete from oa_hotel_apply where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/OaMeetingroomApplyMapper.xml b/PointLion/src/main/resources/mapper/oa/OaMeetingroomApplyMapper.xml deleted file mode 100644 index 1a2915f..0000000 --- a/PointLion/src/main/resources/mapper/oa/OaMeetingroomApplyMapper.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, status, flow_key, flow_ins_id, apply_title, submit_time, billcode, remark, start_time, end_time, room_num, user_count, meeting_title, meeting_des from oa_meetingroom_apply - - - - - - - - insert into oa_meetingroom_apply - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - status, - flow_key, - flow_ins_id, - apply_title, - submit_time, - billcode, - remark, - start_time, - end_time, - room_num, - user_count, - meeting_title, - meeting_des, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{status}, - #{flowKey}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{billcode}, - #{remark}, - #{startTime}, - #{endTime}, - #{roomNum}, - #{userCount}, - #{meetingTitle}, - #{meetingDes}, - - - - - update oa_meetingroom_apply - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - status = #{status}, - flow_key = #{flowKey}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - billcode = #{billcode}, - remark = #{remark}, - start_time = #{startTime}, - end_time = #{endTime}, - room_num = #{roomNum}, - user_count = #{userCount}, - meeting_title = #{meetingTitle}, - meeting_des = #{meetingDes}, - - where id = #{id} - - - - delete from oa_meetingroom_apply where id = #{id} - - - - delete from oa_meetingroom_apply where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/OaReimburseApplyMapper.xml b/PointLion/src/main/resources/mapper/oa/OaReimburseApplyMapper.xml deleted file mode 100644 index 8b82dea..0000000 --- a/PointLion/src/main/resources/mapper/oa/OaReimburseApplyMapper.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, status, flow_key, flow_ins_id, apply_title, submit_time, - billcode, remark, total_amt, bill_type, month, des, city, start_time, end_time, bill_count, img_url, days, standard_subsidy, subsidy_amt, bill_amt - from oa_reimburse_apply - - - - - - - - insert into oa_reimburse_apply - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - status, - flow_key, - flow_ins_id, - apply_title, - submit_time, - billcode, - remark, - total_amt, - bill_type, - month, - des, - city, - start_time, - end_time, - bill_count, - img_url, - days, - standard_subsidy, - subsidy_amt, - bill_amt, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{status}, - #{flowKey}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{billcode}, - #{remark}, - #{totalAmt}, - #{billType}, - #{month}, - #{des}, - #{city}, - #{startTime}, - #{endTime}, - #{billCount}, - #{imgUrl}, - #{days}, - #{standardSubsidy}, - #{subsidyAmt}, - #{billAmt}, - - - - - update oa_reimburse_apply - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - status = #{status}, - flow_key = #{flowKey}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - billcode = #{billcode}, - remark = #{remark}, - total_amt = #{totalAmt}, - bill_type = #{billType}, - month = #{month}, - des = #{des}, - city = #{city}, - start_time = #{startTime}, - end_time = #{endTime}, - bill_count = #{billCount}, - img_url = #{imgUrl}, - days = #{days}, - standard_subsidy = #{standardSubsidy}, - subsidy_amt = #{subsidyAmt}, - bill_amt = #{billAmt}, - - where id = #{id} - - - - delete from oa_reimburse_apply where id = #{id} - - - - delete from oa_reimburse_apply where id in - - #{id} - - - - - delete from oa_reimburse_feeitem where reimburse_id in - - #{reimburseId} - - - - - delete from oa_reimburse_feeitem where reimburse_id = #{reimburseId} - - - - insert into oa_reimburse_feeitem( id, create_by, create_time, update_by, update_time, remark, reimburse_id, item_amt, year, month, bill_type, bill_count, start_city, end_city, bill_date, day_count, standard_subsidy, item_type, stay_city) values - - ( #{item.id}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.reimburseId}, #{item.itemAmt}, #{item.year}, #{item.month}, #{item.billType}, #{item.billCount}, #{item.startCity}, #{item.endCity}, #{item.billDate}, #{item.dayCount}, #{item.standardSubsidy}, #{item.itemType}, #{item.stayCity}) - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/OaSealApplyMapper.xml b/PointLion/src/main/resources/mapper/oa/OaSealApplyMapper.xml deleted file mode 100644 index 06a7003..0000000 --- a/PointLion/src/main/resources/mapper/oa/OaSealApplyMapper.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, status, flow_key, flow_ins_id, apply_title, submit_time, billcode, remark, seal_type, use_time, back_time, use_info from oa_seal_apply - - - - - - - - insert into oa_seal_apply - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - status, - flow_key, - flow_ins_id, - apply_title, - submit_time, - billcode, - remark, - seal_type, - use_time, - back_time, - use_info, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{status}, - #{flowKey}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{billcode}, - #{remark}, - #{sealType}, - #{useTime}, - #{backTime}, - #{useInfo}, - - - - - update oa_seal_apply - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - status = #{status}, - flow_key = #{flowKey}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - billcode = #{billcode}, - remark = #{remark}, - seal_type = #{sealType}, - use_time = #{useTime}, - back_time = #{backTime}, - use_info = #{useInfo}, - - where id = #{id} - - - - delete from oa_seal_apply where id = #{id} - - - - delete from oa_seal_apply where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/OaTicketApplyMapper.xml b/PointLion/src/main/resources/mapper/oa/OaTicketApplyMapper.xml deleted file mode 100644 index cffa940..0000000 --- a/PointLion/src/main/resources/mapper/oa/OaTicketApplyMapper.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, status, flow_key, flow_ins_id, apply_title, submit_time, billcode, remark, destination, departure, total_amt, go_time, car_num, apply_realname, id_num from oa_ticket_apply - - - - - - - - insert into oa_ticket_apply - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - status, - flow_key, - flow_ins_id, - apply_title, - submit_time, - billcode, - remark, - destination, - departure, - total_amt, - go_time, - car_num, - apply_realname, - id_num, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{status}, - #{flowKey}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{billcode}, - #{remark}, - #{destination}, - #{departure}, - #{totalAmt}, - #{goTime}, - #{carNum}, - #{applyRealname}, - #{idNum}, - - - - - update oa_ticket_apply - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - status = #{status}, - flow_key = #{flowKey}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - billcode = #{billcode}, - remark = #{remark}, - destination = #{destination}, - departure = #{departure}, - total_amt = #{totalAmt}, - go_time = #{goTime}, - car_num = #{carNum}, - apply_realname = #{applyRealname}, - id_num = #{idNum}, - - where id = #{id} - - - - delete from oa_ticket_apply where id = #{id} - - - - delete from oa_ticket_apply where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/oa/VTasklistMapper.xml b/PointLion/src/main/resources/mapper/oa/VTasklistMapper.xml index 5c1af95..37e48c7 100644 --- a/PointLion/src/main/resources/mapper/oa/VTasklistMapper.xml +++ b/PointLion/src/main/resources/mapper/oa/VTasklistMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/PointLion/src/main/resources/mapper/pg/PgCodeManageMapper.xml b/PointLion/src/main/resources/mapper/pg/PgCodeManageMapper.xml deleted file mode 100644 index 38bb75f..0000000 --- a/PointLion/src/main/resources/mapper/pg/PgCodeManageMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - select id, project_id, create_by, create_time, update_by, update_time, remark, git_url, store_name from pg_code_manage - - - - - - - - insert into pg_code_manage - - project_id, - create_by, - create_time, - update_by, - update_time, - remark, - git_url, - store_name, - - - #{projectId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{gitUrl}, - #{storeName}, - - - - - update pg_code_manage - - project_id = #{projectId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - git_url = #{gitUrl}, - store_name = #{storeName}, - - where id = #{id} - - - - delete from pg_code_manage where id = #{id} - - - - delete from pg_code_manage where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/pg/PgProjectMapper.xml b/PointLion/src/main/resources/mapper/pg/PgProjectMapper.xml deleted file mode 100644 index 9e1c76b..0000000 --- a/PointLion/src/main/resources/mapper/pg/PgProjectMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - select id, name, liable_person, start_time, end_time, work_days, des, project_status from pg_project - - - - - - - - insert into pg_project - - name, - liable_person, - start_time, - end_time, - work_days, - des, - project_status, - - - #{name}, - #{liablePerson}, - #{startTime}, - #{endTime}, - #{workDays}, - #{des}, - #{projectStatus}, - - - - - update pg_project - - name = #{name}, - liable_person = #{liablePerson}, - start_time = #{startTime}, - end_time = #{endTime}, - work_days = #{workDays}, - des = #{des}, - project_status = #{projectStatus}, - - where id = #{id} - - - - delete from pg_project where id = #{id} - - - - delete from pg_project where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/pg/PgTaskMapper.xml b/PointLion/src/main/resources/mapper/pg/PgTaskMapper.xml deleted file mode 100644 index bbb2f0d..0000000 --- a/PointLion/src/main/resources/mapper/pg/PgTaskMapper.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, model_name, task_name, priority,project_id, summary, des, duty_person, assistants, start_time, end_time, status, progress, create_by, create_time, update_by, update_time, remark from pg_task - - - - - - - - - - - - insert into pg_task - - model_name, - task_name, - project_id, - priority, - summary, - des, - duty_person, - assistants, - start_time, - end_time, - status, - progress, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{modelName}, - #{taskName}, - #{projectId}, - #{priority}, - #{summary}, - #{des}, - #{dutyPerson}, - #{assistants}, - #{startTime}, - #{endTime}, - #{status}, - #{progress}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update pg_task - - model_name = #{modelName}, - task_name = #{taskName}, - priority = #{priority}, - summary = #{summary}, - des = #{des}, - duty_person = #{dutyPerson}, - assistants = #{assistants}, - start_time = #{startTime}, - end_time = #{endTime}, - status = #{status}, - progress = #{progress}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - project_id = #{projectId}, - - where id = #{id} - - - - delete from pg_task where id = #{id} - - - - delete from pg_task where id in - - #{id} - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/staff/StaffInductionMapper.xml b/PointLion/src/main/resources/mapper/staff/StaffInductionMapper.xml deleted file mode 100644 index 28be598..0000000 --- a/PointLion/src/main/resources/mapper/staff/StaffInductionMapper.xml +++ /dev/null @@ -1,343 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, remark, real_name, sex, nation, birthdate, political, joinparty_date, marry_status, height, weight, native_place, id_num, phone, mail, avatar, driverslicense_type, nativeplace_police, nativeplace_postcode, home_address, home_address_postcode, nativeplace_address, now_address, now_address_postcode, urgent_contact, urgent_contact_rel, urgent_contact_address, urgent_contact_phone, english_level, other_language, other_language_level, qualification, publications, reward_punish,education from pl_staff_induction - - - - - - - - insert into pl_staff_induction - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - remark, - real_name, - sex, - nation, - birthdate, - political, - joinparty_date, - marry_status, - height, - weight, - native_place, - id_num, - phone, - mail, - avatar, - driverslicense_type, - nativeplace_police, - nativeplace_postcode, - home_address, - home_address_postcode, - nativeplace_address, - now_address, - now_address_postcode, - urgent_contact, - urgent_contact_rel, - urgent_contact_address, - urgent_contact_phone, - english_level, - other_language, - other_language_level, - qualification, - publications, - reward_punish, - education, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{realName}, - #{sex}, - #{nation}, - #{birthdate}, - #{political}, - #{joinpartyDate}, - #{marryStatus}, - #{height}, - #{weight}, - #{nativePlace}, - #{idNum}, - #{phone}, - #{mail}, - #{avatar}, - #{driverslicenseType}, - #{nativeplacePolice}, - #{nativeplacePostcode}, - #{homeAddress}, - #{homeAddressPostcode}, - #{nativeplaceAddress}, - #{nowAddress}, - #{nowAddressPostcode}, - #{urgentContact}, - #{urgentContactRel}, - #{urgentContactAddress}, - #{urgentContactPhone}, - #{englishLevel}, - #{otherLanguage}, - #{otherLanguageLevel}, - #{qualification}, - #{publications}, - #{rewardPunish}, - #{education}, - - - - - update pl_staff_induction - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - real_name = #{realName}, - sex = #{sex}, - nation = #{nation}, - birthdate = #{birthdate}, - political = #{political}, - joinparty_date = #{joinpartyDate}, - marry_status = #{marryStatus}, - height = #{height}, - weight = #{weight}, - native_place = #{nativePlace}, - id_num = #{idNum}, - phone = #{phone}, - mail = #{mail}, - avatar = #{avatar}, - driverslicense_type = #{driverslicenseType}, - nativeplace_police = #{nativeplacePolice}, - nativeplace_postcode = #{nativeplacePostcode}, - home_address = #{homeAddress}, - home_address_postcode = #{homeAddressPostcode}, - nativeplace_address = #{nativeplaceAddress}, - now_address = #{nowAddress}, - now_address_postcode = #{nowAddressPostcode}, - urgent_contact = #{urgentContact}, - urgent_contact_rel = #{urgentContactRel}, - urgent_contact_address = #{urgentContactAddress}, - urgent_contact_phone = #{urgentContactPhone}, - english_level = #{englishLevel}, - other_language = #{otherLanguage}, - other_language_level = #{otherLanguageLevel}, - qualification = #{qualification}, - publications = #{publications}, - reward_punish = #{rewardPunish}, - education = #{education}, - - where id = #{id} - - - - delete from pl_staff_induction where id = #{id} - - - - delete from pl_staff_induction where id in - - #{id} - - - - - - delete from pl_staff_induction_eduexp where staff_id in - - #{staffId} - - - - - delete from pl_staff_induction_eduexp where staff_id = #{staffId} - - - - insert into pl_staff_induction_eduexp( id, create_time, update_time, remark, school_name, school_address, is_allday, major, education, start_date, end_date, staff_id) values - - ( #{item.id}, #{item.createTime}, #{item.updateTime}, #{item.remark}, #{item.schoolName}, #{item.schoolAddress}, #{item.isAllday}, #{item.major}, #{item.education}, #{item.startDate}, #{item.endDate}, #{item.staffId}) - - - - - - delete from pl_staff_induction_family where staff_id in - - #{staffId} - - - - - delete from pl_staff_induction_family where staff_id = #{staffId} - - - - insert into pl_staff_induction_family( id, create_time, update_time, remark, user_id, name, birthdate, age, political, company, position, phone, relation, staff_id ) values - - ( #{item.id}, #{item.createTime}, #{item.updateTime}, #{item.remark}, #{item.userId}, #{item.name}, #{item.birthdate}, #{item.age}, #{item.political}, #{item.company}, #{item.position}, #{item.phone}, #{item.relation}, #{item.staffId} ) - - - - - - delete from pl_staff_induction_workexp where staff_id in - - #{staffId} - - - - - delete from pl_staff_induction_workexp where staff_id = #{staffId} - - - insert into pl_staff_induction_workexp( id, create_time, update_time, remark, company_name, company_address, company_dept, position, witness, staff_id, witness_phone ) values - - ( #{item.id}, #{item.createTime}, #{item.updateTime}, #{item.remark}, #{item.companyName}, #{item.companyAddress}, #{item.companyDept}, #{item.position}, #{item.witness}, #{item.staffId}, #{item.witnessPhone} ) - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/staff/StaffQuitMapper.xml b/PointLion/src/main/resources/mapper/staff/StaffQuitMapper.xml deleted file mode 100644 index 6c11953..0000000 --- a/PointLion/src/main/resources/mapper/staff/StaffQuitMapper.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, status, flow_key, flow_ins_id, apply_title, submit_time, billcode, remark, plan_quit_date, real_quit_date, quit_user_id, quit_nick_name, quit_type, quit_dept_id, quit_reason, quit_des, handover_person, finish_handover from pl_staff_quit - - - - - - - - insert into pl_staff_quit - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - status, - flow_key, - flow_ins_id, - apply_title, - submit_time, - billcode, - remark, - plan_quit_date, - real_quit_date, - quit_user_id, - quit_nick_name, - quit_type, - quit_dept_id, - quit_reason, - quit_des, - handover_person, - finish_handover, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{status}, - #{flowKey}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{billcode}, - #{remark}, - #{planQuitDate}, - #{realQuitDate}, - #{quitUserId}, - #{quitNickName}, - #{quitType}, - #{quitDeptId}, - #{quitReason}, - #{quitDes}, - #{handoverPerson}, - #{finishHandover}, - - - - - update pl_staff_quit - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - status = #{status}, - flow_key = #{flowKey}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - billcode = #{billcode}, - remark = #{remark}, - plan_quit_date = #{planQuitDate}, - real_quit_date = #{realQuitDate}, - quit_user_id = #{quitUserId}, - quit_nick_name = #{quitNickName}, - quit_type = #{quitType}, - quit_dept_id = #{quitDeptId}, - quit_reason = #{quitReason}, - quit_des = #{quitDes}, - handover_person = #{handoverPerson}, - finish_handover = #{finishHandover}, - - where id = #{id} - - - - delete from pl_staff_quit where id = #{id} - - - - delete from pl_staff_quit where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/staff/StaffToformalMapper.xml b/PointLion/src/main/resources/mapper/staff/StaffToformalMapper.xml deleted file mode 100644 index b71e61b..0000000 --- a/PointLion/src/main/resources/mapper/staff/StaffToformalMapper.xml +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, dept_id, create_by, create_time, update_by, update_time, status, flow_key, flow_ins_id, apply_title, submit_time, billcode, remark, real_name, sex, nation, birthdate, induction_date, work_deptid, work_position, probation_starttime, probation_endtime, main_workcontent, achievement, suggest, defect, lv_achievement, lv_teamwork, lv_innovate, lv_position, lv_skill, lv_potential, lv_attendance, leader_idea, leader_result, hr_idea, hr_result, final_result, toformal_userid from pl_staff_toformal - - - - - - - - insert into pl_staff_toformal - - user_id, - dept_id, - create_by, - create_time, - update_by, - update_time, - status, - flow_key, - flow_ins_id, - apply_title, - submit_time, - billcode, - remark, - real_name, - sex, - nation, - birthdate, - induction_date, - work_deptid, - work_position, - probation_starttime, - probation_endtime, - main_workcontent, - achievement, - suggest, - defect, - lv_achievement, - lv_teamwork, - lv_innovate, - lv_position, - lv_skill, - lv_potential, - lv_attendance, - leader_idea, - leader_result, - hr_idea, - hr_result, - final_result, - toformal_userid, - - - #{userId}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{status}, - #{flowKey}, - #{flowInsId}, - #{applyTitle}, - #{submitTime}, - #{billcode}, - #{remark}, - #{realName}, - #{sex}, - #{nation}, - #{birthdate}, - #{inductionDate}, - #{workDeptid}, - #{workPosition}, - #{probationStarttime}, - #{probationEndtime}, - #{mainWorkcontent}, - #{achievement}, - #{suggest}, - #{defect}, - #{lvAchievement}, - #{lvTeamwork}, - #{lvInnovate}, - #{lvPosition}, - #{lvSkill}, - #{lvPotential}, - #{lvAttendance}, - #{leaderIdea}, - #{leaderResult}, - #{hrIdea}, - #{hrResult}, - #{finalResult}, - #{toformalUserid}, - - - - - update pl_staff_toformal - - user_id = #{userId}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - status = #{status}, - flow_key = #{flowKey}, - flow_ins_id = #{flowInsId}, - apply_title = #{applyTitle}, - submit_time = #{submitTime}, - billcode = #{billcode}, - remark = #{remark}, - real_name = #{realName}, - sex = #{sex}, - nation = #{nation}, - birthdate = #{birthdate}, - induction_date = #{inductionDate}, - work_deptid = #{workDeptid}, - work_position = #{workPosition}, - probation_starttime = #{probationStarttime}, - probation_endtime = #{probationEndtime}, - main_workcontent = #{mainWorkcontent}, - achievement = #{achievement}, - suggest = #{suggest}, - defect = #{defect}, - lv_achievement = #{lvAchievement}, - lv_teamwork = #{lvTeamwork}, - lv_innovate = #{lvInnovate}, - lv_position = #{lvPosition}, - lv_skill = #{lvSkill}, - lv_potential = #{lvPotential}, - lv_attendance = #{lvAttendance}, - leader_idea = #{leaderIdea}, - leader_result = #{leaderResult}, - hr_idea = #{hrIdea}, - hr_result = #{hrResult}, - final_result = #{finalResult}, - toformal_userid = #{toformalUserid}, - - where id = #{id} - - - - delete from pl_staff_toformal where id = #{id} - - - - delete from pl_staff_toformal where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/stu/StuGradTargetMapper.xml b/PointLion/src/main/resources/mapper/stu/StuGradTargetMapper.xml deleted file mode 100644 index fbce84c..0000000 --- a/PointLion/src/main/resources/mapper/stu/StuGradTargetMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - select id, name, year_type, create_by, create_time, update_by, update_time, remark from stu_grad_target - - - - - - - - insert into stu_grad_target - - name, - year_type, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{name}, - #{yearType}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update stu_grad_target - - name = #{name}, - year_type = #{yearType}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from stu_grad_target where id = #{id} - - - - delete from stu_grad_target where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/stu/StuInspectPointMapper.xml b/PointLion/src/main/resources/mapper/stu/StuInspectPointMapper.xml deleted file mode 100644 index 9a0cfbe..0000000 --- a/PointLion/src/main/resources/mapper/stu/StuInspectPointMapper.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select id, year_type, name, create_by, create_time, update_by, update_time, remark from stu_inspect_point - - - - - - - - insert into stu_inspect_point - - id, - year_type, - name, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{id}, - #{yearType}, - #{name}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update stu_inspect_point - - year_type = #{yearType}, - name = #{name}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from stu_inspect_point where id = #{id} - - - - delete from stu_inspect_point where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/stu/StuLessonInspectpointMapper.xml b/PointLion/src/main/resources/mapper/stu/StuLessonInspectpointMapper.xml deleted file mode 100644 index 1f1483d..0000000 --- a/PointLion/src/main/resources/mapper/stu/StuLessonInspectpointMapper.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - select id, point_id, lesson_id, scale, create_time,score_total ,job_total, exp_total - from stu_lesson_inspectpoint - - - - - - - - insert into stu_lesson_inspectpoint - - id, - point_id, - lesson_id, - scale, - create_time, - - score_total, - job_total, - exp_total, - - - #{id}, - #{pointId}, - #{lessonId}, - #{scale}, - #{createTime}, - - #{scoreTotal}, - #{jobTotal}, - #{expTotal}, - - - - - update stu_lesson_inspectpoint - - point_id = #{pointId}, - lesson_id = #{lessonId}, - scale = #{scale}, - create_time = #{createTime}, - - score_total = #{scoreTotal}, - job_total = #{jobTotal}, - exp_total = #{expTotal}, - - where id = #{id} - - - - delete from stu_lesson_inspectpoint where id = #{id} - - - - delete from stu_lesson_inspectpoint where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/stu/StuLessonMapper.xml b/PointLion/src/main/resources/mapper/stu/StuLessonMapper.xml deleted file mode 100644 index 208a7d2..0000000 --- a/PointLion/src/main/resources/mapper/stu/StuLessonMapper.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - select id, year_type,name, teacher, teacher_id, inspect_point_id, inspect_point_name, score_scale, - job_scale, exp_scale, create_by, create_time, update_by, update_time, remark - from stu_lesson - - - - - - - - insert into stu_lesson - - id, - name, - teacher, - teacher_id, - inspect_point_id, - inspect_point_name, - score_scale, - job_scale, - exp_scale, - create_by, - create_time, - update_by, - update_time, - remark, - year_type, - - - #{id}, - #{name}, - #{teacher}, - #{teacherId}, - #{inspectPointId}, - #{inspectPointName}, - #{scoreScale}, - #{jobScale}, - #{expScale}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{yearType}, - - - - - update stu_lesson - - name = #{name}, - teacher = #{teacher}, - teacher_id = #{teacherId}, - inspect_point_id = #{inspectPointId}, - inspect_point_name = #{inspectPointName}, - score_scale = #{scoreScale}, - job_scale = #{jobScale}, - exp_scale = #{expScale}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - year_type = #{yearType}, - - where id = #{id} - - - - delete from stu_lesson where id = #{id} - - - - delete from stu_lesson where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/stu/StuScoreMapper.xml b/PointLion/src/main/resources/mapper/stu/StuScoreMapper.xml deleted file mode 100644 index 52a54a7..0000000 --- a/PointLion/src/main/resources/mapper/stu/StuScoreMapper.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - select id, student_id, lesson_id, point_id, score,type from stu_score - - - - - - - - insert into stu_score - - student_id, - lesson_id, - point_id, - score, - type, - - - #{studentId}, - #{lessonId}, - #{pointId}, - #{score}, - #{type}, - - - - - update stu_score - - student_id = #{studentId}, - lesson_id = #{lessonId}, - point_id = #{pointId}, - score = #{score}, - type = #{type}, - - where id = #{id} - - - - delete from stu_score where id = #{id} - - - - delete from stu_score where id in - - #{id} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/stu/StuStudentMapper.xml b/PointLion/src/main/resources/mapper/stu/StuStudentMapper.xml deleted file mode 100644 index 0045eec..0000000 --- a/PointLion/src/main/resources/mapper/stu/StuStudentMapper.xml +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id,student_code, year_type, create_by, create_time, update_by, update_time, remark, real_name, sex, nation, birthdate, political, joinparty_date, marry_status, height, weight, native_place, id_num, phone, mail, avatar, driverslicense_type, nativeplace_police, nativeplace_postcode, home_address, home_address_postcode, nativeplace_address, now_address, now_address_postcode, urgent_contact, urgent_contact_rel, urgent_contact_address, urgent_contact_phone from stu_student - - - - - - - - - - insert into stu_student - - id, - student_code, - year_type, - create_by, - create_time, - update_by, - update_time, - remark, - real_name, - sex, - nation, - birthdate, - political, - joinparty_date, - marry_status, - height, - weight, - native_place, - id_num, - phone, - mail, - avatar, - driverslicense_type, - nativeplace_police, - nativeplace_postcode, - home_address, - home_address_postcode, - nativeplace_address, - now_address, - now_address_postcode, - urgent_contact, - urgent_contact_rel, - urgent_contact_address, - urgent_contact_phone, - - - #{id}, - #{studentCode}, - #{yearType}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{realName}, - #{sex}, - #{nation}, - #{birthdate}, - #{political}, - #{joinpartyDate}, - #{marryStatus}, - #{height}, - #{weight}, - #{nativePlace}, - #{idNum}, - #{phone}, - #{mail}, - #{avatar}, - #{driverslicenseType}, - #{nativeplacePolice}, - #{nativeplacePostcode}, - #{homeAddress}, - #{homeAddressPostcode}, - #{nativeplaceAddress}, - #{nowAddress}, - #{nowAddressPostcode}, - #{urgentContact}, - #{urgentContactRel}, - #{urgentContactAddress}, - #{urgentContactPhone}, - - - - - update stu_student - - student_code = #{studentCode}, - year_type = #{yearType}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - real_name = #{realName}, - sex = #{sex}, - nation = #{nation}, - birthdate = #{birthdate}, - political = #{political}, - joinparty_date = #{joinpartyDate}, - marry_status = #{marryStatus}, - height = #{height}, - weight = #{weight}, - native_place = #{nativePlace}, - id_num = #{idNum}, - phone = #{phone}, - mail = #{mail}, - avatar = #{avatar}, - driverslicense_type = #{driverslicenseType}, - nativeplace_police = #{nativeplacePolice}, - nativeplace_postcode = #{nativeplacePostcode}, - home_address = #{homeAddress}, - home_address_postcode = #{homeAddressPostcode}, - nativeplace_address = #{nativeplaceAddress}, - now_address = #{nowAddress}, - now_address_postcode = #{nowAddressPostcode}, - urgent_contact = #{urgentContact}, - urgent_contact_rel = #{urgentContactRel}, - urgent_contact_address = #{urgentContactAddress}, - urgent_contact_phone = #{urgentContactPhone}, - - where id = #{id} - - - - delete from stu_student where id = #{id} - - - - delete from stu_student where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/supplier/SupplierMapper.xml b/PointLion/src/main/resources/mapper/supplier/SupplierMapper.xml deleted file mode 100644 index d105d4a..0000000 --- a/PointLion/src/main/resources/mapper/supplier/SupplierMapper.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, supplier, contacts, phone_num, email, description, isystem, type, enabled, advance_in, begin_need_get, begin_need_pay, all_need_get, all_need_pay, fax, telephone, address, tax_num, bank_name, account_number, tax_rate, sort, tenant_id, delete_flag from pl_supplier - - - - - - - - insert into pl_supplier - - supplier, - contacts, - phone_num, - email, - description, - isystem, - type, - enabled, - advance_in, - begin_need_get, - begin_need_pay, - all_need_get, - all_need_pay, - fax, - telephone, - address, - tax_num, - bank_name, - account_number, - tax_rate, - sort, - tenant_id, - delete_flag, - - - #{supplier}, - #{contacts}, - #{phoneNum}, - #{email}, - #{description}, - #{isystem}, - #{type}, - #{enabled}, - #{advanceIn}, - #{beginNeedGet}, - #{beginNeedPay}, - #{allNeedGet}, - #{allNeedPay}, - #{fax}, - #{telephone}, - #{address}, - #{taxNum}, - #{bankName}, - #{accountNumber}, - #{taxRate}, - #{sort}, - #{tenantId}, - #{deleteFlag}, - - - - - update pl_supplier - - supplier = #{supplier}, - contacts = #{contacts}, - phone_num = #{phoneNum}, - email = #{email}, - description = #{description}, - isystem = #{isystem}, - type = #{type}, - enabled = #{enabled}, - advance_in = #{advanceIn}, - begin_need_get = #{beginNeedGet}, - begin_need_pay = #{beginNeedPay}, - all_need_get = #{allNeedGet}, - all_need_pay = #{allNeedPay}, - fax = #{fax}, - telephone = #{telephone}, - address = #{address}, - tax_num = #{taxNum}, - bank_name = #{bankName}, - account_number = #{accountNumber}, - tax_rate = #{taxRate}, - sort = #{sort}, - tenant_id = #{tenantId}, - delete_flag = #{deleteFlag}, - - where id = #{id} - - - - delete from pl_supplier where id = #{id} - - - - delete from pl_supplier where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/wb/WbVideoCollectMapper.xml b/PointLion/src/main/resources/mapper/wb/WbVideoCollectMapper.xml deleted file mode 100644 index 198e2f8..0000000 --- a/PointLion/src/main/resources/mapper/wb/WbVideoCollectMapper.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, video_id, create_time from wb_video_collect - - - - - - - - insert into wb_video_collect - - user_id, - video_id, - create_time, - - - #{userId}, - #{videoId}, - #{createTime}, - - - - - update wb_video_collect - - user_id = #{userId}, - video_id = #{videoId}, - create_time = #{createTime}, - - where id = #{id} - - - - delete from wb_video_collect where id = #{id} - - - - - delete from wb_video_collect where video_id = #{videoId} and user_id = #{userId} - - - - delete from wb_video_collect where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/wb/WbVideoCommentMapper.xml b/PointLion/src/main/resources/mapper/wb/WbVideoCommentMapper.xml deleted file mode 100644 index 038d3e8..0000000 --- a/PointLion/src/main/resources/mapper/wb/WbVideoCommentMapper.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - select id, user_id, comment, create_time, video_id from wb_video_comment - - - - - - - - insert into wb_video_comment - - user_id, - comment, - create_time, - video_id, - - - #{userId}, - #{comment}, - #{createTime}, - #{videoId}, - - - - - update wb_video_comment - - user_id = #{userId}, - comment = #{comment}, - create_time = #{createTime}, - video_id = #{videoId}, - - where id = #{id} - - - - delete from wb_video_comment where id = #{id} - - - - delete from wb_video_comment where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/wb/WbVideoMapper.xml b/PointLion/src/main/resources/mapper/wb/WbVideoMapper.xml deleted file mode 100644 index 55c1243..0000000 --- a/PointLion/src/main/resources/mapper/wb/WbVideoMapper.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, title, direct_name, scenarist_name, main_actor, tag, make_from, show_date, play_length, another_name, img, des, store_type, video_type, story_type, - language, area, score, create_by, create_time,url - from wb_video - - - - - - - - - - - insert into wb_video - - id, - title, - direct_name, - scenarist_name, - main_actor, - tag, - make_from, - show_date, - play_length, - another_name, - img, - des, - store_type, - video_type, - story_type, - language, - area, - score, - url, - create_by, - create_time, - - - #{id}, - #{title}, - #{directName}, - #{scenaristName}, - #{mainActor}, - #{tag}, - #{makeFrom}, - #{showDate}, - #{playLength}, - #{anotherName}, - #{img}, - #{des}, - #{storeType}, - #{videoType}, - #{storyType}, - #{language}, - #{area}, - #{score}, - #{url}, - #{createBy}, - #{createTime}, - - - - - update wb_video - - title = #{title}, - direct_name = #{directName}, - scenarist_name = #{scenaristName}, - main_actor = #{mainActor}, - tag = #{tag}, - make_from = #{makeFrom}, - show_date = #{showDate}, - play_length = #{playLength}, - another_name = #{anotherName}, - img = #{img}, - des = #{des}, - store_type = #{storeType}, - video_type = #{videoType}, - story_type = #{storyType}, - language = #{language}, - area = #{area}, - score = #{score}, - url = #{url}, - create_by = #{createBy}, - create_time = #{createTime}, - - where id = #{id} - - - - delete from wb_video where id = #{id} - - - - delete from wb_video where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioIdentifyMapper.xml b/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioIdentifyMapper.xml deleted file mode 100644 index f728161..0000000 --- a/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioIdentifyMapper.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - select id, url, file_name, person_id, person_name,identify_result, tag, audit_status from xunfei_audio_identify - - - - - - - - insert into xunfei_audio_identify - - id, - url, - file_name, - person_id, - person_name, - identify_result, - tag, - audit_status, - - - #{id}, - #{url}, - #{fileName}, - #{personId}, - #{personName}, - #{identifyResult}, - #{tag}, - #{auditStatus}, - - - - - update xunfei_audio_identify - - url = #{url}, - file_name = #{fileName}, - person_id = #{personId}, - person_name = #{personName}, - identify_result = #{identifyResult}, - tag = #{tag}, - audit_status = #{auditStatus}, - - where id = #{id} - - - - delete from xunfei_audio_identify where id = #{id} - - - - delete from xunfei_audio_identify where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioMapper.xml b/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioMapper.xml deleted file mode 100644 index 3108696..0000000 --- a/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioMapper.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, name, url, create_by, voice_name, speed, volume, pitch, encoding, adj_url, adj_voice_url from xunfei_audio - - - - - - - - insert into xunfei_audio - - name, - url, - create_by, - voice_name, - speed, - volume, - pitch, - encoding, - adj_url, - adj_voice_url, - - - #{name}, - #{url}, - #{createBy}, - #{voiceName}, - #{speed}, - #{volume}, - #{pitch}, - #{encoding}, - #{adjUrl}, - #{adjVoiceUrl}, - - - - - update xunfei_audio - - name = #{name}, - url = #{url}, - create_by = #{createBy}, - voice_name = #{voiceName}, - speed = #{speed}, - volume = #{volume}, - pitch = #{pitch}, - encoding = #{encoding}, - adj_url = #{adjUrl}, - adj_voice_url = #{adjVoiceUrl}, - - where id = #{id} - - - - delete from xunfei_audio where id = #{id} - - - - delete from xunfei_audio where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioTagMapper.xml b/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioTagMapper.xml deleted file mode 100644 index 9f1bbb9..0000000 --- a/PointLion/src/main/resources/mapper/xunfei/XunfeiAudioTagMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - select id, audio_id, name from xunfei_audio_tag - - - - - - - - insert into xunfei_audio_tag - - id, - audio_id, - name, - - - #{id}, - #{audioId}, - #{name}, - - - - - update xunfei_audio_tag - - audio_id = #{audioId}, - name = #{name}, - - where id = #{id} - - - - delete from xunfei_audio_tag where id = #{id} - - - - delete from xunfei_audio_tag where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/xunfei/XunfeiPersonMapper.xml b/PointLion/src/main/resources/mapper/xunfei/XunfeiPersonMapper.xml deleted file mode 100644 index 51c203c..0000000 --- a/PointLion/src/main/resources/mapper/xunfei/XunfeiPersonMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - select id, name, url, gender, age, des,if_create from xunfei_person - - - - - - - - insert into xunfei_person - - id, - name, - url, - gender, - age, - des, - if_create, - - - #{id}, - #{name}, - #{url}, - #{gender}, - #{age}, - #{des}, - #{ifCreate}, - - - - - update xunfei_person - - name = #{name}, - url = #{url}, - gender = #{gender}, - age = #{age}, - des = #{des}, - if_create = #{ifCreate}, - - where id = #{id} - - - - delete from xunfei_person where id = #{id} - - - - delete from xunfei_person where id in - - #{id} - - - \ No newline at end of file diff --git a/PointLion/src/main/resources/mapper/xunfei/XunfeiTextAudioMapper.xml b/PointLion/src/main/resources/mapper/xunfei/XunfeiTextAudioMapper.xml deleted file mode 100644 index eefa51e..0000000 --- a/PointLion/src/main/resources/mapper/xunfei/XunfeiTextAudioMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - select id, text, if_success, url from xunfei_text_audio - - - - - - - - insert into xunfei_text_audio - - text, - if_success, - url, - - - #{text}, - #{ifSuccess}, - #{url}, - - - - - update xunfei_text_audio - - text = #{text}, - if_success = #{ifSuccess}, - url = #{url}, - - where id = #{id} - - - - delete from xunfei_text_audio where id = #{id} - - - - delete from xunfei_text_audio where id in - - #{id} - - - \ No newline at end of file diff --git a/ruoyi-admin/pom.xml b/pointlion-admin/pom.xml similarity index 88% rename from ruoyi-admin/pom.xml rename to pointlion-admin/pom.xml index 2da54ee..aa1bd6e 100644 --- a/ruoyi-admin/pom.xml +++ b/pointlion-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + pointlion + com.pointlion 3.8.3 4.0.0 jar - ruoyi-admin + pointlion-admin web服务入口 @@ -64,24 +64,24 @@ - com.ruoyi - ruoyi-framework + com.pointlion + pointlion-framework - com.ruoyi - ruoyi-quartz + com.pointlion + pointlion-quartz - com.ruoyi - ruoyi-generator + com.pointlion + pointlion-generator - com.ruoyi + com.pointlion PointLion diff --git a/ruoyi-admin/src/main/java/com/ruoyi/Application.java b/pointlion-admin/src/main/java/com/pointlion/Application.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/Application.java rename to pointlion-admin/src/main/java/com/pointlion/Application.java index dd55308..e04f286 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/Application.java +++ b/pointlion-admin/src/main/java/com/pointlion/Application.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.pointlion; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 启动程序 * - * @author ruoyi + * @author ry */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, org.flowable.spring.boot.FlowableSecurityAutoConfiguration.class}) @@ -28,5 +28,7 @@ public class Application " | | `\\ | | ' | | ; | ; | | | | ' | | | | `\\ | | | ; ' | '( ) | '( ) | .'.-. | | `\\ | | | `\\ | \n" + " ; '._,' ' ' `-' ; ' `-' | | | ' `-' ; ; '._,' ' ' `-' / ' `-' | ' `-' | ' `-' / ; '._,' ' ; '._,' ' \n" + " '.___.' `.__. `.__.'_. (___) `.__. '.___.' '.__.' `.__,' `.__,' `.__.' '.___.' '.___.' \n"); + + System.out.println("欢迎使用点狮后台管理系统：http://www.dianshixinxi.com"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/PointLionServletInitializer.java b/pointlion-admin/src/main/java/com/pointlion/PointLionServletInitializer.java similarity index 92% rename from ruoyi-admin/src/main/java/com/ruoyi/PointLionServletInitializer.java rename to pointlion-admin/src/main/java/com/pointlion/PointLionServletInitializer.java index ea5f384..265d38d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/PointLionServletInitializer.java +++ b/pointlion-admin/src/main/java/com/pointlion/PointLionServletInitializer.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.pointlion; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -6,7 +6,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 * - * @author ruoyi + * @author ry */ public class PointLionServletInitializer extends SpringBootServletInitializer { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/common/CaptchaController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/common/CaptchaController.java index 7bdfb51..7741cc9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/common/CaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.pointlion.web.controller.common; import java.awt.image.BufferedImage; import java.io.IOException; @@ -11,19 +11,19 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.sign.Base64; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.system.service.ISysConfigService; +import com.pointlion.common.config.PointLionConfig; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.redis.RedisCache; +import com.pointlion.common.utils.sign.Base64; +import com.pointlion.common.utils.uuid.IdUtils; +import com.pointlion.system.service.ISysConfigService; /** * 验证码操作处理 * - * @author ruoyi + * @author ry */ @RestController public class CaptchaController @@ -61,7 +61,7 @@ public class CaptchaController BufferedImage image = null; // 生成验证码 - String captchaType = RuoYiConfig.getCaptchaType(); + String captchaType = PointLionConfig.getCaptchaType(); if ("math".equals(captchaType)) { String capText = captchaProducerMath.createText(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/common/CommonController.java similarity index 88% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/common/CommonController.java index 93802a8..815481c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/common/CommonController.java @@ -1,11 +1,11 @@ -package com.ruoyi.web.controller.common; +package com.pointlion.web.controller.common; import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.utils.file.MimeTypeUtils; +import com.pointlion.common.utils.file.MimeTypeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -15,18 +15,18 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.framework.config.ServerConfig; +import com.pointlion.common.config.PointLionConfig; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.file.FileUploadUtils; +import com.pointlion.common.utils.file.FileUtils; +import com.pointlion.framework.config.ServerConfig; /** * 通用请求处理 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/common") @@ -55,7 +55,7 @@ public class CommonController throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; + String filePath = PointLionConfig.getDownloadPath() + fileName; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); @@ -80,7 +80,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = PointLionConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -107,7 +107,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = PointLionConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file, MimeTypeUtils.MEDIA_EXTENSION); String url = serverConfig.getUrl() + fileName; @@ -136,7 +136,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = PointLionConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); @@ -178,7 +178,7 @@ public class CommonController throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); } // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); + String localPath = PointLionConfig.getProfile(); // 数据库资源地址 String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX); // 下载名称 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/CacheController.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/CacheController.java index d59ad45..bf3ddbc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/CacheController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.pointlion.web.controller.monitor; import java.util.ArrayList; import java.util.Collection; @@ -16,15 +16,15 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysCache; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.domain.SysCache; /** * 缓存监控 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/monitor/cache") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/ServerController.java similarity index 79% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/ServerController.java index cc805ad..25cd86f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/ServerController.java @@ -1,16 +1,16 @@ -package com.ruoyi.web.controller.monitor; +package com.pointlion.web.controller.monitor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.framework.web.domain.Server; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.framework.web.domain.Server; /** * 服务器监控 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/monitor/server") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysLogininforController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysLogininforController.java index 41dcf98..f95f29c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.pointlion.web.controller.monitor; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,19 +10,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.system.domain.SysLogininfor; +import com.pointlion.system.service.ISysLogininforService; /** * 系统访问记录 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/monitor/logininfor") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysOperlogController.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysOperlogController.java index b6ba56b..19b1f76 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.pointlion.web.controller.monitor; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,19 +10,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.system.domain.SysOperLog; +import com.pointlion.system.service.ISysOperLogService; /** * 操作日志记录 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/monitor/operlog") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysUserOnlineController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysUserOnlineController.java index 294318d..261959b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/monitor/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.pointlion.web.controller.monitor; import java.util.ArrayList; import java.util.Collection; @@ -11,22 +11,22 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.core.redis.RedisCache; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.domain.SysUserOnline; +import com.pointlion.system.service.ISysUserOnlineService; /** * 在线用户监控 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/monitor/online") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysConfigController.java similarity index 89% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysConfigController.java index 1a5e20f..3a9f59b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,20 +13,20 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.system.domain.SysConfig; +import com.pointlion.system.service.ISysConfigService; /** * 参数配置 信息操作处理 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/config") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDeptController.java similarity index 91% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDeptController.java index 867ac71..0cf3ae8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.Iterator; import java.util.List; @@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.entity.SysDept; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.service.ISysDeptService; /** * 部门信息 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/dept") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDictDataController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDictDataController.java index 4f4a504..ca5c34d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.ArrayList; import java.util.List; @@ -14,21 +14,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.entity.SysDictData; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.system.service.ISysDictDataService; +import com.pointlion.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/dict/data") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDictTypeController.java similarity index 89% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDictTypeController.java index c5953e5..b99c195 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,20 +13,20 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictTypeService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.entity.SysDictType; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/dict/type") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysIndexController.java similarity index 60% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysIndexController.java index 13007eb..a2838c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysIndexController.java @@ -1,22 +1,22 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.config.PointLionConfig; +import com.pointlion.common.utils.StringUtils; /** * 首页 * - * @author ruoyi + * @author ry */ @RestController public class SysIndexController { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private PointLionConfig pointLionConfig; /** * 访问首页，提示语 @@ -24,6 +24,6 @@ public class SysIndexController @RequestMapping("/") public String index() { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", pointLionConfig.getName(), pointLionConfig.getVersion()); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysLoginController.java similarity index 78% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysLoginController.java index d959a17..4c63330 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.List; import java.util.Set; @@ -7,20 +7,20 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.framework.web.service.SysLoginService; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.system.service.ISysMenuService; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.entity.SysMenu; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.model.LoginBody; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.framework.web.service.SysLoginService; +import com.pointlion.framework.web.service.SysPermissionService; +import com.pointlion.system.service.ISysMenuService; /** * 登录验证 * - * @author ruoyi + * @author ry */ @RestController public class SysLoginController diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysMenuController.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysMenuController.java index 4a9f73f..c02da96 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysMenuService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.entity.SysMenu; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.service.ISysMenuService; /** * 菜单信息 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/menu") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysNoticeController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysNoticeController.java index 4da9f04..e5b4939 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,18 +12,18 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.system.domain.SysNotice; +import com.pointlion.system.service.ISysNoticeService; /** * 公告 信息操作处理 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/notice") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysPostController.java similarity index 88% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysPostController.java index f2b8dbf..f476774 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,20 +13,20 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.system.domain.SysPost; +import com.pointlion.system.service.ISysPostService; /** * 职位信息操作处理 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/post") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysProfileController.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysProfileController.java index 7ea5a1f..c1480df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysProfileController.java @@ -1,5 +1,6 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; +import com.pointlion.common.config.PointLionConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -9,25 +10,24 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.MimeTypeUtils; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysUserService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.file.FileUploadUtils; +import com.pointlion.common.utils.file.MimeTypeUtils; +import com.pointlion.framework.web.service.TokenService; +import com.pointlion.system.service.ISysUserService; /** * 个人信息 业务处理 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/user/profile") @@ -126,7 +126,7 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); + String avatar = FileUploadUtils.upload(PointLionConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) { AjaxResult ajax = AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysRegisterController.java similarity index 69% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysRegisterController.java index fe19249..ee64b18 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysRegisterController.java @@ -1,20 +1,20 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; 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.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.SysRegisterService; -import com.ruoyi.system.service.ISysConfigService; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.model.RegisterBody; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.framework.web.service.SysRegisterService; +import com.pointlion.system.service.ISysConfigService; /** * 注册验证 * - * @author ruoyi + * @author ry */ @RestController public class SysRegisterController extends BaseController diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysRoleController.java similarity index 89% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysRoleController.java index 2abec1b..9e56eda 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,27 +13,27 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.framework.web.service.SysPermissionService; +import com.pointlion.framework.web.service.TokenService; +import com.pointlion.system.domain.SysUserRole; +import com.pointlion.system.service.ISysRoleService; +import com.pointlion.system.service.ISysUserService; /** * 角色信息 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/role") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysUserController.java similarity index 91% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysUserController.java index 660592b..bfdeb01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/system/SysUserController.java @@ -1,10 +1,10 @@ -package com.ruoyi.web.controller.system; +package com.pointlion.web.controller.system; import java.util.List; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.constant.Constants; +import com.pointlion.common.constant.Constants; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -18,25 +18,25 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.system.service.ISysPostService; +import com.pointlion.system.service.ISysRoleService; +import com.pointlion.system.service.ISysUserService; /** * 用户信息 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/system/user") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/tool/SwaggerController.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/tool/SwaggerController.java index f66ca24..e34b8a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/tool/SwaggerController.java @@ -1,15 +1,15 @@ -package com.ruoyi.web.controller.tool; +package com.pointlion.web.controller.tool; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; +import com.pointlion.common.core.controller.BaseController; /** * swagger 接口 * - * @author ruoyi + * @author ry */ @Controller @RequestMapping("/tool/swagger") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/pointlion-admin/src/main/java/com/pointlion/web/controller/tool/TestController.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java rename to pointlion-admin/src/main/java/com/pointlion/web/controller/tool/TestController.java index b4f6bac..8689c13 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/controller/tool/TestController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.tool; +package com.pointlion.web.controller.tool; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.R; +import com.pointlion.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; /** * swagger 用户测试方法 * - * @author ruoyi + * @author ry */ @Api("用户信息管理") @RestController diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/pointlion-admin/src/main/java/com/pointlion/web/core/config/SwaggerConfig.java similarity index 92% rename from ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java rename to pointlion-admin/src/main/java/com/pointlion/web/core/config/SwaggerConfig.java index a53d6f1..7ced969 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/pointlion-admin/src/main/java/com/pointlion/web/core/config/SwaggerConfig.java @@ -1,12 +1,13 @@ -package com.ruoyi.web.core.config; +package com.pointlion.web.core.config; import java.util.ArrayList; import java.util.List; + +import com.pointlion.common.config.PointLionConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.RuoYiConfig; import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; import springfox.documentation.builders.ApiInfoBuilder; @@ -25,14 +26,14 @@ import springfox.documentation.spring.web.plugins.Docket; /** * Swagger2的接口配置 * - * @author ruoyi + * @author ry */ @Configuration public class SwaggerConfig { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private PointLionConfig pointLionConfig; /** 是否开启swagger */ @Value("${swagger.enabled}") @@ -58,7 +59,7 @@ public class SwaggerConfig // 扫描所有有注解的api，用这种方式更灵活 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 扫描指定包中的swagger注解 - // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) + // .apis(RequestHandlerSelectors.basePackage("com.pointlion.project.tool.swagger")) // 扫描所有 .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build() @@ -117,9 +118,9 @@ public class SwaggerConfig // 描述 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 - .contact(new Contact(ruoyiConfig.getName(), null, null)) + .contact(new Contact(pointLionConfig.getName(), null, null)) // 版本 - .version("版本号:" + ruoyiConfig.getVersion()) + .version("版本号:" + pointLionConfig.getVersion()) .build(); } } diff --git a/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties b/pointlion-admin/src/main/resources/META-INF/spring-devtools.properties similarity index 100% rename from ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties rename to pointlion-admin/src/main/resources/META-INF/spring-devtools.properties diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/pointlion-admin/src/main/resources/application-dev.yml similarity index 89% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to pointlion-admin/src/main/resources/application-dev.yml index c3ab0d1..29296c2 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/pointlion-admin/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ # 项目相关配置 -ruoyi: - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath +pointlion: + # 文件路径 示例（ Windows配置D:/pointlion/uploadPath，Linux配置 /home/pointlion/uploadPath） + profile: D:/pointlion/uploadPath # 数据源配置 spring: datasource: @@ -10,7 +10,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3307/dianshixinxi-erp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3307/pointlion-oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: root # 从库数据源 @@ -47,7 +47,7 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi + login-username: pointlion login-password: 123456 filter: stat: diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/pointlion-admin/src/main/resources/application-prod.yml similarity index 94% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to pointlion-admin/src/main/resources/application-prod.yml index 56a2c31..c0f8cb9 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/pointlion-admin/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ # 项目相关配置 -ruoyi: - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） +pointlion: + # 文件路径 示例（ Windows配置D:/pointlion/uploadPath，Linux配置 /home/pointlion/uploadPath） profile: /volume2/docker/work/dianshixinxi-erp/uploadPath # 数据源配置 spring: @@ -12,7 +12,7 @@ spring: master: url: jdbc:mysql://localhost:3306/dianshixinxi-erp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: 8596729401a + password: root # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -47,7 +47,7 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi + login-username: pointlion login-password: 123456 filter: stat: diff --git a/ruoyi-admin/src/main/resources/application.yml b/pointlion-admin/src/main/resources/application.yml similarity index 94% rename from ruoyi-admin/src/main/resources/application.yml rename to pointlion-admin/src/main/resources/application.yml index 448f3a4..05516af 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/pointlion-admin/src/main/resources/application.yml @@ -1,7 +1,7 @@ # 项目相关配置 -ruoyi: +pointlion: # 名称 - name: RuoYi + name: PointLion # 版本 version: 3.8.3 # 版权年份 @@ -34,7 +34,7 @@ server: # 日志配置 logging: level: - com.ruoyi: debug + com.pointlion: debug org.springframework: warn # Spring配置 @@ -53,7 +53,7 @@ token: # MyBatis配置 mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.pointlion.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/pointlion-admin/src/main/resources/banner.txt similarity index 95% rename from ruoyi-admin/src/main/resources/banner.txt rename to pointlion-admin/src/main/resources/banner.txt index 6d2bbce..62c5f1b 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/pointlion-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi.version} +Application Version: ${pointlion.version} Spring Boot Version: ${spring-boot.version} _ (`-. .-') _ .-') _ .-') _ diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/pointlion-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to pointlion-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/logback.xml b/pointlion-admin/src/main/resources/logback.xml similarity index 98% rename from ruoyi-admin/src/main/resources/logback.xml rename to pointlion-admin/src/main/resources/logback.xml index 88c4190..4adb7b6 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/pointlion-admin/src/main/resources/logback.xml @@ -72,7 +72,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/pointlion-admin/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml rename to pointlion-admin/src/main/resources/mybatis/mybatis-config.xml diff --git a/ruoyi-common/pom.xml b/pointlion-common/pom.xml similarity index 96% rename from ruoyi-common/pom.xml rename to pointlion-common/pom.xml index a73de89..3bc90a3 100644 --- a/ruoyi-common/pom.xml +++ b/pointlion-common/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + pointlion + com.pointlion 3.8.3 4.0.0 - ruoyi-common + pointlion-common common通用工具 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java b/pointlion-common/src/main/java/com/pointlion/common/annotation/Anonymous.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java rename to pointlion-common/src/main/java/com/pointlion/common/annotation/Anonymous.java index 1d6d4f4..fa3d330 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java +++ b/pointlion-common/src/main/java/com/pointlion/common/annotation/Anonymous.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.pointlion.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 匿名访问不鉴权注解 * - * @author ruoyi + * @author ry */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/pointlion-common/src/main/java/com/pointlion/common/annotation/DataScope.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java rename to pointlion-common/src/main/java/com/pointlion/common/annotation/DataScope.java index 176878e..1f5fb77 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/pointlion-common/src/main/java/com/pointlion/common/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.pointlion.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 数据权限过滤注解 * - * @author ruoyi + * @author ry */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/pointlion-common/src/main/java/com/pointlion/common/annotation/DataSource.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java rename to pointlion-common/src/main/java/com/pointlion/common/annotation/DataSource.java index 79cd191..e1d75c9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java +++ b/pointlion-common/src/main/java/com/pointlion/common/annotation/DataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.pointlion.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -6,14 +6,14 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.DataSourceType; +import com.pointlion.common.enums.DataSourceType; /** * 自定义多数据源切换注解 * * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准 * - * @author ruoyi + * @author ry */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/pointlion-common/src/main/java/com/pointlion/common/annotation/Excel.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java rename to pointlion-common/src/main/java/com/pointlion/common/annotation/Excel.java index 6626986..25e9eb9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/pointlion-common/src/main/java/com/pointlion/common/annotation/Excel.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.pointlion.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,12 +7,12 @@ import java.lang.annotation.Target; import java.math.BigDecimal; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; -import com.ruoyi.common.utils.poi.ExcelHandlerAdapter; +import com.pointlion.common.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 * - * @author ruoyi + * @author ry */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/pointlion-common/src/main/java/com/pointlion/common/annotation/Excels.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java rename to pointlion-common/src/main/java/com/pointlion/common/annotation/Excels.java index 1f1cc81..4741f8e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java +++ b/pointlion-common/src/main/java/com/pointlion/common/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.pointlion.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * Excel注解集 * - * @author ruoyi + * @author ry */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/pointlion-common/src/main/java/com/pointlion/common/annotation/Log.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to pointlion-common/src/main/java/com/pointlion/common/annotation/Log.java index ca02c6c..a6ef380 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/pointlion-common/src/main/java/com/pointlion/common/annotation/Log.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.annotation; +package com.pointlion.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.enums.OperatorType; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author ry * */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/pointlion-common/src/main/java/com/pointlion/common/annotation/RateLimiter.java similarity index 81% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java rename to pointlion-common/src/main/java/com/pointlion/common/annotation/RateLimiter.java index 0f024c7..94818e4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java +++ b/pointlion-common/src/main/java/com/pointlion/common/annotation/RateLimiter.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.annotation; +package com.pointlion.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.enums.LimitType; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.enums.LimitType; /** * 限流注解 * - * @author ruoyi + * @author ry */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/pointlion-common/src/main/java/com/pointlion/common/annotation/RepeatSubmit.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to pointlion-common/src/main/java/com/pointlion/common/annotation/RepeatSubmit.java index b769748..1ddfd55 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ b/pointlion-common/src/main/java/com/pointlion/common/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.pointlion.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义注解防止表单重复提交 * - * @author ruoyi + * @author ry * */ @Inherited diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/pointlion-common/src/main/java/com/pointlion/common/config/PointLionConfig.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to pointlion-common/src/main/java/com/pointlion/common/config/PointLionConfig.java index 00f70f6..3e5ab43 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/pointlion-common/src/main/java/com/pointlion/common/config/PointLionConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config; +package com.pointlion.common.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -6,11 +6,11 @@ import org.springframework.stereotype.Component; /** * 读取项目相关配置 * - * @author ruoyi + * @author ry */ @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig +@ConfigurationProperties(prefix = "pointlion") +public class PointLionConfig { /** 项目名称 */ private String name; @@ -80,7 +80,7 @@ public class RuoYiConfig public void setProfile(String profile) { - RuoYiConfig.profile = profile; + PointLionConfig.profile = profile; } public static boolean isAddressEnabled() @@ -90,7 +90,7 @@ public class RuoYiConfig public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + PointLionConfig.addressEnabled = addressEnabled; } public static String getCaptchaType() { @@ -98,7 +98,7 @@ public class RuoYiConfig } public void setCaptchaType(String captchaType) { - RuoYiConfig.captchaType = captchaType; + PointLionConfig.captchaType = captchaType; } /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/pointlion-common/src/main/java/com/pointlion/common/constant/CacheConstants.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java rename to pointlion-common/src/main/java/com/pointlion/common/constant/CacheConstants.java index 7345fe4..388293c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/pointlion-common/src/main/java/com/pointlion/common/constant/CacheConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.pointlion.common.constant; /** * 缓存的key 常量 * - * @author ruoyi + * @author ry */ public class CacheConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/pointlion-common/src/main/java/com/pointlion/common/constant/Constants.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to pointlion-common/src/main/java/com/pointlion/common/constant/Constants.java index b92440a..0f2bf84 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/pointlion-common/src/main/java/com/pointlion/common/constant/Constants.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.constant; +package com.pointlion.common.constant; import io.jsonwebtoken.Claims; /** * 通用常量信息 * - * @author ruoyi + * @author ry */ public class Constants { @@ -127,13 +127,13 @@ public class Constants /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" }; + public static final String[] JOB_WHITELIST_STR = { "com.pointlion" }; /** * 定时任务违规的字符 */ public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", - "org.springframework", "org.apache", "com.ruoyi.common.utils.file" }; + "org.springframework", "org.apache", "com.pointlion.common.utils.file" }; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/pointlion-common/src/main/java/com/pointlion/common/constant/GenConstants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to pointlion-common/src/main/java/com/pointlion/common/constant/GenConstants.java index 7d899d4..7958295 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/pointlion-common/src/main/java/com/pointlion/common/constant/GenConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.pointlion.common.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author ry */ public class GenConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/pointlion-common/src/main/java/com/pointlion/common/constant/HttpStatus.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to pointlion-common/src/main/java/com/pointlion/common/constant/HttpStatus.java index d60afee..5419aed 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/pointlion-common/src/main/java/com/pointlion/common/constant/HttpStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.pointlion.common.constant; /** * 返回状态码 * - * @author ruoyi + * @author ry */ public class HttpStatus { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/pointlion-common/src/main/java/com/pointlion/common/constant/ScheduleConstants.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to pointlion-common/src/main/java/com/pointlion/common/constant/ScheduleConstants.java index 62ad815..9cd7a11 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/pointlion-common/src/main/java/com/pointlion/common/constant/ScheduleConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.pointlion.common.constant; /** * 任务调度通用常量 * - * @author ruoyi + * @author ry */ public class ScheduleConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/pointlion-common/src/main/java/com/pointlion/common/constant/UserConstants.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to pointlion-common/src/main/java/com/pointlion/common/constant/UserConstants.java index 4ed6009..545b3d4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/pointlion-common/src/main/java/com/pointlion/common/constant/UserConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.pointlion.common.constant; /** * 用户常量信息 * - * @author ruoyi + * @author ry */ public class UserConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/pointlion-common/src/main/java/com/pointlion/common/core/controller/BaseController.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to pointlion-common/src/main/java/com/pointlion/common/core/controller/BaseController.java index f3a290e..a3eb750 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/controller/BaseController.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.controller; +package com.pointlion.common.core.controller; import java.beans.PropertyEditorSupport; import java.util.Date; @@ -6,21 +6,21 @@ import java.util.List; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.*; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.pointlion.common.constant.HttpStatus; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.core.page.PageDomain; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.core.page.TableSupport; +import com.pointlion.common.utils.sql.SqlUtil; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; /** * web层通用数据处理 * - * @author ruoyi + * @author ry */ public class BaseController { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/AjaxResult.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/AjaxResult.java index 4950bd0..8b98674 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/AjaxResult.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain; +package com.pointlion.common.core.domain; import java.util.HashMap; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.constant.HttpStatus; +import com.pointlion.common.utils.StringUtils; /** * 操作消息提醒 * - * @author ruoyi + * @author ry */ public class AjaxResult extends HashMap { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/BaseEntity.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/BaseEntity.java index f7d5bf4..afa2682 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.pointlion.common.core.domain; import java.io.Serializable; import java.util.Date; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; /** * Entity基类 * - * @author ruoyi + * @author ry */ public class BaseEntity implements Serializable { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/R.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/R.java index c3df6ae..ebc2fb6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/R.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain; +package com.pointlion.common.core.domain; import java.io.Serializable; -import com.ruoyi.common.constant.HttpStatus; +import com.pointlion.common.constant.HttpStatus; /** * 响应信息主体 * - * @author ruoyi + * @author ry */ public class R implements Serializable { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/TreeEntity.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/TreeEntity.java index a180a18..73dd995 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.pointlion.common.core.domain; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * Tree基类 * - * @author ruoyi + * @author ry */ public class TreeEntity extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/TreeSelect.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/TreeSelect.java index bd835db..199b868 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/TreeSelect.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.core.domain; +package com.pointlion.common.core.domain; import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysMenu; +import com.pointlion.common.core.domain.entity.SysDept; +import com.pointlion.common.core.domain.entity.SysMenu; /** * Treeselect树结构实体类 * - * @author ruoyi + * @author ry */ public class TreeSelect implements Serializable { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDept.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDept.java index fb18c5c..6b2707b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.pointlion.common.core.domain.entity; import java.util.ArrayList; import java.util.List; @@ -8,12 +8,12 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.core.domain.BaseEntity; /** * 部门表 sys_dept * - * @author ruoyi + * @author ry */ public class SysDept extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDictData.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDictData.java index 3f152b3..83639d7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDictData.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.core.domain.entity; +package com.pointlion.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.domain.BaseEntity; /** * 字典数据表 sys_dict_data * - * @author ruoyi + * @author ry */ public class SysDictData extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDictType.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDictType.java index e324fcf..03f206e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysDictType.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.core.domain.entity; +package com.pointlion.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.core.domain.BaseEntity; /** * 字典类型表 sys_dict_type * - * @author ruoyi + * @author ry */ public class SysDictType extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysMenu.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysMenu.java index 042bc76..92e9a79 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.pointlion.common.core.domain.entity; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,12 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.core.domain.BaseEntity; /** * 菜单权限表 sys_menu * - * @author ruoyi + * @author ry */ public class SysMenu extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysRole.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysRole.java index 36629eb..27ce0e5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysRole.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.core.domain.entity; +package com.pointlion.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.core.domain.BaseEntity; /** * 角色表 sys_role * - * @author ruoyi + * @author ry */ public class SysRole extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysUser.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysUser.java index 72c33fc..39a91ac 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/entity/SysUser.java @@ -1,21 +1,21 @@ -package com.ruoyi.common.core.domain.entity; +package com.pointlion.common.core.domain.entity; import java.util.Date; import java.util.List; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.xss.Xss; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.annotation.Excel.Type; +import com.pointlion.common.annotation.Excels; +import com.pointlion.common.core.domain.BaseEntity; +import com.pointlion.common.xss.Xss; /** * 用户对象 sys_user * - * @author ruoyi + * @author ry */ public class SysUser extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/model/LoginBody.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/model/LoginBody.java index b5bc8c8..16655b3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/model/LoginBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.model; +package com.pointlion.common.core.domain.model; /** * 用户登录对象 * - * @author ruoyi + * @author ry */ public class LoginBody { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/model/LoginUser.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/model/LoginUser.java index e485384..a15a266 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/model/LoginUser.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.core.domain.model; +package com.pointlion.common.core.domain.model; import java.util.Collection; import java.util.Set; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import com.alibaba.fastjson2.annotation.JSONField; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.entity.SysUser; /** * 登录用户身份权限 * - * @author ruoyi + * @author ry */ public class LoginUser implements UserDetails { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/pointlion-common/src/main/java/com/pointlion/common/core/domain/model/RegisterBody.java similarity index 57% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java rename to pointlion-common/src/main/java/com/pointlion/common/core/domain/model/RegisterBody.java index 868a1fc..df34db7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/domain/model/RegisterBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.model; +package com.pointlion.common.core.domain.model; /** * 用户注册对象 * - * @author ruoyi + * @author ry */ public class RegisterBody extends LoginBody { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/pointlion-common/src/main/java/com/pointlion/common/core/page/PageDomain.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java rename to pointlion-common/src/main/java/com/pointlion/common/core/page/PageDomain.java index 59633af..bf450cc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/page/PageDomain.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.page; +package com.pointlion.common.core.page; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.utils.StringUtils; /** * 分页数据 * - * @author ruoyi + * @author ry */ public class PageDomain { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/pointlion-common/src/main/java/com/pointlion/common/core/page/TableDataInfo.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to pointlion-common/src/main/java/com/pointlion/common/core/page/TableDataInfo.java index 847685b..c7c8904 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.page; +package com.pointlion.common.core.page; import java.io.Serializable; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 表格分页数据对象 * - * @author ruoyi + * @author ry */ public class TableDataInfo implements Serializable { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/pointlion-common/src/main/java/com/pointlion/common/core/page/TableSupport.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java rename to pointlion-common/src/main/java/com/pointlion/common/core/page/TableSupport.java index a120c30..6060281 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/page/TableSupport.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.page; +package com.pointlion.common.core.page; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.ServletUtils; +import com.pointlion.common.core.text.Convert; +import com.pointlion.common.utils.ServletUtils; /** * 表格数据处理 * - * @author ruoyi + * @author ry */ public class TableSupport { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/pointlion-common/src/main/java/com/pointlion/common/core/redis/RedisCache.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java rename to pointlion-common/src/main/java/com/pointlion/common/core/redis/RedisCache.java index de4a9d4..e1db106 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/redis/RedisCache.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.redis; +package com.pointlion.common.core.redis; import java.util.Collection; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; /** * spring redis 工具类 * - * @author ruoyi + * @author ry **/ @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/pointlion-common/src/main/java/com/pointlion/common/core/text/CharsetKit.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to pointlion-common/src/main/java/com/pointlion/common/core/text/CharsetKit.java index 84124aa..9369ea7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/text/CharsetKit.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.text; +package com.pointlion.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * 字符集工具类 * - * @author ruoyi + * @author ry */ public class CharsetKit { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/pointlion-common/src/main/java/com/pointlion/common/core/text/Convert.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java rename to pointlion-common/src/main/java/com/pointlion/common/core/text/Convert.java index 32200ee..acb7d0f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.pointlion.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -6,13 +6,13 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; /** * 类型转换器 * - * @author ruoyi + * @author ry */ public class Convert { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/pointlion-common/src/main/java/com/pointlion/common/core/text/StrFormatter.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to pointlion-common/src/main/java/com/pointlion/common/core/text/StrFormatter.java index c78ac77..4da7c89 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/pointlion-common/src/main/java/com/pointlion/common/core/text/StrFormatter.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.text; +package com.pointlion.common.core.text; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * 字符串格式化 * - * @author ruoyi + * @author ry */ public class StrFormatter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/pointlion-common/src/main/java/com/pointlion/common/enums/BusinessStatus.java similarity index 74% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to pointlion-common/src/main/java/com/pointlion/common/enums/BusinessStatus.java index 10b7306..d17bd6d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/pointlion-common/src/main/java/com/pointlion/common/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.pointlion.common.enums; /** * 操作状态 * - * @author ruoyi + * @author ry * */ public enum BusinessStatus diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/pointlion-common/src/main/java/com/pointlion/common/enums/BusinessType.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to pointlion-common/src/main/java/com/pointlion/common/enums/BusinessType.java index c0b64ef..f8be2bc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/pointlion-common/src/main/java/com/pointlion/common/enums/BusinessType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.pointlion.common.enums; /** * 业务操作类型 * - * @author ruoyi + * @author ry */ public enum BusinessType { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/pointlion-common/src/main/java/com/pointlion/common/enums/DataSourceType.java similarity index 73% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java rename to pointlion-common/src/main/java/com/pointlion/common/enums/DataSourceType.java index 0d945be..6bdbdab 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java +++ b/pointlion-common/src/main/java/com/pointlion/common/enums/DataSourceType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.pointlion.common.enums; /** * 数据源 * - * @author ruoyi + * @author ry */ public enum DataSourceType { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/pointlion-common/src/main/java/com/pointlion/common/enums/HttpMethod.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to pointlion-common/src/main/java/com/pointlion/common/enums/HttpMethod.java index be6f739..28b3260 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/pointlion-common/src/main/java/com/pointlion/common/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.pointlion.common.enums; import java.util.HashMap; import java.util.Map; @@ -7,7 +7,7 @@ import org.springframework.lang.Nullable; /** * 请求方式 * - * @author ruoyi + * @author ry */ public enum HttpMethod { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/pointlion-common/src/main/java/com/pointlion/common/enums/LimitType.java similarity index 77% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java rename to pointlion-common/src/main/java/com/pointlion/common/enums/LimitType.java index c609fd8..fcfdfa7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java +++ b/pointlion-common/src/main/java/com/pointlion/common/enums/LimitType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.pointlion.common.enums; /** * 限流类型 * - * @author ruoyi + * @author ry */ public enum LimitType diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/pointlion-common/src/main/java/com/pointlion/common/enums/OperatorType.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to pointlion-common/src/main/java/com/pointlion/common/enums/OperatorType.java index bdd143c..8614bb8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/pointlion-common/src/main/java/com/pointlion/common/enums/OperatorType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.pointlion.common.enums; /** * 操作人类别 * - * @author ruoyi + * @author ry */ public enum OperatorType { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/pointlion-common/src/main/java/com/pointlion/common/enums/UserStatus.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to pointlion-common/src/main/java/com/pointlion/common/enums/UserStatus.java index d7ff44a..ddc384d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/pointlion-common/src/main/java/com/pointlion/common/enums/UserStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.pointlion.common.enums; /** * 用户状态 * - * @author ruoyi + * @author ry */ public enum UserStatus { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/DemoModeException.java similarity index 78% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/DemoModeException.java index f6ad2ab..b9e47fa 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/DemoModeException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.pointlion.common.exception; /** * 演示模式异常 * - * @author ruoyi + * @author ry */ public class DemoModeException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/GlobalException.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/GlobalException.java index 211441b..53d7c77 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/GlobalException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.pointlion.common.exception; /** * 全局异常 * - * @author ruoyi + * @author ry */ public class GlobalException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/ServiceException.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/ServiceException.java index 6297f87..cb25ba1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/ServiceException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.pointlion.common.exception; /** * 业务异常 * - * @author ruoyi + * @author ry */ public final class ServiceException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/UtilException.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/UtilException.java index 980fa46..9756850 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/UtilException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.pointlion.common.exception; /** * 工具类异常 * - * @author ruoyi + * @author ry */ public class UtilException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/base/BaseException.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/base/BaseException.java index b55d72e..374f077 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/base/BaseException.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.exception.base; +package com.pointlion.common.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.MessageUtils; +import com.pointlion.common.utils.StringUtils; /** * 基础异常 * - * @author ruoyi + * @author ry */ public class BaseException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/file/FileException.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/file/FileException.java index 871f09b..9f1b8dd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/file/FileException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.file; +package com.pointlion.common.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.pointlion.common.exception.base.BaseException; /** * 文件信息异常类 * - * @author ruoyi + * @author ry */ public class FileException extends BaseException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/file/FileNameLengthLimitExceededException.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/file/FileNameLengthLimitExceededException.java index 70e0ec9..95cb1f3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.pointlion.common.exception.file; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author ry */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/file/FileSizeLimitExceededException.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/file/FileSizeLimitExceededException.java index ec6ab05..d41681c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/file/FileSizeLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.pointlion.common.exception.file; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author ry */ public class FileSizeLimitExceededException extends FileException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/file/InvalidExtensionException.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/file/InvalidExtensionException.java index 8b2af16..25f95d9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/file/InvalidExtensionException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.pointlion.common.exception.file; import java.util.Arrays; import org.apache.commons.fileupload.FileUploadException; @@ -6,7 +6,7 @@ import org.apache.commons.fileupload.FileUploadException; /** * 文件上传 误异常类 * - * @author ruoyi + * @author ry */ public class InvalidExtensionException extends FileUploadException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/job/TaskException.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/job/TaskException.java index a567b40..c8fa8c5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/job/TaskException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.job; +package com.pointlion.common.exception.job; /** * 计划策略异常 * - * @author ruoyi + * @author ry */ public class TaskException extends Exception { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/user/CaptchaException.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/user/CaptchaException.java index 389dbc7..5cae0b1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/user/CaptchaException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.pointlion.common.exception.user; /** * 验证码错误异常类 * - * @author ruoyi + * @author ry */ public class CaptchaException extends UserException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/user/CaptchaExpireException.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/user/CaptchaExpireException.java index 85f9486..15ce373 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/user/CaptchaExpireException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.pointlion.common.exception.user; /** * 验证码失效异常类 * - * @author ruoyi + * @author ry */ public class CaptchaExpireException extends UserException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/user/UserException.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/user/UserException.java index c292d70..0c95807 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/user/UserException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.user; +package com.pointlion.common.exception.user; -import com.ruoyi.common.exception.base.BaseException; +import com.pointlion.common.exception.base.BaseException; /** * 用户信息异常类 * - * @author ruoyi + * @author ry */ public class UserException extends BaseException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/pointlion-common/src/main/java/com/pointlion/common/exception/user/UserPasswordNotMatchException.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to pointlion-common/src/main/java/com/pointlion/common/exception/user/UserPasswordNotMatchException.java index a7f3e5f..da6624e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/pointlion-common/src/main/java/com/pointlion/common/exception/user/UserPasswordNotMatchException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.pointlion.common.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author ruoyi + * @author ry */ public class UserPasswordNotMatchException extends UserException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/pointlion-common/src/main/java/com/pointlion/common/filter/RepeatableFilter.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to pointlion-common/src/main/java/com/pointlion/common/filter/RepeatableFilter.java index a1bcfe2..625edcc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/pointlion-common/src/main/java/com/pointlion/common/filter/RepeatableFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.pointlion.common.filter; import java.io.IOException; import javax.servlet.Filter; @@ -9,12 +9,12 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * Repeatable 过滤器 * - * @author ruoyi + * @author ry */ public class RepeatableFilter implements Filter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/pointlion-common/src/main/java/com/pointlion/common/filter/RepeatedlyRequestWrapper.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to pointlion-common/src/main/java/com/pointlion/common/filter/RepeatedlyRequestWrapper.java index 407d1ba..1192c24 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/pointlion-common/src/main/java/com/pointlion/common/filter/RepeatedlyRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.pointlion.common.filter; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -9,13 +9,13 @@ import javax.servlet.ServletInputStream; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.common.constant.Constants; +import com.pointlion.common.utils.http.HttpHelper; +import com.pointlion.common.constant.Constants; /** * 构建可重复读取inputStream的request * - * @author ruoyi + * @author ry */ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/pointlion-common/src/main/java/com/pointlion/common/filter/XssFilter.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to pointlion-common/src/main/java/com/pointlion/common/filter/XssFilter.java index 9052f0d..b39adee 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/pointlion-common/src/main/java/com/pointlion/common/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.pointlion.common.filter; import java.io.IOException; import java.util.ArrayList; @@ -11,13 +11,13 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.enums.HttpMethod; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.enums.HttpMethod; /** * 防止XSS攻击的过滤器 * - * @author ruoyi + * @author ry */ public class XssFilter implements Filter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/pointlion-common/src/main/java/com/pointlion/common/filter/XssHttpServletRequestWrapper.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to pointlion-common/src/main/java/com/pointlion/common/filter/XssHttpServletRequestWrapper.java index b1eeb65..e337892 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/pointlion-common/src/main/java/com/pointlion/common/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.pointlion.common.filter; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -9,13 +9,13 @@ import javax.servlet.http.HttpServletRequestWrapper; import org.apache.commons.io.IOUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.html.EscapeUtil; /** * XSS过滤处理 * - * @author ruoyi + * @author ry */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/pointlion-common/src/main/java/com/pointlion/common/utils/Arith.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/Arith.java index b6326c2..4e0ff96 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/Arith.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import java.math.BigDecimal; import java.math.RoundingMode; @@ -6,7 +6,7 @@ import java.math.RoundingMode; /** * 精确的浮点数运算 * - * @author ruoyi + * @author ry */ public class Arith { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/DateUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/DateUtils.java index 5e7b86c..f14fc25 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; /** * 时间工具类 * - * @author ruoyi + * @author ry */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/DictUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/DictUtils.java index cc5eab2..ce513ae 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/DictUtils.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import java.util.Collection; import java.util.List; import com.alibaba.fastjson2.JSONArray; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.core.domain.entity.SysDictData; +import com.pointlion.common.core.redis.RedisCache; +import com.pointlion.common.utils.spring.SpringUtils; /** * 字典工具类 * - * @author ruoyi + * @author ry */ public class DictUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/pointlion-common/src/main/java/com/pointlion/common/utils/ExceptionUtil.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/ExceptionUtil.java index 214e4a0..8ed8ca7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import java.io.PrintWriter; import java.io.StringWriter; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; /** * 错误信息处理类。 * - * @author ruoyi + * @author ry */ public class ExceptionUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/LogUtils.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/LogUtils.java index 0de30c6..607937f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/LogUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; /** * 处理并记录日志文件 * - * @author ruoyi + * @author ry */ public class LogUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/MessageUtils.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/MessageUtils.java index 7dac75a..ab6f897 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/MessageUtils.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.pointlion.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 * - * @author ruoyi + * @author ry */ public class MessageUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/PageUtils.java similarity index 78% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/PageUtils.java index 70e9b08..9990366 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/PageUtils.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.pointlion.common.core.page.PageDomain; +import com.pointlion.common.core.page.TableSupport; +import com.pointlion.common.utils.sql.SqlUtil; /** * 分页工具类 * - * @author ruoyi + * @author ry */ public class PageUtils extends PageHelper { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/SecurityUtils.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/SecurityUtils.java index a6f3d53..83bcab1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/SecurityUtils.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.ServiceException; +import com.pointlion.common.constant.HttpStatus; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.exception.ServiceException; /** * 安全服务工具类 * - * @author ruoyi + * @author ry */ public class SecurityUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/ServletUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/ServletUtils.java index 1c19b4e..644489c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -10,13 +10,13 @@ import javax.servlet.http.HttpSession; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.Convert; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.core.text.Convert; /** * 客户端工具类 * - * @author ruoyi + * @author ry */ public class ServletUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/StringUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/StringUtils.java index 6b70889..047ec04 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import java.util.ArrayList; import java.util.Collection; @@ -7,13 +7,13 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.springframework.util.AntPathMatcher; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.StrFormatter; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.core.text.StrFormatter; /** * 字符串工具类 * - * @author ruoyi + * @author ry */ public class StringUtils extends org.apache.commons.lang3.StringUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/pointlion-common/src/main/java/com/pointlion/common/utils/Threads.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/Threads.java index 71fe6d5..6daa773 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.pointlion.common.utils; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; /** * 线程相关工具类. * - * @author ruoyi + * @author ry */ public class Threads { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/bean/BeanUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/bean/BeanUtils.java index 4463662..bfb8e42 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.pointlion.common.utils.bean; import java.lang.reflect.Method; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Bean 工具类 * - * @author ruoyi + * @author ry */ public class BeanUtils extends org.springframework.beans.BeanUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java b/pointlion-common/src/main/java/com/pointlion/common/utils/bean/BeanValidators.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/bean/BeanValidators.java index 80bfed7..a0e8205 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/bean/BeanValidators.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.pointlion.common.utils.bean; import java.util.Set; import javax.validation.ConstraintViolation; @@ -8,7 +8,7 @@ import javax.validation.Validator; /** * bean对象属性验证 * - * @author ruoyi + * @author ry */ public class BeanValidators { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/file/FileTypeUtils.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/file/FileTypeUtils.java index 68130b9..5d96164 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/file/FileTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.pointlion.common.utils.file; import java.io.File; import org.apache.commons.lang3.StringUtils; @@ -6,14 +6,14 @@ import org.apache.commons.lang3.StringUtils; /** * 文件类型工具类 * - * @author ruoyi + * @author ry */ public class FileTypeUtils { /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: pointlion.txt, 返回: txt * * @param file 文件名 * @return 后缀（不含".") @@ -30,7 +30,7 @@ public class FileTypeUtils /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: pointlion.txt, 返回: txt * * @param fileName 文件名 * @return 后缀（不含".") diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/file/FileUploadUtils.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/file/FileUploadUtils.java index b8cc88d..a3670e7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/file/FileUploadUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.pointlion.common.utils.file; import java.io.File; import java.io.IOException; @@ -6,19 +6,19 @@ import java.nio.file.Paths; import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.exception.file.InvalidExtensionException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.Seq; +import com.pointlion.common.config.PointLionConfig; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.exception.file.FileNameLengthLimitExceededException; +import com.pointlion.common.exception.file.FileSizeLimitExceededException; +import com.pointlion.common.exception.file.InvalidExtensionException; +import com.pointlion.common.utils.DateUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.uuid.Seq; /** * 文件上传工具类 * - * @author ruoyi + * @author ry */ public class FileUploadUtils { @@ -35,7 +35,7 @@ public class FileUploadUtils /** * 默认上传的地址 */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); + private static String defaultBaseDir = PointLionConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { @@ -163,7 +163,7 @@ public class FileUploadUtils public static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + int dirLastIndex = PointLionConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/file/FileUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/file/FileUtils.java index f844270..10ed1c9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.pointlion.common.utils.file; import java.io.File; import java.io.FileInputStream; @@ -13,16 +13,16 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; +import com.pointlion.common.config.PointLionConfig; +import com.pointlion.common.utils.DateUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.uuid.IdUtils; import org.apache.commons.io.FilenameUtils; /** * 文件处理工具类 * - * @author ruoyi + * @author ry */ public class FileUtils { @@ -73,7 +73,7 @@ public class FileUtils */ public static String writeImportBytes(byte[] data) throws IOException { - return writeBytes(data, RuoYiConfig.getImportPath()); + return writeBytes(data, PointLionConfig.getImportPath()); } /** @@ -257,7 +257,7 @@ public class FileUtils } /** - * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png + * 获取文件名称 /profile/upload/2022/04/16/pointlion.png -- pointlion.png * * @param fileName 路径名称 * @return 没有文件路径的名称 @@ -275,7 +275,7 @@ public class FileUtils } /** - * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi + * 获取不带后缀文件名称 /profile/upload/2022/04/16/pointlion.png -- pointlion * * @param fileName 路径名称 * @return 没有文件路径和后缀的名称 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/file/ImageUtils.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/file/ImageUtils.java index 432dfda..05cca14 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/file/ImageUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.pointlion.common.utils.file; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -9,14 +9,14 @@ import java.util.Arrays; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.config.PointLionConfig; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.utils.StringUtils; /** * 图片处理工具类 * - * @author ruoyi + * @author ry */ public class ImageUtils { @@ -79,7 +79,7 @@ public class ImageUtils else { // 本机地址 - String localPath = RuoYiConfig.getProfile(); + String localPath = PointLionConfig.getProfile(); String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); in = new FileInputStream(downloadPath); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/file/MimeTypeUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/file/MimeTypeUtils.java index f968f1a..f699ffb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/file/MimeTypeUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.file; +package com.pointlion.common.utils.file; /** * 媒体类型工具类 * - * @author ruoyi + * @author ry */ public class MimeTypeUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/pointlion-common/src/main/java/com/pointlion/common/utils/html/EscapeUtil.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/html/EscapeUtil.java index f52e83e..0f80f8f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/html/EscapeUtil.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.html; +package com.pointlion.common.utils.html; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * 转义和反转义工具类 * - * @author ruoyi + * @author ry */ public class EscapeUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/pointlion-common/src/main/java/com/pointlion/common/utils/html/HTMLFilter.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/html/HTMLFilter.java index db069bc..0d7c27d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.html; +package com.pointlion.common.utils.html; import java.util.ArrayList; import java.util.Collections; @@ -13,7 +13,7 @@ import java.util.regex.Pattern; /** * HTML过滤器，用于去除XSS漏洞隐患。 * - * @author ruoyi + * @author ry */ public final class HTMLFilter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/pointlion-common/src/main/java/com/pointlion/common/utils/http/HttpHelper.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/http/HttpHelper.java index 589d123..c79df39 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/http/HttpHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.pointlion.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory; /** * 通用http工具封装 * - * @author ruoyi + * @author ry */ public class HttpHelper { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/http/HttpUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/http/HttpUtils.java index f85c82c..966aa60 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/http/HttpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.pointlion.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -19,13 +19,13 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.utils.StringUtils; /** * 通用http发送方法 * - * @author ruoyi + * @author ry */ public class HttpUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/ip/AddressUtils.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/ip/AddressUtils.java index edfe419..e771366 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/ip/AddressUtils.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.utils.ip; +package com.pointlion.common.utils.ip; +import com.pointlion.common.config.PointLionConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpUtils; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.http.HttpUtils; /** * 获取地址类 * - * @author ruoyi + * @author ry */ public class AddressUtils { @@ -31,7 +31,7 @@ public class AddressUtils { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) + if (PointLionConfig.isAddressEnabled()) { try { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/ip/IpUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/ip/IpUtils.java index c18c56a..b26a467 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/ip/IpUtils.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.utils.ip; +package com.pointlion.common.utils.ip; import java.net.InetAddress; import java.net.UnknownHostException; import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * 获取IP方法 * - * @author ruoyi + * @author ry */ public class IpUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/pointlion-common/src/main/java/com/pointlion/common/utils/poi/ExcelHandlerAdapter.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/poi/ExcelHandlerAdapter.java index 5ea74c1..39eaf44 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/poi/ExcelHandlerAdapter.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.poi; +package com.pointlion.common.utils.poi; /** * Excel数据格式处理适配器 * - * @author ruoyi + * @author ry */ public interface ExcelHandlerAdapter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/pointlion-common/src/main/java/com/pointlion/common/utils/poi/ExcelUtil.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/poi/ExcelUtil.java index 26a33ce..26f6e82 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.pointlion.common.utils.poi; import java.io.File; import java.io.FileOutputStream; @@ -22,6 +22,8 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import com.pointlion.common.config.PointLionConfig; import org.apache.commons.lang3.RegExUtils; import org.apache.poi.hssf.usermodel.HSSFClientAnchor; import org.apache.poi.hssf.usermodel.HSSFPicture; @@ -64,26 +66,25 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileTypeUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.file.ImageUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.annotation.Excel.Type; +import com.pointlion.common.annotation.Excels; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.text.Convert; +import com.pointlion.common.exception.UtilException; +import com.pointlion.common.utils.DateUtils; +import com.pointlion.common.utils.DictUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.file.FileTypeUtils; +import com.pointlion.common.utils.file.FileUtils; +import com.pointlion.common.utils.file.ImageUtils; +import com.pointlion.common.utils.reflect.ReflectUtils; /** * Excel相关处理 * - * @author ruoyi + * @author ry */ public class ExcelUtil { @@ -1097,7 +1098,7 @@ public class ExcelUtil */ public String getAbsoluteFile(String filename) { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; + String downloadPath = PointLionConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/reflect/ReflectUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/reflect/ReflectUtils.java index b19953e..a91b3fa 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/reflect/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.reflect; +package com.pointlion.common.utils.reflect; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -12,13 +12,13 @@ import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; +import com.pointlion.common.core.text.Convert; +import com.pointlion.common.utils.DateUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * - * @author ruoyi + * @author ry */ @SuppressWarnings("rawtypes") public class ReflectUtils diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/pointlion-common/src/main/java/com/pointlion/common/utils/sign/Base64.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/sign/Base64.java index ca1cd92..c00f4b7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/sign/Base64.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.sign; +package com.pointlion.common.utils.sign; /** * Base64工具类 * - * @author ruoyi + * @author ry */ public final class Base64 { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/sign/Md5Utils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/sign/Md5Utils.java index c1c58db..2394aa1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/sign/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.sign; +package com.pointlion.common.utils.sign; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; /** * Md5加密方法 * - * @author ruoyi + * @author ry */ public class Md5Utils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/spring/SpringUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/spring/SpringUtils.java index f290ec3..a4755de 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.pointlion.common.utils.spring; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; @@ -8,12 +8,12 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * spring工具类 方便在非spring管理环境中获取bean * - * @author ruoyi + * @author ry */ @Component public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/pointlion-common/src/main/java/com/pointlion/common/utils/sql/SqlUtil.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/sql/SqlUtil.java index 246a9cf..26c2451 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/sql/SqlUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.sql; +package com.pointlion.common.utils.sql; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.exception.UtilException; +import com.pointlion.common.utils.StringUtils; /** * sql操作工具类 * - * @author ruoyi + * @author ry */ public class SqlUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/pointlion-common/src/main/java/com/pointlion/common/utils/uuid/IdUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/uuid/IdUtils.java index 2c84427..b400875 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/uuid/IdUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.uuid; +package com.pointlion.common.utils.uuid; /** * ID生成器工具类 * - * @author ruoyi + * @author ry */ public class IdUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java b/pointlion-common/src/main/java/com/pointlion/common/utils/uuid/Seq.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/uuid/Seq.java index 528f3c1..f534c66 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/uuid/Seq.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.uuid; +package com.pointlion.common.utils.uuid; import java.util.concurrent.atomic.AtomicInteger; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.DateUtils; +import com.pointlion.common.utils.StringUtils; /** - * @author ruoyi 序列生成类 + * @author 序列生成类 */ public class Seq { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/pointlion-common/src/main/java/com/pointlion/common/utils/uuid/UUID.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java rename to pointlion-common/src/main/java/com/pointlion/common/utils/uuid/UUID.java index dfda46c..e1b38ff 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java +++ b/pointlion-common/src/main/java/com/pointlion/common/utils/uuid/UUID.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.utils.uuid; +package com.pointlion.common.utils.uuid; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.exception.UtilException; +import com.pointlion.common.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 * - * @author ruoyi + * @author ry */ public final class UUID implements java.io.Serializable, Comparable { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java b/pointlion-common/src/main/java/com/pointlion/common/xss/Xss.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java rename to pointlion-common/src/main/java/com/pointlion/common/xss/Xss.java index 7bfdf04..87cc4bd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java +++ b/pointlion-common/src/main/java/com/pointlion/common/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.pointlion.common.xss; import javax.validation.Constraint; import javax.validation.Payload; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义xss校验注解 * - * @author ruoyi + * @author ry */ @Retention(RetentionPolicy.RUNTIME) @Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/pointlion-common/src/main/java/com/pointlion/common/xss/XssValidator.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java rename to pointlion-common/src/main/java/com/pointlion/common/xss/XssValidator.java index ed9ec1f..b74d968 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java +++ b/pointlion-common/src/main/java/com/pointlion/common/xss/XssValidator.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.xss; +package com.pointlion.common.xss; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.util.regex.Matcher; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * 自定义xss校验注解实现 * - * @author ruoyi + * @author ry */ public class XssValidator implements ConstraintValidator { diff --git a/ruoyi-framework/pom.xml b/pointlion-framework/pom.xml similarity index 88% rename from ruoyi-framework/pom.xml rename to pointlion-framework/pom.xml index 6c6de57..7e8d8be 100644 --- a/ruoyi-framework/pom.xml +++ b/pointlion-framework/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + pointlion + com.pointlion 3.8.3 4.0.0 - ruoyi-framework + pointlion-framework framework框架核心 @@ -55,8 +55,8 @@ - com.ruoyi - ruoyi-system + com.pointlion + pointlion-system diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/pointlion-framework/src/main/java/com/pointlion/framework/aspectj/DataScopeAspect.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to pointlion-framework/src/main/java/com/pointlion/framework/aspectj/DataScopeAspect.java index 56dc7da..5e1b26f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/aspectj/DataScopeAspect.java @@ -1,21 +1,21 @@ -package com.ruoyi.framework.aspectj; +package com.pointlion.framework.aspectj; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.SecurityUtils; +import com.pointlion.common.annotation.DataScope; +import com.pointlion.common.core.domain.BaseEntity; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.SecurityUtils; /** * 数据过滤处理 * - * @author ruoyi + * @author ry */ @Aspect @Component diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/pointlion-framework/src/main/java/com/pointlion/framework/aspectj/DataSourceAspect.java similarity index 82% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to pointlion-framework/src/main/java/com/pointlion/framework/aspectj/DataSourceAspect.java index 8c2c9f4..f53ddf7 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/aspectj/DataSourceAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.pointlion.framework.aspectj; import java.util.Objects; import org.aspectj.lang.ProceedingJoinPoint; @@ -11,14 +11,14 @@ import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; +import com.pointlion.common.annotation.DataSource; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.framework.datasource.DynamicDataSourceContextHolder; /** * 多数据源处理 * - * @author ruoyi + * @author ry */ @Aspect @Order(1) @@ -27,8 +27,8 @@ public class DataSourceAspect { protected Logger logger = LoggerFactory.getLogger(getClass()); - @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)" - + "|| @within(com.ruoyi.common.annotation.DataSource)") + @Pointcut("@annotation(com.pointlion.common.annotation.DataSource)" + + "|| @within(com.pointlion.common.annotation.DataSource)") public void dsPointCut() { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/pointlion-framework/src/main/java/com/pointlion/framework/aspectj/LogAspect.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to pointlion-framework/src/main/java/com/pointlion/framework/aspectj/LogAspect.java index 30742b8..cc1efed 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/aspectj/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.pointlion.framework.aspectj; import java.util.Collection; import java.util.Map; @@ -15,22 +15,22 @@ import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.HandlerMapping; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.domain.SysOperLog; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.enums.BusinessStatus; +import com.pointlion.common.enums.HttpMethod; +import com.pointlion.common.utils.ServletUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.ip.IpUtils; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.framework.manager.AsyncManager; +import com.pointlion.framework.manager.factory.AsyncFactory; +import com.pointlion.system.domain.SysOperLog; /** * 操作日志记录处理 * - * @author ruoyi + * @author ry */ @Aspect @Component diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/pointlion-framework/src/main/java/com/pointlion/framework/aspectj/RateLimiterAspect.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to pointlion-framework/src/main/java/com/pointlion/framework/aspectj/RateLimiterAspect.java index 0d1b62f..b20475b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/aspectj/RateLimiterAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.pointlion.framework.aspectj; import java.lang.reflect.Method; import java.util.Collections; @@ -13,17 +13,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.enums.LimitType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; +import com.pointlion.common.annotation.RateLimiter; +import com.pointlion.common.enums.LimitType; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.ServletUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.ip.IpUtils; /** * 限流处理 * - * @author ruoyi + * @author ry */ @Aspect @Component diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/ApplicationConfig.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/ApplicationConfig.java index 8be0094..48d6ec9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import java.util.TimeZone; import org.mybatis.spring.annotation.MapperScan; @@ -10,13 +10,13 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * 程序注解配置 * - * @author ruoyi + * @author ry */ @Configuration // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan({"com.ruoyi.**.mapper","com.pointlion.**.mapper"}) +@MapperScan({"com.pointlion.**.mapper"}) public class ApplicationConfig { /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/CaptchaConfig.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/CaptchaConfig.java index 43e78ae..f3e3f64 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import java.util.Properties; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ import static com.google.code.kaptcha.Constants.*; /** * 验证码配置 * - * @author ruoyi + * @author ry */ @Configuration public class CaptchaConfig @@ -63,7 +63,7 @@ public class CaptchaConfig // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.pointlion.framework.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/DruidConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/DruidConfig.java index f6abac1..0ff9264 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import java.io.IOException; import java.util.HashMap; @@ -19,15 +19,15 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.util.Utils; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; +import com.pointlion.common.enums.DataSourceType; +import com.pointlion.common.utils.spring.SpringUtils; +import com.pointlion.framework.config.properties.DruidProperties; +import com.pointlion.framework.datasource.DynamicDataSource; /** * druid 配置多数据源 * - * @author ruoyi + * @author ry */ @Configuration public class DruidConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/FastJson2JsonRedisSerializer.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/FastJson2JsonRedisSerializer.java index b6d6110..9140eac 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import java.nio.charset.Charset; import org.springframework.data.redis.serializer.RedisSerializer; @@ -10,7 +10,7 @@ import com.alibaba.fastjson2.JSONWriter; /** * Redis使用FastJson序列化 * - * @author ruoyi + * @author ry */ public class FastJson2JsonRedisSerializer implements RedisSerializer { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/FilterConfig.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/FilterConfig.java index bb14c04..33a0774 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import java.util.HashMap; import java.util.Map; @@ -8,14 +8,14 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.filter.RepeatableFilter; +import com.pointlion.common.filter.XssFilter; +import com.pointlion.common.utils.StringUtils; /** * Filter配置 * - * @author ruoyi + * @author ry */ @Configuration public class FilterConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/KaptchaTextCreator.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/KaptchaTextCreator.java index 3e74580..46fa218 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import java.util.Random; import com.google.code.kaptcha.text.impl.DefaultTextCreator; @@ -6,7 +6,7 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator; /** * 验证码文本生成器 * - * @author ruoyi + * @author ry */ public class KaptchaTextCreator extends DefaultTextCreator { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/MyBatisConfig.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/MyBatisConfig.java index 057c941..4121ca8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/MyBatisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import java.io.IOException; import java.util.ArrayList; @@ -22,12 +22,12 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.util.ClassUtils; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * Mybatis支持*匹配扫描包 * - * @author ruoyi + * @author ry */ @Configuration public class MyBatisConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/RedisConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/RedisConfig.java index 3f4f485..f296c9e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; @@ -12,7 +12,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * redis配置 * - * @author ruoyi + * @author ry */ @Configuration @EnableCaching diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/ResourcesConfig.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/ResourcesConfig.java index 50ad496..573f865 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -9,14 +9,14 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.pointlion.common.config.PointLionConfig; +import com.pointlion.common.constant.Constants; +import com.pointlion.framework.interceptor.RepeatSubmitInterceptor; /** * 通用配置 * - * @author ruoyi + * @author ry */ @Configuration public class ResourcesConfig implements WebMvcConfigurer @@ -29,7 +29,7 @@ public class ResourcesConfig implements WebMvcConfigurer { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") - .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); + .addResourceLocations("file:" + PointLionConfig.getProfile() + "/"); /** swagger配置 */ registry.addResourceHandler("/swagger-ui/**") diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/SecurityConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/SecurityConfig.java index 5d91f5b..b40afde 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -15,15 +15,15 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.ruoyi.framework.config.properties.PermitAllUrlProperties; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; +import com.pointlion.framework.config.properties.PermitAllUrlProperties; +import com.pointlion.framework.security.filter.JwtAuthenticationTokenFilter; +import com.pointlion.framework.security.handle.AuthenticationEntryPointImpl; +import com.pointlion.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security配置 * - * @author ruoyi + * @author ry */ @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) public class SecurityConfig extends WebSecurityConfigurerAdapter diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/ServerConfig.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/ServerConfig.java index b5b7de3..791c888 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/ServerConfig.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.ServletUtils; +import com.pointlion.common.utils.ServletUtils; /** * 服务相关配置 * - * @author ruoyi + * @author ry */ @Component public class ServerConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/ThreadPoolConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/ThreadPoolConfig.java index 7840141..9a5e83e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/ThreadPoolConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.config; +package com.pointlion.framework.config; -import com.ruoyi.common.utils.Threads; +import com.pointlion.common.utils.Threads; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,7 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor; /** * 线程池配置 * - * @author ruoyi + * @author ry **/ @Configuration public class ThreadPoolConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/properties/DruidProperties.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/properties/DruidProperties.java index 84f7e00..5817e34 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.pointlion.framework.config.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import com.alibaba.druid.pool.DruidDataSource; /** * druid 配置属性 * - * @author ruoyi + * @author ry */ @Configuration public class DruidProperties diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/pointlion-framework/src/main/java/com/pointlion/framework/config/properties/PermitAllUrlProperties.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java rename to pointlion-framework/src/main/java/com/pointlion/framework/config/properties/PermitAllUrlProperties.java index 9632eb1..e3ae043 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/config/properties/PermitAllUrlProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.pointlion.framework.config.properties; import java.util.ArrayList; import java.util.List; @@ -15,12 +15,12 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import com.ruoyi.common.annotation.Anonymous; +import com.pointlion.common.annotation.Anonymous; /** * 设置Anonymous注解允许匿名访问的url * - * @author ruoyi + * @author ry */ @Configuration public class PermitAllUrlProperties implements InitializingBean, ApplicationContextAware diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/pointlion-framework/src/main/java/com/pointlion/framework/datasource/DynamicDataSource.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to pointlion-framework/src/main/java/com/pointlion/framework/datasource/DynamicDataSource.java index e70b8cf..76036fc 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/datasource/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.pointlion.framework.datasource; import java.util.Map; import javax.sql.DataSource; @@ -7,7 +7,7 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; /** * 动态数据源 * - * @author ruoyi + * @author ry */ public class DynamicDataSource extends AbstractRoutingDataSource { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/pointlion-framework/src/main/java/com/pointlion/framework/datasource/DynamicDataSourceContextHolder.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java rename to pointlion-framework/src/main/java/com/pointlion/framework/datasource/DynamicDataSourceContextHolder.java index 3572db9..967b5f2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/datasource/DynamicDataSourceContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.pointlion.framework.datasource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; /** * 数据源切换处理 * - * @author ruoyi + * @author ry */ public class DynamicDataSourceContextHolder { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/pointlion-framework/src/main/java/com/pointlion/framework/interceptor/RepeatSubmitInterceptor.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to pointlion-framework/src/main/java/com/pointlion/framework/interceptor/RepeatSubmitInterceptor.java index 4ddacae..f9581fe 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/interceptor/RepeatSubmitInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor; +package com.pointlion.framework.interceptor; import java.lang.reflect.Method; import javax.servlet.http.HttpServletRequest; @@ -7,14 +7,14 @@ import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; +import com.pointlion.common.annotation.RepeatSubmit; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.utils.ServletUtils; /** * 防止重复提交拦截器 * - * @author ruoyi + * @author ry */ @Component public abstract class RepeatSubmitInterceptor implements HandlerInterceptor diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/pointlion-framework/src/main/java/com/pointlion/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to pointlion-framework/src/main/java/com/pointlion/framework/interceptor/impl/SameUrlDataInterceptor.java index 9dc9511..cca8525 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor.impl; +package com.pointlion.framework.interceptor.impl; import java.util.HashMap; import java.util.Map; @@ -8,19 +8,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.pointlion.common.annotation.RepeatSubmit; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.core.redis.RedisCache; +import com.pointlion.common.filter.RepeatedlyRequestWrapper; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.http.HttpHelper; +import com.pointlion.framework.interceptor.RepeatSubmitInterceptor; /** * 判断请求url和数据是否和上一次相同， * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。 * - * @author ruoyi + * @author ry */ @Component public class SameUrlDataInterceptor extends RepeatSubmitInterceptor diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/pointlion-framework/src/main/java/com/pointlion/framework/manager/AsyncManager.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to pointlion-framework/src/main/java/com/pointlion/framework/manager/AsyncManager.java index 7387a02..ee6ee0e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/manager/AsyncManager.java @@ -1,15 +1,15 @@ -package com.ruoyi.framework.manager; +package com.pointlion.framework.manager; import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.pointlion.common.utils.Threads; +import com.pointlion.common.utils.spring.SpringUtils; /** * 异步任务管理器 * - * @author ruoyi + * @author ry */ public class AsyncManager { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/pointlion-framework/src/main/java/com/pointlion/framework/manager/ShutdownManager.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to pointlion-framework/src/main/java/com/pointlion/framework/manager/ShutdownManager.java index e36ca3c..8ceaddc 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/manager/ShutdownManager.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.manager; +package com.pointlion.framework.manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,7 @@ import javax.annotation.PreDestroy; /** * 确保应用退出时能关闭后台线程 * - * @author ruoyi + * @author ry */ @Component public class ShutdownManager diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/pointlion-framework/src/main/java/com/pointlion/framework/manager/factory/AsyncFactory.java similarity index 83% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to pointlion-framework/src/main/java/com/pointlion/framework/manager/factory/AsyncFactory.java index 23d0230..76faf90 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/manager/factory/AsyncFactory.java @@ -1,25 +1,25 @@ -package com.ruoyi.framework.manager.factory; +package com.pointlion.framework.manager.factory; import java.util.TimerTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.LogUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysLogininforService; -import com.ruoyi.system.service.ISysOperLogService; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.utils.LogUtils; +import com.pointlion.common.utils.ServletUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.ip.AddressUtils; +import com.pointlion.common.utils.ip.IpUtils; +import com.pointlion.common.utils.spring.SpringUtils; +import com.pointlion.system.domain.SysLogininfor; +import com.pointlion.system.domain.SysOperLog; +import com.pointlion.system.service.ISysLogininforService; +import com.pointlion.system.service.ISysOperLogService; import eu.bitwalker.useragentutils.UserAgent; /** * 异步工厂（产生任务用） * - * @author ruoyi + * @author ry */ public class AsyncFactory { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/pointlion-framework/src/main/java/com/pointlion/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 85% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to pointlion-framework/src/main/java/com/pointlion/framework/security/filter/JwtAuthenticationTokenFilter.java index 3eb2495..1546f1d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.filter; +package com.pointlion.framework.security.filter; import java.io.IOException; import javax.servlet.FilterChain; @@ -11,15 +11,15 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.TokenService; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.framework.web.service.TokenService; /** * token过滤器 验证token有效性 * - * @author ruoyi + * @author ry */ @Component public class JwtAuthenticationTokenFilter extends OncePerRequestFilter diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/pointlion-framework/src/main/java/com/pointlion/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 79% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to pointlion-framework/src/main/java/com/pointlion/framework/security/handle/AuthenticationEntryPointImpl.java index 93b7032..6c9ec34 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/security/handle/AuthenticationEntryPointImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.pointlion.framework.security.handle; import java.io.IOException; import java.io.Serializable; @@ -8,15 +8,15 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.constant.HttpStatus; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.utils.ServletUtils; +import com.pointlion.common.utils.StringUtils; /** * 认证失败处理类 返回未授权 * - * @author ruoyi + * @author ry */ @Component public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/pointlion-framework/src/main/java/com/pointlion/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 73% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to pointlion-framework/src/main/java/com/pointlion/framework/security/handle/LogoutSuccessHandlerImpl.java index 059f519..be75bf6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.pointlion.framework.security.handle; import java.io.IOException; import javax.servlet.ServletException; @@ -9,20 +9,20 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.web.service.TokenService; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.constant.HttpStatus; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.utils.ServletUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.framework.manager.AsyncManager; +import com.pointlion.framework.manager.factory.AsyncFactory; +import com.pointlion.framework.web.service.TokenService; /** * 自定义退出处理类 返回成功 * - * @author ruoyi + * @author ry */ @Configuration public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/Server.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/domain/Server.java index 63b03da..901f491 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/Server.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.web.domain; +package com.pointlion.framework.web.domain; import java.net.UnknownHostException; import java.util.LinkedList; import java.util.List; import java.util.Properties; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.web.domain.server.Cpu; -import com.ruoyi.framework.web.domain.server.Jvm; -import com.ruoyi.framework.web.domain.server.Mem; -import com.ruoyi.framework.web.domain.server.Sys; -import com.ruoyi.framework.web.domain.server.SysFile; +import com.pointlion.common.utils.Arith; +import com.pointlion.common.utils.ip.IpUtils; +import com.pointlion.framework.web.domain.server.Cpu; +import com.pointlion.framework.web.domain.server.Jvm; +import com.pointlion.framework.web.domain.server.Mem; +import com.pointlion.framework.web.domain.server.Sys; +import com.pointlion.framework.web.domain.server.SysFile; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.hardware.CentralProcessor.TickType; @@ -24,7 +24,7 @@ import oshi.util.Util; /** * 服务器相关信息 * - * @author ruoyi + * @author ry */ public class Server { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Cpu.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Cpu.java index a13a66c..0394d2c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Cpu.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.domain.server; +package com.pointlion.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.pointlion.common.utils.Arith; /** * CPU相关信息 * - * @author ruoyi + * @author ry */ public class Cpu { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Jvm.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Jvm.java index 444b280..c475834 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Jvm.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.web.domain.server; +package com.pointlion.framework.web.domain.server; import java.lang.management.ManagementFactory; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.DateUtils; +import com.pointlion.common.utils.Arith; +import com.pointlion.common.utils.DateUtils; /** * JVM相关信息 * - * @author ruoyi + * @author ry */ public class Jvm { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Mem.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Mem.java index 13eec52..8dcb183 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Mem.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.domain.server; +package com.pointlion.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.pointlion.common.utils.Arith; /** * 內存相关信息 * - * @author ruoyi + * @author ry */ public class Mem { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Sys.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Sys.java index 45d64d9..034856a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/Sys.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain.server; +package com.pointlion.framework.web.domain.server; /** * 系统相关信息 * - * @author ruoyi + * @author ry */ public class Sys { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/SysFile.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/SysFile.java index 1320cde..7dc9276 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/domain/server/SysFile.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain.server; +package com.pointlion.framework.web.domain.server; /** * 系统文件相关信息 * - * @author ruoyi + * @author ry */ public class SysFile { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/exception/GlobalExceptionHandler.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/exception/GlobalExceptionHandler.java index 51dd8c5..675e872 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.exception; +package com.pointlion.framework.web.exception; import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -9,16 +9,16 @@ import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.constant.HttpStatus; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.exception.DemoModeException; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.StringUtils; /** * 全局异常处理器 * - * @author ruoyi + * @author ry */ @RestControllerAdvice public class GlobalExceptionHandler diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/PermissionService.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/service/PermissionService.java index 68b1d69..bfc6186 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/PermissionService.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.web.service; +package com.pointlion.framework.web.service; import java.util.Set; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; /** - * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 + * * - * @author ruoyi + * @author ry */ @Service("ss") public class PermissionService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysLoginService.java similarity index 78% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysLoginService.java index a9383e2..d2e655a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.pointlion.framework.web.service; import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; @@ -7,29 +7,29 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.core.redis.RedisCache; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.exception.user.CaptchaException; +import com.pointlion.common.exception.user.CaptchaExpireException; +import com.pointlion.common.exception.user.UserPasswordNotMatchException; +import com.pointlion.common.utils.DateUtils; +import com.pointlion.common.utils.MessageUtils; +import com.pointlion.common.utils.ServletUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.ip.IpUtils; +import com.pointlion.framework.manager.AsyncManager; +import com.pointlion.framework.manager.factory.AsyncFactory; +import com.pointlion.system.service.ISysConfigService; +import com.pointlion.system.service.ISysUserService; /** * 登录校验方法 * - * @author ruoyi + * @author ry */ @Component public class SysLoginService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysPermissionService.java similarity index 85% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysPermissionService.java index feb8038..fd7184c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysPermissionService.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.web.service; +package com.pointlion.framework.web.service; import java.util.HashSet; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysRoleService; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.system.service.ISysMenuService; +import com.pointlion.system.service.ISysRoleService; /** * 用户权限处理 * - * @author ruoyi + * @author ry */ @Component public class SysPermissionService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysRegisterService.java similarity index 77% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysRegisterService.java index 2de5c8b..6df0f38 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/SysRegisterService.java @@ -1,27 +1,27 @@ -package com.ruoyi.framework.web.service; +package com.pointlion.framework.web.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.model.RegisterBody; +import com.pointlion.common.core.redis.RedisCache; +import com.pointlion.common.exception.user.CaptchaException; +import com.pointlion.common.exception.user.CaptchaExpireException; +import com.pointlion.common.utils.MessageUtils; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.framework.manager.AsyncManager; +import com.pointlion.framework.manager.factory.AsyncFactory; +import com.pointlion.system.service.ISysConfigService; +import com.pointlion.system.service.ISysUserService; /** * 注册校验方法 * - * @author ruoyi + * @author ry */ @Component public class SysRegisterService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/TokenService.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/service/TokenService.java index 3d41241..ca2b45f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/TokenService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.pointlion.framework.web.service; import java.util.HashMap; import java.util.Map; @@ -7,15 +7,15 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.uuid.IdUtils; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.core.redis.RedisCache; +import com.pointlion.common.utils.ServletUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.ip.AddressUtils; +import com.pointlion.common.utils.ip.IpUtils; +import com.pointlion.common.utils.uuid.IdUtils; import eu.bitwalker.useragentutils.UserAgent; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -24,7 +24,7 @@ import io.jsonwebtoken.SignatureAlgorithm; /** * token验证处理 * - * @author ruoyi + * @author ry */ @Component public class TokenService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/UserDetailsServiceImpl.java similarity index 83% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java rename to pointlion-framework/src/main/java/com/pointlion/framework/web/service/UserDetailsServiceImpl.java index c8b1c7b..1fa6590 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/pointlion-framework/src/main/java/com/pointlion/framework/web/service/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.pointlion.framework.web.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,17 +7,17 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysUserService; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.enums.UserStatus; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.service.ISysUserService; /** * 用户验证处理 * - * @author ruoyi + * @author ry */ @Service public class UserDetailsServiceImpl implements UserDetailsService diff --git a/ruoyi-generator/pom.xml b/pointlion-generator/pom.xml similarity index 80% rename from ruoyi-generator/pom.xml rename to pointlion-generator/pom.xml index b065d91..88b5908 100644 --- a/ruoyi-generator/pom.xml +++ b/pointlion-generator/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + pointlion + com.pointlion 3.8.3 4.0.0 - ruoyi-generator + pointlion-generator generator代码生成 @@ -31,8 +31,8 @@ - com.ruoyi - ruoyi-common + com.pointlion + pointlion-common diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/pointlion-generator/src/main/java/com/pointlion/generator/config/GenConfig.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to pointlion-generator/src/main/java/com/pointlion/generator/config/GenConfig.java index cc4cd14..1cd4d94 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.config; +package com.pointlion.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi + * @author ry */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/pointlion-generator/src/main/java/com/pointlion/generator/controller/GenController.java similarity index 91% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to pointlion-generator/src/main/java/com/pointlion/generator/controller/GenController.java index 8521b53..4d59b33 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.controller; +package com.pointlion.generator.controller; import java.io.IOException; import java.util.HashMap; @@ -17,21 +17,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableColumnService; -import com.ruoyi.generator.service.IGenTableService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.core.text.Convert; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.generator.domain.GenTable; +import com.pointlion.generator.domain.GenTableColumn; +import com.pointlion.generator.service.IGenTableColumnService; +import com.pointlion.generator.service.IGenTableService; /** * 代码生成 操作处理 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/tool/gen") @@ -206,7 +206,7 @@ public class GenController extends BaseController response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"pointlion.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/pointlion-generator/src/main/java/com/pointlion/generator/domain/GenTable.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to pointlion-generator/src/main/java/com/pointlion/generator/domain/GenTable.java index 269779c..d6d5632 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/domain/GenTable.java @@ -1,17 +1,17 @@ -package com.ruoyi.generator.domain; +package com.pointlion.generator.domain; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.constant.GenConstants; +import com.pointlion.common.core.domain.BaseEntity; +import com.pointlion.common.utils.StringUtils; /** * 业务表 gen_table * - * @author ruoyi + * @author ry */ public class GenTable extends BaseEntity { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/pointlion-generator/src/main/java/com/pointlion/generator/domain/GenTableColumn.java similarity index 98% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to pointlion-generator/src/main/java/com/pointlion/generator/domain/GenTableColumn.java index d1733b6..59f808f 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/domain/GenTableColumn.java @@ -1,13 +1,13 @@ -package com.ruoyi.generator.domain; +package com.pointlion.generator.domain; import javax.validation.constraints.NotBlank; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.core.domain.BaseEntity; +import com.pointlion.common.utils.StringUtils; /** * 代码生成业务字段表 gen_table_column * - * @author ruoyi + * @author ry */ public class GenTableColumn extends BaseEntity { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/pointlion-generator/src/main/java/com/pointlion/generator/mapper/GenTableColumnMapper.java similarity index 92% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to pointlion-generator/src/main/java/com/pointlion/generator/mapper/GenTableColumnMapper.java index 951e166..d032e6e 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/mapper/GenTableColumnMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.mapper; +package com.pointlion.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; +import com.pointlion.generator.domain.GenTableColumn; /** * 业务字段 数据层 * - * @author ruoyi + * @author ry */ public interface GenTableColumnMapper { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/pointlion-generator/src/main/java/com/pointlion/generator/mapper/GenTableMapper.java similarity index 93% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to pointlion-generator/src/main/java/com/pointlion/generator/mapper/GenTableMapper.java index 9b330df..467f251 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/mapper/GenTableMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.mapper; +package com.pointlion.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.GenTable; +import com.pointlion.generator.domain.GenTable; /** * 业务 数据层 * - * @author ruoyi + * @author ry */ public interface GenTableMapper { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/pointlion-generator/src/main/java/com/pointlion/generator/service/GenTableColumnServiceImpl.java similarity index 86% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to pointlion-generator/src/main/java/com/pointlion/generator/service/GenTableColumnServiceImpl.java index 0679689..425e6ac 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/service/GenTableColumnServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.generator.service; +package com.pointlion.generator.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; +import com.pointlion.common.core.text.Convert; +import com.pointlion.generator.domain.GenTableColumn; +import com.pointlion.generator.mapper.GenTableColumnMapper; /** * 业务字段 服务层实现 * - * @author ruoyi + * @author ry */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/pointlion-generator/src/main/java/com/pointlion/generator/service/GenTableServiceImpl.java similarity index 95% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to pointlion-generator/src/main/java/com/pointlion/generator/service/GenTableServiceImpl.java index 4889f81..b054be1 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.service; +package com.pointlion.generator.service; import java.io.ByteArrayOutputStream; import java.io.File; @@ -23,24 +23,24 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.text.CharsetKit; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; -import com.ruoyi.generator.mapper.GenTableMapper; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; -import com.ruoyi.generator.util.VelocityUtils; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.constant.GenConstants; +import com.pointlion.common.core.text.CharsetKit; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.generator.domain.GenTable; +import com.pointlion.generator.domain.GenTableColumn; +import com.pointlion.generator.mapper.GenTableColumnMapper; +import com.pointlion.generator.mapper.GenTableMapper; +import com.pointlion.generator.util.GenUtils; +import com.pointlion.generator.util.VelocityInitializer; +import com.pointlion.generator.util.VelocityUtils; /** * 业务 服务层实现 * - * @author ruoyi + * @author ry */ @Service public class GenTableServiceImpl implements IGenTableService diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/pointlion-generator/src/main/java/com/pointlion/generator/service/IGenTableColumnService.java similarity index 88% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to pointlion-generator/src/main/java/com/pointlion/generator/service/IGenTableColumnService.java index 3037f70..544addf 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/service/IGenTableColumnService.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.service; +package com.pointlion.generator.service; import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; +import com.pointlion.generator.domain.GenTableColumn; /** * 业务字段 服务层 * - * @author ruoyi + * @author ry */ public interface IGenTableColumnService { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/pointlion-generator/src/main/java/com/pointlion/generator/service/IGenTableService.java similarity index 95% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to pointlion-generator/src/main/java/com/pointlion/generator/service/IGenTableService.java index 9d53f95..41662dd 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/service/IGenTableService.java @@ -1,13 +1,13 @@ -package com.ruoyi.generator.service; +package com.pointlion.generator.service; import java.util.List; import java.util.Map; -import com.ruoyi.generator.domain.GenTable; +import com.pointlion.generator.domain.GenTable; /** * 业务 服务层 * - * @author ruoyi + * @author ry */ public interface IGenTableService { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/pointlion-generator/src/main/java/com/pointlion/generator/util/GenUtils.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to pointlion-generator/src/main/java/com/pointlion/generator/util/GenUtils.java index e7ebc20..d9145ee 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/util/GenUtils.java @@ -1,17 +1,17 @@ -package com.ruoyi.generator.util; +package com.pointlion.generator.util; import java.util.Arrays; import org.apache.commons.lang3.RegExUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.pointlion.common.constant.GenConstants; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.generator.config.GenConfig; +import com.pointlion.generator.domain.GenTable; +import com.pointlion.generator.domain.GenTableColumn; /** * 代码生成器 工具类 * - * @author ruoyi + * @author ry */ public class GenUtils { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/pointlion-generator/src/main/java/com/pointlion/generator/util/VelocityInitializer.java similarity index 88% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to pointlion-generator/src/main/java/com/pointlion/generator/util/VelocityInitializer.java index 9f69403..650a404 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/util/VelocityInitializer.java @@ -1,13 +1,13 @@ -package com.ruoyi.generator.util; +package com.pointlion.generator.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.constant.Constants; +import com.pointlion.common.constant.Constants; /** * VelocityEngine工厂 * - * @author ruoyi + * @author ry */ public class VelocityInitializer { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/pointlion-generator/src/main/java/com/pointlion/generator/util/VelocityUtils.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to pointlion-generator/src/main/java/com/pointlion/generator/util/VelocityUtils.java index 7ede02d..d2acd83 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/pointlion-generator/src/main/java/com/pointlion/generator/util/VelocityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.util; +package com.pointlion.generator.util; import java.util.ArrayList; import java.util.HashSet; @@ -7,16 +7,16 @@ import java.util.Set; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.pointlion.common.constant.GenConstants; +import com.pointlion.common.utils.DateUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.generator.domain.GenTable; +import com.pointlion.generator.domain.GenTableColumn; /** * 模板处理工具类 * - * @author ruoyi + * @author ry */ public class VelocityUtils { diff --git a/ruoyi-generator/src/main/resources/generator.yml b/pointlion-generator/src/main/resources/generator.yml similarity index 89% rename from ruoyi-generator/src/main/resources/generator.yml rename to pointlion-generator/src/main/resources/generator.yml index e369f84..553ecae 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/pointlion-generator/src/main/resources/generator.yml @@ -3,7 +3,7 @@ gen: # 作者 author: pointLion # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.back + packageName: com.pointlion.back # 自动去除表前缀，默认是false autoRemovePre: true # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/pointlion-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 98% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to pointlion-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 5fa790f..679873f 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/pointlion-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/pointlion-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 99% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to pointlion-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 85d4a09..307649b 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/pointlion-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/pointlion-generator/src/main/resources/vm/java/controller.java.vm similarity index 92% rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to pointlion-generator/src/main/resources/vm/java/controller.java.vm index dd0f058..9d0592a 100644 --- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/pointlion-generator/src/main/resources/vm/java/controller.java.vm @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.enums.BusinessType; import ${packageName}.domain.${ClassName}; import ${packageName}.service.${ClassName}Service; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.pointlion.common.utils.poi.ExcelUtil; #if($table.crud || $table.sub) -import com.ruoyi.common.core.page.TableDataInfo; +import com.pointlion.common.core.page.TableDataInfo; #elseif($table.tree) #end diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/pointlion-generator/src/main/resources/vm/java/domain.java.vm similarity index 92% rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to pointlion-generator/src/main/resources/vm/java/domain.java.vm index 01ce4a0..f16adb7 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/pointlion-generator/src/main/resources/vm/java/domain.java.vm @@ -6,11 +6,11 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; +import com.pointlion.common.annotation.Excel; #if($table.crud || $table.sub) -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.core.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.domain.TreeEntity; +import com.pointlion.common.core.domain.TreeEntity; #end /** diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/pointlion-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to pointlion-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/pointlion-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to pointlion-generator/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/pointlion-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 98% rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to pointlion-generator/src/main/resources/vm/java/serviceImpl.java.vm index b817f6c..eca0045 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/pointlion-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.ruoyi.common.utils.DateUtils; +import com.pointlion.common.utils.DateUtils; #break #end #end @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/pointlion-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 95% rename from ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm rename to pointlion-generator/src/main/resources/vm/java/sub-domain.java.vm index a3f53eb..5fd11f3 100644 --- a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm +++ b/pointlion-generator/src/main/resources/vm/java/sub-domain.java.vm @@ -5,8 +5,8 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; /** * ${subTable.functionName}对象 ${subTableName} diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/pointlion-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to pointlion-generator/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-generator/src/main/resources/vm/old/controller.java.vm b/pointlion-generator/src/main/resources/vm/old/controller.java.vm similarity index 92% rename from ruoyi-generator/src/main/resources/vm/old/controller.java.vm rename to pointlion-generator/src/main/resources/vm/old/controller.java.vm index ab19cf5..dd4130a 100644 --- a/ruoyi-generator/src/main/resources/vm/old/controller.java.vm +++ b/pointlion-generator/src/main/resources/vm/old/controller.java.vm @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.enums.BusinessType; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.pointlion.common.utils.poi.ExcelUtil; #if($table.crud || $table.sub) -import com.ruoyi.common.core.page.TableDataInfo; +import com.pointlion.common.core.page.TableDataInfo; #elseif($table.tree) #end diff --git a/ruoyi-generator/src/main/resources/vm/old/domain.java.vm b/pointlion-generator/src/main/resources/vm/old/domain.java.vm similarity index 94% rename from ruoyi-generator/src/main/resources/vm/old/domain.java.vm rename to pointlion-generator/src/main/resources/vm/old/domain.java.vm index 82ba739..675bf1d 100644 --- a/ruoyi-generator/src/main/resources/vm/old/domain.java.vm +++ b/pointlion-generator/src/main/resources/vm/old/domain.java.vm @@ -5,11 +5,11 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; +import com.pointlion.common.annotation.Excel; #if($table.crud || $table.sub) -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.core.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.domain.TreeEntity; +import com.pointlion.common.core.domain.TreeEntity; #end /** diff --git a/ruoyi-generator/src/main/resources/vm/old/serviceImpl.java.vm b/pointlion-generator/src/main/resources/vm/old/serviceImpl.java.vm similarity index 98% rename from ruoyi-generator/src/main/resources/vm/old/serviceImpl.java.vm rename to pointlion-generator/src/main/resources/vm/old/serviceImpl.java.vm index 14746e1..a9566fe 100644 --- a/ruoyi-generator/src/main/resources/vm/old/serviceImpl.java.vm +++ b/pointlion-generator/src/main/resources/vm/old/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service.impl; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.ruoyi.common.utils.DateUtils; +import com.pointlion.common.utils.DateUtils; #break #end #end @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end diff --git a/ruoyi-generator/src/main/resources/vm/old/sub-domain.java.vm b/pointlion-generator/src/main/resources/vm/old/sub-domain.java.vm similarity index 95% rename from ruoyi-generator/src/main/resources/vm/old/sub-domain.java.vm rename to pointlion-generator/src/main/resources/vm/old/sub-domain.java.vm index a3f53eb..5fd11f3 100644 --- a/ruoyi-generator/src/main/resources/vm/old/sub-domain.java.vm +++ b/pointlion-generator/src/main/resources/vm/old/sub-domain.java.vm @@ -5,8 +5,8 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; /** * ${subTable.functionName}对象 ${subTableName} diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/pointlion-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to pointlion-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/pointlion-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to pointlion-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/pointlion-generator/src/main/resources/vm/vue/index.vue.vm similarity index 88% rename from ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to pointlion-generator/src/main/resources/vm/vue/index.vue.vm index 28e4563..35fbf05 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/pointlion-generator/src/main/resources/vm/vue/index.vue.vm @@ -13,22 +13,12 @@ #end #if($column.htmlType == "input") - + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) - + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType) @@ -39,24 +29,11 @@ #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN") - - + #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") - + #end #end @@ -67,48 +44,19 @@ + - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - 导出 + 导出 @@ -153,31 +101,14 @@ #end - + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/pointlion-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 86% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to pointlion-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm index b1a6241..aecdf0c 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/pointlion-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -13,22 +13,12 @@ #end #if($column.htmlType == "input") - + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) - + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType) @@ -39,23 +29,11 @@ #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN") - - + #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") - + #end #end @@ -66,35 +44,20 @@ - - - 新增 - - - 展开/折叠 - - - - + + + + + 新增 + + + 展开/折叠 + + + + + #foreach($column in $columns) #set($javaField=$column.javaField) #set($parentheseIndex=$column.columnComment.indexOf("（")) @@ -136,28 +99,15 @@ #end + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/pointlion-generator/src/main/resources/vm/vue/v3/index.vue.vm similarity index 85% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm rename to pointlion-generator/src/main/resources/vm/vue/v3/index.vue.vm index e21b6d9..0c8c697 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm +++ b/pointlion-generator/src/main/resources/vm/vue/v3/index.vue.vm @@ -13,22 +13,12 @@ #end #if($column.htmlType == "input") - + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) - + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType) @@ -48,14 +38,7 @@ #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") - + #end #end @@ -66,44 +49,20 @@ + + - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - 导出 + 导出 @@ -148,29 +107,15 @@ #end - + + + @@ -223,12 +168,7 @@ #elseif($column.htmlType == "checkbox" && "" != $dictType) - - {{dict.label}} - + {{dict.label}} #elseif($column.htmlType == "checkbox" && $dictType) @@ -256,12 +196,7 @@ #elseif($column.htmlType == "datetime") - - + #elseif($column.htmlType == "textarea") @@ -302,24 +237,14 @@ #elseif($column.list && $column.htmlType == "datetime") #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType) diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt b/pointlion-generator/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt rename to pointlion-generator/src/main/resources/vm/vue/v3/readme.txt diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/pointlion-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to pointlion-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-quartz/pom.xml b/pointlion-quartz/pom.xml similarity index 80% rename from ruoyi-quartz/pom.xml rename to pointlion-quartz/pom.xml index 090c0e2..ba60ed0 100644 --- a/ruoyi-quartz/pom.xml +++ b/pointlion-quartz/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + pointlion + com.pointlion 3.8.3 4.0.0 - ruoyi-quartz + pointlion-quartz quartz定时任务 @@ -31,8 +31,8 @@ - com.ruoyi - ruoyi-common + com.pointlion + pointlion-common diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/config/ScheduleConfig.java similarity index 92% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/config/ScheduleConfig.java index a558170..e54cadf 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -//package com.ruoyi.quartz.config; +//package com.pointlion.quartz.config; // //import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Configuration; @@ -9,7 +9,7 @@ ///** // * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效） // * -// * @author ruoyi +// * @author ry // */ //@Configuration //public class ScheduleConfig @@ -22,7 +22,7 @@ // // // quartz参数 // Properties prop = new Properties(); -// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); +// prop.put("org.quartz.scheduler.instanceName", "PointlionScheduler"); // prop.put("org.quartz.scheduler.instanceId", "AUTO"); // // 线程池配置 // prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); @@ -42,7 +42,7 @@ // prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); // factory.setQuartzProperties(prop); // -// factory.setSchedulerName("RuoyiScheduler"); +// factory.setSchedulerName("PointLionScheduler"); // // 延时启动 // factory.setStartupDelay(1); // factory.setApplicationContextSchedulerContextKey("applicationContextKey"); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/controller/SysJobController.java similarity index 90% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/controller/SysJobController.java index f248430..03c13b8 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/controller/SysJobController.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.controller; +package com.pointlion.quartz.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,24 +13,24 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; -import com.ruoyi.quartz.util.ScheduleUtils; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.exception.job.TaskException; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.quartz.domain.SysJob; +import com.pointlion.quartz.service.ISysJobService; +import com.pointlion.quartz.util.CronUtils; +import com.pointlion.quartz.util.ScheduleUtils; /** * 调度任务信息操作处理 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/monitor/job") diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/controller/SysJobLogController.java similarity index 85% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/controller/SysJobLogController.java index d27100d..1291ded 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/controller/SysJobLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.controller; +package com.pointlion.quartz.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,19 +10,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.pointlion.common.annotation.Log; +import com.pointlion.common.core.controller.BaseController; +import com.pointlion.common.core.domain.AjaxResult; +import com.pointlion.common.core.page.TableDataInfo; +import com.pointlion.common.enums.BusinessType; +import com.pointlion.common.utils.poi.ExcelUtil; +import com.pointlion.quartz.domain.SysJobLog; +import com.pointlion.quartz.service.ISysJobLogService; /** * 调度日志操作处理 * - * @author ruoyi + * @author ry */ @RestController @RequestMapping("/monitor/jobLog") diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/domain/SysJob.java similarity index 92% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/domain/SysJob.java index 1f49695..746cc5b 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/domain/SysJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.domain; +package com.pointlion.quartz.domain; import java.util.Date; import javax.validation.constraints.NotBlank; @@ -6,17 +6,17 @@ import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.quartz.util.CronUtils; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.constant.ScheduleConstants; +import com.pointlion.common.core.domain.BaseEntity; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.quartz.util.CronUtils; /** * 定时任务调度表 sys_job * - * @author ruoyi + * @author ry */ public class SysJob extends BaseEntity { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/domain/SysJobLog.java similarity index 95% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/domain/SysJobLog.java index 121c035..5edbb0d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/domain/SysJobLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.quartz.domain; +package com.pointlion.quartz.domain; import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.core.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log * - * @author ruoyi + * @author ry */ public class SysJobLog extends BaseEntity { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/mapper/SysJobLogMapper.java similarity index 92% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/mapper/SysJobLogMapper.java index 727d916..b61cca8 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/mapper/SysJobLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.mapper; +package com.pointlion.quartz.mapper; import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; +import com.pointlion.quartz.domain.SysJobLog; /** * 调度任务日志信息 数据层 * - * @author ruoyi + * @author ry */ public interface SysJobLogMapper { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/mapper/SysJobMapper.java similarity index 92% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/mapper/SysJobMapper.java index 20f45db..ef96695 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/mapper/SysJobMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.mapper; +package com.pointlion.quartz.mapper; import java.util.List; -import com.ruoyi.quartz.domain.SysJob; +import com.pointlion.quartz.domain.SysJob; /** * 调度任务信息 数据层 * - * @author ruoyi + * @author ry */ public interface SysJobMapper { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/service/ISysJobLogService.java similarity index 91% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/service/ISysJobLogService.java index 8546792..2fc98ed 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/service/ISysJobLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.service; +package com.pointlion.quartz.service; import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; +import com.pointlion.quartz.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 * - * @author ruoyi + * @author ry */ public interface ISysJobLogService { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/service/ISysJobService.java similarity index 93% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/service/ISysJobService.java index 6d62661..ea87140 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/service/ISysJobService.java @@ -1,14 +1,14 @@ -package com.ruoyi.quartz.service; +package com.pointlion.quartz.service; import java.util.List; import org.quartz.SchedulerException; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; +import com.pointlion.common.exception.job.TaskException; +import com.pointlion.quartz.domain.SysJob; /** * 定时任务调度信息信息 服务层 * - * @author ruoyi + * @author ry */ public interface ISysJobService { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/service/impl/SysJobLogServiceImpl.java similarity index 89% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/service/impl/SysJobLogServiceImpl.java index 812eed7..a417bc0 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/service/impl/SysJobLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.quartz.service.impl; +package com.pointlion.quartz.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.mapper.SysJobLogMapper; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.pointlion.quartz.domain.SysJobLog; +import com.pointlion.quartz.mapper.SysJobLogMapper; +import com.pointlion.quartz.service.ISysJobLogService; /** * 定时任务调度日志信息 服务层 * - * @author ruoyi + * @author ry */ @Service public class SysJobLogServiceImpl implements ISysJobLogService diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/service/impl/SysJobServiceImpl.java similarity index 94% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/service/impl/SysJobServiceImpl.java index 0d9a53d..a5c5bb9 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/service/impl/SysJobServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.service.impl; +package com.pointlion.quartz.service.impl; import java.util.List; import javax.annotation.PostConstruct; @@ -9,18 +9,18 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.mapper.SysJobMapper; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; -import com.ruoyi.quartz.util.ScheduleUtils; +import com.pointlion.common.constant.ScheduleConstants; +import com.pointlion.common.exception.job.TaskException; +import com.pointlion.quartz.domain.SysJob; +import com.pointlion.quartz.mapper.SysJobMapper; +import com.pointlion.quartz.service.ISysJobService; +import com.pointlion.quartz.util.CronUtils; +import com.pointlion.quartz.util.ScheduleUtils; /** * 定时任务调度信息 服务层 * - * @author ruoyi + * @author ry */ @Service public class SysJobServiceImpl implements ISysJobService diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/task/RyTask.java similarity index 86% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/task/RyTask.java index 853243b..08e3f5c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/task/RyTask.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.task; +package com.pointlion.quartz.task; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * 定时任务调度测试 * - * @author ruoyi + * @author ry */ @Component("ryTask") public class RyTask diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/AbstractQuartzJob.java similarity index 85% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/util/AbstractQuartzJob.java index 731a5eb..143ee6f 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/AbstractQuartzJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.pointlion.quartz.util; import java.util.Date; import org.quartz.Job; @@ -6,20 +6,20 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.utils.ExceptionUtil; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.constant.ScheduleConstants; +import com.pointlion.common.utils.ExceptionUtil; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.bean.BeanUtils; +import com.pointlion.common.utils.spring.SpringUtils; +import com.pointlion.quartz.domain.SysJob; +import com.pointlion.quartz.domain.SysJobLog; +import com.pointlion.quartz.service.ISysJobLogService; /** * 抽象quartz调用 * - * @author ruoyi + * @author ry */ public abstract class AbstractQuartzJob implements Job { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/CronUtils.java similarity index 96% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/util/CronUtils.java index dd53839..b7709ff 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/CronUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.pointlion.quartz.util; import java.text.ParseException; import java.util.Date; @@ -7,7 +7,7 @@ import org.quartz.CronExpression; /** * cron表达式工具类 * - * @author ruoyi + * @author ry * */ public class CronUtils diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/JobInvokeUtil.java similarity index 96% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/util/JobInvokeUtil.java index e2e420e..75ad414 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/JobInvokeUtil.java @@ -1,17 +1,17 @@ -package com.ruoyi.quartz.util; +package com.pointlion.quartz.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.spring.SpringUtils; +import com.pointlion.quartz.domain.SysJob; /** * 任务执行工具 * - * @author ruoyi + * @author ry */ public class JobInvokeUtil { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 81% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/util/QuartzDisallowConcurrentExecution.java index 5e13558..4f11a10 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/QuartzDisallowConcurrentExecution.java @@ -1,13 +1,13 @@ -package com.ruoyi.quartz.util; +package com.pointlion.quartz.util; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; +import com.pointlion.quartz.domain.SysJob; /** * 定时任务处理（禁止并发执行） * - * @author ruoyi + * @author ry * */ @DisallowConcurrentExecution diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/QuartzJobExecution.java similarity index 77% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/util/QuartzJobExecution.java index e975326..31d15ca 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/QuartzJobExecution.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.util; +package com.pointlion.quartz.util; import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; +import com.pointlion.quartz.domain.SysJob; /** * 定时任务处理（允许并发执行） * - * @author ruoyi + * @author ry * */ public class QuartzJobExecution extends AbstractQuartzJob diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/ScheduleUtils.java similarity index 91% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to pointlion-quartz/src/main/java/com/pointlion/quartz/util/ScheduleUtils.java index 5d00c2c..21f751e 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java +++ b/pointlion-quartz/src/main/java/com/pointlion/quartz/util/ScheduleUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.pointlion.quartz.util; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; @@ -10,18 +10,18 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.exception.job.TaskException.Code; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.constant.ScheduleConstants; +import com.pointlion.common.exception.job.TaskException; +import com.pointlion.common.exception.job.TaskException.Code; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.spring.SpringUtils; +import com.pointlion.quartz.domain.SysJob; /** * 定时任务工具类 * - * @author ruoyi + * @author ry * */ public class ScheduleUtils diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/pointlion-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml similarity index 98% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml rename to pointlion-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index e608e42..19e3598 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/pointlion-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/pointlion-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml similarity index 98% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml rename to pointlion-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 5605c44..703c00e 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/pointlion-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/pom.xml b/pointlion-system/pom.xml similarity index 70% rename from ruoyi-system/pom.xml rename to pointlion-system/pom.xml index 7cd8dd0..123993f 100644 --- a/ruoyi-system/pom.xml +++ b/pointlion-system/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + pointlion + com.pointlion 3.8.3 4.0.0 - ruoyi-system + pointlion-system system系统模块 @@ -19,8 +19,8 @@ - com.ruoyi - ruoyi-common + com.pointlion + pointlion-common diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysCache.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysCache.java index 83f0703..0b409a7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysCache.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * 缓存信息 * - * @author ruoyi + * @author ry */ public class SysCache { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysConfig.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysConfig.java index 8577bfe..370bf02 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysConfig.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.core.domain.BaseEntity; /** * 参数配置表 sys_config * - * @author ruoyi + * @author ry */ public class SysConfig extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysLogininfor.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysLogininfor.java index 7fdea30..a760a38 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysLogininfor.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.core.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor * - * @author ruoyi + * @author ry */ public class SysLogininfor extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysNotice.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysNotice.java index 8c07a54..ffccab0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysNotice.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.xss.Xss; +import com.pointlion.common.core.domain.BaseEntity; +import com.pointlion.common.xss.Xss; /** * 通知公告表 sys_notice * - * @author ruoyi + * @author ry */ public class SysNotice extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysOperLog.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysOperLog.java index 175ee03..1711f39 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysOperLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.core.domain.BaseEntity; /** * 操作日志记录表 oper_log * - * @author ruoyi + * @author ry */ public class SysOperLog extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysPost.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysPost.java index daad795..88dc9ad 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysPost.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.pointlion.common.annotation.Excel; +import com.pointlion.common.annotation.Excel.ColumnType; +import com.pointlion.common.core.domain.BaseEntity; /** * 职位表 sys_post * - * @author ruoyi + * @author ry */ public class SysPost extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysRoleDept.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysRoleDept.java index 47b21bf..705395c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept * - * @author ruoyi + * @author ry */ public class SysRoleDept { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysRoleMenu.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysRoleMenu.java index de10a74..181595c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和菜单关联 sys_role_menu * - * @author ruoyi + * @author ry */ public class SysRoleMenu { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysUserOnline.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysUserOnline.java index 2bbd318..0b72c4e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysUserOnline.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; /** * 当前在线会话 * - * @author ruoyi + * @author ry */ public class SysUserOnline { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysUserPost.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysUserPost.java index 78759dc..5b7cd4c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和职位关联 sys_user_post * - * @author ruoyi + * @author ry */ public class SysUserPost { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/pointlion-system/src/main/java/com/pointlion/system/domain/SysUserRole.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/SysUserRole.java index 4d15810..1451bc2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.pointlion.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role * - * @author ruoyi + * @author ry */ public class SysUserRole { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/pointlion-system/src/main/java/com/pointlion/system/domain/vo/MetaVo.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/vo/MetaVo.java index a5d5fdc..60e9a62 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/vo/MetaVo.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain.vo; +package com.pointlion.system.domain.vo; -import com.ruoyi.common.utils.StringUtils; +import com.pointlion.common.utils.StringUtils; /** * 路由显示信息 * - * @author ruoyi + * @author ry */ public class MetaVo { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/pointlion-system/src/main/java/com/pointlion/system/domain/vo/RouterVo.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to pointlion-system/src/main/java/com/pointlion/system/domain/vo/RouterVo.java index afff8c9..e55c833 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/pointlion-system/src/main/java/com/pointlion/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.pointlion.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 路由配置信息 * - * @author ruoyi + * @author ry */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysConfigMapper.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysConfigMapper.java index 0ed0c0a..bf87fd1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysConfigMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.pointlion.system.domain.SysConfig; /** * 参数配置 数据层 * - * @author ruoyi + * @author ry */ public interface SysConfigMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysDeptMapper.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysDeptMapper.java index 384a9b6..69bb43d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysDeptMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.pointlion.common.core.domain.entity.SysDept; /** * 部门管理 数据层 * - * @author ruoyi + * @author ry */ public interface SysDeptMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysDictDataMapper.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysDictDataMapper.java index a341f1e..6de928d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysDictDataMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.pointlion.common.core.domain.entity.SysDictData; /** * 字典表 数据层 * - * @author ruoyi + * @author ry */ public interface SysDictDataMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysDictTypeMapper.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysDictTypeMapper.java index 5fb48fb..a029a72 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysDictTypeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.pointlion.common.core.domain.entity.SysDictType; /** * 字典表 数据层 * - * @author ruoyi + * @author ry */ public interface SysDictTypeMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysLogininforMapper.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysLogininforMapper.java index 629866f..eed763d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysLogininforMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.pointlion.system.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 * - * @author ruoyi + * @author ry */ public interface SysLogininforMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysMenuMapper.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysMenuMapper.java index 123b47f..f6c66b6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysMenuMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysMenu; +import com.pointlion.common.core.domain.entity.SysMenu; /** * 菜单表 数据层 * - * @author ruoyi + * @author ry */ public interface SysMenuMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysNoticeMapper.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysNoticeMapper.java index c34f0a2..497506a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysNoticeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.pointlion.system.domain.SysNotice; /** * 通知公告表 数据层 * - * @author ruoyi + * @author ry */ public interface SysNoticeMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysOperLogMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysOperLogMapper.java index 2ae6457..34f61f7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysOperLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.pointlion.system.domain.SysOperLog; /** * 操作日志 数据层 * - * @author ruoyi + * @author ry */ public interface SysOperLogMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysPostMapper.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysPostMapper.java index 58ff0b7..88bec8f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.pointlion.system.domain.SysPost; /** * 职位信息 数据层 * - * @author ruoyi + * @author ry */ public interface SysPostMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleDeptMapper.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleDeptMapper.java index f9d3a2f..3618a3e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleDeptMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; +import com.pointlion.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 * - * @author ruoyi + * @author ry */ public interface SysRoleDeptMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleMapper.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleMapper.java index cf2bd8c..1bb4238 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysRole; /** * 角色表 数据层 * - * @author ruoyi + * @author ry */ public interface SysRoleMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleMenuMapper.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleMenuMapper.java index 6602bee..66b3f39 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysRoleMenuMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleMenu; +import com.pointlion.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 * - * @author ruoyi + * @author ry */ public interface SysRoleMenuMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserMapper.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserMapper.java index 266f7d6..b026025 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.entity.SysUser; /** * 用户表 数据层 * - * @author ruoyi + * @author ry */ public interface SysUserMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserPostMapper.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserPostMapper.java index 69f2359..f7c3e9f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUserPost; +import com.pointlion.system.domain.SysUserPost; /** * 用户与职位关联表 数据层 * - * @author ruoyi + * @author ry */ public interface SysUserPostMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserRoleMapper.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserRoleMapper.java index 3143ec8..6b573ff 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/pointlion-system/src/main/java/com/pointlion/system/mapper/SysUserRoleMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.pointlion.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysUserRole; +import com.pointlion.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 * - * @author ruoyi + * @author ry */ public interface SysUserRoleMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysConfigService.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysConfigService.java index 00b037a..416dc46 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysConfigService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.pointlion.system.domain.SysConfig; /** * 参数配置 服务层 * - * @author ruoyi + * @author ry */ public interface ISysConfigService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysDeptService.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysDeptService.java index 72ca048..cbba31a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysDeptService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.pointlion.common.core.domain.TreeSelect; +import com.pointlion.common.core.domain.entity.SysDept; /** * 部门管理 服务层 * - * @author ruoyi + * @author ry */ public interface ISysDeptService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysDictDataService.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysDictDataService.java index 9bc4f13..0e46deb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysDictDataService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.pointlion.common.core.domain.entity.SysDictData; /** * 字典 业务层 * - * @author ruoyi + * @author ry */ public interface ISysDictDataService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysDictTypeService.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysDictTypeService.java index dbb2c16..a2ae343 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysDictTypeService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.pointlion.common.core.domain.entity.SysDictData; +import com.pointlion.common.core.domain.entity.SysDictType; /** * 字典 业务层 * - * @author ruoyi + * @author ry */ public interface ISysDictTypeService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysLogininforService.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysLogininforService.java index ce3151d..50d0b34 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysLogininforService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.pointlion.system.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 * - * @author ruoyi + * @author ry */ public interface ISysLogininforService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysMenuService.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysMenuService.java index 1b43174..2f1b861 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysMenuService.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.system.domain.vo.RouterVo; +import com.pointlion.common.core.domain.TreeSelect; +import com.pointlion.common.core.domain.entity.SysMenu; +import com.pointlion.system.domain.vo.RouterVo; /** * 菜单 业务层 * - * @author ruoyi + * @author ry */ public interface ISysMenuService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysNoticeService.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysNoticeService.java index 47ce1b7..97057e7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysNoticeService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.pointlion.system.domain.SysNotice; /** * 公告 服务层 * - * @author ruoyi + * @author ry */ public interface ISysNoticeService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysOperLogService.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysOperLogService.java index 4fd8e5a..e6a058b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysOperLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.pointlion.system.domain.SysOperLog; /** * 操作日志 服务层 * - * @author ruoyi + * @author ry */ public interface ISysOperLogService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysPostService.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysPostService.java index c7a0a3c..e2ac774 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysPostService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.pointlion.system.domain.SysPost; /** * 职位信息 服务层 * - * @author ruoyi + * @author ry */ public interface ISysPostService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysRoleService.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysRoleService.java index 28c73cc..e5515e4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysRoleService.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.system.domain.SysUserRole; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.system.domain.SysUserRole; /** * 角色业务层 * - * @author ruoyi + * @author ry */ public interface ISysRoleService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysUserOnlineService.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysUserOnlineService.java index 8eb5448..0e66ff8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysUserOnlineService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.system.domain.SysUserOnline; /** * 在线用户 服务层 * - * @author ruoyi + * @author ry */ public interface ISysUserOnlineService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/pointlion-system/src/main/java/com/pointlion/system/service/ISysUserService.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to pointlion-system/src/main/java/com/pointlion/system/service/ISysUserService.java index 4b4ed3d..f823961 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/ISysUserService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.pointlion.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.pointlion.common.core.domain.entity.SysUser; /** * 用户 业务层 * - * @author ruoyi + * @author ry */ public interface ISysUserService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysConfigServiceImpl.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysConfigServiceImpl.java index d6d3986..27dcd07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysConfigServiceImpl.java @@ -1,28 +1,28 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; -import com.ruoyi.common.annotation.DataScope; +import com.pointlion.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; +import com.pointlion.common.annotation.DataSource; +import com.pointlion.common.constant.CacheConstants; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.redis.RedisCache; +import com.pointlion.common.core.text.Convert; +import com.pointlion.common.enums.DataSourceType; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.domain.SysConfig; +import com.pointlion.system.mapper.SysConfigMapper; +import com.pointlion.system.service.ISysConfigService; /** * 参数配置 服务层实现 * - * @author ruoyi + * @author ry */ @Service public class SysConfigServiceImpl implements ISysConfigService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDeptServiceImpl.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDeptServiceImpl.java index 96d215e..bb54ff9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -6,25 +6,25 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.pointlion.common.annotation.DataScope; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.domain.TreeSelect; +import com.pointlion.common.core.domain.entity.SysDept; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.core.text.Convert; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.spring.SpringUtils; +import com.pointlion.system.mapper.SysDeptMapper; +import com.pointlion.system.mapper.SysRoleMapper; +import com.pointlion.system.service.ISysDeptService; /** * 部门管理 服务实现 * - * @author ruoyi + * @author ry */ @Service public class SysDeptServiceImpl implements ISysDeptService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDictDataServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDictDataServiceImpl.java index fced569..67739b8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDictDataServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.pointlion.common.core.domain.entity.SysDictData; +import com.pointlion.common.utils.DictUtils; +import com.pointlion.system.mapper.SysDictDataMapper; +import com.pointlion.system.service.ISysDictDataService; /** * 字典 业务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysDictDataServiceImpl implements ISysDictDataService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDictTypeServiceImpl.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDictTypeServiceImpl.java index 8da7983..8695af0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.Comparator; import java.util.List; @@ -8,20 +8,20 @@ import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.domain.entity.SysDictData; +import com.pointlion.common.core.domain.entity.SysDictType; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.DictUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.mapper.SysDictDataMapper; +import com.pointlion.system.mapper.SysDictTypeMapper; +import com.pointlion.system.service.ISysDictTypeService; /** * 字典 业务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysDictTypeServiceImpl implements ISysDictTypeService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysLogininforServiceImpl.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysLogininforServiceImpl.java index 216aecb..1e5f69b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysLogininforServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.pointlion.system.domain.SysLogininfor; +import com.pointlion.system.mapper.SysLogininforMapper; +import com.pointlion.system.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysLogininforServiceImpl implements ISysLogininforService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysMenuServiceImpl.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysMenuServiceImpl.java index b2ac3f0..104975f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -10,25 +10,25 @@ import java.util.Set; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.vo.MetaVo; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.pointlion.common.constant.Constants; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.domain.TreeSelect; +import com.pointlion.common.core.domain.entity.SysMenu; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.domain.vo.MetaVo; +import com.pointlion.system.domain.vo.RouterVo; +import com.pointlion.system.mapper.SysMenuMapper; +import com.pointlion.system.mapper.SysRoleMapper; +import com.pointlion.system.mapper.SysRoleMenuMapper; +import com.pointlion.system.service.ISysMenuService; /** * 菜单 业务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysMenuServiceImpl implements ISysMenuService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysNoticeServiceImpl.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysNoticeServiceImpl.java index 765438b..9087529 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysNoticeServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.pointlion.system.domain.SysNotice; +import com.pointlion.system.mapper.SysNoticeMapper; +import com.pointlion.system.service.ISysNoticeService; /** * 公告 服务层实现 * - * @author ruoyi + * @author ry */ @Service public class SysNoticeServiceImpl implements ISysNoticeService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysOperLogServiceImpl.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysOperLogServiceImpl.java index 5489815..8907541 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysOperLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.pointlion.system.domain.SysOperLog; +import com.pointlion.system.mapper.SysOperLogMapper; +import com.pointlion.system.service.ISysOperLogService; /** * 操作日志 服务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysOperLogServiceImpl implements ISysOperLogService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysPostServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysPostServiceImpl.java index 7169513..c55b5a7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysPostServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.domain.SysPost; +import com.pointlion.system.mapper.SysPostMapper; +import com.pointlion.system.mapper.SysUserPostMapper; +import com.pointlion.system.service.ISysPostService; /** * 职位信息 服务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysPostServiceImpl implements ISysPostService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysRoleServiceImpl.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysRoleServiceImpl.java index b9b8f32..0a09401 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,27 +8,27 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; +import com.pointlion.common.annotation.DataScope; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.spring.SpringUtils; +import com.pointlion.system.domain.SysRoleDept; +import com.pointlion.system.domain.SysRoleMenu; +import com.pointlion.system.domain.SysUserRole; +import com.pointlion.system.mapper.SysRoleDeptMapper; +import com.pointlion.system.mapper.SysRoleMapper; +import com.pointlion.system.mapper.SysRoleMenuMapper; +import com.pointlion.system.mapper.SysUserRoleMapper; +import com.pointlion.system.service.ISysRoleService; /** * 角色 业务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysRoleServiceImpl implements ISysRoleService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysUserOnlineServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysUserOnlineServiceImpl.java index f80a877..001b428 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.pointlion.common.core.domain.model.LoginUser; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.system.domain.SysUserOnline; +import com.pointlion.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysUserOnlineServiceImpl implements ISysUserOnlineService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysUserServiceImpl.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to pointlion-system/src/main/java/com/pointlion/system/service/impl/SysUserServiceImpl.java index e9316bd..8755c72 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/pointlion-system/src/main/java/com/pointlion/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.pointlion.system.service.impl; import java.util.ArrayList; import java.util.List; @@ -10,30 +10,30 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanValidators; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.pointlion.common.annotation.DataScope; +import com.pointlion.common.constant.UserConstants; +import com.pointlion.common.core.domain.entity.SysRole; +import com.pointlion.common.core.domain.entity.SysUser; +import com.pointlion.common.exception.ServiceException; +import com.pointlion.common.utils.SecurityUtils; +import com.pointlion.common.utils.StringUtils; +import com.pointlion.common.utils.bean.BeanValidators; +import com.pointlion.common.utils.spring.SpringUtils; +import com.pointlion.system.domain.SysPost; +import com.pointlion.system.domain.SysUserPost; +import com.pointlion.system.domain.SysUserRole; +import com.pointlion.system.mapper.SysPostMapper; +import com.pointlion.system.mapper.SysRoleMapper; +import com.pointlion.system.mapper.SysUserMapper; +import com.pointlion.system.mapper.SysUserPostMapper; +import com.pointlion.system.mapper.SysUserRoleMapper; +import com.pointlion.system.service.ISysConfigService; +import com.pointlion.system.service.ISysUserService; /** * 用户 业务层处理 * - * @author ruoyi + * @author ry */ @Service public class SysUserServiceImpl implements ISysUserService diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysConfigMapper.xml index b4b20ca..74f1e6e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysDeptMapper.xml index b01bb32..ae6e05d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 8da9030..bbc7105 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 18b4f5e..65b94bc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 97% rename from ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysLogininforMapper.xml index b8178fa..a8e61b6 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysMenuMapper.xml index 2ad833c..9d194b3 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 93fcaa0..ad0b286 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 018a747..445a64d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysPostMapper.xml index d2a884c..1de33f6 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 7c4139b..1873d88 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysRoleMapper.xml index 96e8615..da1caa5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index cb60a85..680e84f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysUserMapper.xml index ccb8c66..60ea2fa 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc4..b5f6de0 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/pointlion-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 95% rename from ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to pointlion-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd72689..ea23283 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/pointlion-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/pom.xml b/pom.xml index 13be0ed..e83523a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + com.pointlion + pointlion 3.8.3 - ruoyi - + pointlion 点狮后台管理系统 - 3.8.3 + 3.8.3 UTF-8 UTF-8 1.8 @@ -174,44 +173,44 @@ - com.ruoyi - ruoyi-quartz - ${ruoyi.version} + com.pointlion + pointlion-quartz + ${pointlion.version} - com.ruoyi - ruoyi-generator - ${ruoyi.version} + com.pointlion + pointlion-generator + ${pointlion.version} - com.ruoyi - ruoyi-framework - ${ruoyi.version} + com.pointlion + pointlion-framework + ${pointlion.version} - com.ruoyi - ruoyi-system - ${ruoyi.version} + com.pointlion + pointlion-system + ${pointlion.version} - com.ruoyi - ruoyi-common - ${ruoyi.version} + com.pointlion + pointlion-common + ${pointlion.version} - com.ruoyi + com.pointlion PointLion - ${ruoyi.version} + ${pointlion.version} @@ -251,12 +250,12 @@ - ruoyi-admin - ruoyi-framework - ruoyi-system - ruoyi-quartz - ruoyi-generator - ruoyi-common + pointlion-admin + pointlion-framework + pointlion-system + pointlion-quartz + pointlion-generator + pointlion-common PointLion pom