Compare commits

...

5 Commits

  1. 3
      src/main/java/com/cjy/back/sysUser/dao/SysUserMapper.java
  2. 8
      src/main/java/com/cjy/back/sysUser/dao/SysUserMapper.xml
  3. 2
      src/main/java/com/cjy/back/sysUser/service/SysUserService.java
  4. 17
      src/main/java/com/cjy/back/sysUser/service/SysUserServiceImpl.java
  5. 13
      src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentRecordImpl.java
  6. 5
      src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java
  7. 13
      src/main/java/com/cjy/mobile/controller/WxUserController.java
  8. 1
      src/main/webapp/html/back/ybsjMap/scenicDetails.html

@ -125,6 +125,8 @@ public interface SysUserMapper {
*/
SysUser selectUserByWxOpenid(@Param("openid") String openid,@Param("userkey") String userkey);
Map<String,String> selectUserByOpenid(@Param("openid") String openid,@Param("userkey") String userkey);
/**
* 保存用户信息
* @param user
@ -149,6 +151,7 @@ public interface SysUserMapper {
*/
int updateWxUxer(@Param("map") HashMap<String, Object> user);
int updateWxUxerByOpenid(@Param("map") HashMap<String, Object> user);
/**
* 根据userkey查询管理员地域
* @param userkey

@ -103,6 +103,10 @@
SELECT * FROM sys_user WHERE wx_openid = #{openid} AND userkey = #{userkey}
</select>
<select id="selectUserByOpenid" resultType="map">
SELECT wx_nickname as wxNickname,wx_headimgurl as wxHeadimgurl FROM sys_user WHERE wx_openid = #{openid} AND userkey = #{userkey}
</select>
<insert id="saveWxUser" parameterType="map" keyProperty="userid" useGeneratedKeys="true">
INSERT INTO sys_user(usertype,usource,wx_openid,wx_nickname,wx_sex,wx_language,wx_city,wx_province,wx_country,wx_headimgurl,wx_unionid,updatetime,userkey)
VALUES(#{map.usertype},#{map.usource},#{map.openid},#{map.nickname},#{map.sex},#{map.language},#{map.city},#{map.province},#{map.country},#{map.headimgurl},#{map.unionid},#{map.updatetime},#{map.userkey})
@ -125,7 +129,9 @@
<update id="updateWxUxer" parameterType="map">
UPDATE sys_user set wx_nickname = #{map.nickname},wx_headimgurl = #{map.headimgurl} WHERE wx_unionid = #{map.unionid} AND userkey = #{map.userkey}
</update>
<update id="updateWxUxerByOpenid" parameterType="map">
UPDATE sys_user set wx_nickname = #{map.nickname},wx_headimgurl = #{map.headimgurl} WHERE wx_openid = #{map.openid} AND userkey = #{map.userkey}
</update>
<update id="updateLogstate">
UPDATE sys_user set logstate = 0 WHERE logname = #{logname}
</update>

@ -138,6 +138,8 @@ public interface SysUserService {
*/
ServerResponse saveUserInfo(HttpServletRequest request);
ServerResponse getUserByOpenId(HttpServletRequest request);
/**
* 修改密码
* @param request

@ -816,7 +816,7 @@ public class SysUserServiceImpl implements SysUserService {
// codeMsg.put("userid",sysUser.getUserid());
// CommonUtil.createCode(fileName,codeMsg);
}else{
sysUserMapper.updateWxUxer(user);
sysUserMapper.updateWxUxerByOpenid(user);
// if(!new File(InitParam.codeUrl_filepath + "/" + sysUser.getUserid() + ".png").exists()){
// //生成个人二维码
// String fileName = sysUser.getUserid() + ".png";
@ -828,6 +828,21 @@ public class SysUserServiceImpl implements SysUserService {
return ServerResponse.createBySuccess("执行成功");
}
@Override
public ServerResponse getUserByOpenId(HttpServletRequest request) {
String userkey = request.getParameter("userkey");
if(StringUtils.isEmpty(userkey)){
return ServerResponse.createByRequestMessage("userkey不允许为空");
}
String openid = request.getParameter("openid");
if(StringUtils.isEmpty(openid)){
return ServerResponse.createByRequestMessage("请重新授权");
}
Map<String,String> map = sysUserMapper.selectUserByOpenid(openid,userkey);
return ServerResponse.createBySuccess("执行成功",map);
}
@Override
public ServerResponse updateUserPwd(HttpServletRequest request) {
try {

@ -71,18 +71,15 @@ public class YbsjyAppointmentRecordImpl implements YbsjyAppointmentRecordService
pw.getPage().setCurrentPage(pageNo);
pw.getPage().setPageSize(limit); // 每页条数
/* 分页信息结束 */
if (getAppointmentRecordVO.getReservationPersonPhone()!=null && !getAppointmentRecordVO.getReservationPersonPhone().isEmpty()) {
if (getAppointmentRecordVO.getReservationPersonPhone() != null && !getAppointmentRecordVO.getReservationPersonPhone().isEmpty()) {
getAppointmentRecordVO.setReservationPersonPhone(Encryption.encrypt(getAppointmentRecordVO.getReservationPersonPhone(), rule));
}
//根据条件进行分页查询数据
List<Map<String, Object>> list = ybsjyAppointmentRecordMapper.getAppointmentRecordListByPage(pw.getPage(), getAppointmentRecordVO);
list.stream().forEach(item->{
String documentsNumber = Encryption.decrypt(item.get("phone").toString(), rule);
item.put("phone",IdProduceUtil.desensitizePhoneNumber(documentsNumber));
list.stream().forEach(item -> {
String documentsNumber = Encryption.decrypt(item.get("phone").toString(), rule);
item.put("phone", IdProduceUtil.desensitizePhoneNumber(documentsNumber));
});
// 查询总行数
int userCount = pw.getPage().getTotalCount();
@ -207,7 +204,7 @@ public class YbsjyAppointmentRecordImpl implements YbsjyAppointmentRecordService
@Override
public void exportReserveRecord(HttpServletRequest request, HttpServletResponse response, GetAppointmentRecordVO getAppointmentRecordVO) throws IOException, WriteException {
if (getAppointmentRecordVO.getReservationPersonPhone()!=null && !getAppointmentRecordVO.getReservationPersonPhone().isEmpty()) {
if (getAppointmentRecordVO.getReservationPersonPhone() != null && !getAppointmentRecordVO.getReservationPersonPhone().isEmpty()) {
getAppointmentRecordVO.setReservationPersonPhone(Encryption.encrypt(getAppointmentRecordVO.getReservationPersonPhone(), rule));
}
List<Map<String, Object>> list = ybsjyAppointmentRecordMapper.getExportReserveRecordList(getAppointmentRecordVO);

@ -439,12 +439,7 @@ public class YbsjyAppointmentSettingServiceImpl implements YbsjyAppointmentSetti
//根据条件进行分页查询数据
List<Map<String, Object>> list = ybsjyAppointmentRecordMapper.getappletsAppointmentRecordListByPage(pw.getPage(), getAppointmentRecordVO);
list.stream().forEach(item -> {
String documentsNumber = Encryption.decrypt(item.get("phone").toString(), rule);
item.put("phone", IdProduceUtil.desensitizePhoneNumber(documentsNumber));
});
// 查询总行数
int userCount = pw.getPage().getTotalCount();
//返回数据

@ -102,6 +102,19 @@ public class WxUserController {
return userService.saveUserInfo(request);
}
/**
* 功能描述:根据openid和userkey获取用户信息
* @param:
* @return:
* @auther: zc
* @date: 2023/8/22 16:44
*/
@ResponseBody
@RequestMapping(value = "/getUserByOpenId")
public ServerResponse getUserByOpenId(HttpServletRequest request) {
return userService.getUserByOpenId(request);
}
/**
* app管理员登陆
* @return

@ -105,6 +105,7 @@
$('#content').html(details.content);
$('.addr').html(details.addr);
$('.opentime').html(details.opentime);
$('.tel').html(details.tel);
$('.tel').attr('href', "tel:" + details.tel)
}
});

Loading…
Cancel
Save