资料目录管理添加接口

jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/controller/PayDataDirectoryController.java

@@ -211,19 +211,35 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	 }
 
 
-//	 /**
+	 /**
-//	  *  编辑
+	  *  编辑
-//	  *
+	  *
-//	  * @param payDataDirectory
+	  * @param payDataDirectoryDTO
-//	  * @return
+	  * @return
-//	  */
+	  */
-//	 @AutoLog(value = "资料目录管理-编辑")
+	 @AutoLog(value = "资料目录管理-编辑")
-//	 @ApiOperation(value="资料目录管理-编辑", notes="资料目录管理-编辑")
+	 @ApiOperation(value="资料目录管理-编辑", notes="资料目录管理-编辑")
-//	 @PutMapping(value = "/edit")
+	 @PutMapping(value = "/edit")
-//	 public Result<?> edit(@RequestBody PayDataDirectoryDTO payDataDirectoryDTO) {
+	 public Result<?> edit(@RequestBody PayDataDirectoryDTO payDataDirectoryDTO) {
-//		 payDataDirectoryService.updateById(payDataDirectory);
+		 PayDataDirectory payDataDirectory = new PayDataDirectory();
-//		 return Result.OK("编辑成功!");
+		 BeanUtils.copyProperties(payDataDirectoryDTO,payDataDirectory);
-//	 }
+		 payDataDirectoryService.updateById(payDataDirectory);
+		 return Result.OK("编辑成功!");
+	 }
+
+	 /**
+	  *   通过id删除
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "资料目录管理-通过id查询")
+	 @ApiOperation(value="资料目录管理-通过id查询", notes="资料目录管理-通过id查询")
+	 @DeleteMapping(value = "/delete")
+	 public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		 PayDataDirectory payDataDirectory = payDataDirectoryService.getById(id);
+		 return Result.OK(payDataDirectory);
+	 }
 //
 //
 //    /**
@@ -247,19 +263,6 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 //        return super.importExcel(request, response, PayDataDirectory.class);
-//    }
-//	 /**
-//	  *   通过id删除
-//	  *
-//	  * @param id
-//	  * @return
-//	  */
-//	 @AutoLog(value = "资料目录管理-通过id删除")
-//	 @ApiOperation(value="资料目录管理-通过id删除", notes="资料目录管理-通过id删除")
-//	 @DeleteMapping(value = "/delete")
-//	 public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-//		 payDataDirectoryService.removeById(id);
-//		 return Result.OK("删除成功!");
 //    }
 
 

jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payDataDirectory/entity/DTO/PayDataDirectoryDTO.java

@@ -10,12 +10,15 @@ import javax.validation.constraints.NotBlank;
 
 @Data
 public class PayDataDirectoryDTO {
+    @NotBlank(message = "id不能为空")
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
 
     @NotBlank(message = "父id不能为空")
     @ApiModelProperty(value = "父id")
     private java.lang.String parentId;
 
-    @NotBlank(message = "父id不能为空")
+    @NotBlank(message = "名称不能为空")
     @ApiModelProperty(value = "名称")
     private java.lang.String name;
 

jero-boot-single-startup/src/main/resources/application-dev.yml

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:p6spy:mysql://10.0.3.44:3306/income_payments?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:p6spy:mysql://localhost:3306/income_payment?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@@ -144,7 +144,7 @@ spring:
   #redis 配置
   redis:
     database: 14
-    host: 121.36.69.172
+    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -152,8 +152,8 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: hzwlsoft.com
+    password:
-    port: 4780
+    port: 6379
 
 #mybatis plus 设置
 mybatis-plus: