lizeyu 7 месяцев назад
Родитель
Сommit
d1336eb507

+ 26 - 58
src/main/java/com/ghsc/partybuild/service/impl/workresourcelibrary/WorkResourceLibraryServiceImpl.java

@@ -1,7 +1,10 @@
 package com.ghsc.partybuild.service.impl.workresourcelibrary;
 
 import com.ghsc.partybuild.controller.jsonmodel.RequsetData;
-import com.ghsc.partybuild.mapper.*;
+import com.ghsc.partybuild.mapper.CfFileMapper;
+import com.ghsc.partybuild.mapper.DjWorkresourcelibraryCQuery;
+import com.ghsc.partybuild.mapper.DjWorkresourcelibraryMapper;
+import com.ghsc.partybuild.mapper.DjWorkresourcelibrarytypeMapper;
 import com.ghsc.partybuild.model.*;
 import com.ghsc.partybuild.service.DictionaryService;
 import com.ghsc.partybuild.service.workresourcelibrary.WorkResourceLibraryService;
@@ -17,7 +20,6 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 
 /**
- *
  * @author wufs
  * @date 2020/05/15
  */
@@ -67,70 +69,53 @@ public class WorkResourceLibraryServiceImpl implements WorkResourceLibraryServic
         return pList;
     }
 
-    protected List<String> findFileTypeAndChildren(String fileTypeId){
+    protected List<String> findFileTypeAndChildren(String fileTypeId) {
 
-        List<String> fileTypeids=new ArrayList<>();
+        List<String> fileTypeids = new ArrayList<>();
 
         DjWorkresourcelibrarytype filetype = djWorkresourcelibrarytypeMapper.selectByPrimaryKey(fileTypeId);
 
-        if(filetype!=null){
+        if (filetype != null) {
             fileTypeids.add(filetype.getFiletypeid());
-            getFileTypeChildren(filetype.getFiletypeid(),fileTypeids);
+            getFileTypeChildren(filetype.getFiletypeid(), fileTypeids);
         }
 
         return fileTypeids;
     }
 
-    protected void getFileTypeChildren(String parentfileTypeId,List<String> ids){
-        DjWorkresourcelibrarytypeExample exp=new DjWorkresourcelibrarytypeExample();
+    protected void getFileTypeChildren(String parentfileTypeId, List<String> ids) {
+        DjWorkresourcelibrarytypeExample exp = new DjWorkresourcelibrarytypeExample();
         exp.or().andParenttypeidEqualTo(parentfileTypeId);
-        List<DjWorkresourcelibrarytype> typeChildren=djWorkresourcelibrarytypeMapper.selectByExample(exp);
+        List<DjWorkresourcelibrarytype> typeChildren = djWorkresourcelibrarytypeMapper.selectByExample(exp);
 
-        typeChildren.forEach(it->{
+        typeChildren.forEach(it -> {
             ids.add(it.getFiletypeid());
-            this.getFileTypeChildren(it.getFiletypeid(),ids);
+            this.getFileTypeChildren(it.getFiletypeid(), ids);
         });
 
     }
 
-    @Override
-    public List<DjWorkresourcelibrarytype> getFileTypeRoot() {
-
-        DjWorkresourcelibrarytypeExample exp = new DjWorkresourcelibrarytypeExample();
-        exp.or().andParenttypeidIsNull();
-        exp.setOrderByClause("treelevel asc");
-        List<DjWorkresourcelibrarytype> filesRoot = djWorkresourcelibrarytypeMapper.selectByExample(exp);
-
-        return filesRoot;
-    }
-
-    @Override
-    public List<DjWorkresourcelibrarytype> getFileTypeByParent(String parentId) {
-        DjWorkresourcelibrarytypeExample exp = new DjWorkresourcelibrarytypeExample();
-        exp.or().andParenttypeidEqualTo(parentId);
-        exp.setOrderByClause("treelevel asc");
-        List<DjWorkresourcelibrarytype> filetypes = djWorkresourcelibrarytypeMapper.selectByExample(exp);
-        return filetypes;
-    }
-
     @Override
     public List<DsjTreeFiletype> getFileTreeByParent(String parentId, List<String> typeIds, List<String> passTypeIds) {
 
         return djWorkresourcelibraryCQuery.selectTreeFiles(parentId, null, typeIds, passTypeIds);
     }
+
     @Override
-    public PageInfo<Map<String, Object>> selectFiletypeList(String typename,String parentId ,int pageIndex, int pageSize) {
+    public PageInfo<Map<String, Object>> selectFiletypeList(String typename, String parentId, int pageIndex, int pageSize) {
         PageHelper.startPage(pageIndex, pageSize);
         List<DsjTreeFiletype> list = djWorkresourcelibraryCQuery.selectTreeFiles(parentId, typename, null, null);
         PageInfo<Map<String, Object>> pList = new PageInfo(list);
         return pList;
     }
+
     @Override
     public DjWorkresourcelibrarytype getFiletype(String typeid) {
 
-        DjWorkresourcelibrarytype filetype= djWorkresourcelibrarytypeMapper.selectByPrimaryKey(typeid);
-        return  filetype;
+        DjWorkresourcelibrarytype filetype = djWorkresourcelibrarytypeMapper.selectByPrimaryKey(typeid);
+        return filetype;
     }
+
     @Override
     public int deleteFiletype(String id) {
         DjWorkresourcelibrarytypeExample exp = new DjWorkresourcelibrarytypeExample();
@@ -139,12 +124,13 @@ public class WorkResourceLibraryServiceImpl implements WorkResourceLibraryServic
         djWorkresourcelibrarytypeMapper.deleteByExample(exp);
         return djWorkresourcelibrarytypeMapper.deleteByPrimaryKey(id);
     }
+
     @Override
-    public RequsetData<String>  saveFiletype(DjWorkresourcelibrarytype model) {
+    public RequsetData<String> saveFiletype(DjWorkresourcelibrarytype model) {
         RequsetData<String> res = new RequsetData<String>();
         int result = 0;
         DjWorkresourcelibrarytype item = djWorkresourcelibrarytypeMapper.selectByPrimaryKey(model.getFiletypeid());
-        if (item==null) {
+        if (item == null) {
             model.setFiletypeid(UUID.randomUUID().toString());
             result = djWorkresourcelibrarytypeMapper.insert(model);
         } else {
@@ -162,11 +148,13 @@ public class WorkResourceLibraryServiceImpl implements WorkResourceLibraryServic
         }
         return res;
     }
+
     @Override
     public DjWorkresourcelibrary getFileInfo(String fileId) {
 
         return djWorkresourcelibraryMapper.selectByPrimaryKey(fileId);
     }
+
     @Override
     public int deleteFile(String id) {
         return djWorkresourcelibraryMapper.deleteByPrimaryKey(id);
@@ -177,7 +165,7 @@ public class WorkResourceLibraryServiceImpl implements WorkResourceLibraryServic
         RequsetData<String> res = new RequsetData<String>();
         int result = 0;
         DjWorkresourcelibrary item = djWorkresourcelibraryMapper.selectByPrimaryKey(model.getFileid());
-        if (item==null) {
+        if (item == null) {
             model.setCreatedatetime(new Date());
             model.setCreateuserid(userId);
             model.setUpdatedatetime(new Date());
@@ -191,7 +179,7 @@ public class WorkResourceLibraryServiceImpl implements WorkResourceLibraryServic
             item.setSsfl(model.getSsfl());
             model.setUpdatedatetime(new Date());
             model.setUpdateuserid(userId);
-            result= djWorkresourcelibraryMapper.updateByPrimaryKeySelective(item);
+            result = djWorkresourcelibraryMapper.updateByPrimaryKeySelective(item);
         }
         if (result > 0) {
             res.setSuccess(true);
@@ -203,26 +191,6 @@ public class WorkResourceLibraryServiceImpl implements WorkResourceLibraryServic
         return res;
     }
 
-    @Override
-    public PageInfo<Map<String, Object>> FindFilesApp(String fileName, String fileTypeId, int pageIndex, int pageSize) {
-
-
-        List<String> typeIds=new ArrayList<>();
-
-        if(!stringUtils.IsNullOrEmpty(fileTypeId)) {
-            typeIds = findFileTypeAndChildren(fileTypeId);
-
-        }
-
-        PageHelper.startPage(pageIndex, pageSize);
-        PageHelper.orderBy("TREELEVEL asc,cast(filecode2 as unsigned int) asc");
-        List<Map<String,Object>> list= djWorkresourcelibraryCQuery.FindDSJ_File(fileName,typeIds);
-
-        PageInfo<Map<String, Object>> pList = new PageInfo(list);
-
-        return pList;
-    }
-
     @Override
     public PageInfo<Map<String, Object>> getFileList(String fileRefID, Integer fileTypeId, int pageIndex, int pageSize) {
 

+ 27 - 28
src/main/java/com/ghsc/partybuild/service/workresourcelibrary/WorkResourceLibraryService.java

@@ -11,7 +11,6 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *
  * @author wufs
  * @date 2020/05/15
  */
@@ -19,48 +18,41 @@ public interface WorkResourceLibraryService {
 
     /**
      * 文件类型
+     *
      * @param fileTypeId id
-     * @param fileName fn
-     * @param pageIndex pi
-     * @param pageSize ps
+     * @param fileName   fn
+     * @param pageIndex  pi
+     * @param pageSize   ps
      * @return list
      */
     PageInfo<DjWorkresourcelibraryVo> getFilesByType(String fileTypeId, String fileName, int pageIndex, int pageSize);
 
     /**
      * 获取文件
+     *
      * @return list
      */
     List<Map<String, Object>> selectAllFile();
 
-    /**
-     * 获取根
-     * @return
-     */
-    List<DjWorkresourcelibrarytype> getFileTypeRoot();
-
-    /**
-     * 获取文件类型1
-     * @param parentId
-     * @return list
-     */
-    List<DjWorkresourcelibrarytype> getFileTypeByParent(String parentId);
-
     /**
      * 获取文件树
+     *
      * @param parentId 父id
      * @return 文件
      */
-    List<DsjTreeFiletype> getFileTreeByParent(String parentId,List<String> typeIds,List<String> passTypeIds);
+    List<DsjTreeFiletype> getFileTreeByParent(String parentId, List<String> typeIds, List<String> passTypeIds);
 
     /**
      * 获取文件树
+     *
      * @param parentId 父id
      * @return 文件
      */
-    PageInfo<Map<String, Object>> selectFiletypeList(String typename,String parentId ,int pageIndex, int pageSize);
+    PageInfo<Map<String, Object>> selectFiletypeList(String typename, String parentId, int pageIndex, int pageSize);
+
     /**
      * 获取文件类型
+     *
      * @param typeid
      * @return 文件类型
      */
@@ -68,18 +60,23 @@ public interface WorkResourceLibraryService {
 
     /**
      * 删除文件类型
+     *
      * @param id
      * @return
      */
     int deleteFiletype(String id);
+
     /**
      * 保存文件类型
+     *
      * @param model
      * @return
      */
-    RequsetData<String>  saveFiletype(DjWorkresourcelibrarytype model);
+    RequsetData<String> saveFiletype(DjWorkresourcelibrarytype model);
+
     /**
      * 获取文件信息
+     *
      * @param fileId id
      * @return m
      */
@@ -87,26 +84,29 @@ public interface WorkResourceLibraryService {
 
     /**
      * 查询cf_file表附件
-     * @Date 17:31 2019/7/31
-     * @param fileRefID id
+     *
+     * @param fileRefID  id
      * @param fileTypeId 1
-     * @param pageIndex 1
-     * @param pageSize 1
+     * @param pageIndex  1
+     * @param pageSize   1
      * @return 附件
+     * @Date 17:31 2019/7/31
      */
     PageInfo<Map<String, Object>> getFileList(String fileRefID, Integer fileTypeId, int pageIndex, int pageSize);
 
     /**
      * 查询方法
-     * @param fileName 文件名 key
+     *
+     * @param fileName  文件名 key
      * @param pageIndex 1
-     * @param pageSize 10
+     * @param pageSize  10
      * @return list
      */
     PageInfo<DjWorkresourcelibraryVo> getFilesByKey(String fileName, int pageIndex, int pageSize);
 
     /**
      * 删除方法
+     *
      * @param id 10
      * @return list
      */
@@ -114,10 +114,9 @@ public interface WorkResourceLibraryService {
 
     /**
      * 保存方法
+     *
      * @param model 10
      * @return list
      */
     RequsetData<String> saveFile(DjWorkresourcelibrary model, String userId);
-
-    PageInfo<Map<String,Object>> FindFilesApp(String fileName, String fileTypeId, int pageIndex, int pageSize);
 }

+ 45 - 28
src/main/resources/static/app/main/partyUser/workResourceLibrary/fileTreeList.html

@@ -20,38 +20,44 @@
                             <div class="col-md-3 col-lg-3 col-xs-12 col-sm-12">
                                 <div class="card" style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);">
                                     <div class="header">
-<!--                                        <div class="title" style="font-weight: bold;font-size: 16px;"> <i class="material-icons" style="float: left;margin-right: 7px;font-size: 20px;">folder</i>模板分类</div>-->
+                                        <!--                                        <div class="title" style="font-weight: bold;font-size: 16px;"> <i class="material-icons" style="float: left;margin-right: 7px;font-size: 20px;">folder</i>模板分类</div>-->
                                         <div class="title" style="font-weight: bold;font-size: 16px;">
-                                            <span style="margin-left:10px;cursor:pointer;" ng-class="selectData.filetypeid==null?'party_active':'' "
+                                            <span style="margin-left:10px;cursor:pointer;"
+                                                  ng-class="selectData.filetypeid==null?'party_active':'' "
                                                   ng-click="clickTreeChild(null)">模板分类</span>
-                                                <i class="glyphicon glyphicon-remove-circle pull-right"
-                                                   style="padding: 4px;"
-                                                   role-permission-code="workResourceLibraryList.btnDeleteType"
-                                                   title="删除题库" ng-click="deleteFileType()"></i>
-                                                <i class="glyphicon glyphicon-edit pull-right" style="padding: 4px;"
-                                                   role-permission-code="workResourceLibraryList.btnEditType"
-                                                   title="修改题库" ng-click="editFileType()"></i>
-                                                <i class="glyphicon glyphicon-plus-sign pull-right" style="padding: 4px;"
-                                                   role-permission-code="workResourceLibraryList.btnAddType"
-                                                   title="新增题库" ng-click="addFileType()"></i>
-                                            </div>
+                                            <i class="glyphicon glyphicon-remove-circle pull-right"
+                                               style="padding: 4px;"
+                                               role-permission-code="workResourceLibraryList.btnDeleteType"
+                                               title="删除题库" ng-click="deleteFileType()"></i>
+                                            <i class="glyphicon glyphicon-edit pull-right" style="padding: 4px;"
+                                               role-permission-code="workResourceLibraryList.btnEditType"
+                                               title="修改题库" ng-click="editFileType()"></i>
+                                            <i class="glyphicon glyphicon-plus-sign pull-right" style="padding: 4px;"
+                                               role-permission-code="workResourceLibraryList.btnAddType"
+                                               title="新增题库" ng-click="addFileType()"></i>
+                                        </div>
                                     </div>
                                     <div class="body tree-body">
                                         <div class="menu">
                                             <script type="text/ng-template" id="nodes.html">
                                                 <li class="row">
-                                                    <div ng-click="clickTreeChild(tree)" ng-class="selectData.filetypeid==tree.id?'party_active':'' ">
-                                                        <i ng-if="tree.childcount>0" class="material-icons">{{tree.expand ? 'expand_more' :
+                                                    <div ng-click="clickTreeChild(tree)"
+                                                         ng-class="selectData.filetypeid==tree.id?'party_active':'' ">
+                                                        <i ng-if="tree.childcount>0" class="material-icons">{{tree.expand
+                                                            ? 'expand_more' :
                                                             'chevron_right'}}</i>
-                                                        <span class="icon-name" ng-class="tree.childcount>0?'':'icon-name-spac'">{{tree.name}}</span>
+                                                        <span class="icon-name"
+                                                              ng-class="tree.childcount>0?'':'icon-name-spac'">{{tree.name}}</span>
                                                     </div>
                                                     <div ng-hide="!tree.expand">
                                                         <div class="treeitem"
-                                                             ng-repeat="tree in tree.children" ng-include="'nodes.html'"></div>
+                                                             ng-repeat="tree in tree.children"
+                                                             ng-include="'nodes.html'"></div>
                                                     </div>
                                                 </li>
                                             </script>
-                                            <ul class="list-group" ng-repeat="tree in navList" ng-include="'nodes.html'">
+                                            <ul class="list-group" ng-repeat="tree in navList"
+                                                ng-include="'nodes.html'">
                                             </ul>
                                         </div>
                                     </div>
@@ -61,10 +67,12 @@
                                 <div class="table-responsive list-table-panel">
                                     <div class="search-btn" style="margin-bottom: 40px;">
                                         <div style="float: right">
-                                            <button role-permission-code="workResourceLibraryList.btnAdd" class="btn btn-default1"
+                                            <button role-permission-code="workResourceLibraryList.btnAdd"
+                                                    class="btn btn-default1"
                                                     ng-click="addFile()">新增
                                             </button>
-                                            <button role-permission-code="workResourceLibraryList.btnExport" class="btn btn-default1"
+                                            <button role-permission-code="workResourceLibraryList.btnExport"
+                                                    class="btn btn-default1"
                                                     ng-click="exportFile()">导出
                                             </button>
                                         </div>
@@ -72,7 +80,9 @@
                                     <table class="table table-bordered table-striped table-hover js-basic-example dataTable table-text-clip">
                                         <thead>
                                         <tr>
-                                            <th class="th-rownum"><div>序号</div></th>
+                                            <th class="th-rownum">
+                                                <div>序号</div>
+                                            </th>
                                             <th>文件名称</th>
                                             <th>所属分类</th>
                                             <th>上传人</th>
@@ -82,8 +92,11 @@
                                         </thead>
                                         <tbody>
                                         <tr ng-repeat="f in fileList">
-                                            <td class="text-center" td-rownum index="$index" pageindex="selectData.pageindex" pagesize="selectData.pagesize"></td>
-                                            <td class="td_long_content" title="{{ f.filename}}"><a href="javascript:void(0)" ng-click="viewFile(f.fileid,f.filename)">{{ f.filename}}</a></td>
+                                            <td class="text-center" td-rownum index="$index"
+                                                pageindex="selectData.pageindex" pagesize="selectData.pagesize"></td>
+                                            <td class="td_long_content" title="{{ f.filename}}"><a
+                                                    href="javascript:void(0)" ng-click="viewFile(f.fileid,f.filename)">{{
+                                                f.filename}}</a></td>
                                             <td class="text-center">{{f.ssfltypename}}</td>
                                             <td class="text-center">{{f.username}}</td>
                                             <td class="text-center">{{f.updatedatetime|date:'yyyy-MM-dd'}}</td>
@@ -93,29 +106,33 @@
                                                         ng-click="viewFile(f.fileid,f.filename)">
                                                     查看
                                                 </button>
-                                                <button class="btn td-btn bg-pink waves-effect" title="修改" role-permission-code="workResourceLibraryList.btnEdit"
+                                                <button class="btn td-btn bg-pink waves-effect" title="修改"
+                                                        role-permission-code="workResourceLibraryList.btnEdit"
                                                         ng-click="editFile(f.fileid)">
                                                     修改
                                                 </button>
-                                                <button class="btn td-btn bg-pink waves-effect" title="删除" role-permission-code="workResourceLibraryList.btnDelete"
+                                                <button class="btn td-btn bg-pink waves-effect" title="删除"
+                                                        role-permission-code="workResourceLibraryList.btnDelete"
                                                         ng-click="deleteFile(f.fileid)">
                                                     删除
                                                 </button>
-                                                <button class="btn td-btn bg-light-second waves-effect" title="下载" role-permission-code="workResourceLibraryList.btnDown"
+                                                <button class="btn td-btn bg-light-second waves-effect" title="下载"
+                                                        role-permission-code="workResourceLibraryList.btnDown"
                                                         ng-click="downloadFile(f.fileid)">
                                                     下载
                                                 </button>
                                             </td>
                                         </tr>
                                         <tr ng-if="fileList.length<=0">
-                                            <td colspan="5" style="text-align:center">暂无数据</td>
+                                            <td colspan="6" style="text-align:center">暂无数据</td>
                                         </tr>
                                         </tbody>
                                     </table>
                                 </div>
                                 <!--参数含义:page-Index:当前页面,page-Size:每页显示多少数据,total-Length:数据总长度-->
                                 <pagination ng-if="fileList.length>0" data-pageindex="selectData.pageindex"
-                                            data-pagesize="selectData.pagesize" data-ptotal="selectData.ptotal"></pagination>
+                                            data-pagesize="selectData.pagesize"
+                                            data-ptotal="selectData.ptotal"></pagination>
                             </div>
                         </div>
                     </div>