lidongdong
2022-10-08 61d428d6bdbce2e6a6d4507170dc21c644148b10
修改手机号登录
4个文件已修改
69 ■■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -225,37 +225,48 @@
    @Authorization
    public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
    {
        if(entity==null)
//        if(entity==null)
//        {
//            return ResultData.error("参数不能为空");
//        }
//
//        if(entity.getId()<=0)
//        {
//            return ResultData.error("工单id不能为空");
//        }
//
//        if(!StringUtils.equals(entity.getState(),"4"))
//        {
//            return ResultData.error("该工单不能评价!");
//        }
//
//        if(StringUtils.isEmpty(entity.getEvaluateState()))
//        {
//            return ResultData.error("满意程度不能为空!");
//        }
        if(sysUser==null)
        {
            return ResultData.error("参数不能为空");
            return ResultData.error("sysUser为空!");
        }
        if(entity.getId()<=0)
        {
            return ResultData.error("工单id不能为空");
        }
        if(!StringUtils.equals(entity.getState(),"4"))
        {
            return ResultData.error("该工单不能评价!");
        }
        if(StringUtils.isEmpty(entity.getEvaluateState()))
        {
            return ResultData.error("满意程度不能为空!");
        }
        //已办结
        entity.setState("3");
        //新增已办结记录
        GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
        guideEvolveEntity.setCreateTime(LocalDateTime.now());
        guideEvolveEntity.setUpdateTime(LocalDateTime.now());
        guideEvolveEntity.setState("3");
        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
        iGuideEvolveService.insertConfig(guideEvolveEntity);
//        entity.setState("3");
//        //新增已办结记录
//        GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
//        guideEvolveEntity.setCreateTime(LocalDateTime.now());
//        guideEvolveEntity.setUpdateTime(LocalDateTime.now());
//        guideEvolveEntity.setState("3");
//        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
//        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
//        iGuideEvolveService.insertConfig(guideEvolveEntity);
        return toAjax(iGuideRepairOrderService.updateConfig(entity));
//        return toAjax(iGuideRepairOrderService.updateConfig(entity));
        return ResultData.success(sysUser.getUserId()+"");
    }
    /**
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -15,10 +15,6 @@
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;
/**
 * 自定义拦截器,判断此次请求是否有权限
@@ -56,6 +52,7 @@
            if (manager.checkHCToken(HCtoken)) {
                //如果token验证成功,权限检查通过,将token对应的用户id存在request中,便于之后注入
                request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
                System.out.println("花城用户id:"+manager.getHCUserId(HCtoken));
//            SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"");
                return true;
            }
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -82,7 +82,7 @@
                newUser.setSex("1");
                newUser.setCreateTime(LocalDateTime.now());
                newUser.setUpdateTime(LocalDateTime.now());
                baseMapper.insert(newUser);
                baseMapper.insertConfig(newUser);
            }
            else
            {
@@ -96,7 +96,7 @@
                newUser.setAvatar(huaChengSysUser.getImageUrl());
                newUser.setCreateTime(LocalDateTime.now());
                newUser.setUpdateTime(LocalDateTime.now());
                baseMapper.insert(newUser);
                baseMapper.insertConfig(newUser);
            }
        }
flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml
@@ -107,6 +107,7 @@
    <select id="selectData" parameterType="string"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
        <where>
            app_id='wx118de8a734d269f0'
            <if test="userId!=null and userId!=''">
                and user_id=#{userId}
            </if>