fix 居住人员认证

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java

@@ -6,9 +6,12 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
+import org.dromara.common.core.config.BoManConfig;
 import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.AjaxResult;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.FileUploadUtils;
 import org.dromara.common.core.utils.file.MimeTypeUtils;
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -21,9 +24,7 @@ import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysUserBo;
 import org.dromara.system.domain.bo.SysUserPasswordBo;
 import org.dromara.system.domain.bo.SysUserProfileBo;
-import org.dromara.system.domain.vo.AvatarVo;
 import org.dromara.system.domain.vo.ProfileVo;
-import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.ISysOssService;
 import org.dromara.system.service.ISysUserService;
@@ -148,21 +149,32 @@ public class SysProfileController extends BaseController {
     @RepeatSubmit
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<AvatarVo> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
+    public AjaxResult avatar(@RequestPart("avatarfile") MultipartFile avatarfile) throws Exception{
         if (!avatarfile.isEmpty()) {
             String extension = FileUtil.extName(avatarfile.getOriginalFilename());
             if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
-                return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
+                return AjaxResult.error("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
             }
-            SysOssVo oss = ossService.upload(avatarfile);
+
+            //LoginUser loginUser = getLoginUser();
+            String avatar = FileUploadUtils.upload(BoManConfig.getAvatarPath(), avatarfile, MimeTypeUtils.IMAGE_EXTENSION);
+            boolean updateSuccess = DataPermissionHelper.ignore(() -> userService.updateUserAvatar(LoginHelper.getUserId(), avatar));
+            if (updateSuccess)
+            {
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
+                // 更新缓存用户头像
+                return ajax;
+            }
+/*            SysOssVo oss = ossService.upload(avatarfile);
             String avatar = oss.getUrl();
             boolean updateSuccess = DataPermissionHelper.ignore(() -> userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId()));
             if (updateSuccess) {
                 AvatarVo avatarVo = new AvatarVo();
                 avatarVo.setImgUrl(avatar);
                 return R.ok(avatarVo);
-            }
+            }*/
         }
-        return R.fail("上传图片异常，请联系管理员");
+        return AjaxResult.error("上传图片异常，请联系管理员");
     }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -65,7 +65,7 @@ public class SysUser extends TenantEntity {
     /**
      * 用户头像
      */
-    private Long avatar;
+    private String avatar;
 
     /**
      * 密码

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java

@@ -81,7 +81,7 @@ public class SysUserVo implements Serializable {
      * 头像地址
      */
     //@Translation(type = TransConstant.OSS_ID_TO_URL)
-    private Long avatar;
+    private String avatar;
 
     /**
      * 密码

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java

@@ -230,7 +230,7 @@ public interface ISysUserService {
      * @param avatar 头像地址
      * @return 结果
      */
-    boolean updateUserAvatar(Long userId, Long avatar);
+    boolean updateUserAvatar(Long userId, String avatar);
 
     /**
      * 重置用户密码

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -499,7 +499,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar(Long userId, Long avatar) {
+    public boolean updateUserAvatar(Long userId, String avatar) {
         return baseMapper.update(null,
             new LambdaUpdateWrapper<SysUser>()
                 .set(SysUser::getAvatar, avatar)

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/asset/AssetType.java

@@ -55,15 +55,17 @@ public class AssetType extends TenantEntity {
     private String status;
 
     /**
-     * 删除标志（N代表存在 Y代表删除）
+     * 删除标志（0代表存在 1代表删除）
      */
     @TableLogic
     private String delFlag;
 
 
     /** 父资产名称 */
+    @TableField(exist = false)
     private String parentName;
     /** 子资产 */
+    @TableField(exist = false)
     private List<AssetType> children = new ArrayList<AssetType>();
 
 

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/communityNews/CommentIndex.java

@@ -98,7 +98,7 @@ public class CommentIndex extends TenantEntity {
     private String commentContent;
 
     /**
-     * 逻辑删除(Y:已删除，N:未删除)
+     * 逻辑删除(1:已删除，0:未删除)
      */
     @TableLogic
     private String delFlag;

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/communityNews/CommentLikes.java

@@ -28,6 +28,7 @@ public class CommentLikes extends TenantEntity {
     private Long likesId;
 
     /** 社区资讯ID */
+    @TableField(exist = false)
     private Long communityId;
     /**
      * 点赞目标id
@@ -60,7 +61,7 @@ public class CommentLikes extends TenantEntity {
     private String avatar;
 
     /**
-     * 逻辑删除(Y:已删除，N:未删除)
+     * 逻辑删除(1:已删除，0:未删除)
      */
     @TableLogic
     private String delFlag;

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/communityNews/CommentStars.java

@@ -58,7 +58,7 @@ public class CommentStars extends TenantEntity {
     private String avatar;
 
     /**
-     * 逻辑删除(Y:已删除，N:未删除)
+     * 逻辑删除(1:已删除，0:未删除)
      */
     @TableLogic
     private String delFlag;

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/CommentIndexServiceImpl.java

@@ -100,14 +100,14 @@ public class CommentIndexServiceImpl implements ICommentIndexService {
             if (communityIdList != null && communityIdList.size() > 0) {
                 for (CommentIndexVoOld commentIndexVo : rootComment) {
                     if (communityIdList.contains(commentIndexVo.getId())) {
-                        commentIndexVo.setIsLike("Y");
+                        commentIndexVo.setIsLike(Y);
                     }
                 }
             }
             for (CommentIndexVoOld commentIndexVo : rootComment) {
                 //是否是自己的评论
                 if (commentIndexVo.getCommentUser().getId().equals(userId)) {
-                    commentIndexVo.setIsMyself("Y");
+                    commentIndexVo.setIsMyself(Y);
                 }
             }
         }
@@ -131,14 +131,14 @@ public class CommentIndexServiceImpl implements ICommentIndexService {
             if (communityIdList != null && communityIdList.size() > 0) {
                 for (CommentChildrenVo commentChildrenVo : allComment) {
                     if (communityIdList.contains(commentChildrenVo.getId())) {
-                        commentChildrenVo.setIsLike("Y");
+                        commentChildrenVo.setIsLike(Y);
                     }
                 }
             }
             for (CommentChildrenVo commentChildrenVo : allComment) {
                 //是否是自己的评论
                 if (commentChildrenVo.getCommentUser().getId().equals(userId)) {
-                    commentChildrenVo.setIsMyself("Y");
+                    commentChildrenVo.setIsMyself(Y);
                 }
             }
         }
@@ -270,13 +270,9 @@ public class CommentIndexServiceImpl implements ICommentIndexService {
         if (commentIndex != null && commentIndex.getUserId().equals(userId)) {
             //社区资讯id
             Long communityId = commentIndex.getCommunityId();
-            commentIndex.setDelFlag(Y);
-            flag = baseMapper.updateById(commentIndex) > 0;
-            CommentContent commentContent = new CommentContent();
-            commentContent.setCommentId(commentId);
-            commentContent.setDelFlag(Y);
+            flag = baseMapper.deleteById(commentIndex) > 0;
             //删除评论内容表数据
-            commentContentMapper.updateById(commentContent);
+            commentContentMapper.delete(new LambdaQueryWrapper<CommentContent>().eq(CommentContent::getCommentId, commentId));
             //如果是根评论删除，删除所有子评论
             if (1 == commentIndex.getIsRoot()) {
                 //查找出所有parent_id = commentId的commentId

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/CommentLikesServiceImpl.java

@@ -165,8 +165,7 @@ public class CommentLikesServiceImpl implements ICommentLikesService {
         //根据点赞目标id' 点赞目标类型（1：资讯 2：回复） 用户id查询是否已经点赞过
         CommentLikes commentLikesOld = baseMapper.selectCommentLikes(commentLikes);
         if (commentLikesOld != null) {
-            commentLikesOld.setDelFlag("Y");
-            baseMapper.updateById(commentLikesOld);
+            baseMapper.deleteById(commentLikesOld);
         } else {
             baseMapper.insert(commentLikes);
         }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ResidentInfoServiceImpl.java

@@ -250,6 +250,8 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 if (useIds != null && !useIds.isEmpty()) {
                     if (!useIds.contains(userId))
                         userService.insertUserRole(user, false);
+                }else {
+                    userService.insertUserRole(user, false);
                 }
             }
 
@@ -363,6 +365,8 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
             if (useIds != null && !useIds.isEmpty()) {
                 if (!useIds.contains(userId))
                     userService.insertUserRole(user, false);
+            }else {
+                userService.insertUserRole(user, false);
             }
         }
 
@@ -503,6 +507,8 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 if (useIds != null && !useIds.isEmpty()) {
                     if (!useIds.contains(userId))
                         userService.insertUserRole(sysUser, false);
+                }else {
+                    userService.insertUserRole(sysUser, false);
                 }
             }
             //认证通过后 把用户提交的房本信息同步到房屋主表

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StaffTrainTimeServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.dto.StaffManageDTO;
-import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -110,9 +109,8 @@ public class StaffTrainTimeServiceImpl implements IStaffTrainTimeService {
 
         StaffManageDTO staffManage = LoginHelper.getLoginUser().getStaffManage();
         if (staffManage != null) {
-            staffTrainTime.setStaffId(staffManage.getStaffId());
-            staffTrainTime.setStaffName(staffManage.getStaffName());
-            staffTrainTime.setCreateTime(DateUtils.getNowDate());
+            add.setStaffId(staffManage.getStaffId());
+            add.setStaffName(staffManage.getStaffName());
             flag = baseMapper.insert(add) > 0;
         }
         if (flag) {

ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/CommentContentMapper.xml

@@ -5,6 +5,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="org.dromara.mapper.CommentContentMapper">
 
     <update id="deleteCommentContentByCommentId" parameterType="org.dromara.domain.communityNews.CommentContent">
-        update comment_content set del_flag = 'Y' where comment_id in(select comment_id from comment_index where parent_id = #{commentId})
+        update comment_content set del_flag = '1' where comment_id in(select comment_id from comment_index where parent_id = #{commentId})
     </update>
 </mapper>