Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-21 866f5d2f24ec3245742513f97aa95cfe36f47281

Merge branch 'local_20221014' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -155,6 +155,8 @@
    private ComActActivityInviteService comActActivityInviteService;
    @Resource
    private RabbitTemplate rabbitTemplate;
    @Resource
    private AutomessageSysUserService automessageSysUserService;

    /**
     * 新增社区活动
@@ -2696,4 +2698,15 @@
    public R selectCommunityIds(@RequestParam("id") Long id){
        return comActService.selectIds(id);
    }


    /**
     * 通过id查询用户
     * @param id
     * @return
     */
    @GetMapping("selectAutomessageSysUserById")
    public R selectAutomessageSysUserById(@RequestParam("id") Long id){
        return automessageSysUserService.selectAutomessageSysUserById(id);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/AutomessageSysUserDao.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.entity.AutomessageSysUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * 用户表 后台用户+小程序用户(SysUser)表数据库访问层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 用户表 后台用户+小程序用户相关功能
 *
 * @author yh
 * @since 2022-10-21 09:36:09
 */
@Mapper
public interface AutomessageSysUserDao extends BaseMapper<AutomessageSysUser> {


    /**
     * 通过id查询
     * @param id
     * @return
     */
    @Select("select * from automessage_sys_user where id = #{id}")
    AutomessageSysUser selectAutomessageSysUserById(@Param("id") Long id);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/AutomessageSysUser.java

New file
@@ -0,0 +1,263 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 用户信息表
 * </p>
 *
 * @author xiang
 * @since 2022-07-05
 */
@ApiModel("用户信息实体类")
@Data
@TableName("automessage_sys_user")
public class AutomessageSysUser implements Serializable {

    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @ApiModelProperty("主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;


    /**
     * 用户id
     */
    @ApiModelProperty("用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;


    /**
     * 登录账号
     */
    @ApiModelProperty("登录账号")
    private String loginName;

    /**
     * 用户昵称
     */
    @ApiModelProperty("用户昵称")
    private String userName;

    /**
     * 用户类型（1系统后台用户     2导办人员用户）
     */
    @ApiModelProperty("用户类型（1系统后台用户     2导办人员用户）")
    private String userType;


    /**
     * 手机号码
     */
    @ApiModelProperty("手机号码")
    private String phonenumber;

    /**
     * 性别 1 男 2 女
     */
    @ApiModelProperty("性别 1 男 2 女")
    private String sex;

    /**
     * 头像路径
     */
    @ApiModelProperty("头像路径")
    private String avatar;

    /**
     * 密码
     */
    @ApiModelProperty("密码")
    private String password;

    /**
     * 盐加密
     */
    @ApiModelProperty("加密")
    private String salt;

    /**
     * 帐号状态（0正常 1停用）
     */
    @ApiModelProperty("帐号状态（0正常 1停用）")
    private String status;

    /**
     * 删除标志（0代表存在 2代表删除）
     */
    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
    private String delFlag;

    /**
     * 最后登录IP
     */
    @ApiModelProperty("最后登录IP")
    private String loginIp;

    /**
     * 最后登录时间
     */
    @ApiModelProperty("最后登录时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime loginDate;

    /**
     * 密码最后更新时间
     */
    @ApiModelProperty("密码最后更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime pwdUpdateDate;

    /**
     * 创建者
     */
    @ApiModelProperty("创建者")
    private String createBy;

    /**
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    /**
     * 更新者
     */
    @ApiModelProperty("更新者")
    private String updateBy;

    /**
     * 更新时间
     */
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    /**
     * 备注
     */
    @ApiModelProperty("备注")
    private String remark;

    /**
     * 角色ids
     */
    @ApiModelProperty("角色id")
    private String roleIds;

    /**
     * 数据权限
     */
    @ApiModelProperty("数据权限")
    private String dataPermission;

    /**
     * 部门id
     */
    @ApiModelProperty("部门id")
    private String departmentId;


    /**
     * 一级id
     */
    @ApiModelProperty("一级id")
    private String stairId;

    /**
     * 二级id
     */
    @ApiModelProperty("二级id")
    private String secondLevelId;

    /**
     * 所属部门名称
     */
    @ApiModelProperty("所属部门名称")
    private String departmentName;

    /**
     * 部门所属区域
     */
    @ApiModelProperty("部门所属区域")
    private String departmentArea;

    /**
     * 空闲状态（0 空闲    1 忙碌）
     */
    @ApiModelProperty("空闲状态（0 空闲    1 忙碌）")
    private String leisureState;

    /**
     * 擅长办理事务ids
     */
    @ApiModelProperty("擅长办理事务ids")
    private String masterIds;

    /**
     * 擅长事务名称
     */
    @ApiModelProperty("擅长事务名称")
    private String masterNames;

    /**
     * 办结事项ids
     */
    @ApiModelProperty("办结事项ids")
    private String transactionIds;

    /**
     * 办结事项名称
     */
    @ApiModelProperty("办结事项名称")
    private String transactionNames;

    /**
     * 微信小程序id
     */
    @ApiModelProperty("微信小程序id")
    private String openid;

    /**
     * 待处理办事指南数量
     */
    @ApiModelProperty("待处理办事指南数量")
    private Integer transactionNum;


    @TableField(exist = false)
    @ApiModelProperty("权限资格")
    private String permission;

    @TableField(exist = false)
    @ApiModelProperty("角色名称")
    private String roleName;


    @TableField(exist = false)
    @ApiModelProperty("创建人名称")
    private String createName;

    @ApiModelProperty("是否是部门领导（1是  2不是）")
    private String isDivisionHead;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/AutomessageSysUserService.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.AutomessageSysUser;

/**
 * @ClassName: AutomessageSysUserService
 * @Author: yh
 * @Date: 2022/10/21 9:38
 * @Description: TODO
 */
public interface AutomessageSysUserService extends IService<AutomessageSysUser> {

    /**
     * 通过id查询
     * @param id
     * @return
     */
    R selectAutomessageSysUserById(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/AutomessageSysUserServiceImpl.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.AutomessageSysUserDao;
import com.panzhihua.service_community.entity.AutomessageSysUser;
import com.panzhihua.service_community.service.AutomessageSysUserService;
import org.springframework.stereotype.Service;

/**
 * @ClassName: AutomessageSysUserServiceImpl
 * @Author: yh
 * @Date: 2022/10/21 9:39
 * @Description:
 */
@Service
public class AutomessageSysUserServiceImpl extends ServiceImpl<AutomessageSysUserDao, AutomessageSysUser>
        implements AutomessageSysUserService {
    @Override
    public R selectAutomessageSysUserById(Long id) {
        return R.ok(super.getById(id));
    }
}