fuliqi
2024-03-07 aba05c3bc6cd5ef5c48b268d557fc85a11ad0fae
Merge remote-tracking branch 'origin/master'
8个文件已修改
77 ■■■■■ 已修改文件
ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/application-dev.yml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/application-prod.yml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/application.yml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java
@@ -31,7 +31,7 @@
    /**
     * 查询考核发布列表
     */
    @PreAuthorize("@ss.hasPermi('system:publish:list')")
//    @PreAuthorize("@ss.hasPermi('system:publish:list')")
    @GetMapping("/list")
    public TableDataInfo list(TCheckPublish tCheckPublish)
    {
@@ -43,7 +43,7 @@
    /**
     * 导出考核发布列表
     */
    @PreAuthorize("@ss.hasPermi('system:publish:export')")
//    @PreAuthorize("@ss.hasPermi('system:publish:export')")
    @Log(title = "考核发布", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, TCheckPublish tCheckPublish)
@@ -56,7 +56,7 @@
    /**
     * 获取考核发布详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:publish:query')")
//    @PreAuthorize("@ss.hasPermi('system:publish:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -66,7 +66,7 @@
    /**
     * 新增考核发布
     */
    @PreAuthorize("@ss.hasPermi('system:publish:add')")
//    @PreAuthorize("@ss.hasPermi('system:publish:add')")
    @Log(title = "考核发布", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody TCheckPublish tCheckPublish)
@@ -77,7 +77,7 @@
    /**
     * 修改考核发布
     */
    @PreAuthorize("@ss.hasPermi('system:publish:edit')")
//    @PreAuthorize("@ss.hasPermi('system:publish:edit')")
    @Log(title = "考核发布", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody TCheckPublish tCheckPublish)
@@ -88,7 +88,7 @@
    /**
     * 删除考核发布
     */
    @PreAuthorize("@ss.hasPermi('system:publish:remove')")
//    @PreAuthorize("@ss.hasPermi('system:publish:remove')")
    @Log(title = "考核发布", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
@@ -31,7 +31,7 @@
    /**
     * 查询设备资产列表
     */
    @PreAuthorize("@ss.hasPermi('system:monitor:list')")
//    @PreAuthorize("@ss.hasPermi('system:monitor:list')")
    @GetMapping("/list")
    public TableDataInfo list(TMonitor tMonitor)
    {
@@ -43,7 +43,7 @@
    /**
     * 导出设备资产列表
     */
    @PreAuthorize("@ss.hasPermi('system:monitor:export')")
//    @PreAuthorize("@ss.hasPermi('system:monitor:export')")
    @Log(title = "设备资产", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, TMonitor tMonitor)
@@ -56,7 +56,7 @@
    /**
     * 获取设备资产详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:monitor:query')")
//    @PreAuthorize("@ss.hasPermi('system:monitor:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -66,7 +66,7 @@
    /**
     * 新增设备资产
     */
    @PreAuthorize("@ss.hasPermi('system:monitor:add')")
//    @PreAuthorize("@ss.hasPermi('system:monitor:add')")
    @Log(title = "设备资产", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody TMonitor tMonitor)
@@ -77,7 +77,7 @@
    /**
     * 修改设备资产
     */
    @PreAuthorize("@ss.hasPermi('system:monitor:edit')")
//    @PreAuthorize("@ss.hasPermi('system:monitor:edit')")
    @Log(title = "设备资产", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody TMonitor tMonitor)
@@ -88,7 +88,7 @@
    /**
     * 删除设备资产
     */
    @PreAuthorize("@ss.hasPermi('system:monitor:remove')")
//    @PreAuthorize("@ss.hasPermi('system:monitor:remove')")
    @Log(title = "设备资产", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
@@ -54,7 +54,7 @@
        return ywPeopleService.remove(ids);
    }
    @PreAuthorize("@ss.hasPermi('unit:people:page')")
//    @PreAuthorize("@ss.hasPermi('unit:people:page')")
    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(YwPeopleQuery query) {
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -62,7 +62,7 @@
        return ywPointService.remove(ids);
    }
    @PreAuthorize("@ss.hasPermi('point:page')")
//    @PreAuthorize("@ss.hasPermi('point:page')")
    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(YwPointQuery query) {
ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -55,7 +55,7 @@
        return ywUnitService.remove(ids);
    }
    @PreAuthorize("@ss.hasPermi('unit:list')")
//    @PreAuthorize("@ss.hasPermi('unit:list')")
    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(@RequestBody YwUnitQuery query) {
ycl-server/src/main/resources/application-dev.yml
@@ -1,3 +1,19 @@
# 项目相关配置
platform:
  # 名称
  name: zgyw
  # 版本
  version: 1.0.0
  # 版权年份
  copyrightYear: 2024
  # 文件路径 示例( Windows配置D:/zgyw/uploadPath,Linux配置 /home/zgyw/uploadPath)
  profile: D:/zgyw/uploadPath
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数字计算 char 字符验证
  captchaType: math
# 开发环境配置
server:
  # 服务器的HTTP端口,默认为8080
ycl-server/src/main/resources/application-prod.yml
@@ -1,3 +1,19 @@
# 项目相关配置
platform:
  # 名称
  name: zgyw
  # 版本
  version: 1.0.0
  # 版权年份
  copyrightYear: 2024
  # 文件路径 示例( Windows配置D:/zgyw/uploadPath,Linux配置 /home/zgyw/uploadPath)
  profile: /home/zgyw/uploadPath
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数字计算 char 字符验证
  captchaType: math
# 开发环境配置
server:
  # 服务器的HTTP端口,默认为8080
ycl-server/src/main/resources/application.yml
@@ -1,17 +1,4 @@
# 项目相关配置
platform:
  # 名称
  name: zgyw
  # 版本
  version: 1.0.0
  # 版权年份
  copyrightYear: 2024
  # 文件路径 示例( Windows配置D:/zgyw/uploadPath,Linux配置 /home/zgyw/uploadPath)
  profile: D:/zgyw/uploadPath
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数字计算 char 字符验证
  captchaType: math
spring:
  # 资源信息