Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!15 开发同学页面接口

Browse Source 
Merge pull request !15 from 德仔/develop
This commit is contained in:
德仔 2020-12-08 20:51:13 +08:00 committed by Gitee
commit 49d4ffe862
8 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -254,20 +254,20 @@
</pluginRepositories>
<profiles>
<!-- dev开发环境配置,release为生产环境配置 -->
<profile>
<id>dev</id>
<id>local</id>
<properties>
<profileActive>dev</profileActive>
<profileActive>local</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<!-- dev开发环境配置,release为生产环境配置 -->
<profile>
<id>local</id>
<id>dev</id>
<properties>
<profileActive>local</profileActive>
<profileActive>dev</profileActive>
</properties>
</profile>
<profile>

14
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
View File

@ -13,6 +13,7 @@ import com.stdiet.custom.domain.SysWxUserLog;
import com.stdiet.custom.page.WxServeInfo;
import com.stdiet.custom.service.ISysOrderService;
import com.stdiet.custom.service.ISysWxUserInfoService;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -141,4 +142,17 @@ public class SysWxUserInfoController extends BaseController {
return AjaxResult.success(wxServeInfo);
}
@GetMapping("/wx/user/list")
public TableDataInfo userList(SysWxUserInfo sysWxUserInfo) {
startPage();
List<SysWxUserInfo> list = sysWxUserInfoService.selectSysWxUserInfoListNot(sysWxUserInfo);
for (SysWxUserInfo userInfo : list) {
if (StringUtils.isNotEmpty(userInfo.getPhone())) {
userInfo.setPhone(userInfo.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
}
}
return getDataTable(list);
}
}

1
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
View File

@ -108,6 +108,7 @@ public class SysWxUserLogController extends BaseController {
@GetMapping(value = "/wx/logs/list")
public AjaxResult getLogs(SysWxUserLog sysWxUserLog) {
System.out.println(sysWxUserLog.toString());
List<WxLogInfo> list = sysWxUserLogService.selectWxLogInfoList(sysWxUserLog);
return AjaxResult.success(list);
}

2
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java
View File

@ -27,6 +27,8 @@ public interface SysWxUserInfoMapper
*/
public List<SysWxUserInfo> selectSysWxUserInfoList(SysWxUserInfo sysWxUserInfo);
public List<SysWxUserInfo> selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo);
/**
* 新增微信用户
*

2
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java
View File

@ -27,6 +27,8 @@ public interface ISysWxUserInfoService
*/
public List<SysWxUserInfo> selectSysWxUserInfoList(SysWxUserInfo sysWxUserInfo);
public List<SysWxUserInfo> selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo);
/**
* 新增微信用户
*

5
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java
View File

@ -44,6 +44,11 @@ public class SysWxUserInfoServiceImpl implements ISysWxUserInfoService
return sysWxUserInfoMapper.selectSysWxUserInfoList(sysWxUserInfo);
}
@Override
public List<SysWxUserInfo> selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo) {
return sysWxUserInfoMapper.selectSysWxUserInfoListNot(sysWxUserInfo);
}
/**
* 新增微信用户
*

11
stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
View File

@ -35,6 +35,17 @@
</where>
</select>
<select id="selectSysWxUserInfoListNot" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
<include refid="selectSysWxUserInfoVo"/>
<where>
<if test="nickName != null and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
<if test="appid != null and appid != ''"> and appid = #{appid}</if>
<if test="openid != null and openid != ''"> and openid != #{openid}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
<if test="sex != null and sex != ''"> and sex = #{sex}</if>
</where>
</select>
<select id="selectSysWxUserInfoById" parameterType="String" resultMap="SysWxUserInfoResult">
<include refid="selectSysWxUserInfoVo"/>
where openid = #{openid}

4
stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
View File

@ -49,7 +49,7 @@
<select id="selectSysWxUserLogList" parameterType="SysWxUserLog" resultMap="SysWxUserLogResult">
<include refid="selectSysWxUserLogVo"/>
<where>
<if test="appid != null and appid != ''"> and appid = #{appid}</if>
<if test="openid != null and openid != ''"> and openid = #{openid}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
</where>
order by create_time desc
@ -58,7 +58,7 @@
<select id="selectWxLogInfoList" parameterType="SysWxUserLog" resultMap="WxLogInfo">
<include refid="selectSysWxUserLogVo"/>
<where>
<if test="appid != null and appid != ''"> and appid = #{appid}</if>
<if test="openid != null and openid != ''"> and openid = #{openid}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
</where>
order by create_time asc