修改id 精度

lidongdong

2022-10-10 3e3d5f69ab4eb77ab5e09a814c33ffb8237a54f7

修改id 精度

 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,11 +50,62 @@

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

            if(user==null || !password.equals(user.getPassword()))
        if(user==null)
        {
            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
            if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
            {
                //提示用户名或密码错误
                return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
            }

            //本地表查询用户
            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            if (user == null) {
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
                //默认  1系统后台用户
                newSysUser.setUserType("1");
                newSysUser.setPhonenumber(huaChengSysUser.getPhone());
                newSysUser.setUserId(huaChengSysUser.getUserId());
                newSysUser.setUserName(huaChengSysUser.getNickName());
                newSysUser.setSex(huaChengSysUser.getSex());
                newSysUser.setAvatar(huaChengSysUser.getImageUrl());
                newSysUser.setCreateTime(LocalDateTime.now());
                newSysUser.setUpdateTime(LocalDateTime.now());
                newSysUser.setOpenid(huaChengSysUser.getOpenid());
                IUserService.insertConfig(newSysUser);
            }

            user = IUserService.selectData(huaChengSysUser.getUserId()+"");

            if (user == null) {
                return ResultData.error("用户不存在！请联系管理员");
            }

            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);
        }
        else
        {
            if(!password.equals(user.getPassword()))
            {
                //提示用户名或密码错误
                return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
@@ -78,54 +129,6 @@
            return ResultData.success(map);
        }

        HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
        if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
        {
            //提示用户名或密码错误
            return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
        }

        //本地表查询用户
        user = IUserService.selectData(huaChengSysUser.getUserId()+"");
        if (user == null) {
            //本地没有此用户  新用户
            SysUser newSysUser=new SysUser();
            //默认  1系统后台用户
            newSysUser.setUserType("1");
            newSysUser.setPhonenumber(huaChengSysUser.getPhone());
            newSysUser.setUserId(huaChengSysUser.getUserId());
            newSysUser.setUserName(huaChengSysUser.getNickName());
            newSysUser.setSex(huaChengSysUser.getSex());
            newSysUser.setAvatar(huaChengSysUser.getImageUrl());
            newSysUser.setCreateTime(LocalDateTime.now());
            newSysUser.setUpdateTime(LocalDateTime.now());
            newSysUser.setOpenid(huaChengSysUser.getOpenid());
            IUserService.insertConfig(newSysUser);
        }

        user = IUserService.selectData(huaChengSysUser.getUserId()+"");

        if (user == null) {
            return ResultData.error("用户不存在！请联系管理员");
        }

        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);
    }



 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;

}