车车 8 сар өмнө
parent
commit
d0a40bcb93

+ 1 - 1
ktg-admin/src/main/resources/application.yml

@@ -153,7 +153,7 @@ minio:
 mail:
 mail:
   # 邮箱服务地址
   # 邮箱服务地址
   hostIp: 192.168.28.97
   hostIp: 192.168.28.97
-  # 发件人邮箱地址
+  # 系统发件人邮箱地址
   fromMail: cgj@192.168.28.97
   fromMail: cgj@192.168.28.97
   # HMailServer默认使用端口25
   # HMailServer默认使用端口25
   port: 25
   port: 25

+ 2 - 7
ktg-iscs/src/main/java/com/ktg/iscs/controller/IsSystemAttributeController.java

@@ -20,13 +20,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Arrays;
 import java.util.Arrays;
-
-
-
-
-import com.ktg.common.core.page.TableDataInfo;
+import java.util.List;
 
 
 /**
 /**
  * 基础数据Controller
  * 基础数据Controller
@@ -66,7 +61,7 @@ public class IsSystemAttributeController extends BaseController
         page.setSize(-1);
         page.setSize(-1);
         page.setCurrent(1);
         page.setCurrent(1);
         List<IsSystemAttribute> list = isSystemAttributeService.page(page, Wrappers.<IsSystemAttribute>lambdaQuery()
         List<IsSystemAttribute> list = isSystemAttributeService.page(page, Wrappers.<IsSystemAttribute>lambdaQuery()
-                .orderByDesc(IsSystemAttribute::getId)).getRecords();
+                .orderByDesc(IsSystemAttribute::getSysAttrId)).getRecords();
         ExcelUtil<IsSystemAttribute> util = new ExcelUtil<IsSystemAttribute>(IsSystemAttribute.class);
         ExcelUtil<IsSystemAttribute> util = new ExcelUtil<IsSystemAttribute>(IsSystemAttribute.class);
         util.exportExcel(response, list, "基础数据数据");
         util.exportExcel(response, list, "基础数据数据");
     }
     }

+ 15 - 7
ktg-iscs/src/main/java/com/ktg/iscs/domain/IsSystemAttribute.java

@@ -22,15 +22,23 @@ public class IsSystemAttribute extends BaseBean
 
 
     @ApiModelProperty(value = "ID")
     @ApiModelProperty(value = "ID")
     @TableId(type = IdType.AUTO)
     @TableId(type = IdType.AUTO)
-    private Long id;
+    private Long sysAttrId;
 
 
-    @ApiModelProperty(value = "属性")
-    @Excel(name = "属性")
-    private String attribute;
+    @ApiModelProperty(value = "参数名称")
+    @Excel(name = "参数名称")
+    private String sysAttrName;
 
 
-    @ApiModelProperty(value = "数值")
-    @Excel(name = "数值")
-    private String value;
+    @ApiModelProperty(value = "参数键名")
+    @Excel(name = "参数键名")
+    private String sysAttrKey;
+
+    @ApiModelProperty(value = "参数键值")
+    @Excel(name = "参数键值")
+    private String sysAttrValue;
+
+    @ApiModelProperty(value = "系统内置(Y是 N否)")
+    @Excel(name = "系统内置(Y是 N否)")
+    private String sysAttrType;
 
 
     @ApiModelProperty(value = "删除标志(0代表存在 2代表删除)")
     @ApiModelProperty(value = "删除标志(0代表存在 2代表删除)")
     private String delFlag;
     private String delFlag;

+ 1 - 1
ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsSystemAttributeServiceImpl.java

@@ -24,7 +24,7 @@ public class IsSystemAttributeServiceImpl extends ServiceImpl<IsSystemAttributeM
     @Override
     @Override
     public Page<IsSystemAttribute> getIsSystemAttributePage(Page<IsSystemAttribute> page, IsSystemAttribute isSystemAttribute) {
     public Page<IsSystemAttribute> getIsSystemAttributePage(Page<IsSystemAttribute> page, IsSystemAttribute isSystemAttribute) {
         Page<IsSystemAttribute> result = page(page, Wrappers.<IsSystemAttribute>lambdaQuery()
         Page<IsSystemAttribute> result = page(page, Wrappers.<IsSystemAttribute>lambdaQuery()
-                .orderByDesc(IsSystemAttribute::getId));
+                .orderByDesc(IsSystemAttribute::getSysAttrId));
         return result;
         return result;
     }
     }