智慧保安后台管理-外网项目备份
blame | history | patch | commit | commitdiff | ignore whitespace
钟日健
2022-02-22 045b55722b25ccc77d88671c5d6df309edb8a66d 
 src/main/java/org/springblade/modules/system/controller/UserController.java


@@ -31,6 +31,7 @@


import io.swagger.annotations.ApiParam;


import com.alibaba.fastjson.JSON;


import lombok.AllArgsConstructor;


import net.sf.json.JSONObject;


import org.apache.commons.codec.Charsets;


import org.springblade.common.cache.DictCache;


import org.springblade.common.config.FtpConfig;


@@ -38,6 +39,8 @@


import org.springblade.common.excel.CustomCellWriteHeightConfig;


import org.springblade.common.excel.CustomCellWriteWeightConfig;


import org.springblade.common.excel.RowWriteHandler;


import org.springblade.common.utils.HttpClientUtils;


import org.springblade.common.utils.HttpReqUtil;


import org.springblade.common.utils.ImageUtils;


import org.springblade.common.utils.arg;


import org.springblade.core.cache.utils.CacheUtil;


@@ -68,6 +71,7 @@


import org.springblade.modules.securitypaper.service.SecurityPaperService;


import org.springblade.modules.signinrecords.entity.SignInRecords;


import org.springblade.modules.signinrecords.service.SignInRecordsService;


import org.springblade.modules.system.dto.UserDTO;


import org.springblade.modules.system.entity.Dept;


import org.springblade.modules.system.entity.Role;


import org.springblade.modules.system.entity.User;


@@ -76,11 +80,13 @@


import org.springblade.modules.system.service.IDeptService;


import org.springblade.modules.system.service.IRoleService;


import org.springblade.modules.system.service.IUserService;


import org.springblade.modules.system.service.MyAsyncService;


import org.springblade.modules.system.vo.DeptVO;


import org.springblade.modules.system.vo.UserVO;


import org.springblade.modules.system.wrapper.UserWrapper;


import org.springblade.modules.training.entity.TrainingRegistration;


import org.springblade.modules.training.service.TrainingRegistrationService;


import org.springframework.scheduling.annotation.Async;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;


@@ -134,6 +140,8 @@






   private final SecurityPaperService securityPaperService;




   private final MyAsyncService myAsyncService;




   /**


    * 查询单条


@@ -661,6 +669,8 @@


         AccreditationRecords accreditationRecords1 = collect.get(0);


         //修改为已制证状态


         accreditationRecords1.setStatus(2);


         //记录打印时间


         accreditationRecords1.setPaperTime(new Date());


         //更新


         accreditationRecordsService.updateById(accreditationRecords1);


         //同步


@@ -881,7 +891,7 @@


      securityExcel.setCardid("360XXX19XXXXXX****");


      securityExcel.setNation("汉");


      securityExcel.setRegistered("江西省南昌市******");


      securityExcel.setHold("是");


//      securityExcel.setHold("是");


      securityExcel.setSecuritynumber("赣洪202100001");


      list.add(securityExcel);




@@ -893,7 +903,7 @@


      securityExcel1.setCardid("360XXX19XXXXXX****");


      securityExcel1.setNation("汉");


      securityExcel1.setRegistered("江西省南昌市******");


      securityExcel1.setHold("否");


//      securityExcel1.setHold("否");


      securityExcel1.setSecuritynumber("");


      list.add(securityExcel1);


      String fileName = null;


@@ -926,7 +936,7 @@


      securityExcel.setCardid("360XXX19XXXXXX****");


      securityExcel.setNation("汉");


      securityExcel.setRegistered("江西省南昌市******");


      securityExcel.setHold("是");


//      securityExcel.setHold("是");


      securityExcel.setSecuritynumber("赣洪202100001");


      list.add(securityExcel);




@@ -938,7 +948,7 @@


      securityExcel1.setCardid("360XXX19XXXXXX****");


      securityExcel1.setNation("汉");


      securityExcel1.setRegistered("江西省南昌市******");


      securityExcel1.setHold("否");


//      securityExcel1.setHold("否");


      securityExcel1.setSecuritynumber("");


      list.add(securityExcel1);


      String fileName = null;


@@ -1209,6 +1219,14 @@


         user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));


      }




      //数据推送


      //1.群访群控数据推送(异步)


      if (status) {


         myAsyncService.qfqkUserSave(user);


      }






      //2.内网数据推送


      String s = "insert into blade_user(" +


         "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +


         "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +


@@ -1419,4 +1437,44 @@


//      ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);


   }






   /**


    * 保安员账号校验


    * @param user


    * @return


    */


   @GetMapping("/checkAccount")


   public void checkAccount(User user) {


      //根据身份证号查询用户


      User user1 = new User();


      user1.setAccount(user.getCardid());


      user1.setIsDeleted(0);


      user1.setStatus(1);


      User user2 = userService.getOne(Condition.getQueryWrapper(user1));


      if (null!=user2){


         //判断是单位否一致


         if (null!=user.getDeptId() && !user.getDeptId().equals("")) {


            if (!user2.getDeptId().equals(user.getDeptId())) {


               throw new ServiceException(StringUtil.format("当前用户 [{}] 已在其他单位录入!", user.getCardid()));


            } else {


               throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));


            }


         }else {


            //没有传 deptId 的情况


            throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));


         }


      }


   }




   /**


    * 年龄分布查询


    * @param user


    * @return


    */


   @PostMapping("/getAgeStatistics")


   public R getAgeStatistics(UserVO user){


      return R.data(userService.getAgeStatistics(user));


   }






}