Sfoglia il codice sorgente

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

pans 5 mesi fa
parent
commit
583333b33d

+ 4 - 1
snowy-modules/snowy-web-app/src/main/java/vip/xiaonuo/web/core/config/GlobalConfigure.java

@@ -190,7 +190,10 @@ public class GlobalConfigure implements WebMvcConfigurer {
             "/disk/courseauditrecord/addViewCount",
             "/disk/resourcecentre/top5",
             "/resourceFile/getResourceStorage",
-            "/auth/b/doBLogin"
+            "/auth/b/doBLogin",
+            "/disk/CollegeUser/add",
+            "/disk/CollegeOrg/add",
+            "/disk/CollegePosition/add"
     };
 
     /**

+ 19 - 4
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegeOrgController.java

@@ -18,6 +18,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.common.util.AuthUtil;
 import vip.xiaonuo.disk.domain.CollegeOrg;
 import vip.xiaonuo.disk.param.collegeOrg.CollegeOrgAddParam;
 import vip.xiaonuo.disk.param.collegeOrg.CollegeOrgEditParam;
@@ -35,6 +37,7 @@ import vip.xiaonuo.disk.service.CollegeOrgService;
 
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
@@ -44,6 +47,7 @@ import javax.validation.constraints.NotEmpty;
  * @author pans
  * @date  2025/09/04 15:14
  */
+@Slf4j
 @Api(tags = "下发组织日志表控制器")
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController
@@ -53,6 +57,9 @@ public class CollegeOrgController {
     @Resource
     private CollegeOrgService collegeOrgService;
 
+    @Resource
+    private AuthUtil authUtil;
+
     /**
      * 获取下发组织日志表分页
      *
@@ -76,11 +83,19 @@ public class CollegeOrgController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加下发组织日志表")
     @CommonLog("添加下发组织日志表")
-    @SaCheckPermission("/disk/CollegeOrg/add")
     @PostMapping("/disk/CollegeOrg/add")
-    public CommonResult<String> add(@RequestBody @Valid CollegeOrgAddParam collegeOrgAddParam) {
-        collegeOrgService.add(collegeOrgAddParam);
-        return CommonResult.ok();
+    public CommonResult<String> add(@RequestBody @Valid CollegeOrgAddParam collegeOrgAddParam, HttpServletRequest httpServletRequest) {
+        CommonResult<String> rs=authUtil.valid(httpServletRequest);
+        try {
+            if(rs.getCode().equals(200)){
+                collegeOrgService.add(collegeOrgAddParam);
+                return CommonResult.ok("下发组织数据成功");
+            }
+        } catch (Exception e) {
+            log.info("下发组织数据失败,失败原因:{}", e);
+            return CommonResult.error("下发组织数据失败==============================>"+e.getMessage());
+        }
+        return CommonResult.error(rs.getMsg());
     }
 
     /**

+ 18 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegePositionController.java

@@ -18,6 +18,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.common.util.AuthUtil;
 import vip.xiaonuo.disk.domain.CollegePosition;
 import vip.xiaonuo.disk.param.collegePosition.CollegePositionAddParam;
 import vip.xiaonuo.disk.param.collegePosition.CollegePositionEditParam;
@@ -35,6 +37,7 @@ import vip.xiaonuo.disk.service.CollegePositionService;
 
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
@@ -44,6 +47,7 @@ import javax.validation.constraints.NotEmpty;
  * @author pans
  * @date  2025/09/04 15:39
  */
+@Slf4j
 @Api(tags = "下发岗位日志表控制器")
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController
@@ -52,7 +56,8 @@ public class CollegePositionController {
 
     @Resource
     private CollegePositionService collegePositionService;
-
+    @Resource
+    private AuthUtil authUtil;
     /**
      * 获取下发岗位日志表分页
      *
@@ -76,11 +81,19 @@ public class CollegePositionController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加下发岗位日志表")
     @CommonLog("添加下发岗位日志表")
-    @SaCheckPermission("/disk/CollegePosition/add")
     @PostMapping("/disk/CollegePosition/add")
-    public CommonResult<String> add(@RequestBody @Valid CollegePositionAddParam collegePositionAddParam) {
-        collegePositionService.add(collegePositionAddParam);
-        return CommonResult.ok();
+    public CommonResult<String> add(@RequestBody @Valid CollegePositionAddParam collegePositionAddParam, HttpServletRequest httpServletRequest) {
+        CommonResult<String> rs=authUtil.valid(httpServletRequest);
+        try {
+            if(rs.getCode().equals(200)){
+                collegePositionService.add(collegePositionAddParam);
+                return CommonResult.ok("下发岗位数据成功");
+            }
+        } catch (Exception e) {
+            log.info("下发岗位数据失败,失败原因:{}", e);
+            return CommonResult.error("下发岗位数据失败==============================>"+e.getMessage());
+        }
+        return CommonResult.error(rs.getMsg());
     }
 
     /**

+ 18 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegeUserController.java

@@ -18,6 +18,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.common.util.AuthUtil;
 import vip.xiaonuo.disk.domain.CollegeUser;
 import vip.xiaonuo.disk.param.collegeUser.CollegeUserAddParam;
 import vip.xiaonuo.disk.param.collegeUser.CollegeUserEditParam;
@@ -35,6 +37,7 @@ import vip.xiaonuo.disk.service.CollegeUserService;
 
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
@@ -44,6 +47,7 @@ import javax.validation.constraints.NotEmpty;
  * @author pans
  * @date  2025/09/04 14:40
  */
+@Slf4j
 @Api(tags = "下发用户日志表控制器")
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController
@@ -52,7 +56,8 @@ public class CollegeUserController {
 
     @Resource
     private CollegeUserService collegeUserService;
-
+    @Resource
+    private AuthUtil authUtil;
     /**
      * 获取下发用户日志表分页
      *
@@ -76,11 +81,19 @@ public class CollegeUserController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加下发用户日志表")
     @CommonLog("添加下发用户日志表")
-    @SaCheckPermission("/disk/CollegeUser/add")
     @PostMapping("/disk/CollegeUser/add")
-    public CommonResult<String> add(@RequestBody @Valid CollegeUserAddParam collegeUserAddParam) {
-        collegeUserService.add(collegeUserAddParam);
-        return CommonResult.ok();
+    public CommonResult<String> add(@RequestBody @Valid CollegeUserAddParam collegeUserAddParam, HttpServletRequest httpServletRequest) {
+        CommonResult<String> rs=authUtil.valid(httpServletRequest);
+        try {
+            if(rs.getCode().equals(200)){
+                collegeUserService.add(collegeUserAddParam);
+                return CommonResult.ok("下发用户数据成功");
+            }
+        } catch (Exception e) {
+            log.info("下发用户数据失败,失败原因:{}", e);
+            return CommonResult.error("下发用户数据失败==============================>"+e.getMessage());
+        }
+        return CommonResult.error(rs.getMsg());
     }
 
     /**

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

@@ -16,10 +16,12 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
@@ -40,6 +42,7 @@ import vip.xiaonuo.sys.modular.user.entity.SysUser;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 下发组织日志表Service接口实现类
@@ -47,8 +50,12 @@ import java.util.List;
  * @author pans
  * @date  2025/09/04 15:14
  **/
+@Slf4j
 @Service
 public class CollegeOrgServiceImpl extends ServiceImpl<CollegeOrgMapper, CollegeOrg> implements CollegeOrgService {
+
+    private AtomicInteger userAddCounter = new AtomicInteger(0);
+
     @Resource
     private SysOrgMapper sysOrgMapper;
     @Override
@@ -67,6 +74,8 @@ public class CollegeOrgServiceImpl extends ServiceImpl<CollegeOrgMapper, College
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(CollegeOrgAddParam collegeOrgAddParam) {
+        int count = userAddCounter.incrementAndGet();
+        log.info("下发组织数据========================>"+JSON.toJSONString(collegeOrgAddParam));
         CollegeOrg collegeOrg = BeanUtil.toBean(collegeOrgAddParam, CollegeOrg.class);
         collegeOrg.setCreateTime(new Date());
         this.save(collegeOrg);
@@ -105,6 +114,8 @@ public class CollegeOrgServiceImpl extends ServiceImpl<CollegeOrgMapper, College
             org.setCreateTime(new Date());
             sysOrgMapper.insert(org);
         }
+        log.info("用户组织数据下发成功:{}", JSON.toJSONString(collegeOrgAddParam));
+        log.info("用户组织数据下发成功,下发条数:{}",count);
     }
 
     @Transactional(rollbackFor = Exception.class)

+ 12 - 0
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegePositionServiceImpl.java

@@ -16,10 +16,12 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
@@ -40,6 +42,7 @@ import vip.xiaonuo.sys.modular.user.entity.SysUser;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 下发岗位日志表Service接口实现类
@@ -47,8 +50,11 @@ import java.util.List;
  * @author pans
  * @date  2025/09/04 15:39
  **/
+@Slf4j
 @Service
 public class CollegePositionServiceImpl extends ServiceImpl<CollegePositionMapper, CollegePosition> implements CollegePositionService {
+
+    private AtomicInteger userAddCounter = new AtomicInteger(0);
     @Resource
     private SysPositionMapper sysPositionMapper;
     @Override
@@ -67,6 +73,9 @@ public class CollegePositionServiceImpl extends ServiceImpl<CollegePositionMappe
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(CollegePositionAddParam collegePositionAddParam) {
+        int count = userAddCounter.incrementAndGet();
+        log.info("下发岗位数据========================>"+JSON.toJSONString(collegePositionAddParam));
+
         CollegePosition collegePosition = BeanUtil.toBean(collegePositionAddParam, CollegePosition.class);
         collegePosition.setCreateTime(new Date());
         this.save(collegePosition);
@@ -106,6 +115,9 @@ public class CollegePositionServiceImpl extends ServiceImpl<CollegePositionMappe
             sysPositionMapper.insert(position);
         }
 
+        log.info("用户岗位数据下发成功:{}", JSON.toJSONString(collegePositionAddParam));
+        log.info("用户岗位数据下发成功,下发条数:{}",count);
+
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -17,10 +17,12 @@ import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
@@ -40,6 +42,7 @@ import vip.xiaonuo.sys.modular.user.mapper.SysUserMapper;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 下发用户日志表Service接口实现类
@@ -47,8 +50,12 @@ import java.util.List;
  * @author pans
  * @date  2025/09/04 14:40
  **/
+@Slf4j
 @Service
 public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, CollegeUser> implements CollegeUserService {
+
+    private AtomicInteger userAddCounter = new AtomicInteger(0);
+
     @Resource
     private  SysUserMapper sysUserMapper;
     @Override
@@ -67,6 +74,8 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(CollegeUserAddParam collegeUserAddParam) {
+        int count = userAddCounter.incrementAndGet();
+        log.info("下发用户数据========================>"+JSON.toJSONString(collegeUserAddParam));
         //添加用户下发日志表
         CollegeUser collegeUser = BeanUtil.toBean(collegeUserAddParam, CollegeUser.class);
         collegeUser.setCrateTime(new Date());
@@ -86,6 +95,7 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
             sysUser.setEmail(collegeUser.getEmail());    //邮箱
             sysUser.setPhone(collegeUser.getPhone());    //电话
             sysUser.setIdCardNumber(collegeUser.getPsptId());  //身份证号
+            sysUser.setEduIdentity("1");      //身份认证
             if("0".equals(collegeUser.getSex())){    //性别
                 sysUser.setGender("男");
             }else if("1".equals(collegeUser.getSex())){
@@ -117,6 +127,7 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
             user.setEmail(collegeUser.getEmail());
             user.setPhone(collegeUser.getPhone());
             user.setIdCardNumber(collegeUser.getPsptId());
+            user.setEduIdentity("1");
             if("0".equals(collegeUser.getSex())){
                 user.setGender("男");
             }else if("1".equals(collegeUser.getSex())){
@@ -135,8 +146,8 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
             user.setCreateTime(new Date());
             sysUserMapper.insert(user);
         }
-
-
+        log.info("用户数据下发成功:{}", JSON.toJSONString(collegeUserAddParam));
+        log.info("用户数据下发成功,下发条数:{}",count);
     }
 
     @Transactional(rollbackFor = Exception.class)

+ 4 - 1
snowy-server/snowy-gateway-app/src/main/java/vip/xiaonuo/gateway/config/GatewayConfigure.java

@@ -157,7 +157,10 @@ public class GatewayConfigure {
             "/webSocket/**",
             "/api/webapp/disk/resourcecentre/top5",
             "/api/webapp/resourceFile/getResourceStorage",
-            "/api/webapp/auth/b/doBLogin"
+            "/api/webapp/auth/b/doBLogin",
+            "/api/webapp/disk/CollegeUser/add",
+            "/api/webapp/disk/CollegeOrg/add",
+            "/api/webapp/disk/CollegePosition/add"
     };
 
     /**