menus);
+
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserStarService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserStarService.java
index 93922b33..0ac178b2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserStarService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserStarService.java
@@ -1,7 +1,12 @@
package com.adc.da.slrs.sarPersonalCenter.service;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStarEO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestBody;
/**
*
@@ -12,5 +17,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @since 2021-06-21
*/
public interface ISarUserStarService extends IService {
-
+ public ResponseMessage> getUserStarList(SarUserStarEO sarUserStarEO);
+ public ResponseMessage> deleteList(@RequestBody SarUserStarEO sarUserStars);
+ public ResponseMessage deleteById(@RequestBody SarUserStarEO sarUserStars);
+ public ResponseMessage addStar(@RequestBody SarUserStar sarUserStar);
+ public ResponseMessage isStar(String userId, String url);
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java
new file mode 100644
index 00000000..4a1320b5
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java
@@ -0,0 +1,40 @@
+package com.adc.da.slrs.sarPersonalCenter.service.impl;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenu;
+import com.adc.da.slrs.sarPersonalCenter.dao.SarUserPersonalMenuDao;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenuEO;
+import com.adc.da.slrs.sarPersonalCenter.service.ISarUserPersonalMenuService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Service
+public class SarUserPersonalMenuServiceImpl extends ServiceImpl implements ISarUserPersonalMenuService {
+
+
+ @Override
+ public ResponseMessage> getUserPersonalMenu(SarUserPersonalMenuEO eo) {
+ return null;
+ }
+
+ @Override
+ public ResponseMessage> updateUserPersonalMenu(SarUserPersonalMenuEO eo) {
+ return null;
+ }
+
+ @Override
+ public void updateUserPersonalMenuForRole(List menus) {
+
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
index a12d0cde..cc1b7309 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
@@ -1,10 +1,20 @@
package com.adc.da.slrs.sarPersonalCenter.service.impl;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar;
import com.adc.da.slrs.sarPersonalCenter.dao.SarUserStarDao;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStarEO;
import com.adc.da.slrs.sarPersonalCenter.service.ISarUserStarService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Date;
/**
*
@@ -17,4 +27,99 @@ import org.springframework.stereotype.Service;
@Service
public class SarUserStarServiceImpl extends ServiceImpl implements ISarUserStarService {
+ @Autowired
+ private ISarUserStarService iSarUserStarService;
+
+ @Override
+ public ResponseMessage> getUserStarList(SarUserStarEO sarUserStarEO) {
+ if (sarUserStarEO.getUserId() == null) {
+ return Result.error("userId不能为空");
+ } else {
+ if (sarUserStarEO.getSize() == null || sarUserStarEO.getSize() <= 0) sarUserStarEO.setSize(20);
+ if (sarUserStarEO.getCurrent() == null || sarUserStarEO.getCurrent() <= 0) sarUserStarEO.setCurrent(1);
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("user_id", sarUserStarEO.getUserId());
+ if(sarUserStarEO.getType()!=null)wrapper.like("type",sarUserStarEO.getType());
+ if(sarUserStarEO.getName()!=null)wrapper.like("name",sarUserStarEO.getName());
+ if(sarUserStarEO.getModular()!=null)wrapper.like("modular",sarUserStarEO.getModular());
+ if(sarUserStarEO.getInfo()!=null)wrapper.like("info",sarUserStarEO.getInfo());
+ if(sarUserStarEO.getUrl()!=null)wrapper.like("url",sarUserStarEO.getUrl());
+ IPage page = iSarUserStarService.page(new Page<>(sarUserStarEO.getCurrent(), sarUserStarEO.getSize()), wrapper);
+ while (page.getRecords().remove(null)) ;
+ return Result.success(page);
+ }
+ }
+
+
+ @Override
+ public ResponseMessage> deleteList(@RequestBody SarUserStarEO sarUserStars) {
+ if (sarUserStars.getUserId() == null) {
+ return Result.error("userId不能为空");
+ }
+ if (!(sarUserStars.getSarUserStars() == null || sarUserStars.getSarUserStars().size() <= 0)) {
+ for (SarUserStar sarUserStar : sarUserStars.getSarUserStars()) {
+ if (sarUserStar.getId() != null) {
+ QueryWrapper sarUserStarQueryWrapper = new QueryWrapper<>();
+ sarUserStarQueryWrapper.eq("id", sarUserStar.getId());
+ sarUserStarQueryWrapper.eq("user_id", sarUserStars.getUserId());
+ iSarUserStarService.remove(sarUserStarQueryWrapper);
+ }
+ }
+ }
+ return getUserStarList(sarUserStars);
+ }
+
+ @Override
+ public ResponseMessage deleteById(@RequestBody SarUserStarEO sarUserStars) {
+ if (sarUserStars.getUserId() == null) {
+ return Result.error("userId不能为空");
+ }
+ if (!(sarUserStars.getId() == null && sarUserStars.getUrl() == null)) {
+ return Result.error("url或id不能为空");
+ }
+ QueryWrapper sarUserStarQueryWrapper = new QueryWrapper<>();
+ if(sarUserStars.getId()!=null)sarUserStarQueryWrapper.eq("id", sarUserStars.getId());
+ else sarUserStarQueryWrapper.eq("url", sarUserStars.getUrl());
+ sarUserStarQueryWrapper.eq("user_id", sarUserStars.getUserId());
+ iSarUserStarService.remove(sarUserStarQueryWrapper);
+
+ return Result.success(iSarUserStarService.remove(sarUserStarQueryWrapper));
+ }
+
+ @Override
+ public ResponseMessage addStar(@RequestBody SarUserStar sarUserStar) {
+ if (sarUserStar.getUserId() == null) {
+ return Result.error("userId不能为空");
+ }
+ if (sarUserStar.getUrl() == null
+ && sarUserStar.getModular() == null
+ && sarUserStar.getName() == null
+ && sarUserStar.getType() == null) {
+ return Result.error("数据有误");
+ }
+
+ sarUserStar.setId(null);
+ sarUserStar.setCreateTime(new Date());
+
+ return Result.success(iSarUserStarService.save(sarUserStar));
+ }
+
+ @Override
+ public ResponseMessage isStar(String userId, String url) {
+ if (userId == null) {
+ return Result.error("userId不能为空");
+ }
+ if (url == null) {
+ return Result.error("url不能为空");
+ }
+
+ QueryWrapper sarUserStarQueryWrapper = new QueryWrapper<>();
+ sarUserStarQueryWrapper.eq("user_id", userId);
+ sarUserStarQueryWrapper.eq("url", url);
+ int count = iSarUserStarService.count(sarUserStarQueryWrapper);
+
+ return Result.success(count > 0);
+ }
+
+
}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPersonalCenter/SarUserPersonalMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPersonalCenter/SarUserPersonalMenuMapper.xml
new file mode 100644
index 00000000..55241f78
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPersonalCenter/SarUserPersonalMenuMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
From 07c2fae280b2e4ca1dc3ea0f10050ec7a8c7f608 Mon Sep 17 00:00:00 2001
From: yinglong zhang <1679309912@qq.com>
Date: Tue, 22 Jun 2021 09:54:31 +0800
Subject: [PATCH 4/8] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E4=B8=AA=E4=BA=BA?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
adc-da-main/src/main/resources/application-dev.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index 0280f9bd..88425a41 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -3,9 +3,9 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
-spring.datasource.password = root
+spring.datasource.password = 1q2w3e4r
#==============================================
# 应用设置
From 322e057cd4b6e6f3ebb8750a0c0985846ed910f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=82=96=E4=BA=91?= <2816048001@qq.com>
Date: Tue, 22 Jun 2021 14:06:01 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fetch:=E6=96=B0=E5=A2=9E=E6=9C=BA=E6=9E=84/?=
=?UTF-8?q?=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/adc/da/main/generate/CodeGen.java | 4 +-
.../controller/TsInstitutionController.java | 61 +++++++++
.../sarInstitution/dao/TsInstitutionDao.java | 16 +++
.../sarInstitution/entity/TsInstitution.java | 46 +++++++
.../service/ITsInstitutionService.java | 24 ++++
.../impl/TsInstitutionServiceImpl.java | 60 ++++++++
.../sarUser/controller/TsUserController.java | 43 ++++++
.../adc/da/slrs/sarUser/dao/TsUserDao.java | 16 +++
.../adc/da/slrs/sarUser/entity/TsUser.java | 129 ++++++++++++++++++
.../slrs/sarUser/service/ITsUserService.java | 33 +++++
.../service/impl/TsUserServiceImpl.java | 67 +++++++++
.../sarInstitution/TsInstitutionMapper.xml | 5 +
.../mybatis/mapper/sarUser/TsUserMapper.xml | 5 +
13 files changed, 507 insertions(+), 2 deletions(-)
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java
create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
index d583f102..79244a62 100644
--- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
+++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
@@ -22,11 +22,11 @@ public class CodeGen {
// x.x.x.x:3306/xxxx --MYSQL
// 192.168.10.140:1521:foton_slrs_test
- private static final String DB_IP="101.36.227.22:33050/foton_slrs_test";
+ private static final String DB_IP="192.168.10.47:3306/foton_slrs_test";
private static final String DB_USER="root";
- private static final String DB_PWD="1q2w3e4r";
+ private static final String DB_PWD="root";
/**
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
new file mode 100644
index 00000000..a3e5731d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
@@ -0,0 +1,61 @@
+package com.adc.da.slrs.sarInstitution.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author zyl
+* @since 2021-06-22
+*/
+@RestController
+@Api(tags = "|机构管理|")
+@RequestMapping("/SarInstitution/institution")
+public class TsInstitutionController extends BaseController {
+ @Autowired
+ private ITsInstitutionService tsInstitutionService;
+ @Autowired
+ private ITsUserService tsUserService;
+
+ /**
+ * 查询所有机构
+ * @return ResponseMessage>
+ */
+ @ApiOperation("查询所有机构")
+ @GetMapping
+ public ResponseMessage> getInstitution(){
+ List institutions=tsInstitutionService.getInstitution();
+ return Result.success(institutions);
+ }
+
+ /**
+ * 查询机构人员
+ * @param institutionId：机构ID
+ * @return ResponseMessage>
+ */
+ @ApiOperation("查询机构的人员")
+ @GetMapping("/user")
+ public ResponseMessage> getUserByInstitutionId(@RequestParam String institutionId){
+ List tsUsers=tsUserService.getUserByInstitutionId(institutionId);
+ return Result.success(tsUsers);
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
new file mode 100644
index 00000000..f1c9ed26
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarInstitution.dao;
+
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface TsInstitutionDao extends BaseMapper {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java
new file mode 100644
index 00000000..81976dcf
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java
@@ -0,0 +1,46 @@
+package com.adc.da.slrs.sarInstitution.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="TsInstitution对象", description="")
+public class TsInstitution extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private String id;
+
+ @ApiModelProperty(value = "上级机构")
+ private String parentId;
+
+ @ApiModelProperty(value = "机构层级")
+ private Integer level;
+
+ @ApiModelProperty(value = "机构名")
+ private String name;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "子机构")
+ private List children;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
new file mode 100644
index 00000000..6c973148
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
@@ -0,0 +1,24 @@
+package com.adc.da.slrs.sarInstitution.service;
+
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface ITsInstitutionService extends IService {
+
+ /**
+ * 查询所有机构
+ */
+ List getInstitution();
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
new file mode 100644
index 00000000..7823aa51
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
@@ -0,0 +1,60 @@
+package com.adc.da.slrs.sarInstitution.service.impl;
+
+
+import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Service
+public class TsInstitutionServiceImpl extends ServiceImpl implements ITsInstitutionService {
+ @Autowired
+ private TsInstitutionDao tsInstitutionDao;
+
+ /**
+ * 查询所有机构
+ */
+ @Override
+ public List getInstitution() {
+ //查询第一层机构
+ QueryWrapper institutionQueryWrapper=new QueryWrapper<>();
+ institutionQueryWrapper.eq("level",1);
+ List institutionRoot=tsInstitutionDao.selectList(institutionQueryWrapper);
+ for(TsInstitution tsInstitution:institutionRoot){
+ tsInstitution.setChildren(recursionGetInstitution(tsInstitution));
+ }
+ return institutionRoot;
+ }
+
+
+
+ /**
+ * 递归获取子机构
+ * @param tsInstitution：父机构
+ * @return List
+ */
+ private List recursionGetInstitution(TsInstitution tsInstitution){
+ QueryWrapper institutionQueryWrapper=new QueryWrapper<>();
+ institutionQueryWrapper.eq("parent_id",tsInstitution.getId());
+ List tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper);
+ for(TsInstitution tsInstitutionNode:tsInstitutions){
+ tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode));
+ }
+ return tsInstitutions;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java
new file mode 100644
index 00000000..a3efd94a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java
@@ -0,0 +1,43 @@
+package com.adc.da.slrs.sarUser.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author zxy
+* @since 2021-06-22
+*/
+@RestController
+@Api(tags = "|人员管理|")
+@RequestMapping("/sarUser/user")
+public class TsUserController extends BaseController {
+ @Autowired
+ private ITsUserService tsUserService;
+
+ @ApiOperation("禁用/解禁人员")
+ @PostMapping("/disable")
+ public ResponseMessage
*
- * @author zyl
+ * @author zxy
* @since 2021-06-22
*/
@Data
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml
new file mode 100644
index 00000000..98887dad
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+