点赞评论相关提交

zengh

2021-10-29 aa218d70e29e77cfbea2a65d66f119d45e634c66

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -80,11 +80,11 @@

   static BASE64Encoder encoder = new BASE64Encoder();

   private final String sm4Key = "bf679652628841dc8f35f84989abf350";
   private final String sm4Key = "cd888d57e21a4ffc9be7ed601ab3ccd6";

   private final String clientCode = "909BCF57904BDBD3E053AF0A020A3760";
   private final String clientCode = "369947";

   private final String url = "http://eid.gongqing.gov.cn/uias-test/fca/verifyFace";
   private final String url = "http://218.87.21.104:59944/uias/verifyFace";

   @PostMapping("/faceCompare")
   public R upload(@RequestParam("name")String name,@RequestParam("idCardNo")String idCardNo,@RequestParam("file") MultipartFile file){
@@ -204,6 +204,15 @@
   //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
   public R submit(@Valid @RequestBody User user) {
      CacheUtil.clear(USER_CACHE);

      if (user.getExamination_type() == null || user.getExamination_type().equals("")){
         user.setExamination_type("0");
      }

      if (user.getExamination_mx() == null || user.getExamination_mx().equals("")){
         user.setExamination_mx("正常");
      }

      return R.status(userService.submit(user));
   }

@@ -216,11 +225,12 @@
   public R update(@Valid @RequestBody User user) {
      CacheUtil.clear(USER_CACHE);

      if (user.getOnline_status() == null || user.getOnline_status().equals("")){
         user.setOnline_status("0");
      if (user.getExamination_type() == null || user.getExamination_type().equals("")){
         user.setExamination_type("0");
      }
      if (user.getWork_status() == null || user.getWork_status().equals("")){
         user.setWork_status("0");

      if (user.getExamination_mx() == null || user.getExamination_mx().equals("")){
         user.setExamination_mx("正常");
      }

      return R.status(userService.updateUser(user));
@@ -284,12 +294,12 @@
   @ApiOperation(value = "修改基本信息", notes = "传入User")
   public R updateInfo(@Valid @RequestBody User user) {
      CacheUtil.clear(USER_CACHE);
      if (null!= user.getAvatar() && user.getAvatar()!="") {
         String avatar = user.getAvatar();
         String substring = avatar.substring(25, avatar.length());
         String url = "https://web.byisf.com/minio" + substring;
         user.setAvatar(url);
      }
//      if (null!= user.getAvatar() && user.getAvatar()!="") {
//         String avatar = user.getAvatar();
//         String substring = avatar.substring(25, avatar.length());
//         String url = "https://web.byisf.com/minio" + substring;
//         user.setAvatar(url);
//      }
      return R.status(userService.updateUserInfo(user));
   }

@@ -433,6 +443,29 @@
      return R.data(userService.selectUser());
   }

   /**
    * 统计用户注册数据
    * @return
    */
   @GetMapping("/getUserRegisterStatisticsData")
   public R getUserRegisterStatisticsData() {
      return R.data(userService.getUserRegisterStatisticsData());
   }

   /**
    * 统计六大队伍
    */
   @GetMapping("/getUserTypeCount")
   public R getUserTypeCount() {
      return R.data(userService.getUserTypeCount());
   }


   /**
    * 按行政区统计六大队伍
    */
   @GetMapping("/getUserDistrictTypeCount")
   public R getUserDistrictTypeCount() {
      return R.data(userService.getUserDistrictTypeCount());
   }
}