Commit cc8c4712c57e83a5af2a495def3cf564b0aae1ab

Authored by guzijian
1 parent 97694da9

fix: add new ability

redis-dockerfile
... ... @@ -2,6 +2,6 @@ FROM redis:6.2
2 2 MAINTAINER guzijian
3 3 EXPOSE 6379
4 4 # 设置Redis快照
5   -RUN sed -i 's/^# save ""/save 900 1\nsave 300 10\nsave 60 10000/g' /etc/redis/redis.conf
  5 +# RUN sed -i 's/^# save ""/save 900 1\nsave 300 10\nsave 60 10000/g' /etc/redis/redis.conf
6 6 # 确保启动时使用容器内的配置
7 7 CMD ["redis-server", "/etc/redis/redis.conf"]
8 8 \ No newline at end of file
... ...
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
... ... @@ -49,7 +49,7 @@ public class RuoYiApplication {
49 49 String sqlUrl = env.getProperty("spring.datasource.druid.master.url");
50 50 List<String> sqlInfo = getSqlInfo(sqlUrl);
51 51 log.info(
52   - "\n Swagger访问地址:http://" + ip + ":" + port + path + "swagger-ui/index.html \n" +
  52 + "\n Swagger访问地址:http://" + ip + ":" + port + path + "doc.html \n" +
53 53 " Redis服务器地址:" + redisHost + ":" + redisPort + "\n" +
54 54 " Mysql服务器地址:" + sqlInfo.get(0) + ":" + sqlInfo.get(1));
55 55 }
... ...
ruoyi-admin/src/main/java/com/ruoyi/eexception/controller/EquipmentExceptionController.java
... ... @@ -2,6 +2,9 @@ package com.ruoyi.eexception.controller;
2 2  
3 3 import java.util.List;
4 4 import javax.servlet.http.HttpServletResponse;
  5 +
  6 +import io.swagger.annotations.Api;
  7 +import io.swagger.annotations.ApiOperation;
5 8 import org.springframework.security.access.prepost.PreAuthorize;
6 9 import org.springframework.beans.factory.annotation.Autowired;
7 10 import org.springframework.web.bind.annotation.GetMapping;
... ... @@ -29,6 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
29 32 */
30 33 @RestController
31 34 @RequestMapping("/eexception/eexception")
  35 +@Api(tags = "异常设备管理")
32 36 public class EquipmentExceptionController extends BaseController
33 37 {
34 38 @Autowired
... ... @@ -39,6 +43,7 @@ public class EquipmentExceptionController extends BaseController
39 43 */
40 44 @PreAuthorize("@ss.hasPermi('eexception:eexception:list')")
41 45 @GetMapping("/list")
  46 + @ApiOperation("查询设备异常记录列表")
42 47 public TableDataInfo list(EquipmentException equipmentException)
43 48 {
44 49 startPage();
... ... @@ -52,6 +57,7 @@ public class EquipmentExceptionController extends BaseController
52 57 @PreAuthorize("@ss.hasPermi('eexception:eexception:export')")
53 58 @Log(title = "设备异常记录", businessType = BusinessType.EXPORT)
54 59 @PostMapping("/export")
  60 + @ApiOperation("导出设备异常记录列表")
55 61 public void export(HttpServletResponse response, EquipmentException equipmentException)
56 62 {
57 63 List<EquipmentException> list = equipmentExceptionService.selectEquipmentExceptionList(equipmentException);
... ... @@ -64,6 +70,7 @@ public class EquipmentExceptionController extends BaseController
64 70 */
65 71 @PreAuthorize("@ss.hasPermi('eexception:eexception:query')")
66 72 @GetMapping(value = "/{id}")
  73 + @ApiOperation("获取设备异常记录详细信息")
67 74 public AjaxResult getInfo(@PathVariable("id") Long id)
68 75 {
69 76 return success(equipmentExceptionService.selectEquipmentExceptionById(id));
... ... @@ -75,6 +82,7 @@ public class EquipmentExceptionController extends BaseController
75 82 @PreAuthorize("@ss.hasPermi('eexception:eexception:add')")
76 83 @Log(title = "设备异常记录", businessType = BusinessType.INSERT)
77 84 @PostMapping
  85 + @ApiOperation("新增设备异常记录")
78 86 public AjaxResult add(@RequestBody EquipmentException equipmentException)
79 87 {
80 88 return toAjax(equipmentExceptionService.insertEquipmentException(equipmentException));
... ... @@ -86,6 +94,7 @@ public class EquipmentExceptionController extends BaseController
86 94 @PreAuthorize("@ss.hasPermi('eexception:eexception:edit')")
87 95 @Log(title = "设备异常记录", businessType = BusinessType.UPDATE)
88 96 @PutMapping
  97 + @ApiOperation("修改设备异常记录")
89 98 public AjaxResult edit(@RequestBody EquipmentException equipmentException)
90 99 {
91 100 return toAjax(equipmentExceptionService.updateEquipmentException(equipmentException));
... ... @@ -97,6 +106,7 @@ public class EquipmentExceptionController extends BaseController
97 106 @PreAuthorize("@ss.hasPermi('eexception:eexception:remove')")
98 107 @Log(title = "设备异常记录", businessType = BusinessType.DELETE)
99 108 @DeleteMapping("/{ids}")
  109 + @ApiOperation("删除设备异常记录")
100 110 public AjaxResult remove(@PathVariable Long[] ids)
101 111 {
102 112 return toAjax(equipmentExceptionService.deleteEquipmentExceptionByIds(ids));
... ...
ruoyi-admin/src/main/java/com/ruoyi/equipment/controller/EquipmentController.java
... ... @@ -3,6 +3,7 @@ package com.ruoyi.equipment.controller;
3 3 import java.util.List;
4 4 import javax.servlet.http.HttpServletResponse;
5 5  
  6 +import io.swagger.annotations.Api;
6 7 import io.swagger.annotations.ApiOperation;
7 8 import org.springframework.security.access.prepost.PreAuthorize;
8 9 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -31,6 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
31 32 */
32 33 @RestController
33 34 @RequestMapping("/equipment/equipment")
  35 +@Api(tags = "设备信息管理")
34 36 public class EquipmentController extends BaseController
35 37 {
36 38 @Autowired
... ...
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
... ... @@ -3,6 +3,7 @@ package com.ruoyi.in.controller;
3 3 import java.util.List;
4 4 import javax.servlet.http.HttpServletResponse;
5 5  
  6 +import io.swagger.annotations.Api;
6 7 import io.swagger.annotations.ApiOperation;
7 8 import org.springframework.security.access.prepost.PreAuthorize;
8 9 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -31,6 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
31 32 */
32 33 @RestController
33 34 @RequestMapping("/in/in")
  35 +@Api(tags = "签到管理")
34 36 public class SignInController extends BaseController
35 37 {
36 38 @Autowired
... ...