合并分支 'czq' 到 'master'

src/main/java/com/zjty/adaptationmaster/adaptor/entity/RuleSetAndRule.java

+package com.zjty.adaptationmaster.adaptor.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import net.bytebuddy.asm.Advice;
+
+import java.util.List;
+
+/**
+ * <h4>Description : adaptation-master</h4>
+ *
+ * @author : M@tr!x [xhyrzldf@foxmail.com]
+ * @Date : 2019-12-18 13:48
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RuleSetAndRule {
+    private List<RuleSet> ruleSets;
+    private List<Rule> rules;
+}

src/main/java/com/zjty/adaptationmaster/adaptor/repository/RuleDao.java

 package com.zjty.adaptationmaster.adaptor.repository;
 
 import com.zjty.adaptationmaster.adaptor.entity.Rule;
+import org.springframework.data.domain.Example;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
 
 /**
  * <h4>Description : adaptation-master</h4>
@@ -11,4 +15,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  * @Date : 2019-12-09 9:30
  */
 public interface RuleDao extends JpaRepository<Rule, Integer>,JpaSpecificationExecutor {
+
+    @Query("select r from Rule r where r.ruleSet = null and r.status = 1")
+    List<Rule> findRulesInProject();
 }

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/AssemblyServiceImpl.java

@@ -60,6 +60,7 @@ public class AssemblyServiceImpl implements AssemblyService{
                 .build();
 //        Pageable pageable = /*new */PageRequest.of(page-1, 10, Sort.Direction.DESC, "id");
         List<Assembly> assemblyList = assemblyDao.findAll(spec);
-        return ServerResponse.success(new ListResponse<>(assemblyDao.count(spec),assemblyList));
+//        return ServerResponse.success(new ListResponse<>(assemblyDao.count(spec),assemblyList));
+        return ServerResponse.success(assemblyList);
     }
 }

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/DependencyServiceImpl.java

@@ -41,12 +41,13 @@ public class DependencyServiceImpl implements DependencyService {
         //上传的依赖文件和依赖包
         if (!dependencyFile.isEmpty()) {
             //依赖名称
-            String photo = dependencyFile.getName();
-            dependency.setDependencyUrl(Const.UPLOAD_LOCATION+photo);
+            String originalFilename = dependencyFile.getOriginalFilename();
+            assert originalFilename != null;
+            dependency.setDependencyUrl(Const.UPLOAD_LOCATION+originalFilename);
             dependency.setStartTime(new Date());
             try {
                 InputStream inputStream = dependencyFile.getInputStream();
-                Files.copy(inputStream, Paths.get(Const.UPLOAD_LOCATION, photo));
+                Files.copy(inputStream, Paths.get(Const.UPLOAD_LOCATION, originalFilename));
                 inputStream.close();
             } catch (IOException e) {
                 e.printStackTrace();

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/RuleServiceImpl.java

@@ -4,6 +4,7 @@ import com.github.wenhao.jpa.Specifications;
 import com.zjty.adaptationmaster.adaptor.entity.Project;
 import com.zjty.adaptationmaster.adaptor.entity.Rule;
 import com.zjty.adaptationmaster.adaptor.entity.RuleSet;
+import com.zjty.adaptationmaster.adaptor.entity.RuleSetAndRule;
 import com.zjty.adaptationmaster.adaptor.repository.ProjectDao;
 import com.zjty.adaptationmaster.adaptor.repository.RuleDao;
 import com.zjty.adaptationmaster.adaptor.repository.RuleSetDao;
@@ -68,7 +69,8 @@ public class RuleServiceImpl implements RuleService{
                     .collect(toList());
             rules.setRuleList(ruleList);
         }
-        return ServerResponse.success(ruleSetList);
+        List<Rule> rules = ruleDao.findRulesInProject();
+        return ServerResponse.success(new RuleSetAndRule(ruleSetList,rules));
     }
 
 //    @Override