数据提交

blade-ops-api/blade-resource-api/pom.xml

@@ -23,6 +23,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-tenant</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-oss</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOSSClient.java

@@ -17,12 +17,11 @@
 package org.springblade.resource.feign;
 
 import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.core.sms.model.SmsResponse;
+import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -45,6 +44,6 @@ public interface IOSSClient {
 	 * @return R
 	 */
 	@PostMapping(value = SEND_MESSAGE ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-	R addFileInfo(@RequestPart MultipartFile file);
+	R<BladeFile> addFileInfo(@RequestPart MultipartFile file);
 
 }

blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/OssClient.java

@@ -18,25 +18,13 @@ package org.springblade.resource.feign;
 
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
-import org.springblade.core.oss.AliossTemplate;
 import org.springblade.core.oss.model.BladeFile;
-import org.springblade.core.sms.model.SmsCode;
-import org.springblade.core.sms.model.SmsData;
-import org.springblade.core.sms.model.SmsResponse;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.jackson.JsonUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.builder.oss.OssBuilder;
-import org.springblade.resource.builder.sms.SmsBuilder;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Map;
-
-import static org.springblade.resource.utils.SmsUtil.*;
-
 /**
  * 短信远程调用服务
  *
@@ -55,7 +43,7 @@ public class OssClient implements IOSSClient {
 
 	@SneakyThrows
 	@Override
-	public R addFileInfo(MultipartFile file) {
+	public R<BladeFile> addFileInfo(MultipartFile file) {
 		BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
 		/*BladeFile bladeFile1 = aliossTemplate.putFile(file.getOriginalFilename(), file.getInputStream());
 		System.out.println(aliossTemplate.getUploadToken());*/

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ExcelTab.java

@@ -80,6 +80,14 @@ public class ExcelTab extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "附件名")
 		private String extension;
+
+	/**
+	 * html路径
+	 */
+	@ApiModelProperty(value = "html路径")
+	private String htmlUrl;
+
+
 	/**
 	* 附件大小
 	*/

blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Menu.java

@@ -146,6 +146,14 @@ public class Menu implements Serializable {
 	@ApiModelProperty(value = "提示语")
 	private String textInfo;
 
+	/**
+	 * 提示视频路径
+	 */
+	@ApiModelProperty(value = "提示视频路径")
+	private String videoUrl;
+
+
+
 
 	@Override
 	public boolean equals(Object obj) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -16,6 +16,9 @@
  */
 package org.springblade.manager.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.spire.xls.Workbook;
+import com.spire.xls.Worksheet;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
@@ -26,6 +29,7 @@ import lombok.SneakyThrows;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 
+import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -172,17 +176,10 @@ public class ExcelTabController extends BladeController {
 
 		ExcelTab detail = excelTabService.getById(nodeId);
 		// 删除excel文件
-		//R bladeFile = iossClient.addFileInfo(file);
-
-		R bladeFile = iossClient.addFileInfo(file);
-
-		System.out.println(bladeFile);
-
-		/*detail.setExtension(bladeFile.getOriginalName());
-		detail.setFileUrl(bladeFile.getLink());
-		detail.setFileType(3); // 表示为清表信息  1 表示祖节点  2 表示为节点信息 3 表示清表
-		excelTabService.saveOrUpdate(detail);
+		R<BladeFile> bladeFile = iossClient.addFileInfo(file);
+		BladeFile bladeFile1 = bladeFile.getData();
 
+		System.out.println(bladeFile1.getLink());
 		String thmlUrl = "/Users/hongchuangyanfa/Desktop/ToHtml.html";
 		// 解析excel
 		Workbook wb = new Workbook();
@@ -193,6 +190,16 @@ public class ExcelTabController extends BladeController {
 		Worksheet sheet = wb.getWorksheets().get(0);
 		sheet.saveToHtml(thmlUrl);
 
+		detail.setExtension(bladeFile1.getOriginalName());
+		detail.setFileUrl(bladeFile1.getLink());
+		detail.setFileType(3); // 表示为清表信息  1 表示祖节点  2 表示为节点信息 3 表示清表
+		detail.setHtmlUrl(thmlUrl);
+
+		excelTabService.saveOrUpdate(detail);
+
+
+
+/*
 		//解析数据
 		Thread.sleep(200);
 		String htmlString =  readfile(thmlUrl);
@@ -334,4 +341,33 @@ public class ExcelTabController extends BladeController {
 		int e = val.indexOf(end);
 		return val.substring(s, e);
 	}
+
+
+	/**
+	 * 关联清表树
+	 */
+	@GetMapping("/tab-lazytree-all")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "关联清表树all", notes = "关联清表树all")
+	public R<List<ExceTabTreVO>> tabLazyTreeall(Long modeId,String name, BladeUser bladeUser) {
+		List<ExceTabTreVO> tree = excelTabService.tabLazyTreeAll( bladeUser.getTenantId(), modeId, name);
+		return R.data(tree);
+	}
+
+
+	/**
+	 * 关联清表-保存
+	 */
+	@GetMapping("/save-linkTab")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "关联清表-保存", notes = "关联清表-保存")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "exceTabId", value = "清表id", required = true),
+			@ApiImplicitParam(name = "tabId", value = "表Id", required = true)
+	})
+	public R<List<ExceTabTreVO>> saveLinkeTab(Long exceTabId,Long tabId, BladeUser bladeUser) {
+
+		return R.success("关联成功");
+	}
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExcelTabMapper.java

@@ -52,6 +52,8 @@ public interface ExcelTabMapper extends BaseMapper<ExcelTab> {
 	 */
 	List<ExceTabTreVO> tabLazyTree(String tenantId, Long modeId);
 
+	List<ExceTabTreVO> tabLazyTreeAll(String tenantId, Long modeId,String name);
+
 	List<ExcelTabWbsTypeVO> getWbsTypeList();
 
 	List<WbsTreeVO> lazyTree(@Param("wbsId") String wbsId,

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExcelTabMapper.xml

@@ -107,4 +107,36 @@
         AND status = 1
         ORDER BY dept.sort
     </select>
+
+
+    <select id="tabLazyTreeAll" resultMap="treeNodeResultMap" >
+        SELECT
+        dept.id,
+        dept.parent_id,
+        dept.name,
+        dept.file_type,
+        (
+        SELECT
+        CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+        FROM
+        m_excel_tab
+        WHERE
+        parent_id = dept.id and is_deleted = 0
+        ) AS "has_children"
+        FROM
+        m_excel_tab dept
+        WHERE
+         dept.is_deleted = 0
+        <!--<if test="param1!=null and param1!=''">
+            and dept.tenant_id = #{param1}
+        </if>
+        <if test="param2!=null and param2!=''">
+            and dept.tenant_id = #{param2}
+        </if>-->
+
+        <if test="param3!=null and param3!=''">
+            and dept.name like concat(concat('%', #{param3}),'%')
+        </if>
+        ORDER BY dept.create_time
+    </select>
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IExcelTabService.java

@@ -55,6 +55,9 @@ public interface IExcelTabService extends BaseService<ExcelTab> {
 	List<ExceTabTreVO> tabLazyTree(String tenantId, Long modeId);
 
 
+	List<ExceTabTreVO> tabLazyTreeAll(String tenantId, Long modeId,String name);
+
+
 	/**
 	 * 获取wbs类型
 	 */

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -54,6 +54,14 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 		return ForestNodeMerger.merge(baseMapper.tabLazyTree(tenantId, modeId));
 	}
 
+	@Override
+	public List<ExceTabTreVO> tabLazyTreeAll(String tenantId, Long modeId,String name) {
+		if (AuthUtil.isAdministrator()) {
+			tenantId = StringPool.EMPTY;
+		}
+		return ForestNodeMerger.merge(baseMapper.tabLazyTreeAll(tenantId, modeId,name));
+	}
+
 	@Override
 	public List<ExcelTabWbsTypeVO> getWbsTypeList() {
 		return baseMapper.getWbsTypeList();

blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java

@@ -190,7 +190,7 @@ public class MenuController extends BladeController {
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "前端按钮数据", notes = "前端按钮数据")
 	public R<List<MenuVO>> buttons(BladeUser user) {
-		List<MenuVO> list = menuService.buttons(user.getRoleId());
+		List<MenuVO> list = menuService.buttons(user.getRoleId(),user.getClientId());
 		return R.data(list);
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java

@@ -165,7 +165,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
 	 *
 	 * @return
 	 */
-	List<Menu> allButtons();
+	List<Menu> allButtons(String clientId);
 
 	/**
 	 * 按钮树形结构
@@ -175,6 +175,14 @@ public interface MenuMapper extends BaseMapper<Menu> {
 	 */
 	List<Menu> buttons(List<Long> roleId);
 
+	/**
+	 * 按钮树形结构
+	 *
+	 * @param roleId
+	 * @return
+	 */
+	List<Menu> buttonsByClientId(List<Long> roleId,String clientId);
+
 	/**
 	 * 获取配置的角色权限
 	 *

blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml

@@ -182,6 +182,7 @@
                 category = 2 OR id IN ( SELECT parent_id FROM blade_menu WHERE is_deleted = 0 AND category = 2 )
             )
           AND is_deleted = 0
+          and sys_id =(SELECT id from blade_client where client_id=#{param1})
         ORDER BY sort
     </select>
 
@@ -230,6 +231,54 @@
         ) menu ORDER BY sort
     </select>
 
+    <select id="buttonsByClientId" resultMap="menuResultMap">
+        SELECT * FROM (
+        SELECT
+        id,
+        parent_id,
+        code,
+        name,
+        alias,
+        path,
+        source,
+        action,
+        sort
+        FROM
+        blade_menu
+        WHERE
+        is_deleted = 0 and id IN (
+        SELECT parent_id FROM blade_menu
+        WHERE ( category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        ) ) )
+        and sys_id =(SELECT id from blade_client where client_id=#{param2})
+
+        UNION ALL
+
+        SELECT
+        id,
+        parent_id,
+        code,
+        name,
+        alias,
+        path,
+        source,
+        action,
+        sort
+        FROM
+        blade_menu
+        WHERE
+        is_deleted = 0 and  category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>)
+        and sys_id =(SELECT id from blade_client where client_id=#{param2})
+        ) menu ORDER BY sort
+    </select>
+
+
     <select id="grantTree" resultMap="treeNodeResultMap">
         select id, parent_id, name as title, id as "value", id as "key" from blade_menu where is_deleted = 0 order by sort
     </select>

blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java

@@ -60,13 +60,14 @@ public interface IMenuService extends IService<Menu> {
 	 */
 	List<MenuVO> routes(String roleId, Long topMenuId,String sysType);
 
-	/**
-	 * 按钮树形结构
-	 *
-	 * @param roleId
-	 * @return
-	 */
-	List<MenuVO> buttons(String roleId);
+	///**
+	//	 * 按钮树形结构
+	//	 *
+	//	 * @param roleId
+	//	 * @param systype
+	//	 * @return
+	//	 */
+	List<MenuVO> buttons(String roleId,String clientId);
 
 	/**
 	 * 树形结构

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -134,9 +134,10 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 		}
 	}
 
+
 	@Override
-	public List<MenuVO> buttons(String roleId) {
-		List<Menu> buttons = (AuthUtil.isAdministrator()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId));
+	public List<MenuVO> buttons(String roleId,String clientId) {
+		List<Menu> buttons = (AuthUtil.isAdministrator()) ? baseMapper.allButtons(clientId) : baseMapper.buttonsByClientId(Func.toLongList(roleId),clientId);
 		MenuWrapper menuWrapper = new MenuWrapper();
 		return menuWrapper.listNodeVO(buttons);
 	}