966120Api.git - Gitblit

parent: 5390b4fc | 补丁 | 提交 | show whitespace

wanglizhong

2025-05-05 1217bda7a36ad1b48fe0b453b54c84095d62f8d7

fix:增加swagger配置

4个文件已修改

1 文件已重命名

	ruoyi-admin/pom.xml	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java	78 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/login.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sql/menu_client_app.sql	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ruoyi-admin/pom.xml

@@ -45,7 +45,6 @@
        <dependency>
            <groupId>com.microsoft.sqlserver</groupId>
            <artifactId>mssql-jdbc</artifactId>
            <version>9.4.0.jre8</version>
        </dependency>
        <!-- 核心模块-->
        <dependency>
@@ -80,6 +79,10 @@
                <version>2.5.15</version>
                <configuration>
                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                    <profiles>
                        <profile>dev</profile>
                        <profile>prod</profile>
                    </profiles>
                </configuration>
                <executions>
                    <execution>
@@ -102,4 +105,24 @@
        <finalName>${project.artifactId}</finalName>
    </build>

    <profiles>
        <profile>
            <id>dev</id>
            <properties>
                <spring.profiles.active>dev</spring.profiles.active>
                <logging.level.com.ruoyi>debug</logging.level.com.ruoyi>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>prod</id>
            <properties>
                <spring.profiles.active>prod</spring.profiles.active>
                <logging.level.com.ruoyi>info</logging.level.com.ruoyi>
            </properties>
        </profile>
    </profiles>

</project>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java

@@ -13,17 +13,14 @@
import com.ruoyi.common.utils.civilAviation.ServiceOrderUtil;
import com.ruoyi.system.domain.SysClientApp;
import com.ruoyi.system.service.ISysClientAppService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -40,6 +37,7 @@
 * @author wzp
 * @date 2025-05-01
 */
@Api("订单管理")
@RestController
@RequestMapping("/system/orders")
public class TbOrdersController extends BaseController
@@ -50,9 +48,7 @@
    @Autowired
    private ISysClientAppService clientAppService;

    /**
     * 查询orders列表
     */
    @ApiOperation("查询订单列表")
    @PreAuthorize("@ss.hasPermi('system:orders:list')")
    @GetMapping("/list")
    public TableDataInfo list(TbOrders tbOrders)
@@ -62,9 +58,7 @@
        return getDataTable(list);
    }

    /**
     * 导出orders列表
     */
    @ApiOperation("导出订单列表")
    @PreAuthorize("@ss.hasPermi('system:orders:export')")
    @Log(title = "orders", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
@@ -75,9 +69,8 @@
        util.exportExcel(response, list, "orders数据");
    }

    /**
     * 获取orders详细信息
     */
    @ApiOperation("获取订单详细信息")
    @ApiImplicitParam(name = "OrderID", value = "订单ID", required = true, dataType = "Long", paramType = "path")
    @PreAuthorize("@ss.hasPermi('system:orders:query')")
    @GetMapping(value = "/{OrderID}")
    public AjaxResult getInfo(@PathVariable("OrderID") Long OrderID)
@@ -93,6 +86,22 @@
//    @Anonymous(needSign = true)
    @Anonymous
//    @Log(title = "orders", businessType = BusinessType.INSERT)
    @ApiOperation("新增订单")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "orderID", value = "订单ID", dataType = "Long"),
        @ApiImplicitParam(name = "typeCode", value = "订单类型", dataType = "Integer"),
        @ApiImplicitParam(name = "linkTel", value = "联系电话", dataType = "String"),
        @ApiImplicitParam(name = "linkPerson", value = "联系人", dataType = "String"),
        @ApiImplicitParam(name = "bookingDate", value = "预约时间", dataType = "Date"),
        @ApiImplicitParam(name = "patientName", value = "患者姓名", dataType = "String"),
        @ApiImplicitParam(name = "age", value = "年龄", dataType = "Integer"),
        @ApiImplicitParam(name = "sex", value = "性别", dataType = "Integer"),
        @ApiImplicitParam(name = "localAddress", value = "转出医院", dataType = "String"),
        @ApiImplicitParam(name = "sendAddress", value = "转入医院", dataType = "String"),
        @ApiImplicitParam(name = "complaint", value = "诊断信息", dataType = "String"),
        @ApiImplicitParam(name = "remark", value = "备注", dataType = "String"),
        @ApiImplicitParam(name = "bookingPrice", value = "报价", dataType = "BigDecimal")
    })
    @PostMapping("/add")
    public AjaxResult add(@RequestBody TbOrders tbOrders) {
        try {
@@ -154,9 +163,8 @@
        }
    }

    /**
     * 重新发送订单
     */
    @ApiOperation("重新发送订单")
    @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long", paramType = "path")
    @PostMapping("/resend/{orderId}")
    public AjaxResult resendOrder(@PathVariable Long orderId) {

@@ -217,6 +225,12 @@



    @ApiOperation("取消订单")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "orderID", value = "订单ID", required = true, dataType = "Long"),
        @ApiImplicitParam(name = "thirdOrderNo", value = "第三方订单号", required = true, dataType = "String"),
        @ApiImplicitParam(name = "reason", value = "取消原因", required = true, dataType = "String")
    })
    @Anonymous
    @PostMapping("/cancelOrder")
    public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo)
@@ -252,9 +266,22 @@
        }
    }

    /**
     * 修改orders
     */
    @ApiOperation("修改订单")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "orderID", value = "订单ID", required = true, dataType = "Long"),
        @ApiImplicitParam(name = "typeCode", value = "订单类型", dataType = "Integer"),
        @ApiImplicitParam(name = "linkTel", value = "联系电话", dataType = "String"),
        @ApiImplicitParam(name = "linkPerson", value = "联系人", dataType = "String"),
        @ApiImplicitParam(name = "bookingDate", value = "预约时间", dataType = "Date"),
        @ApiImplicitParam(name = "patientName", value = "患者姓名", dataType = "String"),
        @ApiImplicitParam(name = "age", value = "年龄", dataType = "Integer"),
        @ApiImplicitParam(name = "sex", value = "性别", dataType = "Integer"),
        @ApiImplicitParam(name = "localAddress", value = "转出医院", dataType = "String"),
        @ApiImplicitParam(name = "sendAddress", value = "转入医院", dataType = "String"),
        @ApiImplicitParam(name = "complaint", value = "诊断信息", dataType = "String"),
        @ApiImplicitParam(name = "remark", value = "备注", dataType = "String"),
        @ApiImplicitParam(name = "bookingPrice", value = "报价", dataType = "BigDecimal")
    })
    @PreAuthorize("@ss.hasPermi('system:orders:edit')")
    @Log(title = "orders", businessType = BusinessType.UPDATE)
    @PutMapping
@@ -263,9 +290,8 @@
        return toAjax(tbOrdersService.updateTbOrders(tbOrders));
    }

    /**
     * 删除orders
     */
    @ApiOperation("删除订单")
    @ApiImplicitParam(name = "OrderIDs", value = "订单ID数组", required = true, dataType = "Long[]", paramType = "path")
    @PreAuthorize("@ss.hasPermi('system:orders:remove')")
    @Log(title = "orders", businessType = BusinessType.DELETE)
    @DeleteMapping("/{OrderIDs}")

 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -113,9 +113,9 @@
        // 用ApiInfoBuilder进行定制
        return new ApiInfoBuilder()
                // 设置标题
                .title("标题：若依管理系统_接口文档")
                .title("广东民航医疗快线")
                // 描述
                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                .description("用于管理广东民航医疗快线")
                // 作者信息
                .contact(new Contact(ruoyiConfig.getName(), null, null))
                // 版本

 ruoyi-ui/src/views/login.vue

@@ -65,7 +65,7 @@
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'

//admin admin123
export default {
  name: "Login",
  data() {
@@ -73,8 +73,8 @@
      title: process.env.VUE_APP_TITLE,
      codeUrl: "",
      loginForm: {
        username: "admin",
        password: "admin123",
        username: "",
        password: "",
        rememberMe: false,
        code: "",
        uuid: ""

 sql/menu_client_app.sql

			@@ -45,7 +45,6 @@
			<dependency>
			<groupId>com.microsoft.sqlserver</groupId>
			<artifactId>mssql-jdbc</artifactId>
			<version>9.4.0.jre8</version>
			</dependency>
			<!-- 核心模块-->
			<dependency>
			@@ -80,6 +79,10 @@
			<version>2.5.15</version>
			<configuration>
			<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
			<profiles>
			<profile>dev</profile>
			<profile>prod</profile>
			</profiles>
			</configuration>
			<executions>
			<execution>
			@@ -102,4 +105,24 @@
			<finalName>${project.artifactId}</finalName>
			</build>

			<profiles>
			<profile>
			<id>dev</id>
			<properties>
			<spring.profiles.active>dev</spring.profiles.active>
			<logging.level.com.ruoyi>debug</logging.level.com.ruoyi>
			</properties>
			<activation>
			<activeByDefault>true</activeByDefault>
			</activation>
			</profile>
			<profile>
			<id>prod</id>
			<properties>
			<spring.profiles.active>prod</spring.profiles.active>
			<logging.level.com.ruoyi>info</logging.level.com.ruoyi>
			</properties>
			</profile>
			</profiles>

			</project>

			@@ -13,17 +13,14 @@
			import com.ruoyi.common.utils.civilAviation.ServiceOrderUtil;
			import com.ruoyi.system.domain.SysClientApp;
			import com.ruoyi.system.service.ISysClientAppService;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.security.access.prepost.PreAuthorize;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.PutMapping;
			import org.springframework.web.bind.annotation.DeleteMapping;
			import org.springframework.web.bind.annotation.PathVariable;
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RestController;
			import org.springframework.web.bind.annotation.*;
			import com.ruoyi.common.annotation.Log;
			import com.ruoyi.common.core.controller.BaseController;
			import com.ruoyi.common.core.domain.AjaxResult;
			@@ -40,6 +37,7 @@
			* @author wzp
			* @date 2025-05-01
			*/
			@Api("订单管理")
			@RestController
			@RequestMapping("/system/orders")
			public class TbOrdersController extends BaseController
			@@ -50,9 +48,7 @@
			@Autowired
			private ISysClientAppService clientAppService;

			/**
			* 查询orders列表
			*/
			@ApiOperation("查询订单列表")
			@PreAuthorize("@ss.hasPermi('system:orders:list')")
			@GetMapping("/list")
			public TableDataInfo list(TbOrders tbOrders)
			@@ -62,9 +58,7 @@
			return getDataTable(list);
			}

			/**
			* 导出orders列表
			*/
			@ApiOperation("导出订单列表")
			@PreAuthorize("@ss.hasPermi('system:orders:export')")
			@Log(title = "orders", businessType = BusinessType.EXPORT)
			@PostMapping("/export")
			@@ -75,9 +69,8 @@
			util.exportExcel(response, list, "orders数据");
			}

			/**
			* 获取orders详细信息
			*/
			@ApiOperation("获取订单详细信息")
			@ApiImplicitParam(name = "OrderID", value = "订单ID", required = true, dataType = "Long", paramType = "path")
			@PreAuthorize("@ss.hasPermi('system:orders:query')")
			@GetMapping(value = "/{OrderID}")
			public AjaxResult getInfo(@PathVariable("OrderID") Long OrderID)
			@@ -93,6 +86,22 @@
			// @Anonymous(needSign = true)
			@Anonymous
			// @Log(title = "orders", businessType = BusinessType.INSERT)
			@ApiOperation("新增订单")
			@ApiImplicitParams({
			@ApiImplicitParam(name = "orderID", value = "订单ID", dataType = "Long"),
			@ApiImplicitParam(name = "typeCode", value = "订单类型", dataType = "Integer"),
			@ApiImplicitParam(name = "linkTel", value = "联系电话", dataType = "String"),
			@ApiImplicitParam(name = "linkPerson", value = "联系人", dataType = "String"),
			@ApiImplicitParam(name = "bookingDate", value = "预约时间", dataType = "Date"),
			@ApiImplicitParam(name = "patientName", value = "患者姓名", dataType = "String"),
			@ApiImplicitParam(name = "age", value = "年龄", dataType = "Integer"),
			@ApiImplicitParam(name = "sex", value = "性别", dataType = "Integer"),
			@ApiImplicitParam(name = "localAddress", value = "转出医院", dataType = "String"),
			@ApiImplicitParam(name = "sendAddress", value = "转入医院", dataType = "String"),
			@ApiImplicitParam(name = "complaint", value = "诊断信息", dataType = "String"),
			@ApiImplicitParam(name = "remark", value = "备注", dataType = "String"),
			@ApiImplicitParam(name = "bookingPrice", value = "报价", dataType = "BigDecimal")
			})
			@PostMapping("/add")
			public AjaxResult add(@RequestBody TbOrders tbOrders) {
			try {
			@@ -154,9 +163,8 @@
			}
			}

			/**
			* 重新发送订单
			*/
			@ApiOperation("重新发送订单")
			@ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long", paramType = "path")
			@PostMapping("/resend/{orderId}")
			public AjaxResult resendOrder(@PathVariable Long orderId) {

			@@ -217,6 +225,12 @@



			@ApiOperation("取消订单")
			@ApiImplicitParams({
			@ApiImplicitParam(name = "orderID", value = "订单ID", required = true, dataType = "Long"),
			@ApiImplicitParam(name = "thirdOrderNo", value = "第三方订单号", required = true, dataType = "String"),
			@ApiImplicitParam(name = "reason", value = "取消原因", required = true, dataType = "String")
			})
			@Anonymous
			@PostMapping("/cancelOrder")
			public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo)
			@@ -252,9 +266,22 @@
			}
			}

			/**
			* 修改orders
			*/
			@ApiOperation("修改订单")
			@ApiImplicitParams({
			@ApiImplicitParam(name = "orderID", value = "订单ID", required = true, dataType = "Long"),
			@ApiImplicitParam(name = "typeCode", value = "订单类型", dataType = "Integer"),
			@ApiImplicitParam(name = "linkTel", value = "联系电话", dataType = "String"),
			@ApiImplicitParam(name = "linkPerson", value = "联系人", dataType = "String"),
			@ApiImplicitParam(name = "bookingDate", value = "预约时间", dataType = "Date"),
			@ApiImplicitParam(name = "patientName", value = "患者姓名", dataType = "String"),
			@ApiImplicitParam(name = "age", value = "年龄", dataType = "Integer"),
			@ApiImplicitParam(name = "sex", value = "性别", dataType = "Integer"),
			@ApiImplicitParam(name = "localAddress", value = "转出医院", dataType = "String"),
			@ApiImplicitParam(name = "sendAddress", value = "转入医院", dataType = "String"),
			@ApiImplicitParam(name = "complaint", value = "诊断信息", dataType = "String"),
			@ApiImplicitParam(name = "remark", value = "备注", dataType = "String"),
			@ApiImplicitParam(name = "bookingPrice", value = "报价", dataType = "BigDecimal")
			})
			@PreAuthorize("@ss.hasPermi('system:orders:edit')")
			@Log(title = "orders", businessType = BusinessType.UPDATE)
			@PutMapping
			@@ -263,9 +290,8 @@
			return toAjax(tbOrdersService.updateTbOrders(tbOrders));
			}

			/**
			* 删除orders
			*/
			@ApiOperation("删除订单")
			@ApiImplicitParam(name = "OrderIDs", value = "订单ID数组", required = true, dataType = "Long[]", paramType = "path")
			@PreAuthorize("@ss.hasPermi('system:orders:remove')")
			@Log(title = "orders", businessType = BusinessType.DELETE)
			@DeleteMapping("/{OrderIDs}")

			@@ -113,9 +113,9 @@
			// 用ApiInfoBuilder进行定制
			return new ApiInfoBuilder()
			// 设置标题
			.title("标题：若依管理系统_接口文档")
			.title("广东民航医疗快线")
			// 描述
			.description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
			.description("用于管理广东民航医疗快线")
			// 作者信息
			.contact(new Contact(ruoyiConfig.getName(), null, null))
			// 版本

			@@ -65,7 +65,7 @@
			import { getCodeImg } from "@/api/login";
			import Cookies from "js-cookie";
			import { encrypt, decrypt } from '@/utils/jsencrypt'

			//admin admin123
			export default {
			name: "Login",
			data() {
			@@ -73,8 +73,8 @@
			title: process.env.VUE_APP_TITLE,
			codeUrl: "",
			loginForm: {
			username: "admin",
			password: "admin123",
			username: "",
			password: "",
			rememberMe: false,
			code: "",
			uuid: ""