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

yanghui

2022-10-19 e94a80ae3d9733eb2d6a5d9bcbd50a624f058caa

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

@@ -4,12 +4,15 @@
import cn.hutool.core.util.NumberUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.digest.MD5;
import cn.hutool.extra.pinyin.PinyinUtil;
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.community.sanshuo.ComSanshuoExpertDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComSanshuoExpertVO;
import com.panzhihua.common.model.vos.sanshuo.ExpertRangeVO;
import com.panzhihua.common.model.vos.sanshuo.ExpertShowVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
@@ -21,12 +24,14 @@
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.entity.ComSanshuoEvent;
import com.panzhihua.service_community.entity.ComSanshuoExpert;
import com.panzhihua.service_community.entity.ComSanshuoIndustryCenter;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.ComActService;
import com.panzhihua.service_community.service.ComSanShuoExpertService;
import com.panzhihua.service_community.service.ComStreetService;
import com.panzhihua.service_community.util.MyAESUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -40,6 +45,7 @@
import static java.util.Objects.nonNull;

@Service
@Slf4j
public class ComSanShuoExpertServiceImpl  extends ServiceImpl<ComSanshuoExpertDao, ComSanshuoExpert> implements ComSanShuoExpertService {

    @Resource
@@ -144,7 +150,7 @@
     * @return 处理结果
     * */
    @Override
    public R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo) {
    public R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo,Integer level) {
        //range:1.三说会堂下属,2业务中心下属，3街道下属，4社区下属
        //id:社区或街道或业务中心id
        //账号级别
@@ -166,11 +172,23 @@
                }
            }
        }
        if (loginUserInfo.getAccount().equals("admin") || loginUserInfo.getAccount().equals("xiqu")){
        if (loginUserInfo.getAccount().equals("admin") && isNull(level)){
            id=null;
            range=null;
            range=1;
        }
        return R.ok(comSanshuoExpertDao.expertPage(new Page(page,size),keyWord,range,id));
        IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
        for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {
            //获取调解次数和成功率
            record.setCount(comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, record.getId())));
            record.setSuccessCount(comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, record.getId()).eq(ComEvent::getEventResult,2 )));
            if (nonNull(record.getCount()) && nonNull(record.getSuccessCount())){
                if (!record.getCount().equals(0) && !record.getSuccessCount().equals(0)){
                    record.setRate(NumberUtil.div(record.getSuccessCount(), record.getCount(),2));
                }

            }
        }
        return R.ok(comSanshuoExpertVOIPage);
    }

    /**
@@ -247,7 +265,7 @@
                ExpertRangeVO vo=new ExpertRangeVO();
                vo.setLevel(2);
                vo.setName("行业分中心");
                vo.setId(loginUserInfo.getCommunityId());
                vo.setId(comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfo.getAccount())).getId());
                list.add(vo);
                return R.ok(list);
            }else if (nonNull(loginUserInfo.getUserType())){
@@ -344,5 +362,54 @@
        return R.ok(comSanshuoExperts);
    }

    @Override
    public void insertExpert(ComSanshuoExpert expert) {
//            if (nonNull(comSanshuoExpertDTO.getUnit())){
//                String id = comSanshuoExpertDTO.getUnit();
//                String[] split = id.split(",");
//                expert.setUnitId(split[split.length-1]);
//            }
            expert.setId(Snowflake.getId());
            expert.setCreateTime(new Date());
            if (expert.getLevel()==2){
                expert.setIndustryCenterId(Long.parseLong(expert.getUnitId()));
                expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName()+"调解站");
            }else if(expert.getLevel()==3){
                expert.setStreetId(Long.parseLong(expert.getUnitId()));
                expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
            }else if(expert.getLevel()==4){
                expert.setCommunityId(Long.parseLong(expert.getUnitId()));
                expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
            }
            expert.setStatus(1);
            expert.setDelFlag(1);
            expert.setCreateBy("admin");
            expert.setCreateTime(new Date());
            expert.setAdded(0);
            expert.setPassword("Huacheng@123");
            expert.setAccount(PinyinUtil.getPinyin(expert.getName(),""));
            int insert = comSanshuoExpertDao.insert(expert);
            if (insert>0){
                log.info(expert.getName()+"添加完成");
            }
//            if (insert>0){
//                try {
//                    comSanshuoExpertDTO.setPassword(comSanshuoExpertDTO.getPassword());
//                } catch (Exception e) {
//                    e.printStackTrace();
//                }
//                //生成后台账号
//                AdministratorsUserVO user=new AdministratorsUserVO();
//                user.setUserId(Snowflake.getId());
//                user.setAccount(comSanshuoExpertDTO.getAccount());
//                user.setPassword(comSanshuoExpertDTO.getPassword());
//                user.setName(comSanshuoExpertDTO.getName());
//                user.setType(11);
//                user.setImageUrl(comSanshuoExpertDTO.getAvatar());
//                user.setPhone(comSanshuoExpertDTO.getPhone());
//                userService.sanShuoAddUser(user);
//            }
    }


}