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

zhangback

8 天以前 ca412ade3b178fbc8ba0a4b6215a040acdede954

 api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java

@@ -1,19 +1,39 @@
package com.ruoyi.api.third.controller;

import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.PdfTemplateUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.tms.domain.TmsDriver;
import com.ruoyi.tms.domain.TmsFinanceDetail;
import com.ruoyi.tms.domain.TmsTrip;
import com.ruoyi.tms.service.ITmsDispatchOrderService;
import com.ruoyi.tms.service.ITmsDriverService;
import com.ruoyi.tms.service.ITmsFinanceDetailService;
import com.ruoyi.tms.service.ITmsTripService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

@RestController
@RequestMapping("/app/car")
@@ -29,6 +49,14 @@

    @Autowired
    private ITmsFinanceDetailService tmsFinanceDetailService;
    @Autowired
    private ServerConfig serverConfig;
    @Autowired
    private ISysDictTypeService dictTypeService;

    @Value("${custom.upload.network-path}")
    private String networkPath;


    /**
     * 登录方法[pda]
@@ -111,7 +139,7 @@
     * 上传行程
     */
    @PostMapping("/uploadTrip")
    public AjaxResult uploadTrip(@RequestBody TmsTrip tmsTrip){
    public AjaxResult uploadTrip(@RequestBody TmsTrip tmsTrip) throws Exception {
        tmsTrip.setDataSource("1");
        return AjaxResult.success(tmsTripService.insertTmsTrip(tmsTrip));
    }
@@ -129,4 +157,44 @@



    /**
     * 通用上传请求
     */
    @PostMapping("/uploadImg")
    public AjaxResult uploadFile(MultipartFile file) throws Exception
    {

        try
        {
            // 上传文件路径
            String filePath = RuoYiConfig.getUploadPath();
            // 上传并返回新文件名称
            String fileName = FileUploadUtils.upload(filePath, file);
            String url = networkPath + fileName;
            AjaxResult ajax = AjaxResult.success();
            ajax.put("fileName", fileName);
            ajax.put("url", url);
            return ajax;
        }
        catch (Exception e)
        {
            return AjaxResult.error(e.getMessage());
        }
    }

    /**
     * 根据字典类型查询字典数据信息
     */
    @GetMapping(value = "/type/{dictType}")
    public AjaxResult dictType(@PathVariable String dictType)
    {
        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
        if (StringUtils.isNull(data))
        {
            data = new ArrayList<SysDictData>();
        }
        return AjaxResult.success(data);
    }


}