合并分支 'czq' 到 'master'

src/main/java/com/zjty/adaptationmaster/adaptor/controller/AssemblyController.java

@@ -34,9 +34,9 @@ public class AssemblyController {
         return assemblyService.deleteAssembly(id);
     }
 
-    @PostMapping("/{page}")
-    public ServerResponse findAssembly(@PathVariable("page") Integer page ,@RequestBody Assembly assembly){
-        return assemblyService.findAssembly(page,assembly);
+    @PostMapping
+    public ServerResponse findAssembly(@RequestBody Assembly assembly){
+        return assemblyService.findAssembly(0,assembly);
     }
 
 }

src/main/java/com/zjty/adaptationmaster/adaptor/controller/DependencyController.java

@@ -6,6 +6,7 @@ import com.zjty.adaptationmaster.base.response.ServerResponse;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 /**
@@ -26,8 +27,8 @@ public class DependencyController {
     }
 
     @PostMapping
-    public ServerResponse saveDependency(@RequestBody Dependency dependency , MultipartHttpServletRequest request){
-        return dependencyService.saveDependency(dependency,request);
+    public ServerResponse saveDependency(Dependency dependency , @RequestParam("dependency") MultipartFile file){
+        return dependencyService.saveDependency(dependency,file);
     }
 
     @DeleteMapping("/{id}")

src/main/java/com/zjty/adaptationmaster/adaptor/controller/ProjectController.java

 package com.zjty.adaptationmaster.adaptor.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.zjty.adaptationmaster.adaptor.entity.Project;
 import com.zjty.adaptationmaster.adaptor.service.ProjectService;
 import com.zjty.adaptationmaster.base.response.ServerResponse;
@@ -27,6 +28,7 @@ public class ProjectController {
 
     @PutMapping
     public ServerResponse saveProject(@RequestBody Project project){
+        System.out.println(JSON.toJSONString(project));
         return projectService.saveProject(project);
     }
 

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

@@ -27,8 +27,10 @@ public class Assembly {
 
     private String callingMode;//调用方式
 
+    private String demo;//demo链接
+
     @Temporal(TemporalType.TIMESTAMP)
-    private Date startTime;//上传时间
+    private Date startTime = new Date();//上传时间
 
     private Integer status = 1;//状态（0：删除 1：未删除）
 }

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

@@ -36,4 +36,13 @@ public class RuleSet {
 
     @OneToMany(mappedBy = "ruleSet", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private List<Rule> ruleList;//规则
+
+    /**
+     * 项目中的规则集的列表视图
+     */
+    public void ruleSetView(){
+        projects = null;
+        ruleList = null;
+    }
+
 }

src/main/java/com/zjty/adaptationmaster/adaptor/service/DependencyService.java

@@ -2,6 +2,7 @@ package com.zjty.adaptationmaster.adaptor.service;
 
 import com.zjty.adaptationmaster.adaptor.entity.Dependency;
 import com.zjty.adaptationmaster.base.response.ServerResponse;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 /**
@@ -12,7 +13,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
  */
 public interface DependencyService {
 
-    ServerResponse saveDependency(Dependency dependency , MultipartHttpServletRequest request);//保存依赖
+    ServerResponse saveDependency(Dependency dependency , MultipartFile file);//保存依赖
 
     ServerResponse deleteDependency(Integer id);//删除依赖
 

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

@@ -41,7 +41,7 @@ public class AssemblyServiceImpl implements AssemblyService{
     @Override
     public ServerResponse saveAssembly(Assembly assembly) {
         Assembly save = assemblyDao.save(assembly);
-        return ServerResponse.success(JSON.toJSONString(save));
+        return ServerResponse.success(save);
     }
 
     @Override
@@ -58,8 +58,8 @@ public class AssemblyServiceImpl implements AssemblyService{
                 .like(assembly.getName()!=null,"name","%"+assembly.getName()+"%")
                 .eq("status",1)
                 .build();
-        Pageable pageable = /*new */PageRequest.of(page-1, 10, Sort.Direction.DESC, "id");
-        List<Assembly> assemblyList = assemblyDao.findAll(spec,pageable).getContent();
+//        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));
     }
 }

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

@@ -37,14 +37,12 @@ public class DependencyServiceImpl implements DependencyService {
     }
 
     @Override
-    public ServerResponse saveDependency(Dependency dependency, MultipartHttpServletRequest request) {
+    public ServerResponse saveDependency(Dependency dependency, MultipartFile dependencyFile) {
         //上传的依赖文件和依赖包
-        MultipartFile dependencyFile = request.getFile("dependency");
         if (!dependencyFile.isEmpty()) {
             //依赖名称
             String photo = dependencyFile.getName();
-            dependency.setName(photo);
-            dependency.setDependencyUrl("/uploads/"+photo);
+            dependency.setDependencyUrl(Const.UPLOAD_LOCATION+photo);
             dependency.setStartTime(new Date());
             try {
                 InputStream inputStream = dependencyFile.getInputStream();

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

@@ -16,6 +16,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -42,8 +43,11 @@ public class ProjectServiceImpl implements ProjectService {
         if(project.getId() == null){
             project.setUpdateTime(new Date());
         }
+        List<Rule> rules = project.getRules();
+        if(rules != null)
+        rules.forEach(rule -> rule.setProject(project));
         Project save = projectDao.save(project);
-        return ServerResponse.success("项目创建成功",save);
+        return ServerResponse.success("项目创建成功",filter(save));
     }
 
     @Override
@@ -64,19 +68,35 @@ public class ProjectServiceImpl implements ProjectService {
         Pageable pageable = PageRequest.of(page-1, 10, Sort.Direction.DESC, "id");
         List<Project> projects = projectDao.findAll(spec,pageable).getContent();
         for (Project pro:projects) {
-            //过滤删除的规则集
-            List<RuleSet> ruleSets = pro.getRuleSets();
-            List<RuleSet> sets = ruleSets.stream().filter(ruleSet -> ruleSet.getStatus() != 0).collect(toList());
-            for (RuleSet set :sets) {
-                List<Rule> rs = set.getRuleList().stream().filter(rule -> rule.getStatus() != 0).collect(toList());
-                set.setRuleList(rs);
+            filter(pro);
+        }
+        return ServerResponse.success(new ListResponse<>(projectDao.count(spec),projects));
+    }
+
+    /**
+     * 过滤被删除的规则和规则集
+     * @param pro
+     * @return
+     */
+    private Project filter(Project pro){
+        //过滤删除的规则集
+        List<RuleSet> ruleSets = pro.getRuleSets();
+        if(ruleSets != null && ruleSets.size() > 0){
+            List<RuleSet> sets = new ArrayList<>();
+            for (RuleSet set :ruleSets) {
+                set.ruleSetView();
+                if(set.getStatus() == 1){
+                    sets.add(set);
+                }
             }
             pro.setRuleSets(sets);
-            //过滤删除的自定义规则
-            List<Rule> rules = pro.getRules();
-            List<Rule> collect = rules.stream().filter(rule -> rule.getStatus() != 0).collect(toList());
+        }
+        //过滤删除的自定义规则
+        List<Rule> rules = pro.getRules();
+        if(rules != null && rules.size() > 0){
+            List<Rule> collect = rules.stream().filter(rule -> rule != null && rule.getStatus() != 0).collect(toList());
             pro.setRules(collect);
         }
-        return ServerResponse.success(new ListResponse<>(projectDao.count(spec),projects));
+        return pro;
     }
 }

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

@@ -42,8 +42,10 @@ public class RuleServiceImpl implements RuleService{
 
     @Override
     public ServerResponse addRuleSet(RuleSet ruleSet) {
+        List<Rule> ruleList = ruleSet.getRuleList();
+        ruleList.forEach(rule -> rule.setRuleSet(ruleSet));
         RuleSet save = ruleSetDao.save(ruleSet);
-        return ServerResponse.success(save);
+        return ServerResponse.success(filter(save));
     }
 
     @Override
@@ -92,4 +94,11 @@ public class RuleServiceImpl implements RuleService{
         rule.setStatus(0);
         return ServerResponse.success("删除成功");
     }
+
+    private RuleSet filter(RuleSet ruleSet){
+        List<Rule> rules = ruleSet.getRuleList();
+        List<Rule> collect = rules.stream().filter(rule -> rule.getStatus() != 0).collect(toList());
+        ruleSet.setRuleList(collect);
+        return ruleSet;
+    }
 }

src/main/java/com/zjty/adaptationmaster/base/enums/Const.java

@@ -3,6 +3,10 @@ package com.zjty.adaptationmaster.base.enums;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * Description : 常量
  *
@@ -33,4 +37,6 @@ public class Const {
     String SERVER_RESPONSE_DATA_EXAMPLE =
         "[{'name' : '设备1号', 'id' : 'K001002'},{'name' : '设备2号', 'id' : 'K003004'}]";
   }
+
+    public static Map<String,Long> transferCountMap = new ConcurrentHashMap<>();
 }

src/main/java/com/zjty/adaptationmaster/config/MyCorsFilter.java

+package com.zjty.adaptationmaster.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Objects;
+
+/**
+ * Description : 设置response用来解决前后端跨域问题 Date : 2017/12/23 20:25
+ *
+ * @author : M@tr!x [xhyrzldf@foxmail.com]
+ */
+@Order(1)
+@Component
+public class MyCorsFilter implements Filter {
+
+    private static final Logger logger = LoggerFactory.getLogger(MyCorsFilter.class);
+
+    /**
+     * Servlet过滤器，这里用来处理跨域请求HEADER问题
+     *
+     * @param req
+     * @param res
+     * @param chain
+     * @throws IOException
+     * @throws ServletException
+     */
+    @Override
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+            throws IOException, ServletException {
+        HttpServletResponse response = (HttpServletResponse) res;
+        HttpServletRequest request = (HttpServletRequest) req;
+//    String url="192.168.1.111:8888/"
+
+        // 记录发送过来的request情况
+//    logger.info("RequestURI = {}", request.getRequestURI());
+//    logger.info("contentType = {}", request.getContentType());
+
+        request.getParameterMap().forEach((key, value) -> logger.info("Map -> key = {} , value = {}", key, value));
+        // 设置响应头的权限信息 request.getHeader("Origin")
+        String origin = request.getHeader("Origin");
+//        logger.info("request 's header is {}", origin);
+        if (Objects.isNull(origin)) {
+            response.setHeader("Access-Control-Allow-Origin", "*");
+        } else {
+            response.setHeader("Access-Control-Allow-Origin", origin);
+        }
+//        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, PATCH, DELETE");
+        response.setHeader("Access-Control-Max-Age", "3600");
+        response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Access-Token, Accept,token, uuid");
+
+        chain.doFilter(request, response);
+    }
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+    }
+
+    @Override
+    public void destroy() {
+    }
+}