Browse Source

移动端授权以及授权应用功能接口

master
dimengzhe 3 years ago
parent
commit
d34aaf17ad
  1. 64
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
  2. 13
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java
  3. 10
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java
  4. 33
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewListVo.java
  5. 22
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewVo.java
  6. 20
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNumQuery.java
  7. 19
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNumVo.java
  8. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java
  9. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java
  10. 74
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
  11. 21
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java
  12. 121
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java
  13. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java
  14. 25
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml
  15. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java
  16. 12
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.java
  17. 34
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml
  18. 20
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleService.java
  19. 11
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java
  20. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java
  21. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/AppScmVehicleReturnFeign.java
  22. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java
  23. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java

64
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@ -30,8 +30,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemiddleman.*;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@ -95,36 +93,7 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
BeanUtil.copyProperties(dto, baseMiddleman, "sid");
baseMiddleman.setCreateOrgSid(resultBean.getData());
baseMiddleman.setUseOrgSid(resultBean.getData());
String customerNoPrefix = "";
//查询业务员的分公司简称和部门编码
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (staffOrgResultBean.getSuccess()) {
SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
if (sysStaffOrg != null) {
ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
if (resultBean1.getSuccess()) {
String osid = resultBean1.getData();
if (StringUtils.isNotBlank(osid)) {
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
}
}
}
String orgSid1 = sysStaffOrg.getOrgSid();
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
}
}
}
String middleCode = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
baseMiddleman.setMiddleCode(middleCode);
baseMapper.insert(baseMiddleman);
} else {
@ -133,36 +102,7 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
return rb.setMsg("该数据不存在");
}
BeanUtil.copyProperties(dto, baseMiddleman);
String customerNoPrefix = "";
//查询业务员的分公司简称和部门编码
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (staffOrgResultBean.getSuccess()) {
SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
if (sysStaffOrg != null) {
ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
if (resultBean1.getSuccess()) {
String osid = resultBean1.getData();
if (StringUtils.isNotBlank(osid)) {
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
}
}
}
String orgSid1 = sysStaffOrg.getOrgSid();
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
}
}
}
String middleCode = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
baseMiddleman.setMiddleCode(middleCode);
baseMapper.updateById(baseMiddleman);
}

13
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java

@ -4,6 +4,7 @@ import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@ -26,11 +27,21 @@ public interface AppIndexFeign {
@ApiOperation(value = "App首页待办待阅的数量")
@ResponseBody
@GetMapping("/homeWorkBadge")
ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath);
ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
@ApiOperation(value = "App首页子应用的待办数量")
@ResponseBody
@GetMapping("/homeAppBadge")
ResultBean<List<AppIndexAppNumVo>> selectAppNum(@RequestParam("userSid") String userSid, @RequestParam(value = "orgPath", required = false) String orgPath);
@ApiOperation(value = "移动端各插件的应用")
@ResponseBody
@GetMapping("/getBusinessList")
ResultBean<List<AppIndexNewVo>> getBusinessList(@RequestParam("userSid") String userSid, @RequestParam("appSid") String appSid);
@ApiOperation(value = "移动端各插件的应用数量")
@ResponseBody
@GetMapping("/getBusinessNum")
ResultBean<List<AppIndexNumVo>> getBusinessNum(@SpringQueryMap AppIndexNumQuery query);
}

10
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java

@ -27,4 +27,14 @@ public class AppIndexFeignFallBack implements AppIndexFeign {
public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid,String orgPath) {
return null;
}
@Override
public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid) {
return null;
}
@Override
public ResultBean<List<AppIndexNumVo>> getBusinessNum(AppIndexNumQuery query) {
return null;
}
}

33
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewListVo.java

@ -0,0 +1,33 @@
package com.yxt.anrui.portal.api.index;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/10/26 14:38
* @Description
*/
@Data
public class AppIndexNewListVo implements Vo {
private static final long serialVersionUID = -2242568632369452117L;
@ApiModelProperty("菜单sid")
private String sid;
@ApiModelProperty("应用名称")
private String name;
@ApiModelProperty("图标")
private String icon;
@ApiModelProperty("待办数量")
private String num;
@ApiModelProperty("跳转参数")
private String json;
@ApiModelProperty("排序")
private String sortNo;
@ApiModelProperty("跳转路由")
private String moduleAction;
@ApiModelProperty("分类")
private String classification;
}

22
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewVo.java

@ -0,0 +1,22 @@
package com.yxt.anrui.portal.api.index;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/10/26 14:37
* @Description
*/
@Data
public class AppIndexNewVo implements Vo {
private static final long serialVersionUID = 3045438801481395314L;
@ApiModelProperty("应用分组")
private String title;
private List<AppIndexNewListVo> apps;
}

20
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNumQuery.java

@ -0,0 +1,20 @@
package com.yxt.anrui.portal.api.index;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/10/26 17:48
* @Description
*/
@Data
public class AppIndexNumQuery {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
@ApiModelProperty("appSid")
private String appSid;
}

19
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNumVo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.portal.api.index;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/10/26 17:39
* @Description
*/
@Data
public class AppIndexNumVo implements Vo {
private static final long serialVersionUID = -5388012244856879195L;
@ApiModelProperty("应用sid")
private String sid;
@ApiModelProperty("数量")
private String num;
}

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java

@ -32,4 +32,6 @@ public class SysMobileMenu extends BaseEntity {
@ApiModelProperty("父级sid")
private String psid;
private String json;
}

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java

@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.yxt.anrui.portal"
})
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.terminal","com.yxt.anrui.base"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm"})
public class PortalApplication {
public static void main(String[] args) {

74
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java

@ -0,0 +1,74 @@
package com.yxt.anrui.portal.biz.index;
import lombok.Getter;
/**
* @Author dimengzhe
* @Date 2022/10/26 21:32
* @Description
*/
public class AppIndexEnum {
@Getter
public static enum AppVersionSubAppSid {
/**
* 供应链
*/
GYL("98ff0724-5df4-4fc7-ab6d-3996e7706acd", "供应链"),
YW("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028", "业务");
/**
* code值
*/
private final String code;
/**
* 备注
*/
private final String remarks;
/**
* 构造器
*
* @param code code值
* @param remarks 备注
*/
private AppVersionSubAppSid(String code, String remarks) {
this.code = code;
this.remarks = remarks;
}
}
@Getter
public static enum AppMenu {
/**
* 验车
*/
YC("1b993770-0f1f-475e-b153-756ac95f09cf", "验车"),
YK("25b3dfb2-d3df-47c3-b689-8c38a7785391", "移库"),
PK("608e72d3-9f34-4b44-85c4-d6be41de8f76", "盘库"),
XJ("ae160247-195e-4f2c-a167-ae50a2e50c81", "巡检"),
SC("92659535-38f6-4456-a45a-ab5e9ced3fac", "收车");
/**
* code值
*/
private final String code;
/**
* 备注
*/
private final String remarks;
/**
* 构造器
*
* @param code code值
* @param remarks 备注
*/
private AppMenu(String code, String remarks) {
this.code = code;
this.remarks = remarks;
}
}
}

21
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@ -4,10 +4,7 @@ import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
import com.yxt.anrui.portal.api.banner.BannerVo;
import com.yxt.anrui.portal.api.formnotice.FormNoticeQuery;
import com.yxt.anrui.portal.api.formnotice.FormNoticeVo;
import com.yxt.anrui.portal.api.index.AppIndexAppNumVo;
import com.yxt.anrui.portal.api.index.AppIndexFeign;
import com.yxt.anrui.portal.api.index.AppIndexVo;
import com.yxt.anrui.portal.api.index.AppIndexWorkNumVo;
import com.yxt.anrui.portal.api.index.*;
import com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionService;
import com.yxt.anrui.portal.biz.banner.BannerService;
import com.yxt.anrui.portal.biz.flow.FlowableService;
@ -61,6 +58,8 @@ public class AppIndexRest implements AppIndexFeign {
@Autowired
private AppScmBaseInfoFeign appScmBaseInfoFeign;
@Autowired
private AppIndexService appIndexService;
@Override
public ResultBean<AppIndexVo> index(String userSid) {
@ -137,11 +136,11 @@ public class AppIndexRest implements AppIndexFeign {
}
@Override
public ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(String userSid,String orgPath) {
public ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(String userSid, String orgPath) {
ResultBean<AppIndexWorkNumVo> rb = ResultBean.fireFail();
AppIndexWorkNumVo vo = new AppIndexWorkNumVo();
// 待办数量
vo.setNotWorkNum(flowableService.getTodoNum(userSid,orgPath).getData());
vo.setNotWorkNum(flowableService.getTodoNum(userSid, orgPath).getData());
// 待阅数量
vo.setNotReadNum(messageListFeign.selectUnReadCount("", userSid).getData());
return rb.success().setData(vo);
@ -192,4 +191,14 @@ public class AppIndexRest implements AppIndexFeign {
});
return rb.success().setData(appIndexAppNumVos);
}
@Override
public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid) {
return appIndexService.getBusinessList(userSid, appSid);
}
@Override
public ResultBean<List<AppIndexNumVo>> getBusinessNum(AppIndexNumQuery query) {
return appIndexService.getBusinessNum(query);
}
}

121
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java

@ -0,0 +1,121 @@
package com.yxt.anrui.portal.biz.index;
import com.yxt.anrui.portal.api.index.AppIndexNewVo;
import com.yxt.anrui.portal.api.index.AppIndexNumQuery;
import com.yxt.anrui.portal.api.index.AppIndexNumVo;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo;
import com.yxt.anrui.portal.biz.sysmobilemenu.SysMobileMenuService;
import com.yxt.anrui.portal.biz.sysmobilemenurole.SysMobileMenuRoleService;
import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign;
import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign;
import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author dimengzhe
* @Date 2022/10/26 14:43
* @Description
*/
@Service
public class AppIndexService {
@Autowired
private SysUserRoleService sysUserRoleService;
@Autowired
private SysMobileMenuRoleService sysMobileMenuRoleService;
@Autowired
private SysMobileMenuService sysMobileMenuService;
@Autowired
private ScmVehicleExamineFeign scmVehicleExamineFeign;
@Autowired
private ScmVehicleEnterlibraryFeign scmVehicleEnterlibraryFeign;
@Autowired
private ScmVehicleGressionFeign scmVehicleGressionFeign;
@Autowired
private ScmVehicleInventoryFeign scmVehicleInventoryFeign;
@Autowired
private ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign;
public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid) {
ResultBean<List<AppIndexNewVo>> rb = ResultBean.fireFail();
if (StringUtils.isBlank(userSid) || StringUtils.isBlank(appSid)) {
return rb.setData(new ArrayList<>());
}
//查询该用户的所有的角色
List<SysUserRoleVo> userRole = sysUserRoleService.selectByUserSid(userSid);
List<String> roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList());
//根据appSid和角色sid查询移动端菜单
List<AppIndexNewVo> appIndexNewVos = getApp(roleSids, appSid);
return rb.success().setData(appIndexNewVos);
}
private List<AppIndexNewVo> getApp(List<String> roleSids, String appSid) {
return sysMobileMenuRoleService.getApp(roleSids, appSid);
}
public ResultBean<List<AppIndexNumVo>> getBusinessNum(AppIndexNumQuery query) {
ResultBean<List<AppIndexNumVo>> rb = ResultBean.fireFail();
String appSid = query.getAppSid();
String userSid = query.getUserSid();
String orgPath = query.getOrgPath();
AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery();
appToDoNumQuery.setUserSid(userSid);
appToDoNumQuery.setOrgPath(orgPath);
//根据appSid查询菜单的信息
List<SysMobileMenu> sysMobileMenus = sysMobileMenuService.getMenu(appSid);
List<AppIndexNumVo> list = new ArrayList<>();
if (AppIndexEnum.AppVersionSubAppSid.GYL.getCode().equals(appSid)) {
//供应链
for (SysMobileMenu menu : sysMobileMenus) {
AppIndexNumVo appIndexNumVo = new AppIndexNumVo();
appIndexNumVo.setSid(menu.getSid());
//验车
if (AppIndexEnum.AppMenu.YC.getCode().equals(menu.getSid())) {
String num = scmVehicleExamineFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//收车
if (AppIndexEnum.AppMenu.SC.getCode().equals(menu.getSid())) {
String num = scmVehicleEnterlibraryFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//移库
if (AppIndexEnum.AppMenu.YK.getCode().equals(menu.getSid())) {
String num = scmVehicleGressionFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//盘库
if (AppIndexEnum.AppMenu.PK.getCode().equals(menu.getSid())) {
String num = scmVehicleInventoryFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//巡检
if (AppIndexEnum.AppMenu.XJ.getCode().equals(menu.getSid())) {
String num = scmVehiclePatrolinspectionFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
list.add(appIndexNumVo);
}
} else if (AppIndexEnum.AppVersionSubAppSid.YW.getCode().equals(appSid)) {
//业务
}
return rb.success().setData(list);
}
}

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java

@ -17,4 +17,6 @@ import java.util.List;
public interface SysMobileMenuMapper extends BaseMapper<SysMobileMenu> {
//插件列表及应用列表
List<SysMobileMenuVo> listAll(@Param("path") String path, @Param("linkSid") String linkSid);
List<SysMobileMenu> getMenu(String appSid);
}

25
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml

@ -43,16 +43,35 @@
</collection>
</resultMap>
<select id="mobileMenuList" resultMap="childrenMap">
select title appName, titleGroup versionName, DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime, path as sourceAction, sortNo, sid, iconUrl
select title appName,
titleGroup versionName,
DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime,
path as sourceAction,
sortNo,
sid,
iconUrl
from sys_mobile_menu
where linkSid = #{appSid} and psid = '0'
where linkSid = #{appSid}
and psid = '0'
order by sortNo asc
</select>
<select id="childrenList" resultMap="childrenMap">
select title appName, titleGroup versionName, DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime, path as sourceAction, sortNo, sid, iconUrl
select title appName,
titleGroup versionName,
DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime,
path as sourceAction,
sortNo,
sid,
iconUrl
from sys_mobile_menu
where pSid = #{sid}
order by sortNo asc
</select>
<select id="getMenu" resultType="com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu">
select *
from sys_mobile_menu
where linkSid = #{appSid}
</select>
</mapper>

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java

@ -64,4 +64,8 @@ public class SysMobileMenuService extends MybatisBaseService<SysMobileMenuMapper
vo.setList(list);
return rb.success().setData(vo);
}
public List<SysMobileMenu> getMenu(String appSid) {
return baseMapper.getMenu(appSid);
}
}

12
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.java

@ -1,6 +1,8 @@
package com.yxt.anrui.portal.biz.sysmobilemenurole;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.portal.api.index.AppIndexNewListVo;
import com.yxt.anrui.portal.api.index.AppIndexNewVo;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRole;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRoleVo;
import org.apache.ibatis.annotations.Mapper;
@ -42,4 +44,14 @@ public interface SysMobileMenuRoleMapper extends BaseMapper<SysMobileMenuRole> {
* @return
*/
int deleteByRoleSid(String roleSid);
/**
* 移动端插件下的应用按应用类别分类
*
* @param appSid 插件appSid
* @return
*/
List<AppIndexNewVo> getApp( @Param("appSid") String appSid);
List<AppIndexNewListVo> appRoleMenu(@Param("path") String path, @Param("roleSids") List<String> roleSids, @Param("titleGroup") String titleGroup, @Param("appSid") String appSid);
}

34
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml

@ -28,4 +28,38 @@
from sys_mobile_menu_role
where roleSid = #{roleSid}
</delete>
<select id="getApp" resultType="com.yxt.anrui.portal.api.index.AppIndexNewVo">
select titleGroup as title
from sys_mobile_menu
where linkSid = #{appSid}
group by titleGroup
</select>
<!-- <resultMap id="appRoleMenu" type="com.yxt.anrui.portal.api.index.AppIndexNewVo">
<result column="title" jdbcType="VARCHAR" property="title"/>
<collection property="apps" ofType="com.yxt.anrui.portal.api.index.AppIndexNewListVo"
select="apps" column="{appSid = appSid,title = title,prefixPath = prefixPath}">
</collection>
</resultMap>-->
<select id="appRoleMenu" resultType="com.yxt.anrui.portal.api.index.AppIndexNewListVo">
select smm.title name,
if(length(smm.iconUrl) > 0, concat(#{path}, smm.iconUrl), '') as icon,
smm.sid,
smm.titleGroup classification,
smm.sortNo,
smm.path moduleAction,
smm.json
from sys_mobile_menu smm
left join sys_mobile_menu_role smmr on smmr.menuSid = smm.sid
left join sys_user_role sr on sr.sid = smmr.roleSid
where smm.linkSid = #{appSid}
and smmr.roleSid in
<foreach collection="roleSids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
and smm.titleGroup = #{titleGroup}
order by smm.sortNo asc
</select>
</mapper>

20
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleService.java

@ -1,6 +1,8 @@
package com.yxt.anrui.portal.biz.sysmobilemenurole;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
import com.yxt.anrui.portal.api.index.AppIndexNewListVo;
import com.yxt.anrui.portal.api.index.AppIndexNewVo;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRole;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRoleDto;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRoleVo;
@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@ -125,4 +128,21 @@ public class SysMobileMenuRoleService extends MybatisBaseService<SysMobileMenuRo
}
return rb.success();
}
public List<AppIndexNewVo> getApp(List<String> roleSids, String appSid) {
String path = fileUploadComponent.getUrlPrefix();
List<AppIndexNewVo> appIndexNewVos = baseMapper.getApp(appSid);
appIndexNewVos.removeAll(Collections.singleton(null));
if (!appIndexNewVos.isEmpty()) {
for (AppIndexNewVo vo : appIndexNewVos) {
String titleGroup = vo.getTitle();
List<AppIndexNewListVo> apps = baseMapper.appRoleMenu(path, roleSids, titleGroup, appSid);
apps.removeAll(Collections.singleton(null));
if (!apps.isEmpty()) {
vo.setApps(apps);
}
}
}
return appIndexNewVos;
}
}

11
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java

@ -3,17 +3,16 @@ package com.yxt.anrui.portal.biz.sysuserrole;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRole;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRole;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java

@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "巡检记录")
@FeignClient(
contextId = "anrui-scm-ScmVehiclePatrolinspection",
contextId = "anrui-terminal-ScmVehiclePatrolinspection",
name = "anrui-terminal",
path = "/supplychain/v1/inspection",
fallback = AppScmVehiclePatrolinspectionFeignFallback.class)

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/AppScmVehicleReturnFeign.java

@ -1,10 +1,8 @@
package com.yxt.anrui.terminal.api.supplychain.purchaseReturn;
import com.yxt.anrui.terminal.api.supplychain.modelAdjust.ModelModpriceQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
* @Description
*/
@FeignClient(
contextId = "anrui-scm-ScmVehicleReturn",
contextId = "anrui-terminal-ScmVehicleReturn",
name = "anrui-terminal",
path = "supplychain/v1/purchaseReturn",
fallback = AppScmVehicleReturnFeignFallback.class)

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java

@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "入库单")
@FeignClient(
contextId = "scm-ScmVehicleEnterlibrary",
contextId = "terminal-ScmVehicleEnterlibrary",
name = "anrui-terminal",
path = "/supplychain/v1/carWarehousing",
fallback = AppScmVehicleEnterlibraryFeignFallback.class)

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "验车单")
@FeignClient(
contextId = "scm-ScmVehicleExamine",
contextId = "terminal-ScmVehicleExamine",
name = "anrui-terminal",
path = "/supplychain/v1/carInspected",
fallback = AppScmVehicleExamineFeignFallback.class)

Loading…
Cancel
Save