KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: swagger找不到接口bug

Browse Source
This commit is contained in:
mzaxd
2024-04-02 11:54:05 +08:00
parent 3070d38152
commit 0e7a4f33ee
7 changed files with 185 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/pom.xml
+3 -14
View File
@@ -12,20 +12,9 @@
<repositories> <repositories>
<repository> <repository>
<id>aliyun</id> <id>com.e-iceblue</id>
<name>aliyun Repository</name> <name>e-iceblue</name>
<url>https://maven.aliyun.com/repository/public</url> <url>https://repo.e-iceblue.cn/repository/maven-public/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>jeecg</id>
<name>jeecg Repository</name>
<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository> </repository>
</repositories> </repositories>
jero-boot-modules/src/main/java/com/jero/modules/controller/KhDeviceController.java
+9 -4
View File
@@ -1,4 +1,4 @@
package com.jero.modules.controller.controller; package com.jero.modules.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -13,6 +13,7 @@ import com.jero.modules.vo.DeviceStatisticsVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@@ -29,10 +30,12 @@ import org.apache.poi.ss.formula.functions.T;
* @Date: 2024-04-01 * @Date: 2024-04-01
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags="设备")
@RestController
@RequestMapping("/device")
@Slf4j @Slf4j
@Transactional(rollbackFor = Exception.class)
@RestController
@Api(tags = "设备管理")
@RequestMapping("/device")
public class KhDeviceController extends JeroController<KhDevice, IKhDeviceService> { public class KhDeviceController extends JeroController<KhDevice, IKhDeviceService> {
@Autowired @Autowired
private IKhDeviceService khDeviceService; private IKhDeviceService khDeviceService;
@@ -187,3 +190,5 @@ public class KhDeviceController extends JeroController<KhDevice, IKhDeviceServic
} }
} }
jero-boot-modules/src/main/java/com/jero/modules/entity/KhSystemSetting.java
-3
View File
@@ -1,9 +1,7 @@
package com.jero.modules.entity; package com.jero.modules.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,7 +14,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/** /**
jero-boot-modules/src/main/java/com/jero/modules/entity/KhWellhead.java
-3
View File
@@ -1,9 +1,7 @@
package com.jero.modules.entity; package com.jero.modules.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,7 +14,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/** /**
jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhDeviceMapper.xml
+3 -3
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.1.mapper.KhDeviceMapper"> <mapper namespace="com.jero.modules.mapper.KhDeviceMapper">
<resultMap id="KhDeviceResultMap" type="com.jero.modules.1.entity.KhDevice"> <resultMap id="KhDeviceResultMap" type="com.jero.modules.entity.KhDevice">
<id column="id" property="id" /> <id column="id" property="id" />
<result column="create_by" property="createBy" /> <result column="create_by" property="createBy" />
<result column="create_time" property="createTime" /> <result column="create_time" property="createTime" />
@@ -13,6 +13,6 @@
<result column="wellhead_id" property="wellheadId" /> <result column="wellhead_id" property="wellheadId" />
<result column="device_desc" property="deviceDesc" /> <result column="device_desc" property="deviceDesc" />
<result column="device_sn" property="deviceSn" /> <result column="device_sn" property="deviceSn" />
<result column="device_statuts" property="deviceStatuts" /> <result column="device_status" property="deviceStatus" />
</resultMap> </resultMap>
</mapper> </mapper>
jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhWellheadMapper.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.1.mapper.KhWellheadMapper"> <mapper namespace="com.jero.modules.mapper.KhWellheadMapper">
<resultMap id="KhWellheadResultMap" type="com.jero.modules.1.entity.KhWellhead"> <resultMap id="KhWellheadResultMap" type="com.jero.modules.entity.KhWellhead">
<id column="id" property="id" /> <id column="id" property="id" />
<result column="create_by" property="createBy" /> <result column="create_by" property="createBy" />
<result column="create_time" property="createTime" /> <result column="create_time" property="createTime" />
jero-boot-single-startup/pom.xml
+31
View File
@@ -27,6 +27,37 @@
<artifactId>jero-boot-base-generater</artifactId> <artifactId>jero-boot-base-generater</artifactId>
<version>${jero.version}</version> <version>${jero.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.jero.boot</groupId>
<artifactId>jero-boot-modules</artifactId>
<version>${jero.version}</version>
<exclusions>
<exclusion>
<artifactId>activation</artifactId>
<groupId>javax.activation</groupId>
</exclusion>
<exclusion>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>swagger-models</artifactId>
<groupId>io.swagger</groupId>
</exclusion>
<exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
<exclusion>
<artifactId>swagger-annotations</artifactId>
<groupId>io.swagger</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
<build> <build>