下发用户、组织、岗位代码提交

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegeOrgServiceImpl.java

@@ -17,6 +17,7 @@ import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -31,8 +32,13 @@ import vip.xiaonuo.disk.param.collegeOrg.CollegeOrgEditParam;
 import vip.xiaonuo.disk.param.collegeOrg.CollegeOrgIdParam;
 import vip.xiaonuo.disk.param.collegeOrg.CollegeOrgPageParam;
 import vip.xiaonuo.disk.service.CollegeOrgService;
+import vip.xiaonuo.sys.modular.org.entity.SysOrg;
+import vip.xiaonuo.sys.modular.org.mapper.SysOrgMapper;
+import vip.xiaonuo.sys.modular.user.entity.SysUser;
 
 
+import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,8 +49,8 @@ import java.util.List;
  **/
 @Service
 public class CollegeOrgServiceImpl extends ServiceImpl<CollegeOrgMapper, CollegeOrg> implements CollegeOrgService {
-
-
+    @Resource
+    private SysOrgMapper sysOrgMapper;
     @Override
     public Page<CollegeOrg> page(CollegeOrgPageParam collegeOrgPageParam) {
         QueryWrapper<CollegeOrg> queryWrapper = new QueryWrapper<>();
@@ -62,7 +68,43 @@ public class CollegeOrgServiceImpl extends ServiceImpl<CollegeOrgMapper, College
     @Override
     public void add(CollegeOrgAddParam collegeOrgAddParam) {
         CollegeOrg collegeOrg = BeanUtil.toBean(collegeOrgAddParam, CollegeOrg.class);
+        collegeOrg.setCreateTime(new Date());
         this.save(collegeOrg);
+
+        //根据组织id查询组织信息是否存在
+        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SysOrg::getId, collegeOrg.getDeptId());
+        SysOrg sysOrg=sysOrgMapper.selectOne(queryWrapper);
+
+        //如果组织存在,则进行更新
+        if(ObjectUtil.isNotEmpty(sysOrg)){
+            sysOrg.setName(collegeOrg.getUsergName());
+            sysOrg.setRemark(collegeOrg.getDescRibe());
+            if("0".equals(collegeOrg.getDelFlag())){
+                sysOrg.setDeleteFlag("NOT_DELETE");
+            }else if("2".equals(collegeOrg.getDelFlag())){
+                sysOrg.setDeleteFlag("DELETED");
+            }
+            sysOrg.setType(collegeOrg.getType());
+            sysOrg.setUpdateTime(new Date());
+
+            UpdateWrapper<SysOrg> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("id", sysOrg.getId());
+            sysOrgMapper.update(sysOrg, updateWrapper);
+        }else{
+            SysOrg org=new SysOrg();
+            org.setId(String.valueOf(collegeOrg.getDeptId()));
+            org.setName(collegeOrg.getUsergName());
+            org.setRemark(collegeOrg.getDescRibe());
+            if("0".equals(collegeOrg.getDelFlag())){
+                org.setDeleteFlag("NOT_DELETE");
+            }else if("2".equals(collegeOrg.getDelFlag())){
+                org.setDeleteFlag("DELETED");
+            }
+            org.setType(collegeOrg.getType());
+            org.setCreateTime(new Date());
+            sysOrgMapper.insert(org);
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegeUserServiceImpl.java

@@ -17,6 +17,7 @@ import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -31,8 +32,12 @@ import vip.xiaonuo.disk.param.collegeUser.CollegeUserEditParam;
 import vip.xiaonuo.disk.param.collegeUser.CollegeUserIdParam;
 import vip.xiaonuo.disk.param.collegeUser.CollegeUserPageParam;
 import vip.xiaonuo.disk.service.CollegeUserService;
+import vip.xiaonuo.sys.modular.user.entity.SysUser;
+import vip.xiaonuo.sys.modular.user.mapper.SysUserMapper;
 
 
+import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,8 +48,8 @@ import java.util.List;
  **/
 @Service
 public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, CollegeUser> implements CollegeUserService {
-
-
+    @Resource
+    private  SysUserMapper sysUserMapper;
     @Override
     public Page<CollegeUser> page(CollegeUserPageParam collegeUserPageParam) {
         QueryWrapper<CollegeUser> queryWrapper = new QueryWrapper<>();
@@ -61,8 +66,75 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(CollegeUserAddParam collegeUserAddParam) {
+        //添加用户下发日志表
         CollegeUser collegeUser = BeanUtil.toBean(collegeUserAddParam, CollegeUser.class);
+        collegeUser.setCrateTime(new Date());
         this.save(collegeUser);
+
+        //根据账号查询用户表是否存在
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SysUser::getAccount, collegeUser.getUserName());
+        SysUser sysUser=sysUserMapper.selectOne(queryWrapper);
+        //如果用户存在,则进行更新
+        if(ObjectUtil.isNotEmpty(sysUser)){
+
+            sysUser.setOrgId(String.valueOf(collegeUser.getDeptId()));   //组织id
+            sysUser.setPostCode(collegeUser.getPostIds());   //岗位编码
+            sysUser.setAccount(collegeUser.getUserName());   //账号
+            sysUser.setNickname(collegeUser.getNickName());  //昵称
+            sysUser.setEmail(collegeUser.getEmail());    //邮箱
+            sysUser.setPhone(collegeUser.getPhone());    //电话
+            sysUser.setIdCardNumber(collegeUser.getPsptId());  //身份证号
+            if("0".equals(collegeUser.getSex())){    //性别
+                sysUser.setGender("男");
+            }else if("1".equals(collegeUser.getSex())){
+                sysUser.setGender("女");
+            }else{
+                sysUser.setGender("未知");
+            }
+            sysUser.setAvatar(collegeUser.getAvatar());  //头像
+            if("0".equals(collegeUser.getStatus())){
+                sysUser.setUserStatus("ENABLE");
+            }else{
+                sysUser.setUserStatus("DISABLED");
+            }
+            sysUser.setCode(collegeUser.getPersonCode());  //人员编码
+            sysUser.setUserType(collegeUser.getUserType());  //账号类型
+            sysUser.setUpdateTime(new Date());
+
+            UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("account", sysUser.getAccount());
+            sysUserMapper.update(sysUser, updateWrapper);
+        }else{
+            //如果用户存在,进行插入
+            SysUser user =new SysUser();
+            user.setOrgId(String.valueOf(collegeUser.getDeptId()));
+            user.setPostCode(collegeUser.getPostIds());
+            user.setAccount(collegeUser.getUserName());
+            user.setNickname(collegeUser.getNickName());
+            user.setEmail(collegeUser.getEmail());
+            user.setPhone(collegeUser.getPhone());
+            user.setIdCardNumber(collegeUser.getPsptId());
+            if("0".equals(collegeUser.getSex())){
+                user.setGender("男");
+            }else if("1".equals(collegeUser.getSex())){
+                user.setGender("女");
+            }else{
+                user.setGender("未知");
+            }
+            user.setAvatar(collegeUser.getAvatar());
+            if("0".equals(collegeUser.getStatus())){
+               user.setUserStatus("ENABLE");
+            }else{
+               user.setUserStatus("DISABLED");
+            }
+            user.setCode(collegeUser.getPersonCode());
+            user.setUserType(collegeUser.getUserType());
+            user.setCreateTime(new Date());
+            sysUserMapper.insert(user);
+        }
+
+
     }
 
     @Transactional(rollbackFor = Exception.class)

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java

@@ -352,6 +352,7 @@ public class SysUser extends CommonEntity {
 
     /** 账号类型 */
     private String userType;
-
+    /** 岗位编码 */
+    private String postCode;
 
 }