添加 user的分客户端

zhaoxiaohao

2020-05-22 bee86bf6b2c092320a5ea388786c243795b42add

添加 user的分客户端

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISysFeedbackService.java

@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.service;

import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.SysFeedback;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.service.ISuperService;
@@ -37,6 +38,6 @@
     */
    ResultBody updateEnabled(Map<String, Object> params);

    ResultBody getoneee();
    boolean saveOrUpdateStr(SysFeedback sysFeedback, SysUser sysUser);
}


 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java

@@ -156,6 +156,9 @@
                int surplus = surplusDay.intValue();
                mapVo.put("surplus",surplus);
                mapVo.put("logo",logo);
                //获取 售后服务工程师
                mapVo.put("saleUserName",sysOrganization.getSaleUserName());
                mapVo.put("saleUserTel",sysOrganization.getSaleUserTel());
                return ResultBody.ok().data(mapVo);
            }else {
                return ResultBody.failed("该用户套餐已经失效");

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java

@@ -1,8 +1,8 @@
package com.kidgrow.oprationcenter.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.oprationcenter.mapper.SysFeedbackMapper;
import com.kidgrow.oprationcenter.model.SysFeedback;
@@ -14,46 +14,52 @@
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @version 1.0
 * @Description: <br>
 * @Project: 用户中心<br>
 * @CreateDate: Created in 2020-04-01 09:37:04 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 * @version 1.0
 */
@Slf4j
@Service
public class SysFeedbackServiceImpl extends SuperServiceImpl<SysFeedbackMapper, SysFeedback> implements ISysFeedbackService {
    @Autowired
    SysDoctorService sysDoctorService;

    /**
     * 列表
     *
     * @param params
     * @return
     */
    @Override
    public PageResult<SysFeedback> findList(Map<String, Object> params){
    public PageResult<SysFeedback> findList(Map<String, Object> params) {
        Page<SysFeedback> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        List<SysFeedback> list  =  baseMapper.findList(page, params);
        List<SysFeedback> list = baseMapper.findList(page, params);
        return PageResult.<SysFeedback>builder().data(list).code(0).count(page.getTotal()).build();
    }

    /**
   * 根据SysFeedback对象当做查询条件进行查询
   * @param sysFeedback
   * @return SysFeedback
   */
     * 根据SysFeedback对象当做查询条件进行查询
     *
     * @param sysFeedback
     * @return SysFeedback
     */
    @Override
    public SysFeedback findByObject(SysFeedback sysFeedback){
    public SysFeedback findByObject(SysFeedback sysFeedback) {
        return baseMapper.findByObject(sysFeedback);
    }

    /**
     * 根据id和启用禁用值更新数据
     *
     * @param params
     * @return ResultBody
     */
@@ -73,7 +79,38 @@
    }

    @Override
    public ResultBody getoneee() {
        return sysDoctorService.findById(1L);
    public boolean saveOrUpdateStr(SysFeedback sysFeedback, SysUser sysUser) {
        if (sysFeedback.getId()==null) {
            List<SysOrganization> organizations = sysUser.getOrganizations();
            if (organizations.size() > 0) {
                sysFeedback.setDepartmentId(organizations.get(1).getId());
                sysFeedback.setDepartmentName(organizations.get(1).getOrgName());
                sysFeedback.setHospitalId(organizations.get(0).getId());
                sysFeedback.setHospitalName(organizations.get(0).getOrgName());
                Map map = new HashMap();
                map.put("user_id", sysUser.getId());
                ResultBody listByMap = sysDoctorService.getListByMap(map);
                List<SysDoctor> sysDoctors = JSON.parseArray(JSON.toJSONString(listByMap.getData()), SysDoctor.class);
                if (sysDoctors.size() > 0) {
                    sysFeedback.setDoctorId(sysDoctors.get(0).getId());
                    sysFeedback.setDoctorName(sysDoctors.get(0).getDoctorName());
                    sysFeedback.setDoctorTel(sysDoctors.get(0).getDoctorTel());
                }
                int insert = baseMapper.insert(sysFeedback);
                if (insert > 0) {
                    return true;
                } else {
                    return false;
                }
            }
        }else {
            int i = baseMapper.updateById(sysFeedback);
            if (i > 0) {
                return true;
            } else {
                return false;
            }
        }
        return false;
    }
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java

@@ -1,5 +1,6 @@
package com.kidgrow.oprationcenter.controller;

import com.alibaba.fastjson.JSON;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
@@ -85,6 +86,8 @@
            for (ObjectError error : bindingResult.getAllErrors()) {
                errMsg.add(error.getDefaultMessage());
            }
            ResultBody msg = ResultBody.failed().msg(errMsg.toString());
            DoctorServer doctorServer1 = JSON.toJavaObject(JSON.parseObject(msg.getData().toString()), DoctorServer.class);
            return ResultBody.failed().msg(errMsg.toString());
        }  else {
            boolean v= doctorServerService.saveOrUpdate(doctorServer);

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java

@@ -1,8 +1,10 @@
package com.kidgrow.oprationcenter.controller;

import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.SysFeedback;
import com.kidgrow.oprationcenter.service.ISysFeedbackService;
import io.swagger.annotations.Api;
@@ -23,7 +25,8 @@

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 * @Description: 
 *
 * @Description:
 * @Project: 运营中心
 * @CreateDate: Created in 2020-04-02 18:25:34 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
@@ -33,7 +36,7 @@
@RestController
@RequestMapping("/sysfeedback")
@Api(tags = "")
public class SysFeedbackController  extends BaseController{
public class SysFeedbackController extends BaseController {
    @Autowired
    private ISysFeedbackService sysFeedbackService;

@@ -47,9 +50,9 @@
    })
    @GetMapping
    public PageResult list(@RequestParam Map<String, Object> params) {
        if(params.size()==0){
            params.put("page",1);
            params.put("limit",10);
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        return sysFeedbackService.findList(params);
    }
@@ -79,19 +82,18 @@
     */
    @ApiOperation(value = "保存")
    @PostMapping
    public ResultBody save(@Valid @RequestBody SysFeedback sysFeedback, BindingResult bindingResult) {
        List<String> errMsg= new ArrayList<>();
    public ResultBody save(@Valid @RequestBody SysFeedback sysFeedback, BindingResult bindingResult, @LoginUser SysUser sysUser) {
        List<String> errMsg = new ArrayList<>();
        if (bindingResult.hasErrors()) {
            for (ObjectError error : bindingResult.getAllErrors()) {
                errMsg.add(error.getDefaultMessage());
            }
            return ResultBody.failed().msg(errMsg.toString());
        }  else {
            boolean v= sysFeedbackService.saveOrUpdate(sysFeedback);
            if(v) {
        } else {
            boolean v = sysFeedbackService.saveOrUpdateStr(sysFeedback, sysUser);
            if (v) {
                return ResultBody.ok().data(sysFeedback).msg("保存成功");
            }
            else {
            } else {
                return ResultBody.failed().msg("保存失败");
            }
        }
@@ -103,14 +105,14 @@
    @ApiOperation(value = "删除")
    @DeleteMapping("/{id}")
    public ResultBody delete(@PathVariable Long id) {
        boolean v= sysFeedbackService.removeById(id);
        if(v) {
        boolean v = sysFeedbackService.removeById(id);
        if (v) {
            return ResultBody.ok().msg("删除成功");
        }
        else {
        } else {
            return ResultBody.failed().msg("删除失败");
        }
    }

    /**
     * 修改状态
     *
@@ -124,15 +126,9 @@
            @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
    })
    public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
        if (params.size()==0)
        {
        if (params.size() == 0) {
            return ResultBody.failed().msg("参数异常！");
        }
        return sysFeedbackService.updateEnabled(params);
    }
    @PostMapping("getDoctor")
    public ResultBody getoneee(){
        return sysFeedbackService.getoneee();
    }

}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/feign/SysDoctorService.java

New file
@@ -0,0 +1,38 @@
package com.kidgrow.usercenter.feign;

import com.kidgrow.common.constant.ServiceNameConstants;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.usercenter.feign.fallback.SysDoctorServiceFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.Map;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @Description: <br>
 * @Project: <br>
 * @CreateDate: Created in 2020/2/22 14:33 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 */
@FeignClient(name = ServiceNameConstants.USER_SERVICE, fallbackFactory = SysDoctorServiceFallbackFactory.class, decode404 = true)
public interface SysDoctorService {
    /**
     * 根据条件查询
     * @param map
     */
    @PostMapping(value = "/sysdoctor/findByMap")
    ResultBody getListByMap(@RequestBody Map<String, Object> map);

    /**
     * 根据id查询数据
     * @param id
     * @return
     */
    @GetMapping("sysdoctor/{id}")
    ResultBody findById(@PathVariable(value="id") Long id);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/feign/fallback/SysDoctorServiceFallbackFactory.java

New file
@@ -0,0 +1,37 @@
package com.kidgrow.usercenter.feign.fallback;

import com.kidgrow.common.model.ResultBody;
import com.kidgrow.usercenter.feign.SysDoctorService;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import java.util.Map;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @Description: <br>
 * @Project: <br>
 * @CreateDate: Created in 2020/2/22 14:33 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 */
@Slf4j
@Component
public class SysDoctorServiceFallbackFactory implements FallbackFactory<SysDoctorService> {

    @Override
    public SysDoctorService create(Throwable throwable) {
        return  new SysDoctorService() {
            @Override
            public ResultBody getListByMap(Map<String, Object> map) {
                return ResultBody.failed("获取医生失败");
            }

            @Override
            public ResultBody findById(Long id) {
                return ResultBody.failed("获取医生失败");
            }
        };
    }
}

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java

@@ -59,6 +59,18 @@
     */
    private String orgCode;
    /**
     * 负责的销售id
     */
    private Long saleUserId;
    /**
     * 销售代表的名字
     */
    private String saleUserName;
    /**
     * 负责销售的联系方式
     */
    private String saleUserTel;
    /**
     * 是否删除，1删除，0未删除
     */
    private Boolean isDel;