7.8冒烟修改问题

liujie

4 天以前 34c7d903efa4dc06a0f7b38bc5d2d721f80b220d

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java

@@ -1,35 +1,32 @@
package com.ruoyi.web.controller.system;


import cn.hutool.core.map.MapUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.JsonNode;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.utils.QiChaChaUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.dto.AddScheduleDto;
import com.ruoyi.system.dto.CompanyUpdateStatusDto;
import com.ruoyi.system.dto.EditCompanyDto;
import com.ruoyi.system.dto.PushCompanyDto;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.CompanyListQuery;
import com.ruoyi.system.query.MyPushCompanyListQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.CompanyDetailVo;
import com.ruoyi.system.vo.IndexCompanyListVo;
import com.ruoyi.system.vo.MyPushCompanyListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -37,6 +34,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;

@Slf4j
@RestController
@@ -68,41 +66,42 @@
    @Autowired
    private TbCompanyTypeService companyTypeService;


    @Autowired
    private QiChaChaUtil qiChaChaUtil;

    private RedisCache redisCache;




    @ApiOperation(value = "获取我发布的公司",tags = {"发布模块"})
    @GetMapping("/getMyPushCompanyList")
    public R<Page<MyPushCompanyListVo>> getMyPushCompanyList(MyPushCompanyListQuery query) {
    public R< HashMap<String, Object>> getMyPushCompanyList(MyPushCompanyListQuery query) {
        LoginUser loginUser = tokenService.getLoginUser();
        Long userId = loginUser.getUserId();
        Page<MyPushCompanyListVo> page = tbCompanyService.getMyPushCompanyList(query,userId);
        return R.ok(page);
        HashMap<String, Object> map = new HashMap<>();
        map.put("data",page);
        map = tbCompanyService.getMyPushCompanyListNum(userId,map);
        return R.ok(map);
    }

    @ApiOperation(value = "获取行业信息",tags = {"发布模块"})
    @GetMapping("/getIndustryList")
    public R<Page<TbIndustry>> getIndustryList(BasePage page) {
        Page<TbIndustry> page1 = industryService.page(new Page<>(page.getPageNum(),page.getPageSize()),new LambdaQueryWrapper<TbIndustry>().orderByDesc(TbIndustry::getOrderNum));
    public R<List<TbIndustry>> getIndustryList() {
        List<TbIndustry> page1 = industryService.list(new LambdaQueryWrapper<TbIndustry>().orderByDesc(TbIndustry::getOrderNum));
        return R.ok(page1);
    }

    @ApiOperation(value = "获取公司类型信息",tags = {"发布模块"})
    @GetMapping("/getCompanyTypeList")
    public R<Page<TbCompanyType>> getCompanyTypeList(BasePage page) {
        Page<TbCompanyType> page1 = companyTypeService.page(new Page<>(page.getPageNum(),page.getPageSize()),new LambdaQueryWrapper<TbCompanyType>().eq(TbCompanyType::getDelFlag,0).orderByDesc(TbCompanyType::getOrderNum));
    public R<List<TbCompanyType>> getCompanyTypeList() {
        List<TbCompanyType> page1 = companyTypeService.list(new LambdaQueryWrapper<TbCompanyType>().eq(TbCompanyType::getDelFlag,0).orderByDesc(TbCompanyType::getOrderNum));
        return R.ok(page1);
    }

    @ApiOperation(value = "获取许可证信息",tags = {"发布模块"})
    @GetMapping("/getLicenceList")
    public R<Page<TbLicence>> getLicenceList(BasePage page) {
        Page<TbLicence> page1 = licenceService.page(new Page<>(page.getPageNum(),page.getPageSize()),new LambdaQueryWrapper<TbLicence>().eq(TbLicence::getDelFlag,0).orderByDesc(TbLicence::getOrderNum));
    public R<List<TbLicence>> getLicenceList() {
        List<TbLicence> page1 = licenceService.list(new LambdaQueryWrapper<TbLicence>().eq(TbLicence::getDelFlag,0).orderByDesc(TbLicence::getOrderNum));
        return R.ok(page1);
    }

@@ -115,8 +114,8 @@
        if (count > 0) {
            return R.fail("该公司已发布");
        }
        tbCompanyService.pushCompany(dto,userId);
        return R.ok();
        String companyId = tbCompanyService.pushCompany(dto, userId);
        return R.ok(companyId);
    }

    @ApiOperation(value = "发布前获取公司信息--企查查",tags = {"发布模块"})
@@ -126,10 +125,15 @@
        if (count > 0) {
            return R.fail("该公司已发布");
        }
        Object cacheObject = redisCache.getCacheObject("push_" + companyName);
        if(cacheObject!=null){
            return R.ok(cacheObject);
        }
        Object qiChaChaToken = QiChaChaUtil.getQiChaChaCompanyInfo(companyName);
        if(qiChaChaToken==null){
            return R.fail("查询公司信息失败请联系客服");
        }
        redisCache.setCacheObject("push_" + companyName, qiChaChaToken, 24, TimeUnit.HOURS);
        return R.ok(qiChaChaToken);
    }

@@ -157,7 +161,7 @@
        }

        tbCompanyService.editCompany(dto,company,userId);
        return R.ok();
        return R.ok(dto.getId());
    }


@@ -181,6 +185,27 @@
        tbCompanyService.updateById(company);
        return R.ok();
    }


    @ApiOperation(value = "删除公司",tags = {"发布模块"})
    @DeleteMapping("/delete/{id}")
    public R<?> delete(@PathVariable("id")String id) {
        LoginUser loginUser = tokenService.getLoginUser();
        Long userId = loginUser.getUserId();
        TbCompany company = tbCompanyService.getById(id);
        if (company == null || !company.getUserId().equals(userId.toString())) {
            return R.fail("非法操作");
        }
        long count = orderService.count(new LambdaQueryWrapper<TbOrder>().eq(TbOrder::getCompanyId,id).in(TbOrder::getStatus, 3, 4, 5));
        if (company.getStatus()!=1) {
            return R.fail("订单状态不能修改");
        }
        company.setIsDelete(1);
        tbCompanyService.updateById(company);
        return R.ok();
    }



    @ApiOperation(value = "确认订单",tags = {"发布模块"})
    @PostMapping("/confirmOrder")
@@ -255,7 +280,7 @@
        }
        scheduleService.addSchedule(dto,userId);

        messageService.addMessage("您有订单卖家已完成,等待确认", order.getUserId(),order.getId());
        messageService.addMessage("您的订单有新的进度提醒", order.getUserId(),order.getId());
        return R.ok();
    }

@@ -312,10 +337,18 @@
        CompanyDetailVo companyDetailVo = tbCompanyService.companyDetail(companyId,userId);
        Object qiChaChaCompanyExceptionCheck = QiChaChaUtil.getQiChaChaCompanyExceptionCheck(companyDetailVo.getCompanyName());
        companyDetailVo.setCompanyExceptionInfo(qiChaChaCompanyExceptionCheck);

        companyDetailVo.setEstablishTime(companyDetailVo.getEstablishTime().substring(0,10));
        return R.ok(companyDetailVo);
    }


    @ApiOperation(value = "公司详情--异常信息",tags = {"发布模块"})
    @GetMapping("/qiChaChaCompanyExceptionCheck")
    public R<Object> qiChaChaCompanyExceptionCheck(@RequestParam String companyName) {
        Object qiChaChaCompanyExceptionCheck = QiChaChaUtil.getQiChaChaCompanyExceptionCheck(companyName);
        return R.ok(qiChaChaCompanyExceptionCheck);
    }

    @ApiOperation(value = "公司详情--财务征信信息",tags = {"发布模块"})
    @GetMapping("/companyDetailDataInfo")
    public R<Object> companyDetailDataInfo(@RequestParam String companyId) {