1.权限处理 2.新增分页获取通话记录接口，处理查询等条件

slibra-admin/src/main/java/com/slibra/web/controller/business/CityController.java

@@ -37,7 +37,7 @@ public class CityController extends BaseController
     /**
      * 查询全国省市区数据列表
      */
-    @PreAuthorize("@ss.hasPermi('business:city:list')")
+//    @PreAuthorize("@ss.hasPermi('business:city:list')")
     @GetMapping("/list")
     public TableDataInfo list(City city)
     {
@@ -49,7 +49,7 @@ public class CityController extends BaseController
     /**
      * 导出全国省市区数据列表
      */
-    @PreAuthorize("@ss.hasPermi('business:city:export')")
+//    @PreAuthorize("@ss.hasPermi('business:city:export')")
     @Log(title = "全国省市区数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, City city)
@@ -62,7 +62,7 @@ public class CityController extends BaseController
     /**
      * 获取全国省市区数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:city:query')")
+//    @PreAuthorize("@ss.hasPermi('business:city:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -72,7 +72,7 @@ public class CityController extends BaseController
     /**
      * 新增全国省市区数据
      */
-    @PreAuthorize("@ss.hasPermi('business:city:add')")
+//    @PreAuthorize("@ss.hasPermi('business:city:add')")
     @Log(title = "全国省市区数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody City city)
@@ -84,7 +84,7 @@ public class CityController extends BaseController
     /**
      * 修改全国省市区数据
      */
-    @PreAuthorize("@ss.hasPermi('business:city:edit')")
+//    @PreAuthorize("@ss.hasPermi('business:city:edit')")
     @Log(title = "全国省市区数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody City city)
@@ -96,7 +96,7 @@ public class CityController extends BaseController
     /**
      * 删除全国省市区数据
      */
-    @PreAuthorize("@ss.hasPermi('business:city:remove')")
+//    @PreAuthorize("@ss.hasPermi('business:city:remove')")
     @Log(title = "全国省市区数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)

slibra-admin/src/main/java/com/slibra/web/controller/business/FrontController.java

@@ -2,13 +2,17 @@ package com.slibra.web.controller.business;
 
 import com.alibaba.fastjson2.JSON;
 import com.slibra.business.domain.City;
+import com.slibra.business.domain.TCallRecord;
 import com.slibra.business.mapper.CityMapper;
+import com.slibra.business.mapper.TCallRecordMapper;
 import com.slibra.business.req.AiChatReq;
 import com.slibra.business.req.AiChatRes;
 import com.slibra.business.service.IFrontService;
 import com.slibra.common.core.controller.BaseController;
 import com.slibra.common.core.domain.AjaxResult;
 import com.slibra.common.core.domain.R;
+import com.slibra.common.core.page.TableDataInfo;
+import com.slibra.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,6 +34,9 @@ public class FrontController extends BaseController {
     @Autowired
     private CityMapper cityMapper;
 
+    @Autowired
+    private TCallRecordMapper tCallRecordMapper;
+
 
 
     /**
@@ -44,6 +51,19 @@ public class FrontController extends BaseController {
     }
 
 
+    /**
+     * 分页获取通话记录
+     * @param callRecordReq
+     * @return
+     */
+    @GetMapping("/getCallRecordPageList")
+    public TableDataInfo getCallRecordPageList(TCallRecord callRecordReq)
+    {
+        log.info("进入了 分页获取通话记录 接口");
+        startPage();
+        return getDataTable(tCallRecordMapper.selectTCallRecordList(callRecordReq));
+    }
+
 //    /**
 //     * 获取大屏的实时数据 + 统计数据
 //     * @return

slibra-admin/src/main/java/com/slibra/web/controller/business/TCallRecordController.java

@@ -37,7 +37,7 @@ public class TCallRecordController extends BaseController
     /**
      * 查询通话记录列表
      */
-    @PreAuthorize("@ss.hasPermi('business:record:list')")
+//    @PreAuthorize("@ss.hasPermi('business:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(TCallRecord tCallRecord)
     {
@@ -49,8 +49,8 @@ public class TCallRecordController extends BaseController
     /**
      * 导出通话记录列表
      */
-    @PreAuthorize("@ss.hasPermi('business:record:export')")
-    @Log(title = "通话记录", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('business:record:export')")
+//    @Log(title = "通话记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCallRecord tCallRecord)
     {
@@ -62,7 +62,7 @@ public class TCallRecordController extends BaseController
     /**
      * 获取通话记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:record:query')")
+//    @PreAuthorize("@ss.hasPermi('business:record:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,8 +72,8 @@ public class TCallRecordController extends BaseController
     /**
      * 新增通话记录
      */
-    @PreAuthorize("@ss.hasPermi('business:record:add')")
-    @Log(title = "通话记录", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('business:record:add')")
+//    @Log(title = "通话记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCallRecord tCallRecord)
     {
@@ -84,8 +84,8 @@ public class TCallRecordController extends BaseController
     /**
      * 修改通话记录
      */
-    @PreAuthorize("@ss.hasPermi('business:record:edit')")
-    @Log(title = "通话记录", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('business:record:edit')")
+//    @Log(title = "通话记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCallRecord tCallRecord)
     {
@@ -96,8 +96,8 @@ public class TCallRecordController extends BaseController
     /**
      * 删除通话记录
      */
-    @PreAuthorize("@ss.hasPermi('business:record:remove')")
-    @Log(title = "通话记录", businessType = BusinessType.DELETE)
+//    @PreAuthorize("@ss.hasPermi('business:record:remove')")
+//    @Log(title = "通话记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

slibra-admin/src/main/java/com/slibra/web/controller/business/TCutOffWaterController.java

@@ -37,7 +37,7 @@ public class TCutOffWaterController extends BaseController
     /**
      * 查询停水信息列表
      */
-    @PreAuthorize("@ss.hasPermi('business:water:list')")
+//    @PreAuthorize("@ss.hasPermi('business:water:list')")
     @GetMapping("/list")
     public TableDataInfo list(TCutOffWater tCutOffWater)
     {
@@ -49,8 +49,8 @@ public class TCutOffWaterController extends BaseController
     /**
      * 导出停水信息列表
      */
-    @PreAuthorize("@ss.hasPermi('business:water:export')")
-    @Log(title = "停水信息", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('business:water:export')")
+//    @Log(title = "停水信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCutOffWater tCutOffWater)
     {
@@ -62,7 +62,7 @@ public class TCutOffWaterController extends BaseController
     /**
      * 获取停水信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:water:query')")
+//    @PreAuthorize("@ss.hasPermi('business:water:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,8 +72,8 @@ public class TCutOffWaterController extends BaseController
     /**
      * 新增停水信息
      */
-    @PreAuthorize("@ss.hasPermi('business:water:add')")
-    @Log(title = "停水信息", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('business:water:add')")
+//    @Log(title = "停水信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCutOffWater tCutOffWater)
     {
@@ -84,8 +84,8 @@ public class TCutOffWaterController extends BaseController
     /**
      * 修改停水信息
      */
-    @PreAuthorize("@ss.hasPermi('business:water:edit')")
-    @Log(title = "停水信息", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('business:water:edit')")
+//    @Log(title = "停水信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCutOffWater tCutOffWater)
     {
@@ -96,8 +96,8 @@ public class TCutOffWaterController extends BaseController
     /**
      * 删除停水信息
      */
-    @PreAuthorize("@ss.hasPermi('business:water:remove')")
-    @Log(title = "停水信息", businessType = BusinessType.DELETE)
+//    @PreAuthorize("@ss.hasPermi('business:water:remove')")
+//    @Log(title = "停水信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

slibra-admin/src/main/java/com/slibra/web/controller/business/TNeighborhoodBuildingController.java

@@ -37,7 +37,7 @@ public class TNeighborhoodBuildingController extends BaseController
     /**
      * 查询楼号信息列表
      */
-    @PreAuthorize("@ss.hasPermi('business:building:list')")
+//    @PreAuthorize("@ss.hasPermi('business:building:list')")
     @GetMapping("/list")
     public TableDataInfo list(TNeighborhoodBuilding tNeighborhoodBuilding)
     {
@@ -49,8 +49,8 @@ public class TNeighborhoodBuildingController extends BaseController
     /**
      * 导出楼号信息列表
      */
-    @PreAuthorize("@ss.hasPermi('business:building:export')")
-    @Log(title = "楼号信息", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('business:building:export')")
+//    @Log(title = "楼号信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TNeighborhoodBuilding tNeighborhoodBuilding)
     {
@@ -62,7 +62,7 @@ public class TNeighborhoodBuildingController extends BaseController
     /**
      * 获取楼号信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:building:query')")
+//    @PreAuthorize("@ss.hasPermi('business:building:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,8 +72,8 @@ public class TNeighborhoodBuildingController extends BaseController
     /**
      * 新增楼号信息
      */
-    @PreAuthorize("@ss.hasPermi('business:building:add')")
-    @Log(title = "楼号信息", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('business:building:add')")
+//    @Log(title = "楼号信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TNeighborhoodBuilding tNeighborhoodBuilding)
     {
@@ -84,8 +84,8 @@ public class TNeighborhoodBuildingController extends BaseController
     /**
      * 修改楼号信息
      */
-    @PreAuthorize("@ss.hasPermi('business:building:edit')")
-    @Log(title = "楼号信息", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('business:building:edit')")
+//    @Log(title = "楼号信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TNeighborhoodBuilding tNeighborhoodBuilding)
     {
@@ -96,8 +96,8 @@ public class TNeighborhoodBuildingController extends BaseController
     /**
      * 删除楼号信息
      */
-    @PreAuthorize("@ss.hasPermi('business:building:remove')")
-    @Log(title = "楼号信息", businessType = BusinessType.DELETE)
+//    @PreAuthorize("@ss.hasPermi('business:building:remove')")
+//    @Log(title = "楼号信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

slibra-admin/src/main/java/com/slibra/web/controller/business/TNeighborhoodController.java

@@ -37,7 +37,7 @@ public class TNeighborhoodController extends BaseController
     /**
      * 查询服务小区列表
      */
-    @PreAuthorize("@ss.hasPermi('business:neighborhood:list')")
+//    @PreAuthorize("@ss.hasPermi('business:neighborhood:list')")
     @GetMapping("/list")
     public TableDataInfo list(TNeighborhood tNeighborhood)
     {
@@ -49,8 +49,8 @@ public class TNeighborhoodController extends BaseController
     /**
      * 导出服务小区列表
      */
-    @PreAuthorize("@ss.hasPermi('business:neighborhood:export')")
-    @Log(title = "服务小区", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('business:neighborhood:export')")
+//    @Log(title = "服务小区", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TNeighborhood tNeighborhood)
     {
@@ -62,7 +62,7 @@ public class TNeighborhoodController extends BaseController
     /**
      * 获取服务小区详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:neighborhood:query')")
+//    @PreAuthorize("@ss.hasPermi('business:neighborhood:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,8 +72,8 @@ public class TNeighborhoodController extends BaseController
     /**
      * 新增服务小区
      */
-    @PreAuthorize("@ss.hasPermi('business:neighborhood:add')")
-    @Log(title = "服务小区", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('business:neighborhood:add')")
+//    @Log(title = "服务小区", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TNeighborhood tNeighborhood)
     {
@@ -84,8 +84,8 @@ public class TNeighborhoodController extends BaseController
     /**
      * 修改服务小区
      */
-    @PreAuthorize("@ss.hasPermi('business:neighborhood:edit')")
-    @Log(title = "服务小区", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('business:neighborhood:edit')")
+//    @Log(title = "服务小区", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TNeighborhood tNeighborhood)
     {
@@ -96,8 +96,8 @@ public class TNeighborhoodController extends BaseController
     /**
      * 删除服务小区
      */
-    @PreAuthorize("@ss.hasPermi('business:neighborhood:remove')")
-    @Log(title = "服务小区", businessType = BusinessType.DELETE)
+//    @PreAuthorize("@ss.hasPermi('business:neighborhood:remove')")
+//    @Log(title = "服务小区", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

slibra-admin/src/main/java/com/slibra/web/controller/business/TPumpingStationController.java

@@ -37,7 +37,7 @@ public class TPumpingStationController extends BaseController
     /**
      * 查询泵站列表
      */
-    @PreAuthorize("@ss.hasPermi('business:station:list')")
+//    @PreAuthorize("@ss.hasPermi('business:station:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPumpingStation tPumpingStation)
     {
@@ -49,8 +49,8 @@ public class TPumpingStationController extends BaseController
     /**
      * 导出泵站列表
      */
-    @PreAuthorize("@ss.hasPermi('business:station:export')")
-    @Log(title = "泵站", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('business:station:export')")
+//    @Log(title = "泵站", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TPumpingStation tPumpingStation)
     {
@@ -62,7 +62,7 @@ public class TPumpingStationController extends BaseController
     /**
      * 获取泵站详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:station:query')")
+//    @PreAuthorize("@ss.hasPermi('business:station:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,8 +72,8 @@ public class TPumpingStationController extends BaseController
     /**
      * 新增泵站
      */
-    @PreAuthorize("@ss.hasPermi('business:station:add')")
-    @Log(title = "泵站", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('business:station:add')")
+//    @Log(title = "泵站", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPumpingStation tPumpingStation)
     {
@@ -84,8 +84,8 @@ public class TPumpingStationController extends BaseController
     /**
      * 修改泵站
      */
-    @PreAuthorize("@ss.hasPermi('business:station:edit')")
-    @Log(title = "泵站", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('business:station:edit')")
+//    @Log(title = "泵站", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPumpingStation tPumpingStation)
     {
@@ -96,8 +96,8 @@ public class TPumpingStationController extends BaseController
     /**
      * 删除泵站
      */
-    @PreAuthorize("@ss.hasPermi('business:station:remove')")
-    @Log(title = "泵站", businessType = BusinessType.DELETE)
+//    @PreAuthorize("@ss.hasPermi('business:station:remove')")
+//    @Log(title = "泵站", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

slibra-admin/src/main/java/com/slibra/web/controller/business/TPumpingStationNeighbourhoodNumberController.java

@@ -37,7 +37,7 @@ public class TPumpingStationNeighbourhoodNumberController extends BaseController
     /**
      * 查询泵站-小区楼号中间列表
      */
-    @PreAuthorize("@ss.hasPermi('business:number:list')")
+//    @PreAuthorize("@ss.hasPermi('business:number:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPumpingStationNeighbourhoodNumber tPumpingStationNeighbourhoodNumber)
     {
@@ -49,8 +49,8 @@ public class TPumpingStationNeighbourhoodNumberController extends BaseController
     /**
      * 导出泵站-小区楼号中间列表
      */
-    @PreAuthorize("@ss.hasPermi('business:number:export')")
-    @Log(title = "泵站-小区楼号中间", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('business:number:export')")
+//    @Log(title = "泵站-小区楼号中间", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TPumpingStationNeighbourhoodNumber tPumpingStationNeighbourhoodNumber)
     {
@@ -62,7 +62,7 @@ public class TPumpingStationNeighbourhoodNumberController extends BaseController
     /**
      * 获取泵站-小区楼号中间详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:number:query')")
+//    @PreAuthorize("@ss.hasPermi('business:number:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,8 +72,8 @@ public class TPumpingStationNeighbourhoodNumberController extends BaseController
     /**
      * 新增泵站-小区楼号中间
      */
-    @PreAuthorize("@ss.hasPermi('business:number:add')")
-    @Log(title = "泵站-小区楼号中间", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('business:number:add')")
+//    @Log(title = "泵站-小区楼号中间", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPumpingStationNeighbourhoodNumber tPumpingStationNeighbourhoodNumber)
     {
@@ -84,8 +84,8 @@ public class TPumpingStationNeighbourhoodNumberController extends BaseController
     /**
      * 修改泵站-小区楼号中间
      */
-    @PreAuthorize("@ss.hasPermi('business:number:edit')")
-    @Log(title = "泵站-小区楼号中间", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('business:number:edit')")
+//    @Log(title = "泵站-小区楼号中间", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPumpingStationNeighbourhoodNumber tPumpingStationNeighbourhoodNumber)
     {
@@ -96,8 +96,8 @@ public class TPumpingStationNeighbourhoodNumberController extends BaseController
     /**
      * 删除泵站-小区楼号中间
      */
-    @PreAuthorize("@ss.hasPermi('business:number:remove')")
-    @Log(title = "泵站-小区楼号中间", businessType = BusinessType.DELETE)
+//    @PreAuthorize("@ss.hasPermi('business:number:remove')")
+//    @Log(title = "泵站-小区楼号中间", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

slibra-admin/src/main/java/com/slibra/web/controller/business/TWhitelistController.java

@@ -37,7 +37,7 @@ public class TWhitelistController extends BaseController
     /**
      * 查询白名单配置列表
      */
-    @PreAuthorize("@ss.hasPermi('business:whitelist:list')")
+//    @PreAuthorize("@ss.hasPermi('business:whitelist:list')")
     @GetMapping("/list")
     public TableDataInfo list(TWhitelist tWhitelist)
     {
@@ -49,8 +49,8 @@ public class TWhitelistController extends BaseController
     /**
      * 导出白名单配置列表
      */
-    @PreAuthorize("@ss.hasPermi('business:whitelist:export')")
-    @Log(title = "白名单配置", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('business:whitelist:export')")
+//    @Log(title = "白名单配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TWhitelist tWhitelist)
     {
@@ -62,7 +62,7 @@ public class TWhitelistController extends BaseController
     /**
      * 获取白名单配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:whitelist:query')")
+//    @PreAuthorize("@ss.hasPermi('business:whitelist:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,8 +72,8 @@ public class TWhitelistController extends BaseController
     /**
      * 新增白名单配置
      */
-    @PreAuthorize("@ss.hasPermi('business:whitelist:add')")
-    @Log(title = "白名单配置", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('business:whitelist:add')")
+//    @Log(title = "白名单配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TWhitelist tWhitelist)
     {
@@ -84,8 +84,8 @@ public class TWhitelistController extends BaseController
     /**
      * 修改白名单配置
      */
-    @PreAuthorize("@ss.hasPermi('business:whitelist:edit')")
-    @Log(title = "白名单配置", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('business:whitelist:edit')")
+//    @Log(title = "白名单配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TWhitelist tWhitelist)
     {
@@ -96,8 +96,8 @@ public class TWhitelistController extends BaseController
     /**
      * 删除白名单配置
      */
-    @PreAuthorize("@ss.hasPermi('business:whitelist:remove')")
-    @Log(title = "白名单配置", businessType = BusinessType.DELETE)
+//    @PreAuthorize("@ss.hasPermi('business:whitelist:remove')")
+//    @Log(title = "白名单配置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

slibra-system/src/main/java/com/slibra/business/domain/TCallRecord.java

@@ -37,13 +37,13 @@ public class TCallRecord extends BaseEntity
     private Long serviceCategory;
 
     /** 通话发起时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "通话发起时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "通话发起时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date timeBegin;
 
     /** 通话结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "通话结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "通话结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date timeEnd;
 
     /** 通话时长（暂时按字符串接收） */

slibra-system/src/main/resources/mapper/business/TCallRecordMapper.xml

@@ -32,27 +32,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, type, user_id, user_name, service_category, time_begin, time_end, times, category, status, phone, bussiness_type, remark, has_parsed, parsed_voice_content, del_flag, revision, create_by, create_time, update_by, update_time from t_call_record
     </sql>
 
-    <select id="selectTCallRecordList" parameterType="TCallRecord" resultMap="TCallRecordResult">
-        <include refid="selectTCallRecordVo"/>
-        <where>
-            1 = 1
-            <if test="type != null "> and type = #{type}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="serviceCategory != null "> and service_category = #{serviceCategory}</if>
-            <if test="timeBegin != null "> and time_begin = #{timeBegin}</if>
-            <if test="timeEnd != null "> and time_end = #{timeEnd}</if>
-            <if test="times != null  and times != ''"> and times = #{times}</if>
-            <if test="category != null "> and category = #{category}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="bussinessType != null  and bussinessType != ''"> and bussiness_type = #{bussinessType}</if>
-            <if test="hasParsed != null "> and has_parsed = #{hasParsed}</if>
-            <if test="parsedVoiceContent != null  and parsedVoiceContent != ''"> and parsed_voice_content = #{parsedVoiceContent}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-        and del_flag = 0 order by id desc
-    </select>
     
     <select id="selectTCallRecordById" parameterType="Long" resultMap="TCallRecordResult">
         <include refid="selectTCallRecordVo"/>
@@ -147,4 +126,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <!-- 2024年11月12日09:51:10 下面是新增或者调整的，不允许覆盖 -->
+    <select id="selectTCallRecordList" parameterType="TCallRecord" resultMap="TCallRecordResult">
+        <include refid="selectTCallRecordVo"/>
+        <where>
+            1 = 1
+            <if test="type != null "> and type = #{type}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="serviceCategory != null "> and service_category = #{serviceCategory}</if>
+            <if test="timeBegin != null "> and time_begin &gt;= #{timeBegin}</if>
+            <if test="timeEnd != null "> and time_end &lt;= #{timeEnd}</if>
+            <if test="times != null  and times != ''"> and times = #{times}</if>
+            <if test="category != null "> and category = #{category}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
+            <if test="bussinessType != null  and bussinessType != ''"> and bussiness_type = #{bussinessType}</if>
+            <if test="hasParsed != null "> and has_parsed = #{hasParsed}</if>
+            <if test="parsedVoiceContent != null  and parsedVoiceContent != ''"> and parsed_voice_content = #{parsedVoiceContent}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
 </mapper>