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] =?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 disable(@Validated(TsUser.disable.class) @RequestBody TsUser tsUser){ + //判断disableFlag是否填入正确 + if((!tsUser.getDisableFlag().equals("1"))&&(!tsUser.getDisableFlag().equals("0"))){ + return Result.error("disableFlag只能是0或1"); + } + return tsUserService.disable(tsUser); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java new file mode 100644 index 00000000..d3a95719 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarUser.dao; + +import com.adc.da.slrs.sarUser.entity.TsUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zyl + * @since 2021-06-22 + */ +public interface TsUserDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java new file mode 100644 index 00000000..f1e7010e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java @@ -0,0 +1,129 @@ +package com.adc.da.slrs.sarUser.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; + +import java.sql.Timestamp; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author zyl + * @since 2021-06-22 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="TsUser对象", description="") +public class TsUser extends BaseEntity { + + public interface disable{ + } + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键Id") + @NotNull(message = "userId不能为空",groups = {disable.class}) + @TableId(value = "USID") + private String userId; + + @ApiModelProperty(value = "帐户") + @TableField("ACCOUNT") + private String account; + + @ApiModelProperty(value = "密码") + @TableField("PASSWORD") + private String password; + + @ApiModelProperty(value = "用户姓名") + @TableField("UNAME") + private String uname; + + @ApiModelProperty(value = "用户性别（1为男，2为女）") + @TableField("SEX") + private String sex; + + @ApiModelProperty(value = "用户来源") + @TableField("USER_SOURCE") + private String userSource; + + @ApiModelProperty(value = "用户邮箱") + @TableField("EMAIL") + private String email; + + @ApiModelProperty(value = "所属部门名称") + @TableField("INSTITUTION_NAME") + private String institutionName; + + @ApiModelProperty(value = "所属部门ID") + @TableField("INSTITUTION_ID") + private String institutionId; + + @ApiModelProperty(value = "岗位名") + @TableField("POSITION_NAME") + private String positionName; + + @ApiModelProperty(value = "岗位ID") + @TableField("POSITION_ID") + private String positionId; + + @ApiModelProperty(value = "工号") + @TableField("WORK_NUM") + private String workNum; + + @ApiModelProperty(value = "备注") + @TableField("EXT_INFO") + private String extInfo; + + @TableField("OPER_USER") + private String operUser; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp modifyTime; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "是否禁用（0为未禁用，1为已禁用）") + @NotNull(message = "disableFlag不能为空",groups = {disable.class}) + @TableField("DISABLE_FLAG") + private String disableFlag; + + @ApiModelProperty(value = "是否锁定") + @TableField("UNLOCK_FLAG") + private String unlockFlag; + + @ApiModelProperty(value = "用户类型") + @TableField("USER_TYPE") + private String userType; + + @ApiModelProperty(value = "对接单点登录用户ID") + @TableField("SSO_ID") + private String ssoId; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java new file mode 100644 index 00000000..0b806011 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -0,0 +1,33 @@ +package com.adc.da.slrs.sarUser.service; + +import com.adc.da.http.ResponseMessage; +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 ITsUserService extends IService { + + + /** + * 通过机构ID查询人员 + * @param institutionId：机构ID + * @return List + */ + List getUserByInstitutionId(String institutionId); + + /** + * 封禁、解禁用户 + * @param tsUser：目标用户 + * @return ResponseMessage + */ + ResponseMessage disable(TsUser tsUser); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java new file mode 100644 index 00000000..4d9f56cc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -0,0 +1,67 @@ +package com.adc.da.slrs.sarUser.service.impl; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.dao.TsUserDao; +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 TsUserServiceImpl extends ServiceImpl implements ITsUserService { + @Autowired + private TsUserDao tsUserDao; + + /** + * 通过机构ID查询人员 + * @param institutionId：机构ID + * @return List + */ + @Override + public List getUserByInstitutionId(String institutionId) { + QueryWrapper userQueryWrapper=new QueryWrapper<>(); + userQueryWrapper.eq("institution_id",institutionId); + return tsUserDao.selectList(userQueryWrapper); + } + + /** + * 封禁、解禁用户 + * @param tsUser：目标用户 + * @return ResponseMessage + */ + @Override + public ResponseMessage disable(TsUser tsUser) { + TsUser user=tsUserDao.selectById(tsUser.getUserId()); + if(user==null){ + return Result.error("该用户不存在"); + } + //解禁 + if(tsUser.getDisableFlag().equals("0")){ + if(user.getDisableFlag().equals("0")){ + return Result.error("该用户已被解禁，请勿重复操作"); + } + user.setDisableFlag("0"); + //封禁 + }else { + if(user.getDisableFlag().equals("1")){ + return Result.error("该用户已被封禁，请勿重复操作"); + } + user.setDisableFlag("1"); + } + tsUserDao.updateById(user); + return Result.success(); + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml new file mode 100644 index 00000000..fc9dcf3d --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml new file mode 100644 index 00000000..26150f18 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -0,0 +1,5 @@ + + + + +