Browse Source

添加定位权限、用户列表倒叙

Simon 1 year ago
parent
commit
c87588864e

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TElectronicFenceController.java

@@ -51,7 +51,7 @@ public class TElectronicFenceController extends BaseController {
     /**
      * 查询【请填写功能名称】列表
      */
-    @PreAuthorize("@ss.hasPermi('system:fence:list')")
+    @PreAuthorize("@ss.hasPermi('system:fence:listdevice')")
     @GetMapping("/list/device/{deviceId}")
     public TableDataInfo list(@PathVariable("deviceId") Long deviceId) {
         startPage();

+ 6 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TSearchLocationInfoController.java

@@ -66,6 +66,7 @@ public class TSearchLocationInfoController extends BaseController {
     /**
      * 搜索【请填写功能名称】列表
      */
+    @PreAuthorize("@ss.hasPermi('system:info:search')")
     @GetMapping("/search")
     public TableDataInfo search(TSearchLocationInfo tSearchLocationInfo) {
         tSearchLocationInfo.setUserId(getUserId());
@@ -77,6 +78,7 @@ public class TSearchLocationInfoController extends BaseController {
     /**
      * 导出【请填写功能名称】列表
      */
+    @PreAuthorize("@ss.hasPermi('system:info:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TSearchLocationInfo tSearchLocationInfo) {
@@ -88,6 +90,7 @@ public class TSearchLocationInfoController extends BaseController {
     /**
      * 获取【请填写功能名称】详细信息
      */
+    @PreAuthorize("@ss.hasPermi('system:info:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(tSearchLocationInfoService.selectTSearchLocationInfoById(id));
@@ -96,6 +99,7 @@ public class TSearchLocationInfoController extends BaseController {
     /**
      * 新增【请填写功能名称】
      */
+    @PreAuthorize("@ss.hasPermi('system:info:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSearchLocationInfo tSearchLocationInfo) {
@@ -105,6 +109,7 @@ public class TSearchLocationInfoController extends BaseController {
     /**
      * 修改【请填写功能名称】
      */
+    @PreAuthorize("@ss.hasPermi('system:info:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TSearchLocationInfo tSearchLocationInfo) {
@@ -114,6 +119,7 @@ public class TSearchLocationInfoController extends BaseController {
     /**
      * 删除【请填写功能名称】
      */
+    @PreAuthorize("@ss.hasPermi('system:info:remove')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

+ 1 - 0
ruoyi-system/src/main/resources/mapper/system/TUserProfileMapper.xml

@@ -132,6 +132,7 @@
             <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
             <if test="createTime != null ">and createtime = #{createTime}</if>
         </where>
+        order by createTime desc
     </select>
 
     <select id="selectTUserProfileById" parameterType="Integer" resultMap="TUserProfileTEmergentPeopleResult">