From e8a72ebe25e054107b76bde858ae970e24c94cf0 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 18 十月 2024 16:23:47 +0800
Subject: [PATCH] command
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/tstCommand/TstCommandSv.java | 14 ++++---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoTst/TstCommand.java | 10 +++-
pms-parent/pms-global/src/main/resources/mapper/TstCommandMapper.xml | 38 ++++++++++---------
3 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoTst/TstCommand.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoTst/TstCommand.java
index 8a8121a..b65c6f4 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoTst/TstCommand.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoTst/TstCommand.java
@@ -54,6 +54,7 @@
/**
* 鏄惁鍒犻櫎锛�1鏄紝0鍚�
*/
+ @JSONField(serialize = false)
public Boolean deleted;
/**
@@ -62,20 +63,23 @@
public String remark;
/**
- * 鏄惁绂佺敤锛�1鏄紝0鍚�
+ * 鏄惁鍒犻櫎锛�1鏄紝0鍚�
*/
+ @JSONField(serialize = false)
public Boolean disabled;
/**
* 鍒涘缓浜�
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long createBy;
+ public Long creator;
+ @TableField(exist = false)
+ public String creatorName;
/**
* 鍒涘缓鏃堕棿
*/
- public Date createDate;
+ public Date dt;
/**
* 鏇存柊浜�
diff --git a/pms-parent/pms-global/src/main/resources/mapper/TstCommandMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/TstCommandMapper.xml
index 553b47c..ae65b18 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/TstCommandMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/TstCommandMapper.xml
@@ -13,17 +13,19 @@
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="createBy" column="create_by" jdbcType="BIGINT"/>
- <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
+ <result property="creator" column="creator" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="updatedDate" column="updated_date" jdbcType="TIMESTAMP"/>
+ <association property="creatorName" column="creator" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager"/>
</resultMap>
<sql id="Base_Column_List">
id,pro_id,type,
name,value,deleted,
- remark,disabled,create_by,
- create_date,updated_by,updated_date
+ remark,disabled,creator,
+ dt,updated_by,updated_date
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -99,13 +101,13 @@
insert into tst_command
( id,pro_id,type
,name,value,deleted
- ,remark,disabled,create_by
- ,create_date,updated_by,updated_date
+ ,remark,disabled,creator
+ ,dt,updated_by,updated_date
)
values (#{id,jdbcType=BIGINT},#{proId,jdbcType=BIGINT},#{type,jdbcType=TINYINT}
,#{name,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT}
- ,#{remark,jdbcType=VARCHAR},#{disabled,jdbcType=TINYINT},#{createBy,jdbcType=BIGINT}
- ,#{createDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{updatedDate,jdbcType=TIMESTAMP}
+ ,#{remark,jdbcType=VARCHAR},#{disabled,jdbcType=TINYINT},#{creator,jdbcType=VARCHAR}
+ ,#{dt,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{updatedDate,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoTst.TstCommand" useGeneratedKeys="true">
@@ -119,8 +121,8 @@
<if test="deleted != null">deleted,</if>
<if test="remark != null">remark,</if>
<if test="disabled != null">disabled,</if>
- <if test="createBy != null">create_by,</if>
- <if test="createDate != null">create_date,</if>
+ <if test="creator != null and creator !=''">creator,</if>
+ <if test="dt != null">dt,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="updatedDate != null">updated_date,</if>
</trim>
@@ -133,8 +135,8 @@
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
<if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
<if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
- <if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
- <if test="createDate != null">#{createDate,jdbcType=TIMESTAMP},</if>
+ <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
+ <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="updatedDate != null">#{updatedDate,jdbcType=TIMESTAMP},</if>
</trim>
@@ -163,11 +165,11 @@
<if test="disabled != null">
disabled = #{disabled,jdbcType=TINYINT},
</if>
- <if test="createBy != null">
- create_by = #{createBy,jdbcType=BIGINT},
+ <if test="creator != null and creator !=''">
+ creator = #{creator,jdbcType=VARCHAR},
</if>
- <if test="createDate != null">
- create_date = #{createDate,jdbcType=TIMESTAMP},
+ <if test="dt != null">
+ dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="updatedBy != null">
updated_by = #{updatedBy,jdbcType=BIGINT},
@@ -188,8 +190,8 @@
deleted = #{deleted,jdbcType=TINYINT},
remark = #{remark,jdbcType=VARCHAR},
disabled = #{disabled,jdbcType=TINYINT},
- create_by = #{createBy,jdbcType=BIGINT},
- create_date = #{createDate,jdbcType=TIMESTAMP},
+ creator = #{creator,jdbcType=VARCHAR},
+ dt = #{dt,jdbcType=TIMESTAMP},
updated_by = #{updatedBy,jdbcType=BIGINT},
updated_date = #{updatedDate,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/tstCommand/TstCommandSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/tstCommand/TstCommandSv.java
index e1ae498..39b6518 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/tstCommand/TstCommandSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/tstCommand/TstCommandSv.java
@@ -1,7 +1,9 @@
package com.dy.pmsPlatform.tstCommand;
+import com.dy.common.webFilter.UserTokenContext;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.daoTst.TstCommandMapper;
+import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoTst.TstCommand;
import com.dy.pmsGlobal.util.UserUtil;
import lombok.extern.slf4j.Slf4j;
@@ -36,11 +38,11 @@
}
command.disabled = false;
command.deleted = false;
- /* BaUser loginUser = userUtil.getUser(UserTokenContext.get());
+ BaUser loginUser = userUtil.getUser(UserTokenContext.get());
if (loginUser != null) {
- command.createBy = loginUser.id;
- }*/
- command.createDate = new Date();
+ command.creator = loginUser.id;
+ }
+ command.dt = new Date();
int count = dao.insertSelective(command);
return count;
}
@@ -61,10 +63,10 @@
if(dao.selectByNameId(command.id,command.proId,command.name)>0){
throw new RuntimeException("鎸囦护鍚嶇О宸插瓨鍦�");
}
- /* BaUser loginUser = userUtil.getUser(UserTokenContext.get());
+ BaUser loginUser = userUtil.getUser(UserTokenContext.get());
if (loginUser != null) {
command.updatedBy = loginUser.id;
- }*/
+ }
command.updatedDate = new Date();
int count = dao.updateByPrimaryKeySelective(command);
return count;
--
Gitblit v1.8.0