mcj:更新规则显示

src/main/java/com/zjty/project/inspect/controller/RuleController.java

 package com.zjty.project.inspect.controller;
 
 import com.zjty.project.inspect.entity.CustomPage;
+import com.zjty.project.inspect.entity.PageResult;
+import com.zjty.project.inspect.entity.RuleCollection;
 import com.zjty.project.inspect.entity.RuleQo;
 import com.zjty.project.inspect.service.RuleService;
 import io.swagger.annotations.Api;
@@ -77,16 +79,6 @@ public class RuleController {
         return ResponseEntity.ok(ruleService.findAll());
     }
 
-    /**
-     * 查询所有规则
-     * @return 规则
-     */
-    @ApiOperation("查询所有规则")
-    @GetMapping("/test")
-    public ResponseEntity test(){
-        ruleService.test();
-        return ResponseEntity.ok(200);
-    }
     /**
      * 分页+多条件查询
      * @param searchMap 查询条件封装
@@ -101,7 +93,6 @@ public class RuleController {
     })
     @RequestMapping(value="/search/{page}/{size}",method=RequestMethod.POST)
     public ResponseEntity findSearch(@RequestBody Map searchMap , @PathVariable int page, @PathVariable int size){
-        CustomPage<RuleQo> search = ruleService.findSearch(searchMap, page, size);
-        return  ResponseEntity.ok(search);
+        return  ResponseEntity.ok( ruleService.findSearch(searchMap, page, size));
     }
 }

src/main/java/com/zjty/project/inspect/entity/RuleAndReportVo.java

-package com.zjty.project.inspect.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author Mcj
- * @date 2020-02-27 14:42
- */
-
-@Data
-@ApiModel(value = "规则类")
-public class RuleAndReportVo {
-
-    /**
-     * 发现问题的文件地址
-     */
-    private String filePath;
-
-    /**
-     * 匹配行数
-     */
-    @ApiModelProperty(value = "权限",example = "1")
-    private Integer lineNum;
-
-}

src/main/java/com/zjty/project/inspect/entity/RuleCollection.java

+package com.zjty.project.inspect.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.Date;
+
+/**
+ * @author Mcj
+ * @date 2020-02-27 14:42
+ */
+
+@Data
+@Entity
+@ApiModel(value = "规则类")
+public class RuleCollection {
+
+    /**
+     * 主键id
+     */
+    @Id
+    @Column(length = 48)
+    private String id;
+    /**
+     * 技术名称
+     */
+    private String technologyName;
+    /**
+     * 目标关键字
+     */
+    private String target;
+    /**
+     * 匹配的文件后缀
+     */
+    private String suffix;
+
+    /**
+     * 适配技术id
+     */
+    private String technologyId;
+    /**
+     * 数据创建时间
+     */
+    @Column(name="create_time",columnDefinition="TIMESTAMP DEFAULT CURRENT_TIMESTAMP",insertable = false,updatable = false)
+    @CreatedDate
+    private Date createDate;
+
+    /**
+     * 数据更新时间
+     */
+    @Column(name="update_time",columnDefinition="TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP",insertable = false)
+    @LastModifiedDate
+    private Date updateDate;
+
+}

src/main/java/com/zjty/project/inspect/service/RuleService.java

 package com.zjty.project.inspect.service;
 
 
-import com.zjty.project.inspect.entity.CustomPage;
-import com.zjty.project.inspect.entity.RuleQo;
+import com.zjty.project.inspect.entity.*;
 
 import java.util.List;
 import java.util.Map;
@@ -17,16 +16,13 @@ public interface RuleService {
      * @param ruleQo 规则封装类
      */
     public void addRule(RuleQo ruleQo);
+
+    public void addRule(List<Rule> rules);
     /**
      * 修改规则
      * @param ruleQo 规则封装类
      */
     public void upRule(RuleQo ruleQo);
-    /**
-     * 根据id删除规则
-     * @param id
-     */
-    public void deleteById(String id);
 
     /**
      * 删除规则
@@ -38,10 +34,17 @@ public interface RuleService {
      * 查询所有规则
      * @return 规则
      */
-    List<RuleQo> findAll();
+    List<RuleCollection> findAll();
+
+    /**
+     * 查询所有规则
+     * @return 规则
+     */
+    List<Rule> findRules();
+
+    List<RuleCollection> findByName(String name);
 
-    List<RuleQo> findByName(String name);
+    CustomPage<RuleCollection> findSearch(Map searchMap, int page, int size);
 
-    CustomPage<RuleQo> findSearch(Map searchMap, int page, int size);
-    void test();
+    List<Rule> findAllByTechnologyIdIn(List<String> technologyIds);
 }