From 5e1f0b7c671b750ff50777068397fa072d7e534b Mon Sep 17 00:00:00 2001 From: wangchao Date: Sun, 29 Mar 2020 19:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=90=A5=E7=AB=AF?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetUserFeignClient.java | 2 +- .../java/com/epmet/dto/CustomerUserDTO.java | 3 +- .../main/java/com/epmet/dto/OperUserDTO.java | 5 + .../src/main/java/com/epmet/dto/UserDTO.java | 66 +++++++++++ .../java/com/epmet/dto/UserWechatDTO.java | 108 ++++++++++++++++++ .../java/com/epmet/constant/UserConstant.java | 36 ++++++ .../java/com/epmet/dao/CustomerUserDao.java | 1 + .../src/main/java/com/epmet/dao/UserDao.java | 85 ++++++++++++++ .../java/com/epmet/dao/UserWechatDao.java | 35 ++++++ .../java/com/epmet/entity/OperUserEntity.java | 5 + .../java/com/epmet/entity/UserEntity.java | 34 ++++++ .../com/epmet/entity/UserWechatEntity.java | 78 +++++++++++++ .../java/com/epmet/service/UserService.java | 79 +++++++++++++ .../com/epmet/service/UserWechatService.java | 14 +++ .../service/impl/CustomerUserServiceImpl.java | 40 ++++++- .../service/impl/GridLatestServiceImpl.java | 4 + .../epmet/service/impl/UserServiceImpl.java | 51 +++++++++ .../service/impl/UserWechatServiceImpl.java | 20 ++++ .../main/resources/mapper/CustomerUserDao.xml | 7 +- .../src/main/resources/mapper/UserDao.xml | 7 ++ .../main/resources/mapper/UserWechatDao.xml | 56 +++++++++ 21 files changed, 728 insertions(+), 8 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml diff --git a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 406ed01e48..cd460ee758 100644 --- a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @Author yinzuomei * @Date 2020/3/16 14:48 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class ) +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class ,url="http://localhost:8087") public interface EpmetUserFeignClient { /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerUserDTO.java index 2964c379c3..dd32d2b8f5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerUserDTO.java @@ -38,8 +38,9 @@ public class CustomerUserDTO implements Serializable { */ private String id; + /** - * 客户Id CUSTOMER.id + * 客户Id */ private String customerId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java index 7470b30ef2..44e2bd5998 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java @@ -40,6 +40,11 @@ public class OperUserDTO implements Serializable { */ private String id; + /** + * 关联User表的主键Id + * */ + private String userId; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java new file mode 100644 index 0000000000..ab7f652268 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java @@ -0,0 +1,66 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description + * @ClassName UserDTO + * @Author wangc + * @date 2020.03.28 15:11 + */ +@Data +public class UserDTO implements Serializable{ + + private static final long serialVersionUID = 1L; + + + /** + * 唯一标识 + */ + private String id; + + + /** + * 来源App + * */ + private String fromApp; + + /** + * 来源client + * */ + private String fromClient; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java new file mode 100644 index 0000000000..5f6685c0d6 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java @@ -0,0 +1,108 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description + * @ClassName UserWechatDTO + * @Author wangc + * @date 2020.03.28 15:14 + */ +@Data +public class UserWechatDTO implements Serializable{ + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 用户ID + * */ + private String userId; + + /** + * 微信openId + */ + private String wxOpenId; + + /** + * 微信unionId + */ + private String unionId; + + /** + * 手机号 + */ + private String mobile; + + /** + * 昵称 + */ + private String nickname; + + /** + * 性别:0.未知 1.男性2女性 + */ + private Integer sex; + + /** + * 头像 + */ + private String headImgUrl; + + /** + * 国家 + */ + private String country; + + /** + * 省份 + */ + private String province; + + /** + * 城市 + */ + private String city; + + /** + * 语言 + */ + private String language; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java new file mode 100644 index 0000000000..8e1f9e5389 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java @@ -0,0 +1,36 @@ +package com.epmet.constant; + +/** + * @Description + * @IntefaceName UserConstant + * @Author wangc + * @date 2020.03.28 16:51 + */ +public interface UserConstant { + + /** + * 政府端 + * */ + String APP_GOV = "gov"; + + /** + * 居民端 + * */ + String APP_RESI = "resi"; + + /** + * 运营端 + * */ + String APP_OPER = "oper"; + + /** + * PC端 + * */ + String CLIENT_WEB = "web"; + + /** + * 微信端 + * */ + String CLIENT_WX = "wxmp"; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerUserDao.java index d4bdd734b0..e9744a74d8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerUserDao.java @@ -58,6 +58,7 @@ public interface CustomerUserDao extends BaseDao { **/ String selectOperUserId(String openId); + /** * @param phone * @return com.epmet.dto.result.PasswordLoginUserInfoResultDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java new file mode 100644 index 0000000000..276c6f8b1c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java @@ -0,0 +1,85 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.UserDTO; +import com.epmet.dto.UserWechatDTO; +import com.epmet.entity.UserEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * @Description 用户DAO + * @IntefaceName UserDao + * @Author wangc + * @date 2020.03.28 14:45 + */ +@Mapper +public interface UserDao extends BaseDao { + + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return UserWechatDTO + * @author generator + * @date 2020-03-18 + */ + UserDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void save(UserWechatDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void update(UserWechatDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-18 + */ + void delete(String[] ids); + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java new file mode 100644 index 0000000000..c79044d046 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java @@ -0,0 +1,35 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.UserWechatDTO; +import com.epmet.entity.UserWechatEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Description 用户-微信关系DAO + * @IntefaceName UserWechatDao + * @Author wangc + * @date 2020.03.28 14:45 + */ +@Mapper +public interface UserWechatDao extends BaseDao{ + + /** + * @Description 根据userId更新 用户-微信关系表里的属性 + * @Param userWechatDTO + * @return int + * @Author wangc + * @Date 2020.03.28 16:25 + **/ + int updateByUserId(UserWechatDTO userWechatDTO); + + /** + * @Description 根据openId查询系统下用户信息，不区分用户、政府端、运营端 + * @Param openId + * @return userId + * @Author wangc + * @Date 2020.03.28 13:25 + **/ + String selectUserIdByOpenId(String openId); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java index bea7a145d2..6a355ed5ae 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java @@ -38,6 +38,11 @@ public class OperUserEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; + /** + * userId 关联User表主键 + * */ + private String userId; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java new file mode 100644 index 0000000000..47c11d3a60 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java @@ -0,0 +1,34 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @Description 用户表 存储运营人员 政府端工作人员 居民用户的唯一标识 + * @ClassName UserEntity + * @Author wangc + * @date 2020.03.28 13:54 + */ + +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("user") +public class UserEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 来源App + * */ + private String fromApp; + + /** + * 来源client + * */ + private String fromClient; + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java new file mode 100644 index 0000000000..218d7a879d --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java @@ -0,0 +1,78 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @Description + * @ClassName UserWechatEntity + * @Author wangc + * @date 2020.03.28 13:57 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("user_wechat") +public class UserWechatEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + + /** + * 用户ID + * */ + private String userId; + + /** + * 微信openId + */ + private String wxOpenId; + + /** + * 微信unionId + */ + private String unionId; + + /** + * 手机号 + */ + private String mobile; + + /** + * 昵称 + */ + private String nickname; + + /** + * 性别:0.未知 1.男性2女性 + */ + private Integer sex; + + /** + * 头像 + */ + private String headImgUrl; + + /** + * 国家 + */ + private String country; + + /** + * 省份 + */ + private String province; + + /** + * 城市 + */ + private String city; + + /** + * 语言 + */ + private String language; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java new file mode 100644 index 0000000000..8090a7b81b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -0,0 +1,79 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.UserDTO; +import com.epmet.entity.UserEntity; + +import java.util.List; +import java.util.Map; + +/** + * @Description + * @IntefaceName UserService + * @Author wangc + * @date 2020.03.28 14:34 + */ +public interface UserService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return UserDTO + * @author generator + * @date 2020-03-18 + */ + UserDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void save(UserDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void update(UserDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-18 + */ + void delete(String[] ids); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java new file mode 100644 index 0000000000..2141cc6f4b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java @@ -0,0 +1,14 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.entity.UserWechatEntity; + +/** + * @Description + * @IntefaceName UserWechatService + * @Author wangc + * @date 2020.03.28 14:35 + */ +public interface UserWechatService extends BaseService { + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java index 8bd9024bd1..093526d5eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java @@ -25,12 +25,17 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.UserConstant; import com.epmet.dao.CustomerUserDao; +import com.epmet.dao.UserDao; +import com.epmet.dao.UserWechatDao; import com.epmet.dto.CustomerUserDTO; +import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.CustomerUserEntity; +import com.epmet.entity.UserEntity; import com.epmet.redis.CustomerUserRedis; import com.epmet.service.CustomerUserService; import org.apache.commons.lang3.StringUtils; @@ -54,6 +59,12 @@ public class CustomerUserServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -109,6 +120,9 @@ public class CustomerUserServiceImpl extends BaseServiceImpl selecWxLoginUserInfo(WxLoginUserInfoFormDTO formDTO) { String userId = ""; + if (LoginConstant.APP_GOV.equals(formDTO.getApp())) { //查询customer_staff待完善 - userId = baseDao.selectCustomerStaffId(formDTO.getOpenId()); + //userId = baseDao.selectCustomerStaffId(formDTO.getOpenId()); + userId = userWechatDao.selectUserIdByOpenId(formDTO.getOpenId()); } else if (LoginConstant.APP_OPER.equals(formDTO.getApp())) { //查询oper_staff待完善 - userId = baseDao.selectOperUserId(formDTO.getOpenId()); + //userId = baseDao.selectOperUserId(formDTO.getOpenId()); + userId = userWechatDao.selectUserIdByOpenId(formDTO.getOpenId()); } else if (LoginConstant.APP_RESI.equals(formDTO.getApp())) { - userId = baseDao.selectCustomerIdByOpenId(formDTO.getOpenId()); + //居民端 + //userId = baseDao.selectCustomerIdByOpenId(formDTO.getOpenId()); + userId = userWechatDao.selectUserIdByOpenId(formDTO.getOpenId()); } return new Result().ok(userId); } @@ -138,10 +157,21 @@ public class CustomerUserServiceImpl extends BaseServiceImpl saveOrUpdateCustomerUser(CustomerUserDTO customerUserDTO) { CustomerUserEntity entity = ConvertUtils.sourceToTarget(customerUserDTO, CustomerUserEntity.class); + UserWechatDTO dto = ConvertUtils.sourceToTarget(customerUserDTO, UserWechatDTO.class); + if (StringUtils.isNotBlank(customerUserDTO.getId())) { - updateById(entity); + //updateById(entity); + + dto.setUserId(customerUserDTO.getId()); + userWechatDao.updateByUserId(dto); } else { - insert(entity); + //insert(entity); + UserEntity userEntity = new UserEntity(); + userEntity.setFromApp(UserConstant.APP_RESI); + userEntity.setFromClient(UserConstant.CLIENT_WX); + userDao.insert(userEntity); + dto.setUserId(userEntity.getId()); + } return new Result().ok(entity.getId()); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index b060b4940c..da43c73a6d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -33,6 +34,8 @@ import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.entity.GridLatestEntity; import com.epmet.redis.GridLatestRedis; import com.epmet.service.GridLatestService; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -153,4 +156,5 @@ public class GridLatestServiceImpl extends BaseServiceImpl().ok(latestGridInfoResultDTO); } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java new file mode 100644 index 0000000000..0ba9805759 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -0,0 +1,51 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dao.UserDao; +import com.epmet.dto.UserDTO; +import com.epmet.entity.UserEntity; +import com.epmet.service.UserService; + +import java.util.List; +import java.util.Map; + + +/** + * @Description + * @ClassName UserServiceImpl + * @Author wangc + * @date 2020.03.28 14:41 + */ +public class UserServiceImpl extends BaseServiceImpl implements UserService { + + @Override + public PageData page(Map params) { + return null; + } + + @Override + public List list(Map params) { + return null; + } + + @Override + public UserDTO get(String id) { + return null; + } + + @Override + public void save(UserDTO dto) { + + } + + @Override + public void update(UserDTO dto) { + + } + + @Override + public void delete(String[] ids) { + + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java new file mode 100644 index 0000000000..6a7c5807d4 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java @@ -0,0 +1,20 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dao.UserWechatDao; +import com.epmet.entity.UserWechatEntity; +import com.epmet.service.UserWechatService; + +import java.io.Serializable; +import java.util.Collection; + +/** + * @Description + * @ClassName UserWechatServiceImpl + * @Author wangc + * @date 2020.03.28 14:42 + */ +public class UserWechatServiceImpl extends BaseServiceImpl implements UserWechatService{ + +} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerUserDao.xml index 4841a86795..88e278586a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerUserDao.xml @@ -3,6 +3,11 @@ + + + + + SELECT - ou.id AS userId, + ou.USER_ID AS userId, PASSWORD AS PASSWORD FROM oper_user ou diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml new file mode 100644 index 0000000000..11f49b333d --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml new file mode 100644 index 0000000000..dad43badfd --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -0,0 +1,56 @@ + + + + + + + + + UPDATE user_wechat + + + CITY = #{city}, + + + + NICKNAME = #{nickname}, + + + + COUNTRY = #{country}, + + + + PROVINCE = #{province}, + + + + SEX = #{sex}, + + + WX_OPEN_ID = #{wxOpenId}, + + + UPDATED_BY = #{updatedBy}, + + UPDATED_TIME = sysdate + + + + WHERE + USER_ID = #{userId} + + + + + + + \ No newline at end of file