Merge branch 'test_elder_cedoo' into 'test'

罗元桥

2021-06-10 b8d265761ef169cc79e4498f482e0f195af8bab5

Merge branch 'test_elder_cedoo' into 'test'

修改bug

See merge request root/zhihuishequ!41

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java

@@ -40,7 +40,7 @@
    }


    private static final int BATCH_COUNT = 500;
    private static final int BATCH_COUNT = 3000;
    private List<EldersAuthElderlyExcelVO> list = new ArrayList<>();

    @Override

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

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


import com.alibaba.excel.EasyExcel;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComEldersAuthElderlyExcelListen;
import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Slf4j
@RestController
@RequestMapping("/eldersauthelderly")
@Api(tags = {"高龄老人"})
public class EldersAuthElderlyApi extends BaseController {


    @Resource
    private CommunityService communityService;

    /**
     * 高领老人列表
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/page")
    @ApiOperation(value = "高领老人列表", response = ComEldersAuthElderlyVO.class)
    R query(@Validated @RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO){
//        ClazzUtils.setIfStringIsEmpty(pageEldersAuthElderlyDTO);
//        pageEldersAuthElderlyDTO.setUserId(getUserId());
        return communityService.pageQueryEldersAuthElderly(pageEldersAuthElderlyDTO);
    }

    /**
     * 高领老人导入
     * @param file
     * @return
     */
    @PostMapping("/import")
    @ApiOperation(value = "高领老人导入", response = R.class)
    R batchSave(@RequestParam MultipartFile file){
        InputStream inputStream;
        try {
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, EldersAuthElderlyExcelVO.class, new ComEldersAuthElderlyExcelListen(communityService, getCommunityId(),getUserId())).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
        }
        return R.ok();

    }

    /**
     * 查看高龄老人详情
     * @param id
     * @return
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "高领老人详情", response = ComEldersAuthElderlyVO.class)
    R details(@PathVariable("id") Long id){
        return communityService.getEldersAuthElderlyById(id);
    }

    /**
     * 修改高龄老人
     * @param eldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/update")
    @ApiOperation(value = "更新高龄老人信息", response = R.class)
    R update(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO){
        return communityService.updateEldersAuthElderly(eldersAuthElderlyDTO);
    }

    /**
     * 删除高龄老人
     * @param id
     * @return
     */
    @PostMapping("/delete")
    @ApiOperation(value = "更新高龄老人信息", response = R.class)
    R delete(@RequestParam("id") Long id){
        return communityService.deleteEldersAuthElderly(id);
    }


}

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

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
@@ -22,6 +23,7 @@
     * 分页查询高龄老人用户绑定列表
     * @return  高龄老人用户绑定列表
     */
    IPage<ComElderAuthUserAppVO> findByPage(Page page);
    IPage<ComElderAuthUserAppVO> findByPage(Page page,@Param("userId") Long userId);


}

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

@@ -60,8 +60,8 @@
            comEldersAuthElderlyDO.setCommunityId(communityId);
            comEldersAuthElderlyDO.setCreateBy(createBy);
            comEldersAuthElderlyDO.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
            comEldersAuthElderlyDO.setIsExist(Objects.equals("是",e.getIsExist())?1:0);
            comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是",e.getIsExist())?1:0);
            comEldersAuthElderlyDO.setIsExist(Objects.equals("是",e.getIsExist())?1:2);
            comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是",e.getIsExist())?1:2);
            listDO.add(comEldersAuthElderlyDO);
        });
        this.saveBatch(listDO);

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

@@ -295,7 +295,7 @@
            }
        }

        IPage<ComElderAuthUserAppVO> authUserAppVOIPage = comEldersAuthUserMapper.findByPage(new Page(authPageDTO.getPageNum(),authPageDTO.getPageSize()));
        IPage<ComElderAuthUserAppVO> authUserAppVOIPage = comEldersAuthUserMapper.findByPage(new Page(authPageDTO.getPageNum(),authPageDTO.getPageSize()),authPageDTO.getUserId());
        if(!authUserAppVOIPage.getRecords().isEmpty()){
            authUserAppVOIPage.getRecords().forEach(authUser -> {


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthUserMapper.xml

@@ -34,6 +34,8 @@
            com_elders_auth_user AS ceau
            LEFT JOIN com_act AS ca ON ca.community_id = ceau.community_id
            order by ceau.create_at desc

        where ceau.user_id = #{userId}
    </select>