Merge remote-tracking branch '惠信/develop' into develop

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java

@@ -43,7 +43,6 @@ public class BaseAreaController extends ControllerBase {
      * @return
      */
     @PostMapping("getList")
-    @ApiMark(moduleName = "区域管理", apiName = "获取区域列表")
     public ApiResult<PageData<TBaseAreaVO>> getList(@RequestBody BaseAreaQuery query){
 //
         return adminBaseAreaService.getList(query);
@@ -55,7 +54,6 @@ public class BaseAreaController extends ControllerBase {
      * @return
      */
     @GetMapping("getChild")
-    @MethodInfoMark(value = "获取子级", menuName ="区域管理" )
     @ApiMark(moduleName = "区域管理", apiName = "获取子级")
     public ApiResult<List<TBaseAreaVO>> getChild(@RequestParam("parentId") Integer parentId ){
         List<TBaseArea> result = baseAreaService.lambdaQuery().eq(TBaseArea::getParentAreaRowId, parentId).list();

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java

@@ -50,7 +50,6 @@ public class CustomerController extends ControllerBase {
 
 
     @PostMapping("getList")
-    @MethodInfoMark(value = "获取客户列表" ,menuName = "客户管理")
     @ApiMark(moduleName = "客户管理", apiName = "获取客户列表")
     public ApiResult<PageData<TBaseCustomer>> getList(@RequestBody CustomerQuery query){
         Page<TBaseCustomer> result = baseCustomerService.getList(new Page<>(query.getPage(),query.getPageSize()), query);

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java

@@ -54,7 +54,6 @@ public class DepartmentController extends ControllerBase {
      * @return
      */
     @GetMapping("getChild")
-    @MethodInfoMark(value = "获取子级",menuName = "部门管理")
     @ApiMark(moduleName = "部门管理", apiName = "获取子级")
     public ApiResult<List<TBaseDepartment>> getChild(@RequestParam("parentId") Integer parentId ){
 

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java

@@ -56,7 +56,6 @@ public class DeviceComponentController extends ControllerBase {
      * @return
      */
     @PostMapping("getList")
-    @MethodInfoMark(value = "获取设备机型列表", menuName = "机型部件")
     @ApiMark(moduleName = "机型部件管理", apiName = "获取设备机型列表")
     public ApiResult<PageData<DeviceComponent>> getList(@RequestBody DeviceComponentQuery query){
         Page<DeviceComponent> result = deviceComponentService.selectListByPage(query);
@@ -69,7 +68,6 @@ public class DeviceComponentController extends ControllerBase {
      * @return
      */
     @GetMapping("getModelPartList")
-    @MethodInfoMark(value = "获取机型部件列表", menuName = "机型部件")
     @ApiMark(moduleName = "机型部件管理", apiName = "获取机型部件列表")
     public ApiResult<List<DeviceComponentDetailDTO>> getModelPartList(@RequestParam("deviceComponentId") Integer deviceComponentId){
         if (deviceComponentId == null) {
@@ -138,7 +136,6 @@ public class DeviceComponentController extends ControllerBase {
      * @return
      */
     @PostMapping("importData")
-    @MethodInfoMark(value = "导入部件",menuName = "机型部件")
     @ApiMark(moduleName = "机型部件管理", apiName = "导入部件")
     public ApiResult<Boolean> importData( @RequestParam(value = "file") MultipartFile file){
 
@@ -160,7 +157,6 @@ public class DeviceComponentController extends ControllerBase {
      * @throws IOException
      */
     @GetMapping("exportData")
-    @MethodInfoMark(value = "导出部件",menuName = "机型部件")
     @ApiMark(moduleName = "机型部件管理", apiName = "导出部件")
     public void exportData(HttpServletResponse response) throws IOException {
         EecExcelUtil.setResponseExcelHeader(response,"部件列表");

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java

@@ -39,7 +39,6 @@ public class DeviceTypeController extends ControllerBase {
      * @return
      */
     @PostMapping("getList")
-    @MethodInfoMark(value = "获取设备类型列表" ,menuName = "设备类型")
     @ApiMark(moduleName = "设备类型管理", apiName = "获取设备类型列表")
     public ApiResult<PageData<TBaseDeviceTypeVO>> getList(@RequestBody DeviceTypeQuery query){
         Page<TBaseDeviceType> result = baseDeviceTypeService.getList(new Page<>(query.getPage(),query.getPageSize()), query);
@@ -71,7 +70,6 @@ public class DeviceTypeController extends ControllerBase {
      * @return
      */
     @PostMapping("getDeviceTypeForDataSource")
-    @MethodInfoMark(value = "获取设备类型-下拉数据源" ,menuName = "设备类型")
     @ApiMark(moduleName = "设备类型管理", apiName = "获取设备类型-下拉数据源")
     public ApiResult<List<String>> getDeviceTypeForDataSource(){
         return ApiResult.success(baseDeviceTypeService.getDistinctDeviceType());
@@ -83,7 +81,6 @@ public class DeviceTypeController extends ControllerBase {
      * @return
      */
     @PostMapping("getCqmPersonList")
-    @MethodInfoMark(value = "获取客户质量管理人" ,menuName = "设备类型")
     @ApiMark(moduleName = "设备类型管理", apiName = "获取客户质量管理人")
     public ApiResult<List<String>> getCqmPersonList(){
         return ApiResult.success(ImmutableList.of("CQM001","CQM002"));

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java

@@ -1,18 +1,23 @@
 package com.nflg.mobilebroken.admin.controller;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.mobilebroken.admin.annotation.ApiMark;
 import com.nflg.mobilebroken.admin.pojo.query.RequestLogQuery;
+import com.nflg.mobilebroken.common.constant.STATE;
 import com.nflg.mobilebroken.common.pojo.ApiResult;
 import com.nflg.mobilebroken.common.pojo.PageData;
+import com.nflg.mobilebroken.common.util.VUtils;
 import com.nflg.mobilebroken.repository.entity.TBaseRequestLog;
 import com.nflg.mobilebroken.repository.entity.TBaseRequestLogDetail;
 import com.nflg.mobilebroken.repository.service.ITBaseRequestLogDetailService;
 import com.nflg.mobilebroken.repository.service.ITBaseRequestLogService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 日志管理
@@ -34,7 +39,6 @@ public class RequestLogController extends ControllerBase {
      * @return
      */
     @PostMapping("getList")
-    @ApiMark(moduleName = "日志管理", apiName = "获取日志列表")
     public ApiResult<PageData<TBaseRequestLog>> getList(@RequestBody RequestLogQuery query){
 
         Page<TBaseRequestLog> result = logService.getList(new Page<>(query.getPage(), query.getPageSize()), query);
@@ -47,11 +51,28 @@ public class RequestLogController extends ControllerBase {
      * @return
      */
     @GetMapping("getLogDetail")
-    @ApiMark(moduleName = "日志管理", apiName = "获取日志详情")
+
     public ApiResult<TBaseRequestLogDetail> getLogDetail(@RequestParam("id") Long id){
         TBaseRequestLogDetail logDetail = logDetailService.getById(id);
         return ApiResult.success(logDetail);
     }
 
+    /**
+     * 清除日志
+     * @param rowIds
+     * @return
+     */
+    @PostMapping("del")
+    @Transactional(rollbackFor = Exception.class)
+    public ApiResult<Boolean> del(@RequestBody List<Long>  rowIds){
+
+        VUtils.trueThrow(CollUtil.isEmpty(rowIds)).throwMessage(STATE.ParamErr,"请选择要删除的行");
+        logService.getBaseMapper().deleteByIds(rowIds);
+
+        logDetailService.getBaseMapper().deleteByIds(rowIds);
+        return ApiResult.success(true);
+
+    }
+
 
 }

nflg-mobilebroken-repository/src/main/resources/mapper/TBaseRequestLogMapper.xml

@@ -26,7 +26,7 @@
     </select>
 
     <delete id="delByIds">
-        delete from t_base_request_log where id in
+        delete from t_base_request_log where row_id in
         <foreach collection="ids" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>