From a7d06aa3e1cef2e2901112d4db4ec4aa4e2aa141 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 5 Mar 2023 00:34:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContactsController.java | 20 ++--------- .../com/skyeye/contacts/dao/ContactsDao.java | 6 ++-- .../service/impl/ContactsServiceImpl.java | 8 ++--- .../controller/DiscussionController.java | 4 +-- .../skyeye/discussion/dao/DiscussionDao.java | 4 +-- .../service/impl/DiscussionServiceImpl.java | 6 ++-- .../team/classenum/TeamObjectTypeEnum.java | 2 +- .../dsform/classenum/ComponentAttr.java | 3 +- .../com/skyeye/dsform/entity/DsFormPage.java | 2 +- .../dsform/entity/DsFormPageContent.java | 4 +++ .../object/query/BaseServerQueryDo.java | 30 ---------------- .../db/config/BaseDataSourceConfig.java | 36 ++----------------- 12 files changed, 27 insertions(+), 98 deletions(-) delete mode 100644 skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/object/query/BaseServerQueryDo.java diff --git a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/controller/ContactsController.java b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/controller/ContactsController.java index e527ae19..f5251b0a 100644 --- a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/controller/ContactsController.java +++ b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/controller/ContactsController.java @@ -8,11 +8,11 @@ import com.skyeye.annotation.api.Api; import com.skyeye.annotation.api.ApiImplicitParam; import com.skyeye.annotation.api.ApiImplicitParams; import com.skyeye.annotation.api.ApiOperation; +import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.contacts.service.ContactsService; import com.skyeye.contacts.entity.Contacts; -import com.skyeye.eve.entity.object.query.BaseServerQueryDo; +import com.skyeye.contacts.service.ContactsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ public class ContactsController { * @param outputObject 出参以及提示信息的返回值对象 */ @ApiOperation(id = "queryContactsList", value = "获取联系人列表", method = "POST", allUse = "2") - @ApiImplicitParams(classBean = BaseServerQueryDo.class) + @ApiImplicitParams(classBean = CommonPageInfo.class) @RequestMapping("/post/ContactsController/queryContactsList") public void queryContactsList(InputObject inputObject, OutputObject outputObject) { contactsService.queryPageList(inputObject, outputObject); @@ -58,20 +58,6 @@ public class ContactsController { contactsService.saveOrUpdateEntity(inputObject, outputObject); } - /** - * 根据id获取联系人信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @ApiOperation(id = "queryContactsMationById", value = "根据id获取联系人信息", method = "GET", allUse = "2") - @ApiImplicitParams(value = { - @ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) - @RequestMapping("/post/ContactsController/queryContactsMationById") - public void queryContactsMationById(InputObject inputObject, OutputObject outputObject) { - contactsService.selectById(inputObject, outputObject); - } - /** * 根据id删除联系人信息 * diff --git a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/dao/ContactsDao.java b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/dao/ContactsDao.java index 9fb625ce..20513aa3 100644 --- a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/dao/ContactsDao.java +++ b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/dao/ContactsDao.java @@ -4,9 +4,9 @@ package com.skyeye.contacts.dao; -import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.contacts.entity.Contacts; -import com.skyeye.eve.entity.object.query.BaseServerQueryDo; +import com.skyeye.eve.dao.SkyeyeBaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,7 +22,7 @@ import java.util.Map; */ public interface ContactsDao extends SkyeyeBaseMapper { - List> queryContactsList(BaseServerQueryDo baseServerQuery); + List> queryContactsList(CommonPageInfo pageInfo); int setContactsIsNotDefault(@Param("objectId") String objectId, @Param("isDefault") Integer isDefault); diff --git a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/service/impl/ContactsServiceImpl.java b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/service/impl/ContactsServiceImpl.java index 3627b41e..5de51b63 100644 --- a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/service/impl/ContactsServiceImpl.java +++ b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/service/impl/ContactsServiceImpl.java @@ -6,6 +6,7 @@ package com.skyeye.contacts.service.impl; import com.skyeye.annotation.service.SkyeyeService; import com.skyeye.base.business.service.impl.SkyeyeTeamAuthServiceImpl; +import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.enumeration.DeleteFlagEnum; import com.skyeye.common.enumeration.IsDefaultEnum; import com.skyeye.common.object.InputObject; @@ -13,7 +14,6 @@ import com.skyeye.contacts.classenum.ContactsAuthEnum; import com.skyeye.contacts.dao.ContactsDao; import com.skyeye.contacts.entity.Contacts; import com.skyeye.contacts.service.ContactsService; -import com.skyeye.eve.entity.object.query.BaseServerQueryDo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,9 +48,9 @@ public class ContactsServiceImpl extends SkyeyeTeamAuthServiceImpl> queryPageDataList(InputObject inputObject) { - BaseServerQueryDo baseServerQuery = inputObject.getParams(BaseServerQueryDo.class); - baseServerQuery.setDeleteFlag(DeleteFlagEnum.NOT_DELETE.getKey()); - List> beans = contactsDao.queryContactsList(baseServerQuery); + CommonPageInfo pageInfo = inputObject.getParams(CommonPageInfo.class); + pageInfo.setDeleteFlag(DeleteFlagEnum.NOT_DELETE.getKey()); + List> beans = contactsDao.queryContactsList(pageInfo); return beans; } diff --git a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/controller/DiscussionController.java b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/controller/DiscussionController.java index e2ec1f75..de269b2a 100644 --- a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/controller/DiscussionController.java +++ b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/controller/DiscussionController.java @@ -8,11 +8,11 @@ import com.skyeye.annotation.api.Api; import com.skyeye.annotation.api.ApiImplicitParam; import com.skyeye.annotation.api.ApiImplicitParams; import com.skyeye.annotation.api.ApiOperation; +import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.discussion.entity.Discussion; import com.skyeye.discussion.service.DiscussionService; -import com.skyeye.eve.entity.object.query.BaseServerQueryDo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ public class DiscussionController { * @param outputObject 出参以及提示信息的返回值对象 */ @ApiOperation(id = "queryDiscussionList", value = "获取讨论帖列表", method = "POST", allUse = "2") - @ApiImplicitParams(classBean = BaseServerQueryDo.class) + @ApiImplicitParams(classBean = CommonPageInfo.class) @RequestMapping("/post/DiscussionController/queryDiscussionList") public void queryDiscussionList(InputObject inputObject, OutputObject outputObject) { discussionService.queryPageList(inputObject, outputObject); diff --git a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/dao/DiscussionDao.java b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/dao/DiscussionDao.java index b7e363dd..71c86afd 100644 --- a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/dao/DiscussionDao.java +++ b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/dao/DiscussionDao.java @@ -4,15 +4,15 @@ package com.skyeye.discussion.dao; +import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.discussion.entity.Discussion; import com.skyeye.eve.dao.SkyeyeBaseMapper; -import com.skyeye.eve.entity.object.query.BaseServerQueryDo; import java.util.List; import java.util.Map; public interface DiscussionDao extends SkyeyeBaseMapper { - List> queryDiscussionList(BaseServerQueryDo baseServerQuery); + List> queryDiscussionList(CommonPageInfo pageInfo); } diff --git a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/service/impl/DiscussionServiceImpl.java b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/service/impl/DiscussionServiceImpl.java index 71517217..05ab5ae2 100644 --- a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/service/impl/DiscussionServiceImpl.java +++ b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/service/impl/DiscussionServiceImpl.java @@ -5,12 +5,12 @@ package com.skyeye.discussion.service.impl; import com.skyeye.base.business.service.impl.SkyeyeTeamAuthServiceImpl; +import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.discussion.classenum.DisCussionAuthEnum; import com.skyeye.discussion.dao.DiscussionDao; import com.skyeye.discussion.entity.Discussion; import com.skyeye.discussion.service.DiscussionService; -import com.skyeye.eve.entity.object.query.BaseServerQueryDo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,8 +44,8 @@ public class DiscussionServiceImpl extends SkyeyeTeamAuthServiceImpl> queryPageDataList(InputObject inputObject) { - BaseServerQueryDo baseServerQuery = inputObject.getParams(BaseServerQueryDo.class); - List> beans = discussionDao.queryDiscussionList(baseServerQuery); + CommonPageInfo pageInfo = inputObject.getParams(CommonPageInfo.class); + List> beans = discussionDao.queryDiscussionList(pageInfo); return beans; } diff --git a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java index cfaed984..a2169f94 100644 --- a/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java +++ b/skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java @@ -25,7 +25,7 @@ import java.util.List; @AllArgsConstructor public enum TeamObjectTypeEnum implements SkyeyeEnumClass { - CUSTOMER(1, "客户团队", Arrays.asList("contactsAuthEnum", "crmContractAuthEnum", "crmOpportunityAuthEnum"), true, true), + CUSTOMER(1, "客户团队", Arrays.asList("crmContractAuthEnum", "contactsAuthEnum", "crmOpportunityAuthEnum"), true, true), SUPPLIER(2, "供应商团队", Arrays.asList("contactsAuthEnum"), true, false), PROJECT(3, "项目团队", Arrays.asList(), true, false); diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/classenum/ComponentAttr.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/classenum/ComponentAttr.java index fcb69982..9f01322d 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/classenum/ComponentAttr.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/classenum/ComponentAttr.java @@ -32,7 +32,8 @@ public enum ComponentAttr implements SkyeyeEnumClass { UPLOAD_TYPE("uploadTypeBox", "文件上传类型", false, true, false), UPLOAD_NUM("uploadNumBox", "文件数量", false, true, false), DATA_SHOW_TYPE("dataShowTypeBox", "枚举/数据字典展示类型", false, true, false), - TEAM_OBJECT_TYPE("teamObjectTypeBox", "团队适用对象", false, true, false); + TEAM_OBJECT_TYPE("teamObjectTypeBox", "团队适用对象", false, true, false), + IS_EDIT("isEditBox", "是否可以编辑", false, true, false); private String key; diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java index 78662352..311c98d8 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java @@ -32,7 +32,7 @@ import java.util.List; */ @Data @UniqueField({"name", "className"}) -@RedisCacheField(name = "dsForm:page", cacheTime = RedisConstants.A_YEAR_SECONDS) +@RedisCacheField(name = "dsForm:page", value = {"id", "numCode"}, cacheTime = RedisConstants.A_YEAR_SECONDS) @TableName(value = "ds_form_page", autoResultMap = true) @ApiModel("表单布局实体类") public class DsFormPage extends OperatorUserInfo { diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPageContent.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPageContent.java index d54c5ae7..8c7ec40c 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPageContent.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPageContent.java @@ -98,4 +98,8 @@ public class DsFormPageContent extends OperatorUserInfo { @ApiModelProperty(value = "团队适用对象(团队组件拥有)") private String teamObjectType; + @TableField("is_edit") + @ApiModelProperty(value = "是否可以编辑，参考#WhetherEnum") + private Integer isEdit; + } diff --git a/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/object/query/BaseServerQueryDo.java b/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/object/query/BaseServerQueryDo.java deleted file mode 100644 index 0c9eae79..00000000 --- a/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/object/query/BaseServerQueryDo.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.eve.entity.object.query; - -import com.skyeye.annotation.api.ApiModel; -import com.skyeye.annotation.api.ApiModelProperty; -import com.skyeye.common.entity.search.CommonPageInfo; -import lombok.Data; - -/** - * @ClassName: BaseServerQueryDo - * @Description: 基础服务(base - server)搜索列表条件查询实体类 - * @author: skyeye云系列--卫志强 - * @date: 2022/11/5 23:36 - * @Copyright: 2022 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -@Data -@ApiModel("基础服务(base-server)搜索列表条件查询实体类") -public class BaseServerQueryDo extends CommonPageInfo { - - @ApiModelProperty(value = "所属第三方业务数据id", required = "required") - private String objectId; - - @ApiModelProperty(value = "所属第三方业务数据的key", required = "required") - private String objectKey; - -} diff --git a/skyeye-promote/skyeye-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java b/skyeye-promote/skyeye-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java index 588ef5f9..6929a6e7 100644 --- a/skyeye-promote/skyeye-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java +++ b/skyeye-promote/skyeye-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java @@ -5,6 +5,7 @@ package com.skyeye.db.config; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; +import com.skyeye.common.constans.CommonConstants; import com.skyeye.exception.CustomException; import org.apache.commons.collections.CollectionUtils; import org.apache.ibatis.session.SqlSessionFactory; @@ -45,40 +46,7 @@ public class BaseDataSourceConfig { private static final Logger LOGGER = LoggerFactory.getLogger(BaseDataSourceConfig.class); - protected static Properties databaseTypeMappings = getDefaultDatabaseTypeMappings(); - - public static Properties getDefaultDatabaseTypeMappings() { - Properties databaseTypeMappings = new Properties(); - databaseTypeMappings.setProperty("H2", "h2"); - databaseTypeMappings.setProperty("HSQL Database Engine", "hsql"); - databaseTypeMappings.setProperty("MySQL", "mysql"); - databaseTypeMappings.setProperty("Oracle", "oracle"); - databaseTypeMappings.setProperty("PostgreSQL", "postgres"); - databaseTypeMappings.setProperty("Microsoft SQL Server", "mssql"); - databaseTypeMappings.setProperty("db2", "db2"); - databaseTypeMappings.setProperty("DB2", "db2"); - databaseTypeMappings.setProperty("DB2/NT", "db2"); - databaseTypeMappings.setProperty("DB2/NT64", "db2"); - databaseTypeMappings.setProperty("DB2 UDP", "db2"); - databaseTypeMappings.setProperty("DB2/LINUX", "db2"); - databaseTypeMappings.setProperty("DB2/LINUX390", "db2"); - databaseTypeMappings.setProperty("DB2/LINUXX8664", "db2"); - databaseTypeMappings.setProperty("DB2/LINUXZ64", "db2"); - databaseTypeMappings.setProperty("DB2/LINUXPPC64", "db2"); - databaseTypeMappings.setProperty("DB2/400 SQL", "db2"); - databaseTypeMappings.setProperty("DB2/6000", "db2"); - databaseTypeMappings.setProperty("DB2 UDB iSeries", "db2"); - databaseTypeMappings.setProperty("DB2/AIX64", "db2"); - databaseTypeMappings.setProperty("DB2/HPUX", "db2"); - databaseTypeMappings.setProperty("DB2/HP64", "db2"); - databaseTypeMappings.setProperty("DB2/SUN", "db2"); - databaseTypeMappings.setProperty("DB2/SUN64", "db2"); - databaseTypeMappings.setProperty("DB2/PTX", "db2"); - databaseTypeMappings.setProperty("DB2/2", "db2"); - databaseTypeMappings.setProperty("DB2 UDB AS400", "db2"); - databaseTypeMappings.setProperty("DM DBMS", "dm"); - return databaseTypeMappings; - } + protected static Properties databaseTypeMappings = CommonConstants.getDefaultDatabaseTypeMappings(); @Autowired protected ResourceLoader resourceLoader;