Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-api

src/main/java/com/steerinfo/ftp/uploadfile/controller/UploadFileController.java

@@ -1,6 +1,7 @@
 package com.steerinfo.ftp.uploadfile.controller;
 
 import com.steerinfo.auth.utils.JwtUtil;
+import com.steerinfo.ems.Utils.TreeUtils;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -222,4 +223,21 @@ public class UploadFileController extends BaseRESTfulController {
         Set<UploadFile> idAndName = uploadFileService.getIdAndName();
         return success(idAndName);
     }
+
+    @ApiOperation(value="获取树状数据", notes="获取TRmWorkproc的树形数据")
+    @GetMapping(value = "/getFileTree/")
+    public RESTfulResult getTree(@RequestParam HashMap parameters){
+        String fileType = parameters.get("fileType").toString().replace(",","|");
+        parameters.put("fileType",fileType);
+        TreeUtils treeUtils = new TreeUtils();
+        String securityInfo = parameters.get("securityInfo").toString().replaceAll(",","|");
+        //String[] securityInfo =parameters.get("securityInfo").toString().split(",");
+        List<UploadFile> lists = uploadFileService.getTreeByParameters(parameters);
+        //for (int i = 0; i <securityInfo.length; i++) {
+        //List<SecurityType> list = securityTypeService.getTreeByInfo(securityInfo[i]);
+        //lists.removeAll(list);
+        //lists.addAll(list);
+        //}
+        return success(treeUtils.getTreeData(lists));
+    }
 }

src/main/java/com/steerinfo/ftp/uploadfile/mapper/UploadFileMapper.java

@@ -4,11 +4,15 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.ftp.uploadfile.model.UploadFile;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 @Mapper
 public interface UploadFileMapper extends IBaseMapper<UploadFile, String> {
-    Set<UploadFile> getIdAndName ();
+    Set<UploadFile> getIdAndName();
 
-    Set<UploadFile> getTag ();
+    Set<UploadFile> getTag();
+
+    List<UploadFile> getTreeByParameters(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/ftp/uploadfile/mapper/UploadFileMapper.xml

@@ -343,4 +343,11 @@
   <select id="getTag" resultMap="BaseResultMap">
     select distinct FILE_TYPE FROM UPLOAD_FILE
   </select>
+  <select id="getTreeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT s.ID as TYPE,s.SECURITY_NAME AS CREATE_MAN,s.SECURITY_PARENTID AS UPDATE_MAN,
+    t.ID,t.FILE_NAME,t.FILE_URL FROM SECURITY_TYPE s
+    LEFT JOIN UPLOAD_FILE t ON s.ID = t.TYPE
+    <include refid="whereLike"/>
+    order by CREATE_MAN
+  </select>
 </mapper>

src/main/java/com/steerinfo/ftp/uploadfile/model/UploadFile.java

@@ -1,14 +1,16 @@
 package com.steerinfo.ftp.uploadfile.model;
 
+import com.steerinfo.ems.Utils.TreePO;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
+import java.util.List;
 
 @ApiModel(value="文件上传")
-public class UploadFile implements IBasePO<String> {
+public class UploadFile implements IBasePO<String>, TreePO<String, String, UploadFile> {
     /**
      * 主键ID(ID,VARCHAR,100)
      */
@@ -81,6 +83,34 @@ public class UploadFile implements IBasePO<String> {
 
     private static final long serialVersionUID = 1L;
 
+    private List<UploadFile> Children;
+
+    @Override
+    public List<UploadFile> getChildren() {
+        return Children;
+    }
+
+    @Override
+    public void setChildren(List<UploadFile> children) {
+        this.Children = children;
+    }
+
+    @Override
+    public String getCode(){return type;}
+
+    @Override
+    public void  setCode(String type){this.type = type == null ? null : type.trim();}
+
+    @Override
+    public String getParentId() {
+        return updateMan;
+    }
+
+    @Override
+    public void setParentId(String updateMan) {
+        this.updateMan = updateMan == null ? null : updateMan.trim();
+    }
+
     public String getId() {
         return id;
     }

src/main/java/com/steerinfo/ftp/uploadfile/service/IUploadFileService.java

@@ -3,6 +3,8 @@ package com.steerinfo.ftp.uploadfile.service;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.ftp.uploadfile.model.UploadFile;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -22,4 +24,6 @@ public interface IUploadFileService extends IBaseService<UploadFile, String>{
     Set<UploadFile> getIdAndName ();
 
     Set<UploadFile> getTag ();
+
+    List<UploadFile> getTreeByParameters(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/ftp/uploadfile/service/impl/UploadFileServiceImpl.java

@@ -2,17 +2,14 @@ package com.steerinfo.ftp.uploadfile.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.ftp.uploadfile.model.UploadFile;
 import com.steerinfo.ftp.uploadfile.mapper.UploadFileMapper;
+import com.steerinfo.ftp.uploadfile.model.UploadFile;
 import com.steerinfo.ftp.uploadfile.service.IUploadFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -49,5 +46,10 @@ public class UploadFileServiceImpl extends BaseServiceImpl<UploadFile, String> i
         return uploadFileMapper.getTag();
     }
 
+    @Override
+    public List<UploadFile> getTreeByParameters(Map<String, Object> parameters) {
+        return uploadFileMapper.getTreeByParameters(parameters);
+    }
+
 }