riku
2021-09-26 7919d4bab9e4d787b5a8d5dd6c9d99d22e394ca7
1. 新增用户名对照表
已修改2个文件
已添加3个文件
141 ■■■■■ 文件已修改
src/main/kotlin/cn/flightfeather/supervision/domain/entity/UserMap.java 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/kotlin/cn/flightfeather/supervision/domain/mapper/UserMapMapper.kt 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/kotlin/cn/flightfeather/supervision/lightshare/repository/impl/MeetingRepositoryImpl.kt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/generator/generatorConfig.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserMapMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/kotlin/cn/flightfeather/supervision/domain/entity/UserMap.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
package cn.flightfeather.supervision.domain.entity;
import javax.persistence.*;
@Table(name = "ts_t_user_map")
public class UserMap {
    /**
     * é£žç¾½çŽ¯å¢ƒç”¨æˆ·id
     */
    @Id
    @Column(name = "TZ_User_Id")
    private String tzUserId;
    /**
     * é£žç¾½çŽ¯å¢ƒç”¨æˆ·åç§°
     */
    @Column(name = "TZ_User_Name")
    private String tzUserName;
    /**
     * é£žç¾½ç›‘管用户id
     */
    @Column(name = "SV_User_Id")
    private String svUserId;
    /**
     * é£žç¾½ç›‘管用户名称
     */
    @Column(name = "SV_User_Name")
    private String svUserName;
    /**
     * èŽ·å–é£žç¾½çŽ¯å¢ƒç”¨æˆ·id
     *
     * @return TZ_User_Id - é£žç¾½çŽ¯å¢ƒç”¨æˆ·id
     */
    public String getTzUserId() {
        return tzUserId;
    }
    /**
     * è®¾ç½®é£žç¾½çŽ¯å¢ƒç”¨æˆ·id
     *
     * @param tzUserId é£žç¾½çŽ¯å¢ƒç”¨æˆ·id
     */
    public void setTzUserId(String tzUserId) {
        this.tzUserId = tzUserId == null ? null : tzUserId.trim();
    }
    /**
     * èŽ·å–é£žç¾½çŽ¯å¢ƒç”¨æˆ·åç§°
     *
     * @return TZ_User_Name - é£žç¾½çŽ¯å¢ƒç”¨æˆ·åç§°
     */
    public String getTzUserName() {
        return tzUserName;
    }
    /**
     * è®¾ç½®é£žç¾½çŽ¯å¢ƒç”¨æˆ·åç§°
     *
     * @param tzUserName é£žç¾½çŽ¯å¢ƒç”¨æˆ·åç§°
     */
    public void setTzUserName(String tzUserName) {
        this.tzUserName = tzUserName == null ? null : tzUserName.trim();
    }
    /**
     * èŽ·å–é£žç¾½ç›‘ç®¡ç”¨æˆ·id
     *
     * @return SV_User_Id - é£žç¾½ç›‘管用户id
     */
    public String getSvUserId() {
        return svUserId;
    }
    /**
     * è®¾ç½®é£žç¾½ç›‘管用户id
     *
     * @param svUserId é£žç¾½ç›‘管用户id
     */
    public void setSvUserId(String svUserId) {
        this.svUserId = svUserId == null ? null : svUserId.trim();
    }
    /**
     * èŽ·å–é£žç¾½ç›‘ç®¡ç”¨æˆ·åç§°
     *
     * @return SV_User_Name - é£žç¾½ç›‘管用户名称
     */
    public String getSvUserName() {
        return svUserName;
    }
    /**
     * è®¾ç½®é£žç¾½ç›‘管用户名称
     *
     * @param svUserName é£žç¾½ç›‘管用户名称
     */
    public void setSvUserName(String svUserName) {
        this.svUserName = svUserName == null ? null : svUserName.trim();
    }
}
src/main/kotlin/cn/flightfeather/supervision/domain/mapper/UserMapMapper.kt
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
package cn.flightfeather.supervision.domain.mapper
import cn.flightfeather.supervision.domain.util.MyMapper
import cn.flightfeather.supervision.domain.entity.UserMap
import org.apache.ibatis.annotations.Mapper
@Mapper
interface UserMapMapper : MyMapper<UserMap?>
src/main/kotlin/cn/flightfeather/supervision/lightshare/repository/impl/MeetingRepositoryImpl.kt
@@ -54,7 +54,7 @@
        })
        meetingList.forEach {
            //针对 â€œå·¥ä½œéƒ¨ç½²â€ ç±»åž‹çš„会议,只有创建者和参与者可在“会议广场”查看
            //针对 â€œå·¥ä½œéƒ¨ç½²â€ ã€â€œä¸“项培训”类型的会议,只有创建者和参与者可在“会议广场”查看
            if (it.miType == 2.toByte() || it.miType == 3.toByte()) {
                val b1 = meetParticipantMapper.selectByExample(Example(Participant::class.java).apply {
                    createCriteria().andEqualTo("mpParticipantid", userId)
src/main/resources/generator/generatorConfig.xml
@@ -24,9 +24,9 @@
            <property name="suppressAllComments" value="true"/>
        </commentGenerator>
        <!--数据库链接URL,用户名、密码 -->
        <jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="jdbc:mysql://localhost:3306/ledger"
        <jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="jdbc:mysql://192.168.0.200:3306/ledger"
                        userId="root"
                        password="123456">
                        password="cn.FLIGHTFEATHER">
        </jdbcConnection>
        <javaTypeResolver>
            <property name="forceBigDecimals" value="false"/>
@@ -71,14 +71,15 @@
        <!--<table tableName="ea_t_restaurant_base_info" domainObjectName="RestaurantBaseInfo" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
        <!--<table tableName="ea_t_problem" domainObjectName="Problem" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
        <!--<table tableName="ea_t_complaint" domainObjectName="Complaint" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
        <table tableName="fd_t_minutevalue" domainObjectName="FumeMinuteValue" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/>
<!--        <table tableName="fd_t_minutevalue" domainObjectName="FumeMinuteValue" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/>-->
        <!--<table tableName="ea_t_commitment" domainObjectName="Commitment" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/>-->
<!--        <table tableName="ea_t_vehicle_base_info" domainObjectName="VehicleBaseInfo" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
<!--        <table tableName="ea_t_hazardous_waste_file" domainObjectName="HWFile" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
<!--        <table tableName="ea_t_hazardous_waste_record" domainObjectName="HWRecord" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
<!--        <table tableName="voc_t_hour_value" domainObjectName="VOCHourValue" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
        <table tableName="ea_t_device_info" domainObjectName="DeviceInfo" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
<!--        <table tableName="ea_t_device_info" domainObjectName="DeviceInfo" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/>-->
<!--        <table tableName="ea_t_overall_evaluation" domainObjectName="OverallEvaluation" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
<!--        <table tableName="ea_t_punishment" domainObjectName="Punishment" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
        <table tableName="ts_t_user_map" domainObjectName="UserMap" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/>
    </context>
</generatorConfiguration>
src/main/resources/mapper/UserMapMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="cn.flightfeather.supervision.domain.mapper.UserMapMapper" >
  <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.entity.UserMap" >
    <!--
      WARNING - @mbg.generated
    -->
    <id column="TZ_User_Id" property="tzUserId" jdbcType="VARCHAR" />
    <result column="TZ_User_Name" property="tzUserName" jdbcType="VARCHAR" />
    <result column="SV_User_Id" property="svUserId" jdbcType="VARCHAR" />
    <result column="SV_User_Name" property="svUserName" jdbcType="VARCHAR" />
  </resultMap>
  <sql id="Base_Column_List" >
    <!--
      WARNING - @mbg.generated
    -->
    TZ_User_Id, TZ_User_Name, SV_User_Id, SV_User_Name
  </sql>
</mapper>