diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysDictDataController.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysDictDataController.java index 4252e04b..69e555b3 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysDictDataController.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysDictDataController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @RestController -@Api(value = "数据字典管理", tags = "数据字典管理", modelName = "系统公共模块") +@Api(value = "数据字典", tags = "数据字典", modelName = "数据字典") public class SysDictDataController { @Autowired diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysDictTypeController.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysDictTypeController.java index 9001b2bd..b4b0833c 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysDictTypeController.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysDictTypeController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @RestController -@Api(value = "数据字典类型管理", tags = "数据字典类型管理", modelName = "系统公共模块") +@Api(value = "数据字典类型管理", tags = "数据字典类型管理", modelName = "数据字典") public class SysDictTypeController { @Autowired diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SystemFoundationSettingsController.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SystemFoundationSettingsController.java index 235c6702..2df1a6bb 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SystemFoundationSettingsController.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SystemFoundationSettingsController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @RestController -@Api(value = "系统基础设置", tags = "系统基础设置", modelName = "系统公共模块") +@Api(value = "系统基础设置", tags = "系统基础设置", modelName = "系统基础设置") public class SystemFoundationSettingsController { @Autowired diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SystemFoundationSettingsDao.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SystemFoundationSettingsDao.java index 05955b5a..d7c06318 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SystemFoundationSettingsDao.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SystemFoundationSettingsDao.java @@ -4,6 +4,8 @@ package com.skyeye.eve.dao; +import com.skyeye.eve.entity.SystemFoundationSettings; + import java.util.Map; /** @@ -14,7 +16,7 @@ import java.util.Map; * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ -public interface SystemFoundationSettingsDao { +public interface SystemFoundationSettingsDao extends SkyeyeBaseMapper { Map querySystemFoundationSettingsList(); diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/entity/SystemFoundationSettings.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/entity/SystemFoundationSettings.java new file mode 100644 index 00000000..36e458d1 --- /dev/null +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/entity/SystemFoundationSettings.java @@ -0,0 +1,83 @@ +/******************************************************************************* + * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye + ******************************************************************************/ + +package com.skyeye.eve.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.skyeye.annotation.api.ApiModel; +import com.skyeye.annotation.api.ApiModelProperty; +import com.skyeye.annotation.cache.RedisCacheField; +import com.skyeye.common.constans.CacheConstants; +import com.skyeye.common.entity.CommonInfo; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: SystemFoundationSettings + * @Description: 系统基础设置实体类 + * @author: skyeye云系列--卫志强 + * @date: 2024/10/1 22:18 + * @Copyright: 2024 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目 + */ +@Data +@RedisCacheField(name = CacheConstants.SYSTEM_FOUNDATION_SETTINGS_CACHE_KEY) +@TableName(value = "system_foundation_settings", autoResultMap = true) +@ApiModel("系统基础设置实体类") +public class SystemFoundationSettings extends CommonInfo { + + @TableId("id") + @ApiModelProperty(value = "主键id。为空时新增,不为空时编辑") + private String id; + + @TableField("email_type") + @ApiModelProperty(value = "邮箱类型") + private String emailType; + + @TableField("email_receipt_server") + @ApiModelProperty(value = "收件服务器") + private String emailReceiptServer; + + @TableField("email_receipt_server_port") + @ApiModelProperty(value = "收件服务器ssl端口") + private String emailReceiptServerPort; + + @TableField("email_send_server") + @ApiModelProperty(value = "发件服务器") + private String emailSendServer; + + @TableField("email_send_server_port") + @ApiModelProperty(value = "发件服务器ssl端口") + private String emailSendServerPort; + + @TableField("no_documentary_day_num") + @ApiModelProperty(value = "未跟单天数,N天未跟单自动进入公海") + private Integer noDocumentaryDayNum; + + @TableField("no_charge_id") + @ApiModelProperty(value = "未指定负责人,未指定责任人自动进入公海") + private Integer noChargeId; + + @TableField(value = "holidays_type_json", typeHandler = JacksonTypeHandler.class) + @ApiModelProperty(value = "企业假期类型以及扣薪信息") + private List> holidaysTypeJson; + + @TableField(value = "year_holidays_mation", typeHandler = JacksonTypeHandler.class) + @ApiModelProperty(value = "年假信息") + private List> yearHolidaysMation; + + @TableField(value = "abnormal_mation", typeHandler = JacksonTypeHandler.class) + @ApiModelProperty(value = "异常考勤制度管理信息") + private List> abnormalMation; + + @TableField(value = "sys_order_basic_design", typeHandler = JacksonTypeHandler.class) + @ApiModelProperty(value = "系统单据是否需要审核的设置") + private List> sysOrderBasicDesign; + +} diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SystemFoundationSettingsService.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SystemFoundationSettingsService.java index a9ce81ef..c1c60bc7 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SystemFoundationSettingsService.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SystemFoundationSettingsService.java @@ -4,8 +4,10 @@ package com.skyeye.eve.service; +import com.skyeye.base.business.service.SkyeyeBusinessService; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; +import com.skyeye.eve.entity.SystemFoundationSettings; import java.util.Map; @@ -17,7 +19,7 @@ import java.util.Map; * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ -public interface SystemFoundationSettingsService { +public interface SystemFoundationSettingsService extends SkyeyeBusinessService { /** * 查询系统基础信息 diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SystemFoundationSettingsServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SystemFoundationSettingsServiceImpl.java index 9b9fc612..ee7d71e3 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SystemFoundationSettingsServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SystemFoundationSettingsServiceImpl.java @@ -5,12 +5,15 @@ package com.skyeye.eve.service.impl; import cn.hutool.json.JSONUtil; +import com.skyeye.annotation.service.SkyeyeService; +import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.common.constans.CommonNumConstants; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.MapUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SystemFoundationSettingsDao; +import com.skyeye.eve.entity.SystemFoundationSettings; import com.skyeye.eve.service.SystemFoundationSettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +35,8 @@ import java.util.Map; * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @Service -public class SystemFoundationSettingsServiceImpl implements SystemFoundationSettingsService { +@SkyeyeService(name = "系统基础设置", groupName = "系统基础设置") +public class SystemFoundationSettingsServiceImpl extends SkyeyeBusinessServiceImpl implements SystemFoundationSettingsService { private static final Logger LOGGER = LoggerFactory.getLogger(SystemFoundationSettingsServiceImpl.class);