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

yanghui

2022-10-10 23ea8ee10fac0ee12d6f2be822c8d6af4c13e330

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

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -72,6 +72,11 @@
            return error("密码不能为空");
        }

        if(StringUtils.isEmpty(config.getPhonenumber()))
        {
            return error("手机号不能为空");
        }

        if(StringUtils.isEmpty(config.getUserName()))
        {
            return error("昵称不能为空");
@@ -107,6 +112,12 @@
            return error("userId不能为空");
        }

        if(StringUtils.isEmpty(config.getPhonenumber()))
        {
            return error("手机号不能为空");
        }


        if(StringUtils.isEmpty(config.getLoginName()))
        {
            return error("账户不能为空");

 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

New file
@@ -0,0 +1,37 @@
package com.dg.core.controller;

import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.WorkOrder;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Api(tags = {"首页统计接口"})
@RestController
@RequestMapping("/Home")
public class HomeStatisticsController
{








    @GetMapping("/getWorkOrder")
    public ResultData getWorkOrder()
    {

        WorkOrder workOrder=new WorkOrder();




        return ResultData.success();
    }



}

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -50,34 +50,10 @@

        SysUser user=null;
        //管理员登录
        if(StringUtils.equals("zigonggaoadmin",account) || StringUtils.equals("ceshirenyuan",account) )
        {
            user= IUserService.getUserByAccount(account);

            if(user==null || !password.equals(user.getPassword()))
        if(user==null)
            {
                //提示用户名或密码错误
                return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
            }
            String token = tokenManager.getTokenByUserId(user.getUserId());
            System.out.println("token "+token);
            if (token == null) {
                //生成一个token，保存用户登录状态
                token = tokenManager.createToken(user.getUserId(), user.getUserId());
            }

            user.setLoginDate(LocalDateTime.now());
            //更新登录时间
            IUserService.updateConfig(user);

            Map<String, Object> map = new HashMap<>();
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());

            return ResultData.success(map);
        }

        HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
        if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
        {
@@ -127,6 +103,33 @@

        return ResultData.success(map);
    }
        else
        {
            if(!password.equals(user.getPassword()))
            {
                //提示用户名或密码错误
                return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
            }
            String token = tokenManager.getTokenByUserId(user.getUserId());
            System.out.println("token "+token);
            if (token == null) {
                //生成一个token，保存用户登录状态
                token = tokenManager.createToken(user.getUserId(), user.getUserId());
            }

            user.setLoginDate(LocalDateTime.now());
            //更新登录时间
            IUserService.updateConfig(user);

            Map<String, Object> map = new HashMap<>();
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());

            return ResultData.success(map);
        }

    }


    @ApiOperation("发送登录短信验证码")
@@ -142,6 +145,18 @@
        return IUserService.loginByAccount(phonenumber,code);
    }


    @ApiOperation("通过手机号获取用户信息 登录")
    @PostMapping(value = "/loginPhionne")
    public ResultData loginPhionne(@RequestParam String phonenumber)
    {
        if(StringUtils.isEmpty(phonenumber))
        {
            return ResultData.error("请输入手机号");
        }
        return IUserService.loginByPhonenumber(phonenumber);
    }

    /**
     * 查询列表
     *

 flower_city/src/main/java/com/dg/core/db/gen/entity/WorkOrder.java

New file
@@ -0,0 +1,72 @@
package com.dg.core.db.gen.entity;

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

import java.io.Serializable;

/**
 * 导办工单统计类
 */
@ApiModel("导办工单统计类")
@Data
public class WorkOrder implements Serializable
{

    /**
     * 待分配
     */
    @ApiModelProperty("待分配数量")
    private String waitDistribution;

    /**
     * 待办结
     */
    @ApiModelProperty("待办结")
    private String waitDealWith;

    /**
     * 已办结
     */
    @ApiModelProperty("已办结")
    private String haveDealWith;


    /**
     * 待评价
     */
    @ApiModelProperty("待评价")
    private String remainEvaluated;

    /**
     * 已取消
     */
    @ApiModelProperty("已取消")
    private String canceled;

    /**
     * 已超时
     */
    @ApiModelProperty("已超时")
    private String overtime;

    /**
     * 超时未办结
     */
    @ApiModelProperty("超时未办结")
    private String overtimeWaitDealWith;

    /**
     * 未解决
     */
    @ApiModelProperty("未解决")
    private String unsolved;

    /**
     * 已解决
     */
    @ApiModelProperty("已解决")
    private String resolved;

}

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -72,4 +72,12 @@
    List<SysUser> selectListByDepartmentId(String departmentId,String classifyId);


    /**
     * 通过手机号获取用户信息
     *
     * @return 结果
     */
    ResultData loginByPhonenumber(String phonenumber);


}

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -150,6 +150,80 @@
        return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
    }

    @Override
    public ResultData loginByPhonenumber(String phonenumber)
    {
        SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
        if (sysUser==null){
            //查询花城e+是否存在此用户
            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
            SysUser newUser = new SysUser();
            if(huaChengSysUser==null)
            {
                newUser.setUserId(Snowflake.getId());
                newUser.setLoginName(phonenumber);
                newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
                newUser.setUserType("3");
                newUser.setPhonenumber(phonenumber);
                newUser.setSex("1");
                newUser.setCreateTime(LocalDateTime.now());
                newUser.setUpdateTime(LocalDateTime.now());
                baseMapper.insertConfig(newUser);
            }
            else
            {
                newUser.setUserId(huaChengSysUser.getUserId());
                newUser.setLoginName(huaChengSysUser.getPhone());
                newUser.setUserName(huaChengSysUser.getNickName());
                newUser.setUserType("3");
                newUser.setPhonenumber(huaChengSysUser.getPhone());
                newUser.setSex(huaChengSysUser.getSex());
                newUser.setAvatar(huaChengSysUser.getImageUrl());
                newUser.setCreateTime(LocalDateTime.now());
                newUser.setUpdateTime(LocalDateTime.now());
                newUser.setOpenid(huaChengSysUser.getOpenid());
                baseMapper.insertConfig(newUser);
            }

            String token = tokenManager.getTokenByUserId(newUser.getUserId());
//        String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
            System.out.println("token " + token);
            if (token == null) {
                //生成一个token，保存用户登录状态
                token = tokenManager.createToken(newUser.getUserId(), newUser.getUserId());
            }

            Map<String, Object> map = new HashMap<>();
            map.put("token", token);
            map.put("userId", newUser.getUserId());
            map.put("userName", newUser.getUserName());

            return ResultData.success(map);

        }
        else
        {
            String token = tokenManager.getTokenByUserId(sysUser.getUserId());
//        String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
            System.out.println("token " + token);
            if (token == null) {
                //生成一个token，保存用户登录状态
                token = tokenManager.createToken(sysUser.getUserId(), sysUser.getUserId());
            }

            sysUser.setLoginDate(LocalDateTime.now());
            //更新登录时间
            this.updateConfig(sysUser);

            Map<String, Object> map = new HashMap<>();
            map.put("token", token);
            map.put("userId", sysUser.getUserId());
            map.put("userName", sysUser.getUserName());

            return ResultData.success(map);
        }
    }

    public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
        for (OrganizationChartEntity organizationChart:organizationChartEntities) {
            departmentIds.add(organizationChart.getId().toString());