Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

dsk-admin/src/main/java/com/dsk/web/controller/system/SysUserController.java

@@ -125,7 +125,7 @@ public class SysUserController extends BaseController {
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
         List<Object> list = new ArrayList<>();
-        list.add(new SysUserImportVo("测试部门", "测试用户昵称", "18888888888", "测试角色"));
+        list.add(new SysUserImportVo("测试组织", "测试用户昵称", "18888888888", "测试角色"));
         ExcelUtil.exportTemplate(list, "用户数据", "excel/userImportTemplate.xlsx", response);
     }
 

dsk-common/src/main/java/com/dsk/common/constant/Constants.java

@@ -77,5 +77,10 @@ public interface Constants {
      */
     Long TOP_PARENT_ID = 0L;
 
+
+    String SUFFIX_XLSX = ".xlsx";
+
+    String CONTENT_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+
 }
 

dsk-common/src/main/java/com/dsk/common/core/page/TableDataInfo.java

@@ -48,6 +48,8 @@ public class TableDataInfo<T> implements Serializable {
     public TableDataInfo(List<T> list, long total) {
         this.rows = list;
         this.total = total;
+        this.code = HttpStatus.HTTP_OK;
+        this.msg = "查询成功";
     }
 
     public static <T> TableDataInfo<T> build(IPage<T> page) {

dsk-module/dsk-biz-api/pom.xml

@@ -28,6 +28,16 @@
             <artifactId>dsk-sms</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.dsk</groupId>
+            <artifactId>dsk-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.dsk</groupId>
+            <artifactId>dsk-system</artifactId>
+        </dependency>
+
         <!-- 短信 用哪个导入哪个依赖 -->
 <!--        <dependency>-->
 <!--            <groupId>com.aliyun</groupId>-->

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/utils/ExcelUtils.java

@@ -310,6 +310,21 @@ public class ExcelUtils<T> {
         exportExcel(response);
     }
 
+    public ByteArrayOutputStream exportExcel( List<T> list, String sheetName, String title, boolean dateStatus) {
+        ByteArrayOutputStream ba= new ByteArrayOutputStream();
+        this.init(list, sheetName, title, Excel.Type.EXPORT, dateStatus);
+        try {
+            writeSheet();
+            wb.write(ba);
+        } catch (Exception e) {
+            log.error("导出Excel异常{}", e.getMessage());
+        } finally {
+            IOUtils.closeQuietly(wb);
+        }
+        return ba;
+    }
+
+
     private static final String FILE_PATH = "D://";
 
     /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/JskCombineInfoController.java

@@ -2,16 +2,23 @@ package com.dsk.jsk.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.dsk.biz.utils.ExcelUtils;
+import com.dsk.common.constant.Constants;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.core.service.OssService;
 import com.dsk.jsk.domain.JskCombineBidPageDto;
 import com.dsk.jsk.domain.JskCombineCertificateDto;
 import com.dsk.jsk.domain.JskCombineSearchDto;
 import com.dsk.jsk.domain.vo.JskCombineBidProjectExportVo;
 import com.dsk.jsk.domain.vo.JskCombineWinBidProjectExportVo;
 import com.dsk.jsk.service.JskCombineInfoService;
+import com.dsk.oss.core.OssClient;
+import com.dsk.oss.entity.UploadResult;
+import com.dsk.oss.factory.OssFactory;
+import com.dsk.system.domain.vo.SysOssVo;
+import com.dsk.system.service.ISysOssService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +45,8 @@ public class JskCombineInfoController extends BaseController {
 
     @Autowired
     private JskCombineInfoService baseService;
+    @Autowired
+    private ISysOssService ossService;
 
     /**
      * 集团成员列表
@@ -89,7 +100,7 @@ public class JskCombineInfoController extends BaseController {
      * 集团户搜索
      */
     @PostMapping("/index")
-    public AjaxResult index(@RequestBody Map<String,Object> object) {
+    public AjaxResult index(@RequestBody Map<String, Object> object) {
         return baseService.index(object);
     }
 
@@ -113,7 +124,7 @@ public class JskCombineInfoController extends BaseController {
      * 查央企子公司  翻页
      */
     @PostMapping("/centralEnterprse/child/page")
-    public AjaxResult centralEnterprseChildPage(@RequestBody Map<String,Object> object) {
+    public AjaxResult centralEnterprseChildPage(@RequestBody Map<String, Object> object) {
         return baseService.centralEnterprseChildPage(object);
     }
 
@@ -121,7 +132,7 @@ public class JskCombineInfoController extends BaseController {
      * 查地方国企
      */
     @PostMapping("/centralEnterprse/local")
-    public AjaxResult centralEnterprseLocal(@RequestBody Map<String,Object> object) {
+    public AjaxResult centralEnterprseLocal(@RequestBody Map<String, Object> object) {
         return baseService.centralEnterprseLocal(object);
     }
 
@@ -129,7 +140,7 @@ public class JskCombineInfoController extends BaseController {
      * 查地方国企 翻页
      */
     @PostMapping("/centralEnterprse/local/page")
-    public AjaxResult centralEnterprseLocalPage(@RequestBody Map<String,Object> object) {
+    public AjaxResult centralEnterprseLocalPage(@RequestBody Map<String, Object> object) {
         return baseService.centralEnterprseLocalPage(object);
     }
 
@@ -145,7 +156,7 @@ public class JskCombineInfoController extends BaseController {
      * 民营企业  翻页
      */
     @PostMapping("/centralEnterprse/social/page")
-    public AjaxResult centralEnterprseSocialPage(@RequestBody Map<String,Object> object) {
+    public AjaxResult centralEnterprseSocialPage(@RequestBody Map<String, Object> object) {
         return baseService.centralEnterprseSocialPage(object);
     }
 
@@ -175,10 +186,28 @@ public class JskCombineInfoController extends BaseController {
 
 
     /**
-     *  集团招标分页列表
+     * 集团招标分页列表
      */
     @PostMapping("/bidPage")
     public TableDataInfo bidPage(@RequestBody JskCombineBidPageDto dto) throws Exception {
         return baseService.bidPage(dto);
     }
+
+
+    /**
+     * 导出上传oss测试
+     */
+    @PostMapping("/export/upload")
+    public R<SysOssVo> exportuUpload(@RequestBody JskCombineSearchDto dto) {
+        List<JskCombineWinBidProjectExportVo> list = baseService.exportWinBid(dto);
+        String title = dto.getCombineName().concat("中标业绩清单");
+        ExcelUtils<JskCombineWinBidProjectExportVo> util = new ExcelUtils<>(JskCombineWinBidProjectExportVo.class);
+        ByteArrayOutputStream ba = util.exportExcel(list, "集团中标", title, true);
+        ByteArrayInputStream bio = new ByteArrayInputStream(ba.toByteArray());
+        OssClient client = OssFactory.instance();
+        UploadResult uploadResult = client.uploadSuffix(bio, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
+        //总文件记录
+        SysOssVo sysOssVo = ossService.buildResultEntity(title.concat(Constants.SUFFIX_XLSX), Constants.SUFFIX_XLSX, client.getConfigKey(), uploadResult);
+        return R.ok(sysOssVo);
+    }
 }

dsk-operate-ui/public/index.html

@@ -118,7 +118,8 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #7171C6;
+      /*background: #7171C6;*/
+      background: #46A5FF;
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);
@@ -197,12 +198,12 @@
   </head>
   <body>
     <div id="app">
-<!--	    <div id="loader-wrapper">
+	    <div id="loader-wrapper">
 		    <div id="loader"></div>
 		    <div class="loader-section section-left"></div>
 		    <div class="loader-section section-right"></div>
-		    <div class="load_title">正在加载系统资源，请耐心等待</div>
-      </div>-->
+		    <div class="load_title">正在加载央企数字化经营管理系统</div>
+      </div>
 	</div>
   </body>
 </html>

dsk-operate-ui/src/layout/components/TagsView/index.vue

 <template>
   <div id="tags-view-container" class="tags-view-container">
-    <div class="alltags" v-if="visitedViews.length > 0">
-      <div class="imgs" @click="closeall">
-        <img src="@/assets/images/all.png" v-if="!showall"/>
-        <img src="@/assets/images/all_on.png" v-if="showall"/>
-        <!--<i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i>-->
+    <div id="getviews">
+      <div class="alltags" v-if="visitedViews.length > 0">
+        <div class="imgs" @click="closeall">
+          <img src="@/assets/images/all.png" v-if="!showall"/>
+          <img src="@/assets/images/all_on.png" v-if="showall"/>
+          <!--<i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i>-->
+          </div>
+        <el-collapse-transition>
+        <div class="tagslist" v-if="showall">
+          <draggable v-model="visitedViews" :options="dragOptions" @end="end">
+            <router-link
+              v-for="(tag, index) in visitedViews"
+              ref="tag"
+              :key="tag.path"
+              :class="isActive(tag)?'active':''"
+              :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
+              tag="span"
+              class="tags-view-item"
+              @contextmenu.prevent.native="openMenu(tag,$event)"
+            >
+              <div @click="changetags">
+                <i class="el-icon-check"></i>
+                <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+              </div>
+            </router-link>
+            <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
+
+          </draggable>
         </div>
-      <div class="tagslist" v-if="showall">
+        </el-collapse-transition>
+      </div>
+      <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
         <draggable v-model="visitedViews" :options="dragOptions" @end="end">
           <router-link
             v-for="(tag, index) in visitedViews"
@@ -16,41 +41,19 @@
             :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
             tag="span"
             class="tags-view-item"
+            @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
             @contextmenu.prevent.native="openMenu(tag,$event)"
           >
-            <div @click="changetags">
-              <i class="el-icon-check"></i>
-              <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
-            </div>
+            <svg :class="isActive(tag)?'tags-icon tags-icon-active':'tags-icon'" aria-hidden="true">
+              <use :xlink:href="iconName(tag)" />
+            </svg>
+            <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+            <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+            <i :class="index!=visitedViews.length-1 && index != isActiveIndex() && index != isActiveIndex()-1?'tags-item-line':'tags-item-line item-color'" />
           </router-link>
-          <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
-
         </draggable>
-      </div>
-    </div>
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
-      <draggable v-model="visitedViews" :options="dragOptions" @end="end">
-        <router-link
-          v-for="(tag, index) in visitedViews"
-          ref="tag"
-          :key="tag.path"
-          :class="isActive(tag)?'active':''"
-          :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-          tag="span"
-          class="tags-view-item"
-          @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
-          @contextmenu.prevent.native="openMenu(tag,$event)"
-        >
-          <svg :class="isActive(tag)?'tags-icon tags-icon-active':'tags-icon'" aria-hidden="true">
-            <use :xlink:href="iconName(tag)" />
-          </svg>
-          <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
-          <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-          <i :class="index!=visitedViews.length-1 && index != isActiveIndex() && index != isActiveIndex()-1?'tags-item-line':'tags-item-line item-color'" />
-        </router-link>
-      </draggable>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+      </scroll-pane>
+      <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>
       <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>
@@ -58,6 +61,7 @@
       <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
       <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
     </ul>
+    </div>
   </div>
 </template>
 
@@ -118,6 +122,7 @@ export default {
     $route() {
       this.addTags()
       this.moveToCurrentTag()
+      this.getviews()
     },
     visible(value) {
       if (value) {
@@ -130,8 +135,27 @@ export default {
   mounted() {
     this.initTags()
     this.addTags()
+    // this.getviews()
   },
   methods: {
+    getviews(){
+        let viewlist = []
+        let views = this.$store.state.tagsView.visitedViews
+        views.forEach(view =>{
+          let li = {}
+          li.fullPath = view.fullPath
+          li.hash = view.hash
+          li.meta = view.meta
+          li.name = view.name
+          li.params = view.params
+          li.path = view.path
+          li.query = view.query
+          li.title = view.title
+          // li.matched = view.matched //此条数据放出会报错
+          viewlist.push(li)
+        })
+        localStorage.setItem("views",JSON.stringify(viewlist))
+    },
     changetags(){
       this.showall = false
     },

dsk-operate-ui/src/layout/index.vue

@@ -21,6 +21,7 @@ import ResizeMixin from './mixin/ResizeHandler'
 import { mapState } from 'vuex'
 import variables from '@/assets/styles/variables.scss'
 import elementResizeDetectorMaker from "element-resize-detector"
+import { parse,stringify }  from 'flatted';
 export default {
   name: 'Layout',
   components: {
@@ -64,10 +65,11 @@ export default {
       this.listenSider()
   })
     // console.log(9999)
-    // let views = localStorage.getItem('views')
-    // console.log(views)
-    // this.$store.state.tagsView.visitedViews = JSON.parse(views)
-    // localStorage.removeItem('views')
+    let views = localStorage.getItem('views')
+    if(views!=null){
+    this.$store.state.tagsView.visitedViews = JSON.parse(views)
+    localStorage.removeItem('views')
+    }
   },
   methods: {
     handleClickOutside() {

dsk-operate-ui/src/store/modules/tagsView.js

-import {parse, stringify} from 'flatted';
+
+import { parse,stringify }  from 'flatted';
 const state = {
   visitedViews: [],
   cachedViews: [],
@@ -22,8 +23,27 @@ const mutations = {
       })
     )
     // console.log(state.visitedViews)
-    // let visitedViews = stringify(state.visitedViews)
-    // localStorage.setItem("views",visitedViews)
+    // try {
+    //   stringify(view)
+    // }catch(e)
+    // {
+    //
+    // }
+    // console.log(
+    // localStorage.removeItem('views')
+    // let views =view
+    // let viewlist = localStorage.getItem("views")==null?[]:JSON.parse(localStorage.getItem("views"))
+    // let li = {}
+    // li.fullPath = view.fullPath
+    // li.hash = view.hash
+    // li.meta = view.meta
+    // li.name = view.name
+    // li.params = view.params
+    // li.path = view.path
+    // li.query = view.query
+    // viewlist.push(li)
+    // viewlist.push(parse(stringify(view)))
+    // localStorage.setItem("views",stringify(viewlist))
   },
   ADD_CACHED_VIEW: (state, view) => {
     if (state.cachedViews.includes(view.name)) return

dsk-operate-ui/src/views/system/user/index.vue

@@ -399,6 +399,7 @@
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
 import { getToken ,getTenantid} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
+import {Base64} from 'js-base64'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
@@ -653,8 +654,9 @@ export default {
         inputPattern: /^.{5,20}$/,
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          resetUserPwd(row.userId, Base64.encode(value)).then(response => {
+            // this.$modal.msgSuccess("修改成功，新密码是：" + value);
+            this.$modal.msgSuccess("修改成功！");
           });
         }).catch(() => {});
     },

dsk-system/src/main/java/com/dsk/system/domain/vo/SysUserImportVo.java

@@ -21,9 +21,9 @@ public class SysUserImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 所属部门
+     * 所属组织
      */
-    @ExcelProperty(value = "*所属部门")
+    @ExcelProperty(value = "*所属组织")
     private String deptName;
 
     /**

dsk-system/src/main/java/com/dsk/system/service/ISysOssService.java

 package com.dsk.system.service;
 
+import com.dsk.oss.entity.UploadResult;
 import com.dsk.system.domain.bo.SysOssBo;
 import com.dsk.system.domain.vo.SysOssVo;
 import com.dsk.common.core.domain.PageQuery;
@@ -29,6 +30,8 @@ public interface ISysOssService {
 
     SysOssVo upload(File file);
 
+    SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult);
+
     void download(Long ossId, HttpServletResponse response) throws IOException;
 
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);

dsk-system/src/main/java/com/dsk/system/service/impl/SysOssServiceImpl.java

@@ -147,7 +147,8 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult);
     }
 
-    private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) {
+    @Override
+    public SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) {
         SysOss oss = new SysOss();
         oss.setUrl(uploadResult.getUrl());
         oss.setFileSuffix(suffix);