邮件发送功能

sdjk-admin/src/main/java/com/miaxis/open/controller/OpenDictDataController.java

@@ -5,6 +5,7 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysDictData;
+import com.miaxis.common.core.domain.entity.SysDictData1;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.SecurityUtils;
@@ -48,4 +49,6 @@ public class OpenDictDataController extends BaseController
     }
 
 
+
+
 }

sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysDictDataController.java

@@ -1,9 +1,11 @@
 package com.miaxis.system.controller.system;
 
 import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysDictData;
+import com.miaxis.common.core.domain.entity.SysDictData1;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.SecurityUtils;
@@ -104,12 +106,16 @@ public class SysDictDataController extends BaseController
     @Log(title = "字典数据", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改保存字典数据")
-    public Response<Integer> edit(@Validated @RequestBody SysDictData dict)
+    public Response<Integer> edit(@RequestBody SysDictData dict)
     {
         dict.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(dictDataService.updateDictData(dict));
     }
 
+
+
+
+
     /**
      * 删除字典数据
      */

sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictData.java

@@ -67,125 +67,125 @@ public class SysDictData extends BaseEntity
     @ApiModelProperty(value = "状态（0正常 1停用）")
     private String status;
 
-    public Long getDictCode()
-    {
-        return dictCode;
-    }
-
-    public void setDictCode(Long dictCode)
-    {
-        this.dictCode = dictCode;
-    }
-
-    public Long getDictSort()
-    {
-        return dictSort;
-    }
-
-    public void setDictSort(Long dictSort)
-    {
-        this.dictSort = dictSort;
-    }
-
-    @NotBlank(message = "字典标签不能为空")
-    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    public String getDictLabel()
-    {
-        return dictLabel;
-    }
-
-    public void setDictLabel(String dictLabel)
-    {
-        this.dictLabel = dictLabel;
-    }
-
-    @NotBlank(message = "字典键值不能为空")
-    //@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue()
-    {
-        return dictValue;
-    }
-
-    public void setDictValue(String dictValue)
-    {
-        this.dictValue = dictValue;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass()
-    {
-        return cssClass;
-    }
-
-    public void setCssClass(String cssClass)
-    {
-        this.cssClass = cssClass;
-    }
-
-    public String getListClass()
-    {
-        return listClass;
-    }
-
-    public void setListClass(String listClass)
-    {
-        this.listClass = listClass;
-    }
-
-    public boolean getDefault()
-    {
-        return UserConstants.YES.equals(this.isDefault) ? true : false;
-    }
-
-    public String getIsDefault()
-    {
-        return isDefault;
-    }
-
-    public void setIsDefault(String isDefault)
-    {
-        this.isDefault = isDefault;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictCode", getDictCode())
-            .append("dictSort", getDictSort())
-            .append("dictLabel", getDictLabel())
-            .append("dictValue", getDictValue())
-            .append("dictType", getDictType())
-            .append("cssClass", getCssClass())
-            .append("listClass", getListClass())
-            .append("isDefault", getIsDefault())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
+//    public Long getDictCode()
+//    {
+//        return dictCode;
+//    }
+//
+//    public void setDictCode(Long dictCode)
+//    {
+//        this.dictCode = dictCode;
+//    }
+//
+//    public Long getDictSort()
+//    {
+//        return dictSort;
+//    }
+//
+//    public void setDictSort(Long dictSort)
+//    {
+//        this.dictSort = dictSort;
+//    }
+//
+//    @NotBlank(message = "字典标签不能为空")
+//    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+//    public String getDictLabel()
+//    {
+//        return dictLabel;
+//    }
+//
+//    public void setDictLabel(String dictLabel)
+//    {
+//        this.dictLabel = dictLabel;
+//    }
+//
+//   // @NotBlank(message = "字典键值不能为空")
+//    //@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+//    public String getDictValue()
+//    {
+//        return dictValue;
+//    }
+//
+//    public void setDictValue(String dictValue)
+//    {
+//        this.dictValue = dictValue;
+//    }
+//
+//    @NotBlank(message = "字典类型不能为空")
+//    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+//    public String getDictType()
+//    {
+//        return dictType;
+//    }
+//
+//    public void setDictType(String dictType)
+//    {
+//        this.dictType = dictType;
+//    }
+//
+//    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+//    public String getCssClass()
+//    {
+//        return cssClass;
+//    }
+//
+//    public void setCssClass(String cssClass)
+//    {
+//        this.cssClass = cssClass;
+//    }
+//
+//    public String getListClass()
+//    {
+//        return listClass;
+//    }
+//
+//    public void setListClass(String listClass)
+//    {
+//        this.listClass = listClass;
+//    }
+//
+//    public boolean getDefault()
+//    {
+//        return UserConstants.YES.equals(this.isDefault) ? true : false;
+//    }
+//
+//    public String getIsDefault()
+//    {
+//        return isDefault;
+//    }
+//
+//    public void setIsDefault(String isDefault)
+//    {
+//        this.isDefault = isDefault;
+//    }
+//
+//    public String getStatus()
+//    {
+//        return status;
+//    }
+//
+//    public void setStatus(String status)
+//    {
+//        this.status = status;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+//            .append("dictCode", getDictCode())
+//            .append("dictSort", getDictSort())
+//            .append("dictLabel", getDictLabel())
+//            .append("dictValue", getDictValue())
+//            .append("dictType", getDictType())
+//            .append("cssClass", getCssClass())
+//            .append("listClass", getListClass())
+//            .append("isDefault", getIsDefault())
+//            .append("status", getStatus())
+//            .append("createBy", getCreateBy())
+//            .append("createTime", getCreateTime())
+//            .append("updateBy", getUpdateBy())
+//            .append("updateTime", getUpdateTime())
+//            .append("remark", getRemark())
+//            .toString();
+//    }
 }

sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictData1.java

@@ -0,0 +1,185 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 字典数据表 sys_dict_data
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "SysDictData", description = "字典数据表")
+@Data
+public class SysDictData1 extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典编码 */
+    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "字典编码")
+    private Long dictCode;
+
+    /** 字典排序 */
+    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "字典排序")
+    private Long dictSort;
+
+    /** 字典标签 */
+    @Excel(name = "字典标签")
+    @ApiModelProperty(value = "字典标签")
+    private String dictLabel;
+
+    /** 字典键值 */
+    @Excel(name = "字典键值")
+    @ApiModelProperty(value = "字典键值")
+    private String dictValue;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    @ApiModelProperty(value = "字典类型")
+    private String dictType;
+
+    /** 样式属性（其他样式扩展） */
+    @ApiModelProperty(value = "样式属性（其他样式扩展）")
+    private String cssClass;
+
+    /** 表格字典样式 */
+    @ApiModelProperty(value = "表格字典样式")
+    private String listClass;
+
+    /** 是否默认（Y是 N否） */
+    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+    @ApiModelProperty(value = "是否默认（Y是 N否）")
+    private String isDefault;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "状态（0正常 1停用）")
+    private String status;
+
+//    public Long getDictCode()
+//    {
+//        return dictCode;
+//    }
+//
+//    public void setDictCode(Long dictCode)
+//    {
+//        this.dictCode = dictCode;
+//    }
+//
+//    public Long getDictSort()
+//    {
+//        return dictSort;
+//    }
+//
+//    public void setDictSort(Long dictSort)
+//    {
+//        this.dictSort = dictSort;
+//    }
+//
+//    @NotBlank(message = "字典标签不能为空")
+//    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+//    public String getDictLabel()
+//    {
+//        return dictLabel;
+//    }
+//
+//    public void setDictLabel(String dictLabel)
+//    {
+//        this.dictLabel = dictLabel;
+//    }
+//
+//   // @NotBlank(message = "字典键值不能为空")
+//    //@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+//    public String getDictValue()
+//    {
+//        return dictValue;
+//    }
+//
+//    public void setDictValue(String dictValue)
+//    {
+//        this.dictValue = dictValue;
+//    }
+//
+//    @NotBlank(message = "字典类型不能为空")
+//    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+//    public String getDictType()
+//    {
+//        return dictType;
+//    }
+//
+//    public void setDictType(String dictType)
+//    {
+//        this.dictType = dictType;
+//    }
+//
+//    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+//    public String getCssClass()
+//    {
+//        return cssClass;
+//    }
+//
+//    public void setCssClass(String cssClass)
+//    {
+//        this.cssClass = cssClass;
+//    }
+//
+//    public String getListClass()
+//    {
+//        return listClass;
+//    }
+//
+//    public void setListClass(String listClass)
+//    {
+//        this.listClass = listClass;
+//    }
+//
+//    public boolean getDefault()
+//    {
+//        return UserConstants.YES.equals(this.isDefault) ? true : false;
+//    }
+//
+//    public String getIsDefault()
+//    {
+//        return isDefault;
+//    }
+//
+//    public void setIsDefault(String isDefault)
+//    {
+//        this.isDefault = isDefault;
+//    }
+//
+//    public String getStatus()
+//    {
+//        return status;
+//    }
+//
+//    public void setStatus(String status)
+//    {
+//        this.status = status;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+//            .append("dictCode", getDictCode())
+//            .append("dictSort", getDictSort())
+//            .append("dictLabel", getDictLabel())
+//            .append("dictValue", getDictValue())
+//            .append("dictType", getDictType())
+//            .append("cssClass", getCssClass())
+//            .append("listClass", getListClass())
+//            .append("isDefault", getIsDefault())
+//            .append("status", getStatus())
+//            .append("createBy", getCreateBy())
+//            .append("createTime", getCreateTime())
+//            .append("updateBy", getUpdateBy())
+//            .append("updateTime", getUpdateTime())
+//            .append("remark", getRemark())
+//            .toString();
+//    }
+}

sdjk-service/src/main/java/com/miaxis/user/dto/UserParams.java

@@ -0,0 +1,10 @@
+package com.miaxis.user.dto;
+
+import com.miaxis.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class UserParams extends BaseEntity {
+    String headImage;
+    String nickName;
+}