Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-19 0d248bc79c25c38dbdbda49dbcb5a6595cbca379

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java

New file
@@ -0,0 +1,74 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesByAppVO;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
import com.panzhihua.common.model.vos.vaccines.VaccinesUserInoculationByAppVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @auther lyq
 * @create 2021-05-19 14:25:49
 * @describe 疫苗服务API
 */
@Slf4j
@RestController
@RequestMapping("/vaccines/")
@Api(tags = {"疫苗服务"})
public class VaccinesApi extends BaseController{

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "疫苗分类列表" , response = VaccinesByAppVO.class)
    @PostMapping("list")
    public R getVaccinesListByApp() {
        return communityService.getVaccinesListByApp();
    }

    @ApiOperation(value = "疫苗类型对应家庭成员接种列表" , response = VaccinesEnrollUserByAppVO.class)
    @PostMapping("user/list")
    public R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        enrollUserByAppDTO.setUserId(loginUserInfo.getUserId());
        return communityService.getVaccinesUserListByApp(enrollUserByAppDTO);
    }

    @ApiOperation(value = "用户疫苗报名")
    @PostMapping("enroll")
    public R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        enrollByAppDTO.setUserId(loginUserInfo.getUserId());
        return communityService.VaccinesEnrollByApp(enrollByAppDTO);
    }

    @ApiOperation(value = "用户家庭接种记录" , response = VaccinesUserInoculationByAppVO.class)
    @PostMapping("user/inoculation/list")
    public R getVaccinesUserInoculationListByApp() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        return communityService.getVaccinesUserInoculationListByApp(loginUserInfo.getUserId());
    }

}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/VaccinesApi.java

New file
@@ -0,0 +1,46 @@
package com.panzhihua.applets_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesByAppVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/vaccines/")
@Api(tags = {"疫苗服务"})
public class VaccinesApi  extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "疫苗分类列表" , response = VaccinesByAppVO.class)
    @PostMapping("list")
    public R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
        return communityService.getVaccinesListByAdmin(vaccinesByAdminDTO);
    }

    @ApiOperation(value = "编辑疫苗信息")
    @PostMapping("edit")
    public R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
        return communityService.editVaccinesByAdmin(vaccinesByAdminDTO);
    }

    @ApiOperation(value = "添加疫苗信息")
    @PostMapping("add")
    public R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
        return communityService.addVaccinesByAdmin(vaccinesByAdminDTO);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/EnrollUserByAppDTO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.dtos.vaccines;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("用户信息")
public class EnrollUserByAppDTO {

    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("是否是自己（1.是 2.否）")
    private Integer isUser;

    /**
     * 是否是自己（1.是 2.否）
     */
    public interface isUser{
        int yes = 1;
        int no = 2;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesByAdminDTO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.dtos.vaccines;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("疫苗分类列表请求参数")
public class VaccinesByAdminDTO {

    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty("疫苗id")
    private Long id;

    @ApiModelProperty("疫苗类型名称")
    private String name;

    @ApiModelProperty("疫苗描述")
    private String describe;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAdminDTO.java

New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.dtos.vaccines;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@ApiModel("疫苗分类列表请求参数")
public class VaccinesEnrollByAdminDTO {

    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("身份证号")
    private String idCard;

    @ApiModelProperty("手机号")
    private String phone;

    @ApiModelProperty("登记时间开始")
    private Date startTime;

    @ApiModelProperty("登记时间结束")
    private Date endTime;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAppDTO.java

New file
@@ -0,0 +1,22 @@
package com.panzhihua.common.model.dtos.vaccines;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("用户报名疫苗请求参数")
public class VaccinesEnrollByAppDTO {

    @ApiModelProperty("疫苗类型id")
    private Long vaccinesId;

    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

    @ApiModelProperty("报名用户列表")
    private List<EnrollUserByAppDTO> enrollUserList;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollUserByAppDTO.java

New file
@@ -0,0 +1,22 @@
package com.panzhihua.common.model.dtos.vaccines;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("查询疫苗类型下用户列表请求参数")
public class VaccinesEnrollUserByAppDTO {

    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty("疫苗类型id")
    private Long vaccinesId;

    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -140,8 +140,8 @@
    private List<ComMngStructHouseVO> comMngStructHouseVOS;

    @ApiModelProperty("用户小区id")
    @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
    @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
//    @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
//    @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
    private Long areaId;

    @ApiModelProperty("用户所在社区信息")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesByAppVO.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.vos.vaccines;


import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @auther lyq
 * @describe 疫苗分类信息
 */
@Data
@ApiModel("疫苗分类信息")
public class VaccinesByAppVO {

    @ApiModelProperty("疫苗id")
    private Long id;

    @ApiModelProperty("疫苗名称")
    private String name;

    @ApiModelProperty("疫苗描述")
    private String describe;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollByAdminVO.java

New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.model.vos.vaccines;


import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @auther lyq
 * @describe 疫苗登记记录
 */
@Data
@ApiModel("疫苗登记记录")
public class VaccinesEnrollByAdminVO {

    @ApiModelProperty("疫苗登记记录id")
    private Long id;

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("年龄")
    private Integer age;

    @ApiModelProperty("职业")
    private String job;

    @ApiModelProperty("手机号")
    private String phone;

    @ApiModelProperty("身份证号码")
    private String idCard;

    @ApiModelProperty("登记时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createAt;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollUserByAppVO.java

New file
@@ -0,0 +1,48 @@
package com.panzhihua.common.model.vos.vaccines;


import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther lyq
 * @describe 疫苗分类信息
 */
@Data
@ApiModel("家庭成员接种信息")
public class VaccinesEnrollUserByAppVO {

    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("年龄")
    private Integer age;

    @ApiModelProperty("职业")
    private String job;

    @ApiModelProperty("手机号")
    private String phone;

    @ApiModelProperty("身份证号码")
    private String idCard;

    @ApiModelProperty("是否已报名(1.是  2.否)")
    private Integer isEnroll;

    @ApiModelProperty("是否是自己（1.是 2.否）")
    private Integer isUser;

    /**
     * 是否已报名(1.是  2.否)
     */
    public interface isEnroll{
        int yes = 1;
        int no = 2;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesUserInoculationByAppVO.java

New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.model.vos.vaccines;


import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @auther lyq
 * @describe 疫苗接种记录信息
 */
@Data
@ApiModel("疫苗接种记录信息")
public class VaccinesUserInoculationByAppVO {

    @ApiModelProperty("接种记录id")
    private Long id;

    @ApiModelProperty("接种疫苗类型")
    private String vaccines;

    @ApiModelProperty("受种人")
    private String name;

    @ApiModelProperty("接种日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date inoculationAt;

    @ApiModelProperty("疫苗批号")
    private String vaccinesCode;

    @ApiModelProperty("医疗机构")
    private String medicalInstitution;

    @ApiModelProperty("剂次")
    private String dosage;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -17,6 +17,10 @@
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -2536,4 +2540,66 @@
     */
    @PostMapping("/eldersauth/addFeedback")
    R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);

    /**
     * 小程序-查询疫苗分类列表
     * @return  疫苗分类列表
     */
    @PostMapping("/vaccines/app/list")
    R getVaccinesListByApp();

    /**
     * 小程序-疫苗类型对应家庭成员接种列表
     * @return  疫苗类型对应家庭成员接种列表
     */
    @PostMapping("/vaccines/app/user/list")
    R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO);

    /**
     * 小程序-报名疫苗
     * @param enrollByAppDTO    请求参数
     * @return  报名结果
     */
    @PostMapping("/vaccines/app/enroll")
    R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO);

    /**
     * 小程序-查询用户家庭成员接种记录
     * @param userId    用户id
     * @return  用户家庭成员接种记录
     */
    @PostMapping("/vaccines/app/user/inoculation/list")
    R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId);

    /**
     * 后台管理-查询疫苗分类列表
     * @param vaccinesByAdminDTO    请求参数
     * @return  疫苗分类列表
     */
    @PostMapping("/vaccines/admin/list")
    R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);

    /**
     * 修改疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  修改结果
     */
    @PostMapping("/vaccines/admin/edit")
    R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);

    /**
     * 新增疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  新增结果
     */
    @PostMapping("/vaccines/admin/add")
    R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);

    /**
     * 查询疫苗登记列表
     * @param vaccinesByAdminDTO 请求参数
     * @return  登记列表
     */
    @PostMapping("/vaccines/admin/enroll/list")
    R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VaccinesApi.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollByAdminVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/vaccines/")
@Api(tags = {"疫苗服务"})
public class VaccinesApi {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "疫苗登记列表" , response = VaccinesEnrollByAdminVO.class)
    @PostMapping("/enroll/list")
    public R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO) {
        return communityService.getVaccinesEnrollListByAdmin(vaccinesByAdminDTO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java

New file
@@ -0,0 +1,105 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngVaccinesEnrollRecordService;
import com.panzhihua.service_community.service.ComMngVaccinesInoculationRecordService;
import com.panzhihua.service_community.service.ComMngVaccinesService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/vaccines")
public class VaccinesApi {

    @Resource
    private ComMngVaccinesService comMngVaccinesService;
    @Resource
    private ComMngVaccinesEnrollRecordService comMngVaccinesEnrollRecordService;
    @Resource
    private ComMngVaccinesInoculationRecordService comMngVaccinesInoculationRecordService;

    /**
     * 小程序-查询疫苗分类列表
     * @return  疫苗分类列表
     */
    @PostMapping("/app/list")
    public R getVaccinesListByApp() {
        return comMngVaccinesService.getVaccinesListByApp();
    }

    /**
     * 小程序-疫苗类型对应家庭成员接种列表
     * @return  疫苗类型对应家庭成员接种列表
     */
    @PostMapping("/app/user/list")
    public R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO) {
        return comMngVaccinesEnrollRecordService.getVaccinesUserListByApp(enrollUserByAppDTO);
    }

    /**
     * 用户疫苗报名
     * @param enrollByAppDTO    请求参数
     * @return  报名结果
     */
    @PostMapping("/app/enroll")
    public R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO){
        return comMngVaccinesEnrollRecordService.VaccinesEnrollByApp(enrollByAppDTO);
    }

    /**
     * 小程序-查询用户家庭成员接种记录
     * @param userId    用户id
     * @return  用户家庭成员接种记录
     */
    @PostMapping("/app/user/inoculation/list")
    public R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId) {
        return comMngVaccinesInoculationRecordService.getVaccinesUserInoculationListByApp(userId);
    }

    /**
     * 后台管理-查询疫苗分类列表
     * @param vaccinesByAdminDTO    请求参数
     * @return  疫苗分类列表
     */
    @PostMapping("/admin/list")
    public R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
        return comMngVaccinesService.getVaccinesListByAdmin(vaccinesByAdminDTO);
    }

    /**
     * 修改疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  修改结果
     */
    @PostMapping("/admin/edit")
    public R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
        return comMngVaccinesService.editVaccinesByAdmin(vaccinesByAdminDTO);
    }

    /**
     * 新增疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  新增结果
     */
    @PostMapping("/admin/add")
    public R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
        return comMngVaccinesService.addVaccinesByAdmin(vaccinesByAdminDTO);
    }

    /**
     * 查询疫苗登记列表
     * @param vaccinesByAdminDTO 请求参数
     * @return  登记列表
     */
    @PostMapping("admin/enroll/list")
    public R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO) {
        return comMngVaccinesEnrollRecordService.getVaccinesEnrollListByAdmin(vaccinesByAdminDTO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesDAO.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.vos.vaccines.VaccinesByAppVO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:46
 * @describe 疫苗分类表mapper类
 */
@Mapper
public interface ComMngVaccinesDAO extends BaseMapper<ComMngVaccinesDO> {

    @Select("<script> " +
            "select * from com_mng_vaccines" +
            " <where>" +
            "<if test='vaccinesByAdminDTO.name != null and vaccinesByAdminDTO.name != &quot;&quot;'>" +
            "`name` like concat('%',#{vaccinesByAdminDTO.name},'%') "+
            " </if> " +
            " </where>" +
            " order by create_at desc" +
            " </script>")
    IPage<VaccinesByAppVO> getVaccinesByName(Page page,@Param("vaccinesByAdminDTO") VaccinesByAdminDTO vaccinesByAdminDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesEnrollRecordDAO.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollByAdminVO;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesEnrollRecordDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:53
 * @describe 疫苗报名记录表mapper类
 */
@Mapper
public interface ComMngVaccinesEnrollRecordDAO extends BaseMapper<ComMngVaccinesEnrollRecordDO> {

    @Select("select cmfi.id as userId,cmfi.name,cmfi.age,cmfi.job,cmfi.phone,cmfi.id_card from com_mng_family_info as cmfi where user_id = #{userId}")
    List<VaccinesEnrollUserByAppVO> getFamilyUserList(@Param("userId") Long userId);

    @Select("select su.user_id,su.name,su.nick_name,su.job,su.phone,su.id_card,su.birthday from sys_user as su where user_id = #{userId}")
    VaccinesEnrollUserByAppVO getSysUser(@Param("userId") Long userId);

    @Select("<script> " +
            "select cmver.id,cmv.`name`,cmver.create_at from com_mng_vaccines_enroll_record as cmver" +
            " </script>")
    IPage<VaccinesEnrollByAdminVO> getVaccinesEnrollListByAdmin(Page page, @Param("vaccinesByAdminDTO") VaccinesEnrollByAdminDTO vaccinesByAdminDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java

New file
@@ -0,0 +1,36 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.vaccines.VaccinesUserInoculationByAppVO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesInoculationRecordDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:59
 * @describe 疫苗接种记录表mapper类
 */
@Mapper
public interface ComMngVaccinesInoculationRecordDAO extends BaseMapper<ComMngVaccinesInoculationRecordDO> {

    @Select("<script> " +
            "select id,vaccines,name,inoculation_at,vaccines_code,medical_institution,dosage from com_mng_vaccines_inoculation_record " +
            " where 1=1 and " +
            "<if test='ids != null and ids.size>0'>" +
            "(user_type = 2 and user_id in  "+
            "<foreach item=\"item\" collection=\"ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> " +
            "#{item} " +
            "</foreach>" +
            " ) or  " +
            " </if> " +

            " (user_type = 1 and user_id = #{userId}) " +
            " order by inoculation_at desc " +
            " </script>")
    List<VaccinesUserInoculationByAppVO> getUserInoculationListByApp(@Param("ids") List<Long> ids, @Param("userId") Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesDO.java

New file
@@ -0,0 +1,68 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther lyq
 * @create 2021-05-19 14:17:46
 * @describe 疫苗分类表实体类
 */

@Data
@TableName("com_mng_vaccines")
public class ComMngVaccinesDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 疫苗分类名称
     */
    private String name;

    /**
     * 疫苗分类描述
     */
    @TableField("`describe`")
    private String describe;

    /**
     * 状态（1.启用 2.禁用）
     */
    private Integer status;

    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 状态（1.启用 2.禁用）
     */
    public interface status{
        int yes = 1;
        int no = 2;
    }

    @Override
    public String toString() {
        return "ComMngVaccinesDO{" +
                "id=" + id +
                ", name=" + name +
                ", describe=" + describe +
                ", status=" + status +
                ", createAt=" + createAt +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesEnrollRecordDO.java

New file
@@ -0,0 +1,79 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther lyq
 * @create 2021-05-19 14:17:53
 * @describe 疫苗报名记录表实体类
 */

@Data
@TableName("com_mng_vaccines_enroll_record")
public class ComMngVaccinesEnrollRecordDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 疫苗分类id
     */
    private Long type;

    /**
     * 疫苗申请报名用户id
     */
    private Long userId;

    /**
     * 疫苗报名用户id
     */
    private Long familyUserId;

    /**
     * 报名时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 修改时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 报名类型（1.小程序用户  2.小程序家庭成员）
     */
    private Integer familyUserType;

    /**
     * 报名类型（1.小程序用户  2.小程序家庭成员）
     */
    public interface familyUserType{
        int mini = 1;
        int family = 2;
    }

    @Override
    public String toString() {
        return "ComMngVaccinesEnrollRecordDO{" +
                "id=" + id +
                ", type=" + type +
                ", userId=" + userId +
                ", familyUserId=" + familyUserId +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesInoculationRecordDO.java

New file
@@ -0,0 +1,119 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther lyq
 * @create 2021-05-19 14:17:59
 * @describe 疫苗接种记录表实体类
 */

@Data
@TableName("com_mng_vaccines_inoculation_record")
public class ComMngVaccinesInoculationRecordDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 疫苗类型
     */
    private String vaccines;

    /**
     * 接种用户id（对应家庭成员表id）
     */
    private Long userId;

    /**
     * 姓名
     */
    private String name;

    /**
     * 性别(1.男 2.女)
     */
    private Integer sex;

    /**
     * 年龄
     */
    private Integer age;

    /**
     * 手机号
     */
    private String phone;

    /**
     * 身份证号码
     */
    private String idCard;

    /**
     * 接种剂次
     */
    private String dosage;

    /**
     * 疫苗编号
     */
    private String vaccinesCode;

    /**
     * 医疗机构
     */
    private String medicalInstitution;

    /**
     * 备注
     */
    private String remark;

    /**
     * 接种时间
     */
    private Date inoculationAt;

    /**
     * 创建时间
     */
    private Date createAt;

    /**
     * 接种用户类型（1.小程序用户  2.家庭成员用户
     */
    private Long userType;

    @Override
    public String toString() {
        return "ComMngVaccinesInoculationRecordDO{" +
                "id=" + id +
                ", vaccines=" + vaccines +
                ", userId=" + userId +
                ", name=" + name +
                ", sex=" + sex +
                ", age=" + age +
                ", phone=" + phone +
                ", idCard=" + idCard +
                ", dosage=" + dosage +
                ", vaccinesCode=" + vaccinesCode +
                ", medicalInstitution=" + medicalInstitution +
                ", remark=" + remark +
                ", inoculationAt=" + inoculationAt +
                ", createAt=" + createAt +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVaccinesEnrollRecordService.java

New file
@@ -0,0 +1,37 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComMngVaccinesEnrollRecordDO;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:53
 * @describe 疫苗报名记录表服务类
 */
public interface ComMngVaccinesEnrollRecordService extends IService<ComMngVaccinesEnrollRecordDO> {

    /**
     * 小程序-疫苗类型对应家庭成员接种列表
     * @return  疫苗类型对应家庭成员接种列表
     */
    R getVaccinesUserListByApp(VaccinesEnrollUserByAppDTO enrollUserByAppDTO);

    /**
     * 用户疫苗报名
     * @param enrollByAppDTO    请求参数
     * @return  报名结果
     */
    R VaccinesEnrollByApp(VaccinesEnrollByAppDTO enrollByAppDTO);

    /**
     * 查询疫苗登记列表
     * @param vaccinesByAdminDTO 请求参数
     * @return  登记列表
     */
    R getVaccinesEnrollListByAdmin(VaccinesEnrollByAdminDTO vaccinesByAdminDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVaccinesInoculationRecordService.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComMngVaccinesInoculationRecordDO;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:59
 * @describe 疫苗接种记录表服务类
 */
public interface ComMngVaccinesInoculationRecordService extends IService<ComMngVaccinesInoculationRecordDO> {

    /**
     * 小程序-查询用户家庭成员接种记录
     * @param userId    用户id
     * @return  用户家庭成员接种记录
     */
    R getVaccinesUserInoculationListByApp(Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVaccinesService.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComMngVaccinesDO;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:46
 * @describe 疫苗分类表服务类
 */
public interface ComMngVaccinesService extends IService<ComMngVaccinesDO> {

    /**
     * 小程序-查询疫苗分类列表
     * @return  疫苗分类列表
     */
    R getVaccinesListByApp();

    /**
     * 后台管理-查询疫苗分类列表
     * @param vaccinesByAdminDTO    请求参数
     * @return  疫苗分类列表
     */
    R getVaccinesListByAdmin(VaccinesByAdminDTO vaccinesByAdminDTO);

    /**
     * 修改疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  修改结果
     */
    R editVaccinesByAdmin(VaccinesByAdminDTO vaccinesByAdminDTO);

    /**
     * 新增疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  新增结果
     */
    R addVaccinesByAdmin(VaccinesByAdminDTO vaccinesByAdminDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java

New file
@@ -0,0 +1,127 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.vaccines.EnrollUserByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollByAdminVO;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.service_community.dao.ComMngVaccinesDAO;
import com.panzhihua.service_community.dao.ComMngVaccinesEnrollRecordDAO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesDO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesEnrollRecordDO;
import com.panzhihua.service_community.service.ComMngVaccinesEnrollRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:53
 * @describe 疫苗报名记录表服务实现类
 */
@Slf4j
@Service
public class ComMngVaccinesEnrollRecordServiceImpl extends ServiceImpl<ComMngVaccinesEnrollRecordDAO, ComMngVaccinesEnrollRecordDO> implements ComMngVaccinesEnrollRecordService {

    @Resource
    private ComMngVaccinesDAO comMngVaccinesDAO;

    /**
     * 小程序-疫苗类型对应家庭成员接种列表
     * @return  疫苗类型对应家庭成员接种列表
     */
    @Override
    public R getVaccinesUserListByApp(VaccinesEnrollUserByAppDTO enrollUserByAppDTO){
        //查询当前用户的家庭成员列表
        List<VaccinesEnrollUserByAppVO> userLists = new ArrayList<>();
        //将自己的信息组装进家庭成员列表中
        VaccinesEnrollUserByAppVO ownUser = this.baseMapper.getSysUser(enrollUserByAppDTO.getUserId());
        if(ownUser != null){
            ownUser.setIsUser(1);
            //计算年龄
            ownUser.setAge(IdCard.IdNOToAge(ownUser.getIdCard()));
            userLists.add(ownUser);
        }
        List<VaccinesEnrollUserByAppVO> userList = this.baseMapper.getFamilyUserList(enrollUserByAppDTO.getUserId());
        if(!userList.isEmpty()){
            userLists.addAll(userList);
        }

        if(!userLists.isEmpty()){
            userLists.forEach(user -> {
                if(user.getIsUser() == null){
                    user.setIsUser(2);
                }
                //查询当前用户是否已经报名
                ComMngVaccinesEnrollRecordDO enrollRecordDO = this.baseMapper.selectOne(new QueryWrapper<ComMngVaccinesEnrollRecordDO>()
                        .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId()).eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId()));
                if(enrollRecordDO != null){
                    user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.yes);
                }else{
                    user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.no);
                }

            });
        }
        return R.ok(userLists);
    }

    /**
     * 用户疫苗报名
     * @param enrollByAppDTO    请求参数
     * @return  报名结果
     */
    @Override
    public R VaccinesEnrollByApp(VaccinesEnrollByAppDTO enrollByAppDTO){
        //查询疫苗信息
        ComMngVaccinesDO vaccinesDO = comMngVaccinesDAO.selectById(enrollByAppDTO.getVaccinesId());
        if(vaccinesDO == null){
            return R.fail("未找到到疫苗信息");
        }
        List<ComMngVaccinesEnrollRecordDO> vaccinesEnrollRecordDOList = new ArrayList<>();
        if(!enrollByAppDTO.getEnrollUserList().isEmpty()){
            for (EnrollUserByAppDTO userByAppDTO:enrollByAppDTO.getEnrollUserList()) {
                ComMngVaccinesEnrollRecordDO enrollRecordDO = this.baseMapper.selectOne(new QueryWrapper<ComMngVaccinesEnrollRecordDO>()
                        .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserType,userByAppDTO.getIsUser())
                        .eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,userByAppDTO.getUserId())
                        .eq(ComMngVaccinesEnrollRecordDO::getUserId,enrollByAppDTO.getUserId())
                        .eq(ComMngVaccinesEnrollRecordDO::getType,enrollByAppDTO.getVaccinesId()));
                if(enrollRecordDO != null){
                    continue;
                }
                //报名疫苗填充对象
                ComMngVaccinesEnrollRecordDO vaccinesEnrollRecordDO = new ComMngVaccinesEnrollRecordDO();
                if(userByAppDTO.getIsUser().equals(EnrollUserByAppDTO.isUser.yes)){
                    vaccinesEnrollRecordDO.setFamilyUserType(ComMngVaccinesEnrollRecordDO.familyUserType.mini);
                }
                vaccinesEnrollRecordDO.setUserId(enrollByAppDTO.getUserId());
                vaccinesEnrollRecordDO.setFamilyUserId(userByAppDTO.getUserId());
                vaccinesEnrollRecordDO.setType(enrollByAppDTO.getVaccinesId());
                vaccinesEnrollRecordDOList.add(vaccinesEnrollRecordDO);
            }
        }
        if(!vaccinesEnrollRecordDOList.isEmpty()){
            this.saveBatch(vaccinesEnrollRecordDOList);
        }
        return R.ok();
    }

    /**
     * 查询疫苗登记列表
     * @param vaccinesByAdminDTO 请求参数
     * @return  登记列表
     */
    public R getVaccinesEnrollListByAdmin(VaccinesEnrollByAdminDTO vaccinesByAdminDTO){
        return R.ok(this.baseMapper.getVaccinesEnrollListByAdmin(new Page<VaccinesEnrollByAdminVO>(vaccinesByAdminDTO.getPageNum(),vaccinesByAdminDTO.getPageSize()),vaccinesByAdminDTO));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesInoculationRecordServiceImpl.java

New file
@@ -0,0 +1,40 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
import com.panzhihua.common.model.vos.vaccines.VaccinesUserInoculationByAppVO;
import com.panzhihua.service_community.dao.ComMngVaccinesEnrollRecordDAO;
import com.panzhihua.service_community.dao.ComMngVaccinesInoculationRecordDAO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesInoculationRecordDO;
import com.panzhihua.service_community.service.ComMngVaccinesEnrollRecordService;
import com.panzhihua.service_community.service.ComMngVaccinesInoculationRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:59
 * @describe 疫苗接种记录表服务实现类
 */
@Slf4j
@Service
public class ComMngVaccinesInoculationRecordServiceImpl extends ServiceImpl<ComMngVaccinesInoculationRecordDAO, ComMngVaccinesInoculationRecordDO> implements ComMngVaccinesInoculationRecordService {

    @Resource
    private ComMngVaccinesEnrollRecordDAO comMngVaccinesEnrollRecordDAO;

    @Override
    public R getVaccinesUserInoculationListByApp(Long userId){
        //查询当前用户的家庭成员列表
        List<VaccinesEnrollUserByAppVO> userLists = comMngVaccinesEnrollRecordDAO.getFamilyUserList(userId);
        List<Long> userIds = userLists.stream().map(comPbActivityMemberDO -> comPbActivityMemberDO.getUserId()).collect(Collectors.toList());
        return R.ok(this.baseMapper.getUserInoculationListByApp(userIds,userId));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesServiceImpl.java

New file
@@ -0,0 +1,98 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesByAppVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComMngVaccinesDAO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesDO;
import com.panzhihua.service_community.service.ComMngVaccinesService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
 * @auther lyq
 * @create 2021-05-19 14:17:46
 * @describe 疫苗分类表服务实现类
 */
@Slf4j
@Service
public class ComMngVaccinesServiceImpl extends ServiceImpl<ComMngVaccinesDAO, ComMngVaccinesDO> implements ComMngVaccinesService {

    /**
     * 小程序-查询疫苗分类列表
     * @return  疫苗分类列表
     */
    @Override
    public R getVaccinesListByApp(){
        List<ComMngVaccinesDO> vaccinesDOList = this.baseMapper.selectList(new QueryWrapper<ComMngVaccinesDO>().lambda().eq(ComMngVaccinesDO::getStatus,ComMngVaccinesDO.status.yes));
        List<VaccinesByAppVO> vaccinesList = new ArrayList<>();
        if(!vaccinesDOList.isEmpty()){
            vaccinesDOList.forEach(vaccines ->{
                VaccinesByAppVO vaccinesVO = new VaccinesByAppVO();
                BeanUtils.copyProperties(vaccines,vaccinesVO);
                vaccinesList.add(vaccinesVO);
            });
        }
        return R.ok(vaccinesList);
    }

    /**
     * 后台管理-查询疫苗分类列表
     * @param vaccinesByAdminDTO    请求参数
     * @return  疫苗分类列表
     */
    @Override
    public R getVaccinesListByAdmin(VaccinesByAdminDTO vaccinesByAdminDTO){
        return R.ok(this.baseMapper.getVaccinesByName(new Page<ComMngVaccinesDO>(vaccinesByAdminDTO.getPageNum(),vaccinesByAdminDTO.getPageSize()),vaccinesByAdminDTO));
    }

    /**
     * 修改疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  修改结果
     */
    @Override
    public R editVaccinesByAdmin(VaccinesByAdminDTO vaccinesByAdminDTO){
        ComMngVaccinesDO vaccinesDO = this.baseMapper.selectById(vaccinesByAdminDTO.getId());
        if(vaccinesDO == null){
            return R.fail("未找到疫苗分类记录");
        }
        if(StringUtils.isNotEmpty(vaccinesByAdminDTO.getName())){
            vaccinesDO.setName(vaccinesByAdminDTO.getName());
        }
        if(StringUtils.isNotEmpty(vaccinesByAdminDTO.getDescribe())){
            vaccinesDO.setDescribe(vaccinesByAdminDTO.getDescribe());
        }
        if(this.baseMapper.updateById(vaccinesDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

    /**
     * 新增疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  新增结果
     */
    @Override
    public R addVaccinesByAdmin(VaccinesByAdminDTO vaccinesByAdminDTO){
        ComMngVaccinesDO vaccinesDO = new ComMngVaccinesDO();
        BeanUtils.copyProperties(vaccinesByAdminDTO,vaccinesDO);
        if(this.baseMapper.insert(vaccinesDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -585,7 +585,7 @@
    public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
//        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        int update = userDao.updateById(sysUserDO);
        if (update > 0) {