luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改刷卡记录和设备操作日志接口权限；在刷卡记录中添加userName字段

Browse Source
This commit is contained in:
童丽然
2024-12-30 17:11:02 +08:00
parent ca1fd4a3d8
commit c783cfb492
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java
View File

@ -69,4 +69,9 @@ public class NgCardSwipeRecords extends BaseEntity
@ApiModelProperty("区域码")
private String areaCode;
/** 用户名称 */
@Excel(name = "用户名称")
@ApiModelProperty("用户名称")
private String userName;
}

8
fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml
View File

@ -19,10 +19,11 @@
<result property="updateTime" column="update_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="userName" column="user_name" />
</resultMap>
<sql id="selectNgCardSwipeRecordsVo">
select id, user_id, device_number, card_swipe_type, card_number, dept_id, card_swipe_time, amount_due, area_code, remark, create_time, update_time, create_by, update_by from ng_card_swipe_records
select id, user_id, device_number, card_swipe_type, card_number, dept_id, card_swipe_time, amount_due, area_code, remark, create_time, update_time, create_by, update_by, user_name from ng_card_swipe_records
</sql>
<select id="selectNgCardSwipeRecordsList" parameterType="NgCardSwipeRecords" resultMap="NgCardSwipeRecordsResult">
@ -36,6 +37,7 @@
<if test="cardSwipeTime != null "> and card_swipe_time = #{cardSwipeTime}</if>
<if test="amountDue != null "> and amount_due = #{amountDue}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
</where>
</select>
@ -50,6 +52,7 @@
<if test="cardSwipeTime != null "> and card_swipe_time = #{cardSwipeTime}</if>
<if test="amountDue != null "> and amount_due = #{amountDue}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
</where>
</select>
@ -74,6 +77,7 @@
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
<if test="userName != null">user_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},</if>
@ -89,6 +93,7 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="userName != null">#{userName},</if>
</trim>
</insert>
@ -108,6 +113,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="userName != null">user_name = #{userName},</if>
</trim>
where id = #{id}
</update>