diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java index ce39e96..b0e0b54 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java @@ -1,6 +1,8 @@ package com.muyu.common.system.domain; +import lombok.Data; + import java.io.Serializable; import java.util.Set; @@ -9,6 +11,7 @@ import java.util.Set; * * @author muyu */ +@Data public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; @@ -57,6 +60,8 @@ public class LoginUser implements Serializable { */ private SysUser sysUser; + private Long firm; + public String getToken () { return token; } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/EnterpriseConfig.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/EnterpriseConfig.java index 712db88..c4a82f6 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/EnterpriseConfig.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/EnterpriseConfig.java @@ -1,6 +1,8 @@ package muyu.goods.enterprise.client.config; import com.muyu.common.core.domain.Result; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysUser; import com.muyu.goods.domain.Enterprise; import com.muyu.system.remote.RemoteSystemManageService; @@ -11,7 +13,10 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; @Log4j2 @ComponentScan @@ -20,10 +25,11 @@ public class EnterpriseConfig { @Autowired private RemoteSystemManageService remoteSystemManageService; - + /** + * 添加新用户 + * @param enterprise + */ public void index(Enterprise enterprise) { - Result> lists = remoteSystemManageService.lists(); - List data = lists.getData(); SysUser sysUser = new SysUser(); //用户昵称 sysUser.setNickName(enterprise.getEnterpriseName()); @@ -51,4 +57,15 @@ public class EnterpriseConfig { sysUser.setFirm(enterprise.getId()); remoteSystemManageService.add(sysUser); } + + /** + * 展示和企业绑定的用户 + * @return + */ + public List sysUsers() { + Result> lists = remoteSystemManageService.lists(); + List sysUserList = lists.getData(); + List collect = sysUserList.stream().filter(user -> user.getFirm()!=null).collect(Collectors.toList()); + return collect; + } } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java index cd90bc7..5cdddbe 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java @@ -3,6 +3,7 @@ package com.muyu.goods.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.muyu.common.system.domain.SysUser; import com.muyu.goods.domain.Enterprise; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -38,7 +39,7 @@ public class EnterpriseController extends BaseController /** * 查询企业列表 */ - @RequiresPermissions("goods:enterprise:list") +// @RequiresPermissions("goods:enterprise:list") @GetMapping("/list") public Result> list(Enterprise enterprise) { @@ -47,10 +48,19 @@ public class EnterpriseController extends BaseController return getDataTable(list); } + /** + * 企业详情 + * @return + */ + @PostMapping("lists") + public Result> lists(){ + return success(enterpriseService.lists()); + } + /** * 导出企业列表 */ - @RequiresPermissions("goods:enterprise:export") +// @RequiresPermissions("goods:enterprise:export") @Log(title = "企业", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, Enterprise enterprise) @@ -63,7 +73,7 @@ public class EnterpriseController extends BaseController /** * 获取企业详细信息 */ - @RequiresPermissions("goods:enterprise:query") +// @RequiresPermissions("goods:enterprise:query") @GetMapping(value = "/{id}") public Result getInfo(@PathVariable("id") Long id) { @@ -89,7 +99,7 @@ public class EnterpriseController extends BaseController /** * 修改企业 */ - @RequiresPermissions("goods:enterprise:edit") +// @RequiresPermissions("goods:enterprise:edit") @Log(title = "企业", businessType = BusinessType.UPDATE) @PutMapping public Result edit(@RequestBody Enterprise enterprise) @@ -110,11 +120,20 @@ public class EnterpriseController extends BaseController /** * 删除企业 */ - @RequiresPermissions("goods:enterprise:remove") +// @RequiresPermissions("goods:enterprise:remove") @Log(title = "企业", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public Result remove(@PathVariable Long[] ids) { return toAjax(enterpriseService.deleteEnterpriseByIds(ids)); } + + /** + * 获取企业管理账户 + * @return + */ + @PostMapping("sysUsers") + public Result> sysUsers() { + return success(enterpriseService.sysUsers()); + } } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/mapper/EnterpriseMapper.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/mapper/EnterpriseMapper.java index 75d5d9a..f9de2df 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/mapper/EnterpriseMapper.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/mapper/EnterpriseMapper.java @@ -63,4 +63,6 @@ public interface EnterpriseMapper int authentication(Enterprise enterprise); Enterprise getEnterpriseById(@Param("id") Long id); + + Enterprise queryDateEnterprise(); } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/IEnterpriseService.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/IEnterpriseService.java index 86fb8f6..9e0525c 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/IEnterpriseService.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/IEnterpriseService.java @@ -1,6 +1,8 @@ package com.muyu.goods.service; import java.util.List; + +import com.muyu.common.system.domain.SysUser; import com.muyu.goods.domain.Enterprise; /** @@ -68,4 +70,8 @@ public interface IEnterpriseService Enterprise getEnterpriseById(Long id); + + List sysUsers(); + + List lists(); } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java index 6f99607..6d55e1f 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.goods.service.impl; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.DateUtils; @@ -54,7 +55,8 @@ public class EnterpriseServiceImpl implements IEnterpriseService @Override public List selectEnterpriseList(Enterprise enterprise) { - return enterpriseMapper.selectEnterpriseList(enterprise); + List enterprises = enterpriseMapper.selectEnterpriseList(enterprise); + return enterprises; } /** @@ -71,7 +73,12 @@ public class EnterpriseServiceImpl implements IEnterpriseService LoginUser loginUser = SecurityUtils.getLoginUser(); enterprise.setCreateBy(loginUser.getUsername()); enterprise.setBusinessLincenseNumber(UUID.randomUUID().toString()); - return enterpriseMapper.insertEnterprise(enterprise); + int i = enterpriseMapper.insertEnterprise(enterprise); + if (i>0){ + Enterprise enterprise1 = enterpriseMapper.queryDateEnterprise(); + enterpriseConfig.index(enterprise1); + } + return i; } /** @@ -99,8 +106,7 @@ public class EnterpriseServiceImpl implements IEnterpriseService Enterprise enterprise = new Enterprise(); enterprise.setId(id); enterprise.setAuthenticationDate(DateUtils.getNowDate()); - Enterprise enterprise1 = getEnterpriseById(id); - enterpriseConfig.index(enterprise1); + return enterpriseMapper.authentication(enterprise); } @@ -128,8 +134,31 @@ public class EnterpriseServiceImpl implements IEnterpriseService return enterpriseMapper.deleteEnterpriseById(id); } + /** + * 获取企业详情 + * @param id + * @return + */ @Override public Enterprise getEnterpriseById(Long id) { return enterpriseMapper.getEnterpriseById(id); } + + /** + * 获取和企业绑定的用户 + * @return + */ + @Override + public List sysUsers() { + return enterpriseConfig.sysUsers(); + } + + /** + * 获取全部企业详情 + * @return + */ + @Override + public List lists() { + return selectEnterpriseList(null); + } } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/resources/mapper/goods/EnterpriseMapper.xml b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/resources/mapper/goods/EnterpriseMapper.xml index bb2d795..d542221 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/resources/mapper/goods/EnterpriseMapper.xml +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/resources/mapper/goods/EnterpriseMapper.xml @@ -48,6 +48,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from enterprise where id = #{id} + insert into enterprise @@ -65,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, create_by, create_time, - authentication, + authentication, #{enterpriseName}, @@ -83,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateTime}, #{updateBy}, - 0, + 0, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml index d4bafc7..df1d951 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -117,7 +117,7 @@