关闭审批模块

README.md

@@ -8,6 +8,8 @@
 
 ### nacos配置
 > nacos配置信息在 LauncherConstant 类中，系统默认使用的命名空间为 gubersail
+### 项目启动所需基本模块
+> blade-gateway、blade-auth、blade-system、blade-resource、blade-user、blade-client
 
 ### 模块介绍
 
@@ -27,6 +29,7 @@
 * blade-check: 审批流模块
 * blade-system: 系统模块
 * blade-user: 用户模块
+* blade-client: 客户端模块主要存放了一个消息通知
 > 所有 -api的模块都是fegin接口
 
 ### 本地settings 文件新增配置

blade-ops/blade-report/src/main/java/org/springblade/report/ureport/ClientBean.java

@@ -1,28 +0,0 @@
-package org.springblade.report.ureport;
-
-import lombok.AllArgsConstructor;
-import org.springblade.client.entity.GoodsDesc;
-import org.springblade.client.feign.IGoodsDescClient;
-import org.springblade.report.util.ParamUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-@Component
-@AllArgsConstructor
-public class ClientBean {
-
-	private IGoodsDescClient goodsDescClient;
-
-	public List<GoodsDesc> loadGoodsData(String dsName, String datasetName, Map<String, Object> params) {
-		String code = ParamUtil.getString(params.get("code"));
-		String cname = ParamUtil.getString(params.get("cname"));
-		String cnameInt = ParamUtil.getString(params.get("cnameInt"));
-		String goodsTypeId = ParamUtil.getString(params.get("goodsTypeId"));
-		String tenantId = ParamUtil.getString(params.get("tenantId"));
-
-		return goodsDescClient.getGoodsReport(cname, cnameInt, code, goodsTypeId, tenantId).getData();
-	}
-
-}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/UnReadDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.client.dto;
+
+import lombok.Data;
+
+@Data
+public class UnReadDTO {
+	private Boolean unRead;
+
+	private Integer unReadNum;
+
+	@Override
+	public String toString() {
+		return "{" +
+			"\"unRead\":" + unRead +
+			",\"unReadNum\":" + unReadNum +
+			'}';
+	}
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.client.entity.CommonFile;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 实体类
@@ -53,11 +51,6 @@ public class Notice extends TenantEntity {
 	@ApiModelProperty(value = "发送范围")
 	private String sendRange;
 
-	/**
-	 * 附件
-	 */
-	@TableField(exist = false)
-	private List<CommonFile> fileList;
 
 	/**
 	 * 通告开始日期

blade-service-api/pom.xml

@@ -22,7 +22,6 @@
         <module>blade-system-api</module>
         <module>blade-user-api</module>
         <module>blade-client-api</module>
-        <module>blade-check-api</module>
     </modules>
 
     <dependencies>

blade-service/blade-client/src/main/java/org/springblade/client/message/service/impl/MessageServiceImpl.java

@@ -101,15 +101,6 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
 
 	@Override
 	public UnReadDTO getUserMessage(Long userId) {
-		//消息列表
-		/*LambdaQueryWrapper<Message> messageLambdaQueryWrapper=new LambdaQueryWrapper<>();
-		messageLambdaQueryWrapper
-			.eq(Message::getToUserId,userId)
-			.eq(Message::getIsDeleted,0)
-			.eq(Message::getMessageType,MessageType)
-		    .orderByDesc(Message::getCreateTime);
-		IPage<Message> page = baseMapper.selectPage(iPage, messageLambdaQueryWrapper);
-		List<Message> records = page.getRecords();*/
 		//是否未读
 		LambdaQueryWrapper<Message> readMessageLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		readMessageLambdaQueryWrapper
@@ -122,8 +113,6 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
 		UnReadDTO dto = new UnReadDTO();
 		dto.setUnRead(count != null && count > 0);
 		dto.setUnReadNum(count != null && count > 0 ? count : 0);
-
-		/*map.put("list",records);*/
 		return dto;
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java

@@ -3,12 +3,9 @@ package org.springblade.desk.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
-import org.springblade.client.entity.CommonFile;
-import org.springblade.client.entity.CorpsDesc;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -18,7 +15,6 @@ import org.springblade.core.tenant.annotation.TenantDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.RsaUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.desk.entity.Notice;
 import org.springblade.desk.feign.INoticeClient;
@@ -28,9 +24,6 @@ import org.springblade.desk.wrapper.NoticeWrapper;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 控制器
  *
@@ -55,7 +48,6 @@ public class NoticeController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入notice")
 	public R<NoticeVO> detail(Notice notice) {
 		Notice detail = noticeService.getOne(Condition.getQueryWrapper(notice));
-		detail.setFileList(noticeService.fileList(detail.getId()));
 		return R.data(NoticeWrapper.build().entityVO(detail));
 	}
 
@@ -156,24 +148,4 @@ public class NoticeController extends BladeController {
 		return R.data(page);
 	}
 
-	/**
-	 * 附件上传
-	 */
-	@PostMapping("/file")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "附件上传", notes = "传入fileList")
-	public R file(@RequestBody Notice notice) {
-		return R.status(noticeService.file(notice));
-	}
-
-	/**
-	 * 附件列表
-	 */
-	@GetMapping("/file-list")
-	@ApiOperationSupport(order = 10)
-	@ApiOperation(value = "附件列表", notes = "传入id")
-	public R fileList(Long id) {
-		return R.data(noticeService.fileList(id));
-	}
-
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/service/INoticeService.java

@@ -2,7 +2,6 @@
 package org.springblade.desk.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.client.entity.CommonFile;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.entity.Notice;
 import org.springblade.desk.vo.NoticeVO;
@@ -33,19 +32,4 @@ public interface INoticeService extends BaseService<Notice> {
 	 */
 	IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice);
 
-	/**
-	 * 附件上传
-	 *
-	 * @param notice
-	 * @return
-	 */
-	boolean file(Notice notice);
-
-	/**
-	 * 附件列表
-	 *
-	 * @param id
-	 * @return
-	 */
-	List<CommonFile> fileList(Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java

@@ -4,12 +4,8 @@ package org.springblade.desk.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
-import org.springblade.client.constant.LandConstant;
-import org.springblade.client.entity.CommonFile;
-import org.springblade.client.feign.ICommonFileClient;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.desk.entity.Notice;
 import org.springblade.desk.mapper.NoticeMapper;
@@ -18,9 +14,7 @@ import org.springblade.desk.vo.NoticeVO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 服务实现类
@@ -31,7 +25,6 @@ import java.util.List;
 @AllArgsConstructor
 public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> implements INoticeService {
 
-	private final ICommonFileClient commonFileClient;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -49,17 +42,6 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 			baseMapper.updateById(notice);
 		}
 
-		List<CommonFile> fileList = notice.getFileList();
-		if (ObjectUtil.isNotEmpty(fileList)) {
-			fileList.forEach(file -> {
-				if (ObjectUtil.isEmpty(file.getId())) {
-					file.setPid(notice.getId());
-					file.setSource("LAND_NOTICE_FEE");
-				}
-			});
-		}
-		commonFileClient.saveList(fileList);
-
 		baseMapper.updateById(notice);
 		return notice.getId();
 	}
@@ -70,26 +52,4 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		notice.setTenantId(AuthUtil.getTenantId());
 		return page.setRecords(baseMapper.selectNoticePage(page, notice));
 	}
-
-	@Override
-	public boolean file(Notice notice) {
-		List<CommonFile> fileList = notice.getFileList();
-		fileList.forEach(file -> {
-			if (ObjectUtil.isEmpty(file.getId())) {
-				file.setPid(notice.getId());
-				file.setSource("LAND_NOTICE_FEE");
-			}
-		});
-		commonFileClient.saveList(fileList);
-		return true;
-	}
-
-	@Override
-	public List<CommonFile> fileList(Long id) {
-		R<List<CommonFile>> fileList = commonFileClient.getList(id, "LAND_NOTICE_FEE");
-		if (fileList.isSuccess() && fileList.getData() != null) {
-			return fileList.getData();
-		}
-		return Collections.emptyList();
-	}
 }

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

@@ -1,4 +1,3 @@
-
 package org.springblade.system.user.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,7 +11,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.client.feign.IRedisClient;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -64,7 +62,6 @@ public class UserController {
 	private final ISysClient sysClient;
 	private final IUserSearchClient userSearchClient;
 
-	private final IRedisClient redisClient;
 
 	/**
 	 * 查询单条
@@ -72,7 +69,6 @@ public class UserController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "查看详情", notes = "传入id")
 	@GetMapping("/detail")
-//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<UserVO> detail(User user) {
 		if (ObjectUtils.isNotNull(user.getId())) {
 			User detail = userService.getOne(Condition.getQueryWrapper(user));
@@ -101,24 +97,11 @@ public class UserController {
 
 	@GetMapping("/userList")
 	public R userList(UserVO userVO) {
-		if (AuthUtil.getTenantId().equals("234557") && StringUtil.isBlank(userVO.getRoleAlias())) {
-			userVO.setRoleAlias("业务员");
-		}
-		if (AuthUtil.getTenantId().equals("119111") && StringUtil.isBlank(userVO.getRoleAlias())) {
-			userVO.setRoleAlias("业务员");
-		}
-		if (AuthUtil.getTenantId().equals("809700") && StringUtil.isBlank(userVO.getRoleAlias())) {
-			userVO.setRoleAlias("业务员");
-		}
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
 			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
-
-		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			userVO.setRoleAlias("分管调度");
-		}
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
 			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());
 			if (!roleR.isSuccess()) {
@@ -165,16 +148,6 @@ public class UserController {
 			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
-
-		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			if ("1504336886057963521".equals(userVO.getDeptPid()) || "1567796746975727617".equals(userVO.getDeptPid())
-				|| "1862313560907030530".equals(userVO.getDeptPid()) || "1863853735860514817".equals(userVO.getDeptPid())
-				|| "1905144938132189185".equals(userVO.getDeptPid()) || "1909147036956012546".equals(userVO.getDeptPid())) {
-				userVO.setRoleAlias("分管调度");
-			} else {
-				userVO.setRoleAlias("大件调度");
-			}
-		}
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
 			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());
 			if (!roleR.isSuccess()) {
@@ -246,7 +219,6 @@ public class UserController {
 	})
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "列表", notes = "传入account和realName")
-//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<IPage<UserVO>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query, BladeUser bladeUser) {
 		QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
 		IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -263,7 +235,6 @@ public class UserController {
 	})
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "列表", notes = "传入account和realName")
-//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
 		IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
 		return R.data(UserWrapper.build().pageVO(pages));
@@ -275,11 +246,9 @@ public class UserController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增或修改", notes = "传入User")
-//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R submit(@Valid @RequestBody User user) {
 		CacheUtil.clear(USER_CACHE);
 		boolean status = userService.submit(user);
-		redisClient.basicData("user");
 		return R.status(status);
 	}
 
@@ -292,7 +261,6 @@ public class UserController {
 	public R update(@Valid @RequestBody User user) {
 		CacheUtil.clear(USER_CACHE);
 		boolean status = userService.updateUser(user);
-		redisClient.basicData("user");
 		return R.status(status);
 	}
 
@@ -302,11 +270,9 @@ public class UserController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "删除", notes = "传入id集合")
-//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R remove(@RequestParam String ids) {
 		CacheUtil.clear(USER_CACHE);
 		boolean status = userService.removeUser(ids);
-		redisClient.basicData("user");
 		return R.status(status);
 	}
 
@@ -316,7 +282,6 @@ public class UserController {
 	@PostMapping("/grant")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "权限设置", notes = "传入roleId集合以及menuId集合")
-//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R grant(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds,
 				   @ApiParam(value = "roleId集合", required = true) @RequestParam String roleIds) {
 		boolean temp = userService.grant(userIds, roleIds);
@@ -329,12 +294,9 @@ public class UserController {
 	@PostMapping("/reset-password")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "初始化密码", notes = "传入userId集合")
-//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-//	public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
 	public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds,
 						   @ApiParam(value = "密码", readOnly = true) @RequestParam(value = "newPassword") String password) {
 		boolean temp = userService.resetPassword(userIds, password);
-		redisClient.basicData("user");
 		return R.status(temp);
 	}
 
@@ -348,7 +310,6 @@ public class UserController {
 							@ApiParam(value = "新密码", required = true) @RequestParam String newPassword,
 							@ApiParam(value = "新密码", required = true) @RequestParam String newPassword1) {
 		boolean temp = userService.updatePassword(user.getUserId(), oldPassword, newPassword, newPassword1);
-		redisClient.basicData("user");
 		return R.status(temp);
 	}
 
@@ -361,7 +322,6 @@ public class UserController {
 	public R updateInfo(@Valid @RequestBody User user) {
 		CacheUtil.clear(USER_CACHE);
 		boolean temp = userService.updateUserInfo(user);
-		redisClient.basicData("user");
 		return R.status(temp);
 	}
 
@@ -425,7 +385,6 @@ public class UserController {
 	@ApiOperation(value = "第三方注册用户", notes = "传入user")
 	public R registerGuest(User user, Long oauthId) {
 		boolean temp = userService.registerGuest(user, oauthId);
-		redisClient.basicData("user");
 		return R.status(temp);
 	}
 
@@ -438,7 +397,6 @@ public class UserController {
 	@ApiOperation(value = "配置用户平台信息", notes = "传入user")
 	public R updatePlatform(Long userId, Integer userType, String userExt) {
 		boolean temp = userService.updatePlatform(userId, userType, userExt);
-		redisClient.basicData("user");
 		return R.status(temp);
 	}
 
@@ -448,7 +406,6 @@ public class UserController {
 	@ApiOperationSupport(order = 17)
 	@ApiOperation(value = "查看平台详情", notes = "传入id")
 	@GetMapping("/platform-detail")
-//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<UserVO> platformDetail(User user) {
 		return R.data(userService.platformDetail(user));
 	}
@@ -471,56 +428,6 @@ public class UserController {
 		return R.data(userService.selectUserSearch(user, query));
 	}
 
-	/**
-	 * 嘉通木材用户列表（库管员）
-	 */
-	@GetMapping("/MCSelectList")
-	@ApiOperationSupport(order = 3)
-	public R<List<User>> list() {
-		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(), "库管员"));
-	}
-
-	/**
-	 * 轮胎配件用户列表（库管）
-	 */
-	@GetMapping("/stockClerkList")
-	public R<List<User>> stockClerkList() {
-		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(), "库管"));
-	}
-
-	/**
-	 * 轮胎配件用户列表（财务）
-	 */
-	@GetMapping("/financeList")
-	public R<List<User>> financeList() {
-		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(), "财务"));
-	}
-
-	/**
-	 * 轮胎配件用户列表（业务员）
-	 */
-	@GetMapping("/salerList")
-	public R<List<User>> salerList() {
-		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(), "业务员"));
-	}
-
-	/**
-	 * 轮胎配件用户列表（库管）
-	 */
-	@GetMapping("/getWarehouseKeeper")
-	public R<List<User>> getWarehouseKeeper(@RequestParam("salesCompanyId") String salesCompanyId) {
-		return userSearchClient.getWarehouseKeeper(SysCache.getRoleIds(AuthUtil.getTenantId(), "库管"), salesCompanyId);
-	}
-
-	/**
-	 * 货代角色用户
-	 */
-	@GetMapping("/selectListLos")
-	@ApiOperationSupport(order = 3)
-	public R<List<User>> selectListLos(@RequestParam("roles") String roles, @RequestParam(value = "account", required = false) String account) {
-		return userService.selectUserByRolesAndAccount(SysCache.getRoleIds(AuthUtil.getTenantId(), roles), account);
-	}
-
 
 	@GetMapping("/userListAll")
 	public R userListAll(UserVO userVO) {

blade-service/pom.xml

@@ -22,7 +22,6 @@
         <module>blade-system</module>
         <module>blade-user</module>
         <module>blade-client</module>
-        <module>blade-check</module>
     </modules>
 
     <dependencies>