From 2cff667a85961cbb4566ac021680997595da9c25 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Thu, 19 Mar 2020 18:17:41 +0800 Subject: [PATCH] 0319.2 --- .../com/ccsens/health/bean/vo/AbnormalVo.java | 14 ++++++++- .../health/persist/dao/HealthAbnormalDao.java | 1 + .../health/service/AbnormalService.java | 13 ++++++-- .../health/service/IAbnormalService.java | 2 +- .../mapper_dao/HealthAbnormalDao.xml | 30 +++++++++++++++++++ .../com/ccsens/tall/config/SpringConfig.java | 1 + .../com/ccsens/tall/service/IUserService.java | 2 ++ .../com/ccsens/tall/service/UserService.java | 29 ++++++++++++++++++ .../com/ccsens/tall/web/UserController.java | 12 ++++++++ 9 files changed, 100 insertions(+), 4 deletions(-) diff --git a/health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java b/health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java index 02150d56..4f13bfa2 100644 --- a/health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java +++ b/health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java @@ -1,5 +1,6 @@ package com.ccsens.health.bean.vo; +import cn.hutool.core.util.ObjectUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,9 +19,20 @@ public class AbnormalVo { @ApiModelProperty("异常状态名称") private String abnormalName; @ApiModelProperty("异常状态code") - private String code; + private Integer code; @ApiModelProperty("数量") private Long number; + public String getAbnormalName(){ + switch (code){ + case 0: abnormalName = "健康"; break; + case 1: abnormalName = "治愈"; break; + case 2: abnormalName = "隔离"; break; + case 3: abnormalName = "疑似"; break; + case 4: abnormalName = "确诊"; break; + default:abnormalName = null; + } + return null; + } } @Data diff --git a/health/src/main/java/com/ccsens/health/persist/dao/HealthAbnormalDao.java b/health/src/main/java/com/ccsens/health/persist/dao/HealthAbnormalDao.java index 6933fbb8..56d1f18b 100644 --- a/health/src/main/java/com/ccsens/health/persist/dao/HealthAbnormalDao.java +++ b/health/src/main/java/com/ccsens/health/persist/dao/HealthAbnormalDao.java @@ -13,4 +13,5 @@ import java.util.List; public interface HealthAbnormalDao extends HealthAbnormalMapper { List getAbnormalList(@Param("post") Integer post, @Param("department")String department, @Param("healthType")Integer healthType); + List abnormalOverview(@Param("department")String department, @Param("startTime")Long startTime, @Param("endTime")Long endTime); } diff --git a/health/src/main/java/com/ccsens/health/service/AbnormalService.java b/health/src/main/java/com/ccsens/health/service/AbnormalService.java index c3fa52fa..79865044 100644 --- a/health/src/main/java/com/ccsens/health/service/AbnormalService.java +++ b/health/src/main/java/com/ccsens/health/service/AbnormalService.java @@ -5,10 +5,12 @@ import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.health.bean.dto.AbnormalDto; +import com.ccsens.health.bean.dto.JourneyDto; import com.ccsens.health.bean.po.HealthAbnormal; import com.ccsens.health.bean.vo.AbnormalVo; import com.ccsens.health.persist.dao.HealthAbnormalDao; import com.ccsens.util.CodeEnum; +import com.ccsens.util.DateUtil; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import com.github.pagehelper.PageHelper; @@ -18,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; @Slf4j @@ -35,9 +38,15 @@ public class AbnormalService implements IAbnormalService{ * @return */ @Override - public List abnormalOverview(QueryDto params) { + public List abnormalOverview(QueryDto params) throws Exception { + AbnormalDto.SelectAbnormal selectAbnormal = params.getParam(); + Long startTime = selectAbnormal.getStartTime() == null ? DateUtil.getZeroTime(new Date()) : selectAbnormal.getStartTime(); + Long endTime = selectAbnormal.getEndTime() == null ? System.currentTimeMillis() : selectAbnormal.getEndTime(); - return null; + List abnormalOverviewList = + healthAbnormalDao.abnormalOverview(selectAbnormal.getDepartment(),startTime,endTime); + + return abnormalOverviewList; } /** diff --git a/health/src/main/java/com/ccsens/health/service/IAbnormalService.java b/health/src/main/java/com/ccsens/health/service/IAbnormalService.java index cea109fb..9f03659f 100644 --- a/health/src/main/java/com/ccsens/health/service/IAbnormalService.java +++ b/health/src/main/java/com/ccsens/health/service/IAbnormalService.java @@ -7,7 +7,7 @@ import com.ccsens.util.bean.dto.QueryDto; import java.util.List; public interface IAbnormalService { - List abnormalOverview(QueryDto params); + List abnormalOverview(QueryDto params) throws Exception; void addAbnormal(QueryDto params); diff --git a/health/src/main/resources/mapper_dao/HealthAbnormalDao.xml b/health/src/main/resources/mapper_dao/HealthAbnormalDao.xml index 460837d5..f9c1c0e3 100644 --- a/health/src/main/resources/mapper_dao/HealthAbnormalDao.xml +++ b/health/src/main/resources/mapper_dao/HealthAbnormalDao.xml @@ -14,6 +14,11 @@ + + + + + + + \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java index 0befd015..09039e74 100644 --- a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java +++ b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java @@ -143,6 +143,7 @@ public class SpringConfig implements WebMvcConfigurer { .excludePathPatterns("/users/member") .excludePathPatterns("/users/allMemberAll") .excludePathPatterns("/users/userId") + .excludePathPatterns("/users/mergeUserId") .addPathPatterns("/plugins/**") .excludePathPatterns("/plugins/sign") .excludePathPatterns("/plugins/fuzzy") diff --git a/tall/src/main/java/com/ccsens/tall/service/IUserService.java b/tall/src/main/java/com/ccsens/tall/service/IUserService.java index a6eaf2b2..e9536e11 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IUserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IUserService.java @@ -74,4 +74,6 @@ public interface IUserService { UserVo.UserSign changePhoneNotPassword(Long userId,UserDto.WxBindingPhone phoneInfo) throws Exception; UserVo.TokenBean getTokenByUserId(Long userId); + + void mergeUserId(Long userId, Long uselessId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index cba1bd33..fee0e14e 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -1244,6 +1244,35 @@ public class UserService implements IUserService { sysBalanceLogDao.insertSelective(balanceLog); } + /** + * 输入两个userid合并账号 + */ + @Override + public void mergeUserId(Long userId, Long uselessId) { + SysUser user = userDao.selectByPrimaryKey(userId); + SysUser uselessUser = userDao.selectByPrimaryKey(userId); + if(ObjectUtil.isNull(user) || ObjectUtil.isNull(uselessUser)){ + throw new BaseException(CodeEnum.NOT_MEMBER); + } + userDao.replaceAuth(userId, uselessId); + //查询所有关联userId的数据库表 auth表 attention表 balance表 project表 member表 DeliverPostLog表 proLog表 + //依次将查出的数据的旧userId 替换成新的userId + userDao.replaceAttention(userId, uselessId); + userDao.replaceBalance(userId, uselessId); + userDao.replaceProject(userId, uselessId); + userDao.replaceMember(userId, uselessId); + userDao.replaceDeliverPostLog(userId, uselessId); + userDao.replaceProLog(userId, uselessId); + //将以前的余额添加至此账号 + SysUser oldUser = userDao.selectByPrimaryKey(userId); + SysUser newUser = userDao.selectByPrimaryKey(uselessId); + updateBalance(oldUser, newUser); + //将以前的user删除 + oldUser.setRecStatus((byte) 2); + userDao.updateByPrimaryKeySelective(oldUser); + + } + /** * 修改用户信息（添加微信信息） * diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java index 9489ab77..b0c49819 100644 --- a/tall/src/main/java/com/ccsens/tall/web/UserController.java +++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java @@ -302,6 +302,18 @@ public class UserController { return JsonResponse.newInstance().ok(); } + @ApiOperation(value = "输入两个userid将两个账号合并（保留企业用户的id）",notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name="userId",value = "需要保留的userId",required = true,paramType = "query"), + @ApiImplicitParam(name="uselessId",value = "不需要保留的userId",required = true,paramType = "query") + }) + @RequestMapping(value = "/mergeUserId",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) + public JsonResponse mergeUserId(HttpServletRequest request, + @RequestParam(required = true) Long userId,Long uselessId) throws Exception { + userService.mergeUserId(userId,uselessId); + return JsonResponse.newInstance().ok(); + } + @ApiOperation(value = "通过userId获取token",notes = "") @ApiImplicitParams({