From 7919d4bab9e4d787b5a8d5dd6c9d99d22e394ca7 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期日, 26 九月 2021 18:24:56 +0800
Subject: [PATCH] 1. 新增用户名对照表
---
src/main/kotlin/cn/flightfeather/supervision/domain/entity/UserMap.java | 103 ++++++++++++++++++++++++++++++++++
src/main/resources/generator/generatorConfig.xml | 9 +-
src/main/kotlin/cn/flightfeather/supervision/domain/mapper/UserMapMapper.kt | 8 ++
src/main/resources/mapper/UserMapMapper.xml | 19 ++++++
src/main/kotlin/cn/flightfeather/supervision/lightshare/repository/impl/MeetingRepositoryImpl.kt | 2
5 files changed, 136 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/entity/UserMap.java b/src/main/kotlin/cn/flightfeather/supervision/domain/entity/UserMap.java
new file mode 100644
index 0000000..32b29e6
--- /dev/null
+++ b/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();
+ }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/mapper/UserMapMapper.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/mapper/UserMapMapper.kt
new file mode 100644
index 0000000..4a512e5
--- /dev/null
+++ b/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?>
\ No newline at end of file
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/repository/impl/MeetingRepositoryImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/repository/impl/MeetingRepositoryImpl.kt
index 5bda148..1c75080 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/repository/impl/MeetingRepositoryImpl.kt
+++ b/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)
diff --git a/src/main/resources/generator/generatorConfig.xml b/src/main/resources/generator/generatorConfig.xml
index 2e704cd..dcfa7f6 100644
--- a/src/main/resources/generator/generatorConfig.xml
+++ b/src/main/resources/generator/generatorConfig.xml
@@ -24,9 +24,9 @@
<property name="suppressAllComments" value="true"/>
</commentGenerator>
<!--鏁版嵁搴撻摼鎺RL锛岀敤鎴峰悕銆佸瘑鐮� -->
- <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>
\ No newline at end of file
diff --git a/src/main/resources/mapper/UserMapMapper.xml b/src/main/resources/mapper/UserMapMapper.xml
new file mode 100644
index 0000000..1d467f5
--- /dev/null
+++ b/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>
\ No newline at end of file
--
Gitblit v1.9.3