refactor(os-admin, os-ems): 调整 Redis 主机配置并修复权限控制和sql排序问题

- 将 Redis 主机配置从 175.27.215.92 修改为 127.0.0.1
- 修正权限控制相关的表达式,将 'ems.base' 修改为 'ems/base'
- 在 EmsVibrationInstantMapper.xml 中修改查询结果的排序方式,从 collectTime 改为 objId
boardTest
zch 2 months ago
parent 31c2b862eb
commit ab522c45f6

@ -80,7 +80,7 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 175.27.215.92 host: 127.0.0.1
# 端口默认为6379 # 端口默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引

@ -37,7 +37,7 @@ public class EmsBaseEnergyTypeController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:list')") @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(EmsBaseEnergyType emsBaseEnergyType) public TableDataInfo list(EmsBaseEnergyType emsBaseEnergyType)
{ {
@ -70,7 +70,7 @@ public class EmsBaseEnergyTypeController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:export')") @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:export')")
@Log(title = "能源类型信息", businessType = BusinessType.EXPORT) @Log(title = "能源类型信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, EmsBaseEnergyType emsBaseEnergyType) public void export(HttpServletResponse response, EmsBaseEnergyType emsBaseEnergyType)
@ -83,7 +83,7 @@ public class EmsBaseEnergyTypeController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:query')") @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:query')")
@GetMapping(value = "/{objId}") @GetMapping(value = "/{objId}")
public AjaxResult getInfo(@PathVariable("objId") Long objId) public AjaxResult getInfo(@PathVariable("objId") Long objId)
{ {
@ -93,7 +93,7 @@ public class EmsBaseEnergyTypeController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:add')") @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:add')")
@Log(title = "能源类型信息", businessType = BusinessType.INSERT) @Log(title = "能源类型信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody EmsBaseEnergyType emsBaseEnergyType) public AjaxResult add(@RequestBody EmsBaseEnergyType emsBaseEnergyType)
@ -104,7 +104,7 @@ public class EmsBaseEnergyTypeController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:edit')") @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:edit')")
@Log(title = "能源类型信息", businessType = BusinessType.UPDATE) @Log(title = "能源类型信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody EmsBaseEnergyType emsBaseEnergyType) public AjaxResult edit(@RequestBody EmsBaseEnergyType emsBaseEnergyType)
@ -115,7 +115,7 @@ public class EmsBaseEnergyTypeController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:remove')") @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:remove')")
@Log(title = "能源类型信息", businessType = BusinessType.DELETE) @Log(title = "能源类型信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{objIds}") @DeleteMapping("/{objIds}")
public AjaxResult remove(@PathVariable Long[] objIds) public AjaxResult remove(@PathVariable Long[] objIds)

@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''"> <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
and rdi.collectTime between #{params.beginRecordTime} and #{params.endRecordTime}</if> and rdi.collectTime between #{params.beginRecordTime} and #{params.endRecordTime}</if>
</where> </where>
order by rdi.collectTime order by rdi.objId
</select> </select>

Loading…
Cancel
Save