Merge remote-tracking branch 'origin/master'

This commit is contained in:
小魔仙~
2024-12-19 19:19:01 +08:00
26 changed files with 1093 additions and 78 deletions

View File

@ -0,0 +1,106 @@
<?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="com.fastbee.rechargecard.mapper.NgIrrigationControllersMapper">
<resultMap type="NgIrrigationControllers" id="NgIrrigationControllersResult">
<result property="id" column="id" />
<result property="serialNumber" column="serial_number" />
<result property="controllerName" column="controller_name" />
<result property="controllerModel" column="controller_model" />
<result property="installationDate" column="installation_date" />
<result property="status" column="status" />
<result property="lastMaintenance" column="last_maintenance" />
<result property="areaCode" column="area_code" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
</resultMap>
<sql id="selectNgIrrigationControllersVo">
select id, serial_number, controller_name, controller_model, installation_date, status, last_maintenance, area_code, remark, create_time, update_time, create_by, update_by from ng_irrigation_controllers
</sql>
<select id="selectNgIrrigationControllersList" parameterType="NgIrrigationControllers" resultMap="NgIrrigationControllersResult">
<include refid="selectNgIrrigationControllersVo"/>
<where>
<if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
<if test="controllerName != null and controllerName != ''"> and controller_name like concat('%', #{controllerName}, '%')</if>
<if test="controllerModel != null and controllerModel != ''"> and controller_model = #{controllerModel}</if>
<if test="installationDate != null "> and installation_date = #{installationDate}</if>
<if test="status != null "> and status = #{status}</if>
<if test="lastMaintenance != null "> and last_maintenance = #{lastMaintenance}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
</where>
</select>
<select id="selectNgIrrigationControllersById" parameterType="Long" resultMap="NgIrrigationControllersResult">
<include refid="selectNgIrrigationControllersVo"/>
where id = #{id}
</select>
<insert id="insertNgIrrigationControllers" parameterType="NgIrrigationControllers" useGeneratedKeys="true" keyProperty="id">
insert into ng_irrigation_controllers
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">serial_number,</if>
<if test="controllerName != null">controller_name,</if>
<if test="controllerModel != null and controllerModel != ''">controller_model,</if>
<if test="installationDate != null">installation_date,</if>
<if test="status != null">status,</if>
<if test="lastMaintenance != null">last_maintenance,</if>
<if test="areaCode != null">area_code,</if>
<if test="remark != null">remark,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
<if test="controllerName != null">#{controllerName},</if>
<if test="controllerModel != null and controllerModel != ''">#{controllerModel},</if>
<if test="installationDate != null">#{installationDate},</if>
<if test="status != null">#{status},</if>
<if test="lastMaintenance != null">#{lastMaintenance},</if>
<if test="areaCode != null">#{areaCode},</if>
<if test="remark != null">#{remark},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
</trim>
</insert>
<update id="updateNgIrrigationControllers" parameterType="NgIrrigationControllers">
update ng_irrigation_controllers
<trim prefix="SET" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
<if test="controllerName != null">controller_name = #{controllerName},</if>
<if test="controllerModel != null and controllerModel != ''">controller_model = #{controllerModel},</if>
<if test="installationDate != null">installation_date = #{installationDate},</if>
<if test="status != null">status = #{status},</if>
<if test="lastMaintenance != null">last_maintenance = #{lastMaintenance},</if>
<if test="areaCode != null">area_code = #{areaCode},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteNgIrrigationControllersById" parameterType="Long">
delete from ng_irrigation_controllers where id = #{id}
</delete>
<delete id="deleteNgIrrigationControllersByIds" parameterType="String">
delete from ng_irrigation_controllers where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

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="deviceName" column="device_name" />
</resultMap>
<sql id="selectNgRechargeMachinesVo">
select id, location, device_model, serial_number, area_code, installation_date, status, contact_person, contact_phone, remark, create_time, update_time, create_by, update_by from ng_recharge_machines
select id, location, device_model, serial_number, area_code, installation_date, status, contact_person, contact_phone, remark, create_time, update_time, create_by, update_by, device_name from ng_recharge_machines
</sql>
<select id="selectNgRechargeMachinesList" parameterType="NgRechargeMachines" resultMap="NgRechargeMachinesResult">
@ -36,6 +37,7 @@
<if test="status != null "> and status = #{status}</if>
<if test="contactPerson != null and contactPerson != ''"> and contact_person = #{contactPerson}</if>
<if test="contactPhone != null and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
</where>
</select>
@ -60,6 +62,7 @@
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
<if test="deviceName != null">device_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="location != null">#{location},</if>
@ -75,6 +78,7 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="deviceName != null">#{deviceName},</if>
</trim>
</insert>
@ -94,6 +98,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="deviceName != null">device_name = #{deviceName},</if>
</trim>
where id = #{id}
</update>

View File

@ -16,7 +16,7 @@
<result property="rechargeTime" column="recharge_time" />
<result property="rechargeCode" column="recharge_code" />
<result property="status" column="status" />
<result property="deviceId" column="device_id" />
<result property="serialNumber" column="serial_number" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
@ -25,7 +25,7 @@
</resultMap>
<sql id="selectNgUserRechargeRecordsVo">
select id, user_id, user_name, card_number, area_code, type, amount, balance, recharge_time, recharge_code, status, device_id, remark, create_time, update_time, create_by, update_by from ng_user_recharge_records
select id, user_id, user_name, card_number, area_code, type, amount, balance, recharge_time, recharge_code, status, serial_number, remark, create_time, update_time, create_by, update_by from ng_user_recharge_records
</sql>
<select id="selectNgUserRechargeRecordsList" parameterType="NgUserRechargeRecords" resultMap="NgUserRechargeRecordsResult">
@ -41,7 +41,7 @@
<if test="rechargeTime != null "> and recharge_time = #{rechargeTime}</if>
<if test="rechargeCode != null and rechargeCode != ''"> and recharge_code = #{rechargeCode}</if>
<if test="status != null "> and status = #{status}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
</where>
</select>
@ -63,7 +63,7 @@
<if test="rechargeTime != null">recharge_time,</if>
<if test="rechargeCode != null">recharge_code,</if>
<if test="status != null">status,</if>
<if test="deviceId != null">device_id,</if>
<if test="serialNumber != null and serialNumber != ''">serial_number,</if>
<if test="remark != null">remark,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
@ -81,7 +81,7 @@
<if test="rechargeTime != null">#{rechargeTime},</if>
<if test="rechargeCode != null">#{rechargeCode},</if>
<if test="status != null">#{status},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
<if test="remark != null">#{remark},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
@ -103,7 +103,7 @@
<if test="rechargeTime != null">recharge_time = #{rechargeTime},</if>
<if test="rechargeCode != null">recharge_code = #{rechargeCode},</if>
<if test="status != null">status = #{status},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>

View File

@ -0,0 +1,71 @@
<?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="com.fastbee.rechargecard.mapper.NgWaterPumpUsageRecordsMapper">
<resultMap type="NgWaterPumpUsageRecords" id="NgWaterPumpUsageRecordsResult">
<result property="id" column="id" />
<result property="pumpStartTime" column="pump_start_time" />
<result property="pumpStopTime" column="pump_stop_time" />
<result property="deviceNumber" column="device_number" />
<result property="messageContent" column="message_content" />
</resultMap>
<sql id="selectNgWaterPumpUsageRecordsVo">
select id, pump_start_time, pump_stop_time, device_number, message_content from ng_water_pump_usage_records
</sql>
<select id="selectNgWaterPumpUsageRecordsList" parameterType="NgWaterPumpUsageRecords" resultMap="NgWaterPumpUsageRecordsResult">
<include refid="selectNgWaterPumpUsageRecordsVo"/>
<where>
<if test="pumpStartTime != null "> and pump_start_time = #{pumpStartTime}</if>
<if test="pumpStopTime != null "> and pump_stop_time = #{pumpStopTime}</if>
<if test="deviceNumber != null and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
<if test="messageContent != null and messageContent != ''"> and message_content = #{messageContent}</if>
</where>
</select>
<select id="selectNgWaterPumpUsageRecordsById" parameterType="Long" resultMap="NgWaterPumpUsageRecordsResult">
<include refid="selectNgWaterPumpUsageRecordsVo"/>
where id = #{id}
</select>
<insert id="insertNgWaterPumpUsageRecords" parameterType="NgWaterPumpUsageRecords" useGeneratedKeys="true" keyProperty="id">
insert into ng_water_pump_usage_records
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="pumpStartTime != null">pump_start_time,</if>
<if test="pumpStopTime != null">pump_stop_time,</if>
<if test="deviceNumber != null and deviceNumber != ''">device_number,</if>
<if test="messageContent != null">message_content,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="pumpStartTime != null">#{pumpStartTime},</if>
<if test="pumpStopTime != null">#{pumpStopTime},</if>
<if test="deviceNumber != null and deviceNumber != ''">#{deviceNumber},</if>
<if test="messageContent != null">#{messageContent},</if>
</trim>
</insert>
<update id="updateNgWaterPumpUsageRecords" parameterType="NgWaterPumpUsageRecords">
update ng_water_pump_usage_records
<trim prefix="SET" suffixOverrides=",">
<if test="pumpStartTime != null">pump_start_time = #{pumpStartTime},</if>
<if test="pumpStopTime != null">pump_stop_time = #{pumpStopTime},</if>
<if test="deviceNumber != null and deviceNumber != ''">device_number = #{deviceNumber},</if>
<if test="messageContent != null">message_content = #{messageContent},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteNgWaterPumpUsageRecordsById" parameterType="Long">
delete from ng_water_pump_usage_records where id = #{id}
</delete>
<delete id="deleteNgWaterPumpUsageRecordsByIds" parameterType="String">
delete from ng_water_pump_usage_records where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>