weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-03-05 20:05:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

代码提交

Browse source
This commit is contained in:
weizhiqiang 2023-03-05 00:34:33 +08:00
parent 6b62c3e3b6
commit a7d06aa3e1
12 changed files with 27 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/controller/ContactsController.java
View file

@ -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删除联系人信息
*

6
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/dao/ContactsDao.java
View file

@ -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<Contacts> {
List<Map<String, Object>> queryContactsList(BaseServerQueryDo baseServerQuery);
List<Map<String, Object>> queryContactsList(CommonPageInfo pageInfo);
int setContactsIsNotDefault(@Param("objectId") String objectId, @Param("isDefault") Integer isDefault);

8
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/contacts/service/impl/ContactsServiceImpl.java
View file

@ -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<ContactsDao,
@Override
public List<Map<String, Object>> queryPageDataList(InputObject inputObject) {
BaseServerQueryDo baseServerQuery = inputObject.getParams(BaseServerQueryDo.class);
baseServerQuery.setDeleteFlag(DeleteFlagEnum.NOT_DELETE.getKey());
List<Map<String, Object>> beans = contactsDao.queryContactsList(baseServerQuery);
CommonPageInfo pageInfo = inputObject.getParams(CommonPageInfo.class);
pageInfo.setDeleteFlag(DeleteFlagEnum.NOT_DELETE.getKey());
List<Map<String, Object>> beans = contactsDao.queryContactsList(pageInfo);
return beans;
}

4
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/controller/DiscussionController.java
View file

@ -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);

4
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/dao/DiscussionDao.java
View file

@ -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<Discussion> {
List<Map<String, Object>> queryDiscussionList(BaseServerQueryDo baseServerQuery);
List<Map<String, Object>> queryDiscussionList(CommonPageInfo pageInfo);
}

6
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/discussion/service/impl/DiscussionServiceImpl.java
View file

@ -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<DiscussionD
@Override
public List<Map<String, Object>> queryPageDataList(InputObject inputObject) {
BaseServerQueryDo baseServerQuery = inputObject.getParams(BaseServerQueryDo.class);
List<Map<String, Object>> beans = discussionDao.queryDiscussionList(baseServerQuery);
CommonPageInfo pageInfo = inputObject.getParams(CommonPageInfo.class);
List<Map<String, Object>> beans = discussionDao.queryDiscussionList(pageInfo);
return beans;
}

2
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/classenum/TeamObjectTypeEnum.java
View file

@ -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);

3
skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/classenum/ComponentAttr.java
View file

@ -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;

2
skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPage.java
View file

@ -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 {

4
skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormPageContent.java
View file

@ -98,4 +98,8 @@ public class DsFormPageContent extends OperatorUserInfo {
@ApiModelProperty(value = "团队适用对象(团队组件拥有)")
private String teamObjectType;
@TableField("is_edit")
@ApiModelProperty(value = "是否可以编辑，参考#WhetherEnum")
private Integer isEdit;
}

30
skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/object/query/BaseServerQueryDo.java
View file

@ -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;
}

36
skyeye-promote/skyeye-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java
View file

@ -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;