suzhou-jichuang-lanhai
/
networkingEwm-java
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改历史表分页查询搜索条件商户id

Browse Source
master
吴顺杰 2 years ago
parent 336e930833
commit 728c5cfd0f
5 changed files with 162 additions and 76 deletions
Show Stats Download Patch File Download Diff File

56
ruoyi-admin/src/main/resources/mapper/netEwm/BNetHistoryMapper.xml
Unescape View File

@ -1,32 +1,46 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BNetHistoryMapper">
<resultMap type="BNetHistory" id="BNetHistoryResult">
<result property="id" column="id" />
<result property="isTrue" column="is_true" />
<result property="netId" column="net_id" />
<result property="netName" column="net_name" />
<result property="wifiName" column="wifi_name" />
<result property="wifiPass" column="wifi_pass" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="id" column="id"/>
<result property="isTrue" column="is_true"/>
<result property="shanghuId" column="shanghu_id"/>
<result property="netId" column="net_id"/>
<result property="netName" column="net_name"/>
<result property="wifiName" column="wifi_name"/>
<result property="wifiPass" column="wifi_pass"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectBNetHistoryVo">
select id, is_true, net_id, net_name, wifi_name, wifi_pass, create_by, create_time, update_by, update_time, remark from b_net_history
select id,
is_true,
shanghu_id,
net_id,
net_name,
wifi_name,
wifi_pass,
create_by,
create_time,
update_by,
update_time,
remark
from b_net_history
</sql>
<select id="selectBNetHistoryList" parameterType="BNetHistory" resultMap="BNetHistoryResult">
<include refid="selectBNetHistoryVo"/>
<where>
<if test="isTrue != null "> and is_true = #{isTrue}</if>
<if test="netName != null and netName != ''"> and net_name like concat('%', #{netName}, '%')</if>
<if test="isTrue != null ">and is_true = #{isTrue}</if>
<if test="shanghuId != null ">and shanghu_id = #{shanghuId}</if>
<if test="netName != null and netName != ''">and net_name like concat('%', #{netName}, '%')</if>
</where>
</select>
@ -35,11 +49,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<insert id="insertBNetHistory" parameterType="com.ruoyi.system.domain.BNetHistory" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBNetHistory" parameterType="com.ruoyi.system.domain.BNetHistory" useGeneratedKeys="true"
keyProperty="id">
insert into b_net_history
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="isTrue != null">is_true,</if>
<if test="netId != null">net_id,</if>
<if test="shanghuId != null">shanghu_id,</if>
<if test="netName != null and netName != ''">net_name,</if>
<if test="wifiName != null and wifiName != ''">wifi_name,</if>
<if test="wifiPass != null and wifiPass != ''">wifi_pass,</if>
@ -52,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="isTrue != null">#{isTrue},</if>
<if test="netId != null">#{netId},</if>
<if test="shanghuId != null">#{shanghuId},</if>
<if test="netName != null and netName != ''">#{netName},</if>
<if test="wifiName != null and wifiName != ''">#{wifiName},</if>
<if test="wifiPass != null and wifiPass != ''">#{wifiPass},</if>
@ -68,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="isTrue != null">is_true = #{isTrue},</if>
<if test="netId != null">net_id = #{netId},</if>
<if test="shanghuId != null">shanghu_id = #{shanghuId},</if>
<if test="netName != null and netName != ''">net_name = #{netName},</if>
<if test="wifiName != null and wifiName != ''">wifi_name = #{wifiName},</if>
<if test="wifiPass != null and wifiPass != ''">wifi_pass = #{wifiPass},</if>
@ -81,7 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteBNetHistoryById" parameterType="Long">
delete from b_net_history where id = #{id}
delete
from b_net_history
where id = #{id}
</delete>
<delete id="deleteBNetHistoryByIds" parameterType="String">

59
ruoyi-admin/src/main/resources/mapper/netEwm/BPosterHistoryMapper.xml
Unescape View File

@ -1,34 +1,50 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BPosterHistoryMapper">
<resultMap type="BPosterHistory" id="BPosterHistoryResult">
<result property="id" column="id" />
<result property="posterId" column="poster_id" />
<result property="posterName" column="poster_name" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="videoPath" column="video_path" />
<result property="videoLogo" column="video_logo" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="id" column="id"/>
<result property="posterId" column="poster_id"/>
<result property="shanghuId" column="shanghu_id"/>
<result property="posterName" column="poster_name"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="videoPath" column="video_path"/>
<result property="videoLogo" column="video_logo"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectBPosterHistoryVo">
select id, poster_id, poster_name, start_time, end_time, video_path, video_logo, create_by, create_time, update_by, update_time, remark from b_poster_history
select id,
poster_id,
shanghu_id,
poster_name,
start_time,
end_time,
video_path,
video_logo,
create_by,
create_time,
update_by,
update_time,
remark
from b_poster_history
</sql>
<select id="selectBPosterHistoryList" parameterType="BPosterHistory" resultMap="BPosterHistoryResult">
<include refid="selectBPosterHistoryVo"/>
<where>
<if test="posterName != null and posterName != ''"> and poster_name like concat('%', #{posterName}, '%')</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="posterName != null and posterName != ''">and poster_name like concat('%', #{posterName}, '%')
</if>
<if test="startTime != null ">and start_time = #{startTime}</if>
<if test="shanghuId != null ">and shanghu_id = #{shanghuId}</if>
<if test="endTime != null ">and end_time = #{endTime}</if>
</where>
</select>
@ -41,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into b_poster_history
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="posterId != null">poster_id,</if>
<if test="shanghuId != null">shanghu_id,</if>
<if test="posterName != null and posterName != ''">poster_name,</if>
<if test="startTime != null">start_time,</if>
<if test="endTime != null">end_time,</if>
@ -54,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="posterId != null">#{posterId},</if>
<if test="shanghuId != null">#{shanghuId},</if>
<if test="posterName != null and posterName != ''">#{posterName},</if>
<if test="startTime != null">#{startTime},</if>
<if test="endTime != null">#{endTime},</if>
@ -71,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update b_poster_history
<trim prefix="SET" suffixOverrides=",">
<if test="posterId != null">poster_id = #{posterId},</if>
<if test="shanghuId != null">shanghu_id = #{shanghuId},</if>
<if test="posterName != null and posterName != ''">poster_name = #{posterName},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
@ -86,7 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteBPosterHistoryById" parameterType="Long">
delete from b_poster_history where id = #{id}
delete
from b_poster_history
where id = #{id}
</delete>
<delete id="deleteBPosterHistoryByIds" parameterType="String">

27
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
Unescape View File

@ -5,8 +5,7 @@ package com.ruoyi.common.core.domain.model;
*
* @author ruoyi
*/
public class LoginBody
{
public class LoginBody {
/**
* 用户名
*/
@ -27,43 +26,35 @@ public class LoginBody
*/
private String uuid;
public String getUsername()
{
public String getUsername() {
return username;
}
public void setUsername(String username)
{
public void setUsername(String username) {
this.username = username;
}
public String getPassword()
{
public String getPassword() {
return password;
}
public void setPassword(String password)
{
public void setPassword(String password) {
this.password = password;
}
public String getCode()
{
public String getCode() {
return code;
}
public void setCode(String code)
{
public void setCode(String code) {
this.code = code;
}
public String getUuid()
{
public String getUuid() {
return uuid;
}
public void setUuid(String uuid)
{
public void setUuid(String uuid) {
this.uuid = uuid;
}
}

55
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
Unescape View File

@ -1,11 +1,62 @@
package com.ruoyi.common.core.domain.model;
import com.ruoyi.common.annotation.Excel;
/**
* 用户注册对象
*
* @author ruoyi
*/
public class RegisterBody extends LoginBody
{
public class RegisterBody extends LoginBody {
/**
* 商户名称
*/
@Excel(name = "商户名称")
private String posName;
/**
* 城市
*/
@Excel(name = "城市")
private String city;
/**
* 地址信息
*/
@Excel(name = "地址信息")
private String address;
@Override
public String toString() {
return "RegisterBody{" +
"posName='" + posName + '\'' +
", city='" + city + '\'' +
", address='" + address + '\'' +
'}';
}
public String getPosName() {
return posName;
}
public void setPosName(String posName) {
this.posName = posName;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
}

9
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
Unescape View File

@ -20,6 +20,7 @@ import com.ruoyi.system.service.ISysUserService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
/**
* 注册校验方法
@ -45,7 +46,7 @@ public class SysRegisterService {
* 注册
*/
public String register(RegisterBody registerBody) {
String msg = "" , username = registerBody.getUsername(), password = registerBody.getPassword();
String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
SysUser sysUser = new SysUser();
sysUser.setUserName(username);
@ -80,10 +81,12 @@ public class SysRegisterService {
} else {
// 添加商户
SysShanghu shangHu = new SysShanghu();
shangHu.setAddress(sysUser.getAddress());
shangHu.setPosName(sysUser.getPosName());
shangHu.setAddress(registerBody.getAddress());
shangHu.setCity(registerBody.getCity());
shangHu.setPosName(registerBody.getPosName());
shangHu.setPhoneNumber(sysUser.getUserName());
shangHu.setLinkMan(sysUser.getNickName());
shangHu.setCreateTime(new Date());
shanghuMapper.insertBShanghu(shangHu);
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success")));
}

Write Preview
Loading…
Cancel
Save