From ac0130226734a59401e32da9d4998e7361c555f9 Mon Sep 17 00:00:00 2001 From: Pancaihua <75729660@qq.com> Date: Sat, 26 Oct 2024 21:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/elasticsearch/EsearchUtils.java | 2 +- .../service/knows/KnowledgeServiceImpl.java | 16 ++-- .../module/home/enums/ErrorCodeConstants.java | 2 + .../admin/datainfo/DataInfoController.java | 5 +- .../admin/datainfo/vo/DataInfoPageReqVO.java | 1 - .../admin/datainfo/vo/DataInfoRespVO.java | 3 +- .../admin/datainfo/vo/DataInfoSaveReqVO.java | 3 +- .../admin/homeimg/HomeimgController.java | 5 +- .../admin/homeimg/vo/HomeimgPageReqVO.java | 1 - .../admin/homeimg/vo/HomeimgRespVO.java | 3 +- .../admin/homeimg/vo/HomeimgSaveReqVO.java | 3 +- .../admin/homepj/HomepjController.java | 5 +- .../admin/homepj/vo/HomepjPageReqVO.java | 1 - .../admin/homepj/vo/HomepjRespVO.java | 3 +- .../admin/homepj/vo/HomepjSaveReqVO.java | 3 +- .../controller/admin/qjgl/QjglController.java | 92 +++++++++++++++++++ .../admin/qjgl/vo/QjglPageReqVO.java | 62 +++++++++++++ .../controller/admin/qjgl/vo/QjglRespVO.java | 71 ++++++++++++++ .../admin/qjgl/vo/QjglSaveReqVO.java | 68 ++++++++++++++ .../module/home/controller/package-info.java | 1 + .../home/dal/dataobject/qjgl/QjglDO.java | 80 ++++++++++++++++ .../dal/mysql/datainfo/DataInfoMapper.java | 4 +- .../home/dal/mysql/homeimg/HomeimgMapper.java | 4 +- .../home/dal/mysql/homepj/HomepjMapper.java | 4 +- .../home/dal/mysql/qjgl/QjglMapper.java | 50 ++++++++++ .../service/datainfo/DataInfoService.java | 6 +- .../service/datainfo/DataInfoServiceImpl.java | 6 +- .../home/service/homeimg/HomeimgService.java | 6 +- .../service/homeimg/HomeimgServiceImpl.java | 6 +- .../home/service/homepj/HomepjService.java | 6 +- .../service/homepj/HomepjServiceImpl.java | 6 +- .../datainfo/DataInfoServiceImplTest.java | 10 +- .../homeimg/HomeimgServiceImplTest.java | 10 +- .../service/homepj/HomepjServiceImplTest.java | 10 +- .../src/main/resources/application-local.yaml | 4 +- 35 files changed, 476 insertions(+), 86 deletions(-) create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglPageReqVO.java create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglRespVO.java create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglSaveReqVO.java create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/package-info.java create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/qjgl/QjglDO.java create mode 100644 yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/qjgl/QjglMapper.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java index d403a21..7c91a7e 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java @@ -41,7 +41,7 @@ import java.util.Map; * @author pch */ public class EsearchUtils { - private static String ipStr = "140.143.164.40"; + private static String ipStr = "192.168.1.28"; private static int port = 9200; private static String modeStr = "http"; private static RestHighLevelClient esClient = new RestHighLevelClient(RestClient.builder(new HttpHost(ipStr,port,modeStr))); diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java index 585025c..8b9a65b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java @@ -69,14 +69,14 @@ public class KnowledgeServiceImpl implements KnowledgeService { // 插入子表 createCommentList(knowledge.getId(), createReqVO.getComments()); // 发起 BPM 流程 -// Map processInstanceVariables = new HashMap<>(); -// String processInstanceId = processInstanceApi.createProcessInstance(userId, -// new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY) -// .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(knowledge.getId())) -// .setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees())); -// -// // 将工作流的编号，更新到 OA 请假单中 -// knowledgeMapper.updateById(new KnowledgeDO().setId(knowledge.getId()).setProcessInstanceId(processInstanceId)); + Map processInstanceVariables = new HashMap<>(); + String processInstanceId = processInstanceApi.createProcessInstance(userId, + new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY) + .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(knowledge.getId())) + .setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees())); + + // 将工作流的编号，更新到 OA 请假单中 + knowledgeMapper.updateById(new KnowledgeDO().setId(knowledge.getId()).setProcessInstanceId(processInstanceId)); try { if (isEsFlag){ EsearchUtils.saveIndex(knowledge.getId(),createReqVO,indexName); diff --git a/yudao-module-home/yudao-module-home-api/src/main/java/cn/iocoder/yudao/module/home/enums/ErrorCodeConstants.java b/yudao-module-home/yudao-module-home-api/src/main/java/cn/iocoder/yudao/module/home/enums/ErrorCodeConstants.java index f5200e9..2e181db 100644 --- a/yudao-module-home/yudao-module-home-api/src/main/java/cn/iocoder/yudao/module/home/enums/ErrorCodeConstants.java +++ b/yudao-module-home/yudao-module-home-api/src/main/java/cn/iocoder/yudao/module/home/enums/ErrorCodeConstants.java @@ -14,4 +14,6 @@ public interface ErrorCodeConstants { ErrorCode PJ_NOT_EXISTS = new ErrorCode(1_009_002_000, "主要用于首页的项目数据不存在"); // ========== 公告内容 1_009_003_000 ========== ErrorCode IMG_NOT_EXISTS = new ErrorCode(1_009_003_000, "公告内容不存在"); + // ========== 请假管理 1_009_004_000 ========== + ErrorCode QJGL_NOT_EXISTS = new ErrorCode(1_009_004_000, "请假管理不存在"); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/DataInfoController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/DataInfoController.java index 50d29a0..181414a 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/DataInfoController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/DataInfoController.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.home.controller.admin.datainfo; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoRespVO; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoSaveReqVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -8,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -25,7 +27,6 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; -import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO; import cn.iocoder.yudao.module.home.service.datainfo.DataInfoService; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoPageReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoPageReqVO.java index c3822ca..e86e3d0 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoPageReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoPageReqVO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.home.controller.admin.datainfo.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoRespVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoRespVO.java index 87d8dd6..100c634 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoRespVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoRespVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.home.controller.admin.datainfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoSaveReqVO.java index 1aaf459..b53b780 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoSaveReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoSaveReqVO.java @@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.home.controller.admin.datainfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @Schema(description = "管理后台 - 首页数据统计新增/修改 Request VO") diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/HomeimgController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/HomeimgController.java index 4a0d257..37d6e03 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/HomeimgController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/HomeimgController.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.home.controller.admin.homeimg; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgRespVO; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgSaveReqVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -8,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -25,7 +27,6 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; -import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO; import cn.iocoder.yudao.module.home.service.homeimg.HomeimgService; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java index 9d190c7..6d4636c 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.home.controller.admin.homeimg.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java index cd76ed0..884139a 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.home.controller.admin.homeimg.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java index 18aff41..b993710 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java @@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.home.controller.admin.homeimg.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @Schema(description = "管理后台 - 公告管理新增/修改 Request VO") diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/HomepjController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/HomepjController.java index 636cff8..8772aeb 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/HomepjController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/HomepjController.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.home.controller.admin.homepj; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjRespVO; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjSaveReqVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -8,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -25,7 +27,6 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; -import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO; import cn.iocoder.yudao.module.home.service.homepj.HomepjService; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjPageReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjPageReqVO.java index 2549c4e..9bbbc3f 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjPageReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjPageReqVO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.home.controller.admin.homepj.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjRespVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjRespVO.java index a184656..beab58d 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjRespVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjRespVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.home.controller.admin.homepj.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjSaveReqVO.java index 64723c3..0077a29 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjSaveReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjSaveReqVO.java @@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.home.controller.admin.homepj.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @Schema(description = "管理后台 - 主要用于首页的项目数据新增/修改 Request VO") diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java new file mode 100644 index 0000000..878ad69 --- /dev/null +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java @@ -0,0 +1,92 @@ +package cn.iocoder.yudao.module.home.controller.admin.qjgl; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.home.controller.admin.qjgl.vo.*; +import cn.iocoder.yudao.module.home.dal.dataobject.qjgl.QjglDO; +import cn.iocoder.yudao.module.home.service.qjgl.QjglService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; + +@Tag(name = "管理后台 - 请假管理") +@RestController +@RequestMapping("/home/qjgl") +@Validated +public class QjglController { + + @Resource + private QjglService qjglService; + + @PostMapping("/create") + @Operation(summary = "创建请假管理") + @PreAuthorize("@ss.hasPermission('base:qjgl:create')") + public CommonResult createQjgl(@Valid @RequestBody QjglSaveReqVO createReqVO) { + return success(qjglService.createQjgl(getLoginUserId(),createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新请假管理") + @PreAuthorize("@ss.hasPermission('base:qjgl:update')") + public CommonResult updateQjgl(@Valid @RequestBody QjglSaveReqVO updateReqVO) { + qjglService.updateQjgl(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除请假管理") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:qjgl:delete')") + public CommonResult deleteQjgl(@RequestParam("id") Long id) { + qjglService.deleteQjgl(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得请假管理") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:qjgl:query')") + public CommonResult getQjgl(@RequestParam("id") Long id) { + QjglDO qjgl = qjglService.getQjgl(id); + return success(BeanUtils.toBean(qjgl, QjglRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得请假管理分页") + @PreAuthorize("@ss.hasPermission('base:qjgl:query')") + public CommonResult> getQjglPage(@Valid QjglPageReqVO pageReqVO) { + PageResult pageResult = qjglService.getQjglPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, QjglRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出请假管理 Excel") + @PreAuthorize("@ss.hasPermission('base:qjgl:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportQjglExcel(@Valid QjglPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = qjglService.getQjglPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "请假管理.xls", "数据", QjglRespVO.class, + BeanUtils.toBean(list, QjglRespVO.class)); + } + +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglPageReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglPageReqVO.java new file mode 100644 index 0000000..a2b6579 --- /dev/null +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglPageReqVO.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.home.controller.admin.qjgl.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 请假管理分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class QjglPageReqVO extends PageParam { + + @Schema(description = "请假标题") + private String title; + + @Schema(description = "请假原因", example = "不对") + private String reason; + + @Schema(description = "请假类型", example = "1") + private Integer type; + + @Schema(description = "开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] startTime; + + @Schema(description = "结束时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] endTime; + + @Schema(description = "请假天数") + private Integer day; + + @Schema(description = "文件路径") + private String filePath; + + @Schema(description = "作者", example = "赵六") + private String userName; + + @Schema(description = "部门id", example = "8402") + private Long deptId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +// @Schema(description = "流程实例的编号", example = "24108") +// private String processInstanceId; +// +// @Schema(description = "申请人的用户编号", example = "14417") +// private Long userId; + + @Schema(description = "审批状态", example = "2") + private Integer status; + +} \ No newline at end of file diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglRespVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglRespVO.java new file mode 100644 index 0000000..2ede8fa --- /dev/null +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglRespVO.java @@ -0,0 +1,71 @@ +package cn.iocoder.yudao.module.home.controller.admin.qjgl.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 请假管理 Response VO") +@Data +@ExcelIgnoreUnannotated +public class QjglRespVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14023") + @ExcelProperty("id") + private Long id; + + @Schema(description = "请假标题") + @ExcelProperty("请假标题") + private String title; + + @Schema(description = "请假原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "不对") + @ExcelProperty("请假原因") + private String reason; + + @Schema(description = "请假类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("请假类型") + private Integer type; + + @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("开始时间") + private LocalDateTime startTime; + + @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("结束时间") + private LocalDateTime endTime; + + @Schema(description = "请假天数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("请假天数") + private Integer day; + + @Schema(description = "文件路径") + @ExcelProperty("文件路径") + private String filePath; + + @Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("作者") + private String userName; + + @Schema(description = "部门id", example = "8402") + @ExcelProperty("部门id") + private Long deptId; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "流程实例的编号", example = "24108") + @ExcelProperty("流程实例的编号") + private String processInstanceId; + +// @Schema(description = "申请人的用户编号", example = "14417") +// @ExcelProperty("申请人的用户编号") +// private Long userId; + + @Schema(description = "审批状态", example = "2") + @ExcelProperty("审批状态") + private Integer status; + +} \ No newline at end of file diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglSaveReqVO.java new file mode 100644 index 0000000..5a78c9b --- /dev/null +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglSaveReqVO.java @@ -0,0 +1,68 @@ +package cn.iocoder.yudao.module.home.controller.admin.qjgl.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.AssertTrue; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +@Schema(description = "管理后台 - 请假管理新增/修改 Request VO") +@Data +public class QjglSaveReqVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14023") + private Long id; + + @Schema(description = "请假标题") + private String title; + + @Schema(description = "请假原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "不对") + @NotEmpty(message = "请假原因不能为空") + private String reason; + + @Schema(description = "请假类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "请假类型不能为空") + private Integer type; + + @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "开始时间不能为空") + private LocalDateTime startTime; + + @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "结束时间不能为空") + private LocalDateTime endTime; + + @Schema(description = "请假天数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "请假天数不能为空") + private Integer day; + + @Schema(description = "文件路径") + private String filePath; + + @Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "作者不能为空") + private String userName; + + @Schema(description = "部门id", example = "8402") + private Long deptId; + +// @Schema(description = "流程实例的编号", example = "24108") +// private String processInstanceId; +// +// @Schema(description = "申请人的用户编号", example = "14417") +// private Long userId; +// +// @Schema(description = "审批状态", example = "2") +// private Integer status; + @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}") + private Map> startUserSelectAssignees; + + @AssertTrue(message = "结束时间，需要在开始时间之后") + public boolean isEndTimeValid() { + return !getEndTime().isBefore(getStartTime()); + } +} \ No newline at end of file diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/package-info.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/package-info.java new file mode 100644 index 0000000..4c12f68 --- /dev/null +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.yudao.module.home.controller; \ No newline at end of file diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/qjgl/QjglDO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/qjgl/QjglDO.java new file mode 100644 index 0000000..17f55dd --- /dev/null +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/qjgl/QjglDO.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.home.dal.dataobject.qjgl; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * 请假管理 DO + * + * @author 君风 + */ +@TableName("oa_qjgl") +@KeySequence("oa_qjgl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class QjglDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 请假标题 + */ + private String title; + /** + * 请假原因 + */ + private String reason; + /** + * 请假类型 + */ + private Integer type; + /** + * 开始时间 + */ + private LocalDateTime startTime; + /** + * 结束时间 + */ + private LocalDateTime endTime; + /** + * 请假天数 + */ + private Integer day; + /** + * 文件路径 + */ + private String filePath; + /** + * 作者 + */ + private String userName; + /** + * 部门id + */ + private Long deptId; + /** + * 流程实例的编号 + */ + private String processInstanceId; + /** + * 申请人的用户编号 + */ + private Long userId; + /** + * 审批状态 + */ + private Integer status; + +} \ No newline at end of file diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/datainfo/DataInfoMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/datainfo/DataInfoMapper.java index 702260d..12e5706 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/datainfo/DataInfoMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/datainfo/DataInfoMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.home.dal.mysql.datainfo; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO; import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.*; /** * 首页数据统计 Mapper diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java index 82714e6..33cd002 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.home.dal.mysql.homeimg; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO; import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.*; /** * 公告管理 Mapper diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homepj/HomepjMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homepj/HomepjMapper.java index 667911d..9504f4f 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homepj/HomepjMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homepj/HomepjMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.home.dal.mysql.homepj; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO; import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.*; /** * 主要用于首页的项目数据 Mapper diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/qjgl/QjglMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/qjgl/QjglMapper.java new file mode 100644 index 0000000..62470dd --- /dev/null +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/qjgl/QjglMapper.java @@ -0,0 +1,50 @@ +package cn.iocoder.yudao.module.home.dal.mysql.qjgl; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.home.controller.admin.qjgl.vo.*; +import cn.iocoder.yudao.module.home.dal.dataobject.qjgl.QjglDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 请假管理 Mapper + * + * @author 君风 + */ +@Mapper +public interface QjglMapper extends BaseMapperX { + + default PageResult selectPage(QjglPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(QjglDO::getTitle, reqVO.getTitle()) + .eqIfPresent(QjglDO::getReason, reqVO.getReason()) + .eqIfPresent(QjglDO::getType, reqVO.getType()) + .betweenIfPresent(QjglDO::getStartTime, reqVO.getStartTime()) + .betweenIfPresent(QjglDO::getEndTime, reqVO.getEndTime()) + .eqIfPresent(QjglDO::getDay, reqVO.getDay()) + .eqIfPresent(QjglDO::getFilePath, reqVO.getFilePath()) + .likeIfPresent(QjglDO::getUserName, reqVO.getUserName()) + .eqIfPresent(QjglDO::getDeptId, reqVO.getDeptId()) + .betweenIfPresent(QjglDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(QjglDO::getStatus, reqVO.getStatus()) + .orderByDesc(QjglDO::getId)); + } + default PageResult selectPage(long userId,QjglPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(QjglDO::getTitle, reqVO.getTitle()) + .eqIfPresent(QjglDO::getReason, reqVO.getReason()) + .eqIfPresent(QjglDO::getType, reqVO.getType()) + .betweenIfPresent(QjglDO::getStartTime, reqVO.getStartTime()) + .betweenIfPresent(QjglDO::getEndTime, reqVO.getEndTime()) + .eqIfPresent(QjglDO::getDay, reqVO.getDay()) + .eqIfPresent(QjglDO::getFilePath, reqVO.getFilePath()) + .likeIfPresent(QjglDO::getUserName, reqVO.getUserName()) + .eqIfPresent(QjglDO::getDeptId, reqVO.getDeptId()) + .betweenIfPresent(QjglDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(QjglDO::getUserId, userId) + .eqIfPresent(QjglDO::getStatus, reqVO.getStatus()) + .orderByDesc(QjglDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoService.java index 162c03d..d8e49a9 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoService.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.home.service.datainfo; -import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.*; + +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoSaveReqVO; import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; /** * 首页数据统计 Service 接口 diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImpl.java index 988b222..828cf89 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImpl.java @@ -1,15 +1,13 @@ package cn.iocoder.yudao.module.home.service.datainfo; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoSaveReqVO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; -import java.util.*; -import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.home.dal.mysql.datainfo.DataInfoMapper; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgService.java index e45043f..6e5f1c2 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgService.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.home.service.homeimg; -import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.*; + +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgSaveReqVO; import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; /** * 公告管理 Service 接口 diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java index a0170e0..53f5d97 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java @@ -1,15 +1,13 @@ package cn.iocoder.yudao.module.home.service.homeimg; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgSaveReqVO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; -import java.util.*; -import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.home.dal.mysql.homeimg.HomeimgMapper; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjService.java index 514a0a5..fc6c363 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjService.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.home.service.homepj; -import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.*; + +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjSaveReqVO; import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; /** * 主要用于首页的项目数据 Service 接口 diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImpl.java index 81110d5..aaf0002 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImpl.java @@ -1,15 +1,13 @@ package cn.iocoder.yudao.module.home.service.homepj; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjSaveReqVO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; -import java.util.*; -import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.home.dal.mysql.homepj.HomepjMapper; diff --git a/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImplTest.java b/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImplTest.java index 4ab09a5..5d596c5 100644 --- a/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImplTest.java +++ b/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImplTest.java @@ -1,32 +1,26 @@ package cn.iocoder.yudao.module.home.service.datainfo; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoSaveReqVO; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; import javax.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO; import cn.iocoder.yudao.module.home.dal.mysql.datainfo.DataInfoMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; -import static cn.hutool.core.util.RandomUtil.*; import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*; import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; /** * {@link DataInfoServiceImpl} 的单元测试类 diff --git a/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImplTest.java b/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImplTest.java index e4fada3..8d46db4 100644 --- a/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImplTest.java +++ b/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImplTest.java @@ -1,32 +1,26 @@ package cn.iocoder.yudao.module.home.service.homeimg; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgSaveReqVO; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; import javax.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO; import cn.iocoder.yudao.module.home.dal.mysql.homeimg.HomeimgMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; -import static cn.hutool.core.util.RandomUtil.*; import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*; import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; /** * {@link HomeimgServiceImpl} 的单元测试类 diff --git a/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImplTest.java b/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImplTest.java index 760b505..2e600c9 100644 --- a/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImplTest.java +++ b/yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImplTest.java @@ -1,32 +1,26 @@ package cn.iocoder.yudao.module.home.service.homepj; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO; +import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjSaveReqVO; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; import javax.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.*; import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO; import cn.iocoder.yudao.module.home.dal.mysql.homepj.HomepjMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; -import static cn.hutool.core.util.RandomUtil.*; import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*; import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; /** * {@link HomepjServiceImpl} 的单元测试类 diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 5f35094..fd741b5 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -46,7 +46,7 @@ spring: primary: master datasource: master: - url: jdbc:mysql://192.168.1.28:3306/yudao-vue?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://140.143.164.40:3306/yudao-oa?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://192.168.1.28:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 @@ -71,7 +71,7 @@ spring: # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 192.168.1.28 # 地址140.143.164.40 + host: 140.143.164.40 # 地址140.143.164.40 port: 6379 # 端口 database: 0 # 数据库索引 password: 123456