diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java index 6f09919f..262b02d8 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java @@ -9,6 +9,7 @@ import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; /** @@ -122,9 +123,14 @@ public class UserResourceController { return R.ok(userResourceService.removeByIds(ids)); } - @ResponseBody @GetMapping("/findAll") public R findAll(String resource,String user){ return R.ok(userResourceService.findAll(resource,user)); } + + @PostMapping("saveAll") + public R saveAll(@RequestBody HashMap map){ + userResourceService.saveAll(map); + return R.ok(); + } } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java index b6853314..b25be4ba 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java @@ -1,8 +1,9 @@ package com.foreverwin.mesnac.dispatch.service; -import com.foreverwin.mesnac.dispatch.model.UserResource; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.dispatch.model.UserResource; +import java.util.HashMap; import java.util.List; /** @@ -18,4 +19,6 @@ public interface UserResourceService extends IService { List findEnableList(String site, String resource, String user); List findAll(String resource,String user); + + void saveAll(HashMap map); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java index 54074261..14680a30 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java @@ -1,6 +1,7 @@ package com.foreverwin.mesnac.dispatch.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.dispatch.mapper.UserResourceMapper; import com.foreverwin.mesnac.dispatch.model.UserResource; import com.foreverwin.mesnac.dispatch.service.UserResourceService; @@ -9,7 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; + /** *

* 员工资源对应表 服务实现类 @@ -38,4 +43,35 @@ public class UserResourceServiceImpl extends ServiceImpl map) { + List userResourceList = new ArrayList(); + + List> list = (List>)map.get("userResourceList"); +// (List)map.get("userResourceList"); + + String site = CommonMethods.getSite(); + for (int i=0; i < list.size(); i++) { + UserResource userResource = new UserResource(); + userResource.setSite(site); + userResource.setResourceBo(HandleEnum.RESOURCE.getHandle(site, list.get(i).get("resrce").toString())); + userResource.setResrce(list.get(i).get("resrce").toString()); + userResource.setUserId(list.get(i).get("userId").toString()); + userResource.setTemporaryUser(list.get(i).get("temporaryUser").toString()); + userResource.setStatus(list.get(i).get("status").toString()); + userResource.setCreateUser(CommonMethods.getUser()); + userResource.setHandle("UserResourceBo:"+userResource.getSite()+","+ + userResource.getResrce()+","+userResource.getUserId()); + if(userResourceMapper.selectById(userResource.getHandle()) == null){ + userResource.setCreatedDateTime(LocalDateTime.now()); + } + + userResource.setModifyUser(CommonMethods.getUser()); + userResource.setModifiedDateTime(LocalDateTime.now()); + + userResourceList.add(userResource); + } + this.saveOrUpdateBatch(userResourceList); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java index 5f73b713..4e7286ea 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.meapi.model.NwaUser; import com.foreverwin.mesnac.meapi.service.NwaUserService; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; @@ -63,6 +64,8 @@ public class NwaUserController { public R page(FrontPage frontPage, NwaUser nwaUser){ IPage result; QueryWrapper queryWrapper = new QueryWrapper<>(); + String site = CommonMethods.getSite(); + nwaUser.setSite(site); queryWrapper.setEntity(nwaUser); if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { //TODO modify global query diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java index c63dcceb..08afa467 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java @@ -131,4 +131,11 @@ public class ResrceController { public R removeByIds(List ids){ return R.ok(resrceService.removeByIds(ids)); } + /** + * + */ + @GetMapping("findByResrce") + public R findByResrce(String resrce){ + return R.ok(resrceService.findByResrce(resrce)); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java index 8d437689..e6b9b8a8 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java @@ -28,4 +28,6 @@ public interface ResrceMapper extends BaseMapper { * @return */ List> selectResourceTypeResourceList(@Param("site") String site); + + Resrce findByResrce(@Param("site")String site,@Param("resrce")String resrce); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java index 42d1e67a..8e12d7e5 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java @@ -43,4 +43,6 @@ public interface ResrceService extends IService { * @return */ List> getResourceTypeResourceList(String site); + + Resrce findByResrce(String resrce); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java index 0c574b16..0d8f23b1 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.meapi.service.impl; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -54,5 +55,12 @@ public class ResrceServiceImpl extends ServiceImpl impleme return resrceMapper.selectResourceTypeResourceList(site); } + @Override + public Resrce findByResrce(String resrce) { + String site = CommonMethods.getSite(); + Resrce byResrce = resrceMapper.findByResrce(site, resrce); + return byResrce; + } + } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml index 027a15db..b6383fa2 100644 --- a/meapi/src/main/resources/mapper/ResrceMapper.xml +++ b/meapi/src/main/resources/mapper/ResrceMapper.xml @@ -556,4 +556,12 @@ INNER JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO WHERE RT.SITE = #{site} +