diff --git a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java
index 62bd8ea..53f1086 100644
--- a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java
+++ b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java
@@ -48,7 +48,7 @@ public class SysPasswordService
     public void validate(SysUser user, String password)
     {
         long startTime = System.currentTimeMillis();
-        String username = user.getUserName();
+        String username = user.getNickName();
         Integer retryCount=redisService.getIntVal(username);
         if(retryCount>ERROR_TIMES){
             long time=redisService.getExpireTimes(username);
diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java
index c7220fe..a14d3e1 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java
@@ -2,6 +2,7 @@ package com.securitycontrol.entity.screen.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.omg.CORBA.PRIVATE_MEMBER;
 
 /**
  * 告警管理
@@ -23,4 +24,13 @@ public class AlarmMgeDto extends ScreenParamDto {
 
     @ApiModelProperty(value = "告警类型")
     private String warnType;
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "处理人")
+    private String  userName;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 }
diff --git a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java
index 58f70e5..7fcdffa 100644
--- a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java
+++ b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java
@@ -49,18 +49,19 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
 
     public  static  String  ur="/";
     /**
-     * 放权的请求 -公共的请求
+     * 越权 放权的请求 指定的前缀 -公共的请求+数据接口
      */
-    public static String WHITE_URL="/sys/select/";
+    public static String[] WHITE_URL=new String[]{"/sys/select/","/dataCenter/inter/"};
+
     /**
-     * 白名单路径
+     * 越权白名单路径->指定的路径
      */
     public  static String[] WHITE_URLS= new String[]{"/sys/sysLog/addLogs"};
 
     /**
-     * 大屏路径拦截
+     * 越权 大屏路径拦截-指定的前缀拦截
      */
-    public  static String[] SC_URL= new String[]{"/largeScreen/xcIndex/"};
+    public  static String[] SC_URL= new String[]{"/largeScreen/accessMge/","/largeScreen/alarmMge/","/largeScreen/constructionQuality/","/largeScreen/operatingEnvironment/","/largeScreen/personnelControl/","/largeScreen/scIndex/","/largeScreen/towerAssInspect/","/largeScreen/video/","/largeScreen/xcIndex/"};
 
 
     private final String whiteURL = "http://127.0.0.1:18080/";
@@ -194,8 +195,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
         if(urls.length>4){
             requestUri=ur+urls[1]+ur+urls[2]+ur+urls[3];
         }else {
-           String selected=ur+urls[1]+ur+urls[2]+ur;
-            if(selected.equals(WHITE_URL)){
+             String selected=ur+urls[1]+ur+urls[2]+ur;
+            if(Arrays.asList(WHITE_URL).contains(selected)){
                 return true;
             }else  if(Arrays.asList(SC_URL).contains(selected)){
                   requestUri=selected;
diff --git a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java
index ab53796..16c6060 100644
--- a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java
+++ b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java
@@ -42,7 +42,7 @@ class RsaDecryptResponseGatewayFilterFactory extends AbstractGatewayFilterFactor
     public    boolean jaData;
 
     public final static String HEARD_NAME="decrypt";
-
+    public final static String CONTENT_TYPE="content-type";
     public final static String PARAMS="params";
 
     @Override
@@ -69,9 +69,11 @@ class RsaDecryptResponseGatewayFilterFactory extends AbstractGatewayFilterFactor
                     }
                 }
             }
+
             if (!HttpMethod.POST.matches(serverHttpRequest.getMethodValue())) {//非 post请求
                 return chain.filter(exchange);
             }
+
             byte[] decrypBytes;
             GatewayContext gatewayContext = exchange.getAttribute(GatewayContext.CACHE_GATEWAY_CONTEXT);
             if(StrUtil.isBlank(gatewayContext.getCacheBody())){
diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java
index a45ed9b..fbffab2 100644
--- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java
+++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java
@@ -18,7 +18,7 @@ import java.util.List;
  * @author lsun
  */
 @RestController
-@RequestMapping("/dataCenter/")
+@RequestMapping("/dataCenter/inter/")
 @Slf4j
 public class BdController  {
 
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/DownLoadFileController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DownLoadFileController.java
similarity index 74%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/DownLoadFileController.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DownLoadFileController.java
index eb44de5..e706443 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/DownLoadFileController.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DownLoadFileController.java
@@ -1,19 +1,32 @@
-package com.securitycontrol.system.base.controller;
+package com.securitycontrol.background.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import com.securitycontrol.background.service.IProService;
+import com.securitycontrol.common.core.utils.ExcelStyleUtil;
 import com.securitycontrol.common.log.annotation.Log;
 import com.securitycontrol.common.log.enums.OperationType;
+import com.securitycontrol.entity.system.base.dto.ProDto;
+import com.securitycontrol.entity.system.base.vo.ProVo;
+import com.securitycontrol.system.export.entity.ProExportVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.util.IOUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author：cwchen
@@ -46,4 +59,6 @@ public class DownLoadFileController {
             log.error("工程模板-下载失败", e);
         }
     }
+
+
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ProController.java
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProController.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ProController.java
index c5e8b22..751cafa 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProController.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ProController.java
@@ -1,5 +1,6 @@
-package com.securitycontrol.system.base.controller;
+package com.securitycontrol.background.controller;
 
+import com.securitycontrol.background.service.IProService;
 import com.securitycontrol.common.core.web.controller.BaseController;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.core.web.page.TableDataInfo;
@@ -9,7 +10,6 @@ import com.securitycontrol.entity.system.base.dto.GxPlanDto;
 import com.securitycontrol.entity.system.base.dto.ProDto;
 import com.securitycontrol.entity.system.base.vo.GxPlanVo;
 import com.securitycontrol.entity.system.base.vo.ProVo;
-import com.securitycontrol.system.base.service.IProService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -29,7 +29,7 @@ import java.util.List;
 @RequestMapping("/sys/pro/")
 public class ProController extends BaseController {
 
-    @Resource(name = "IProService")
+    @Resource
     private IProService service;
 
     @ApiOperation(value = "获取工程列表")
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProScheduleController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ProScheduleController.java
similarity index 94%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProScheduleController.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ProScheduleController.java
index 547d8c7..5d6c69d 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProScheduleController.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ProScheduleController.java
@@ -1,5 +1,6 @@
-package com.securitycontrol.system.base.controller;
+package com.securitycontrol.background.controller;
 
+import com.securitycontrol.background.service.IProScheduleService;
 import com.securitycontrol.common.core.web.controller.BaseController;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.core.web.page.TableDataInfo;
@@ -10,7 +11,6 @@ import com.securitycontrol.entity.system.base.dto.ProScheduleDto;
 import com.securitycontrol.entity.system.base.vo.GxPlanProgressVo;
 import com.securitycontrol.entity.system.base.vo.GxPlanVo;
 import com.securitycontrol.entity.system.base.vo.ProScheduleVo;
-import com.securitycontrol.system.base.service.IProScheduleService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,7 +27,7 @@ import java.util.List;
 @RequestMapping("/base/proSchedule/")
 public class ProScheduleController extends BaseController {
 
-    @Resource(name = "IProScheduleService")
+    @Resource
     private IProScheduleService service;
 
     @ApiOperation(value = "获取工程进度列表")
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/TeamQuEvalController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TeamQuEvalController.java
similarity index 95%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/TeamQuEvalController.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TeamQuEvalController.java
index 3aa4ff3..477a6e5 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/TeamQuEvalController.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TeamQuEvalController.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.controller;
+package com.securitycontrol.background.controller;
 
 import com.securitycontrol.common.core.web.controller.BaseController;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
@@ -7,7 +7,7 @@ import com.securitycontrol.common.log.annotation.Log;
 import com.securitycontrol.common.log.enums.OperationType;
 import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;
 import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo;
-import com.securitycontrol.system.base.service.ITeamQuEvalService;
+import com.securitycontrol.background.service.ITeamQuEvalService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IProMapper.java
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IProMapper.java
index 9124c34..93e78f8 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IProMapper.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.mapper;
+package com.securitycontrol.background.mapper;
 
 import com.securitycontrol.entity.system.base.dto.GxPlanDto;
 import com.securitycontrol.entity.system.base.dto.ProDto;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProScheduleMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IProScheduleMapper.java
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProScheduleMapper.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IProScheduleMapper.java
index 8646d47..adec17a 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProScheduleMapper.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IProScheduleMapper.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.mapper;
+package com.securitycontrol.background.mapper;
 
 import com.securitycontrol.entity.system.base.dto.GxPlanDto;
 import com.securitycontrol.entity.system.base.dto.ProScheduleDto;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ITeamQuEvalMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/ITeamQuEvalMapper.java
similarity index 96%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ITeamQuEvalMapper.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/ITeamQuEvalMapper.java
index d8c9369..faddb61 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ITeamQuEvalMapper.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/ITeamQuEvalMapper.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.mapper;
+package com.securitycontrol.background.mapper;
 
 import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;
 import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProScheduleService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IProScheduleService.java
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProScheduleService.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IProScheduleService.java
index e450a6a..a360edb 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProScheduleService.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IProScheduleService.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service;
+package com.securitycontrol.background.service;
 
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.base.dto.GxPlanDto;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IProService.java
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProService.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IProService.java
index 0a23b5d..4c35665 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProService.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IProService.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service;
+package com.securitycontrol.background.service;
 
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.base.dto.GxPlanDto;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ITeamQuEvalService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/ITeamQuEvalService.java
similarity index 96%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ITeamQuEvalService.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/ITeamQuEvalService.java
index 2e0b8dd..4658f5a 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ITeamQuEvalService.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/ITeamQuEvalService.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service;
+package com.securitycontrol.background.service;
 
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/ProScheduleServiceImpl.java
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/ProScheduleServiceImpl.java
index 42e8bfb..1d6e315 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/ProScheduleServiceImpl.java
@@ -1,5 +1,6 @@
-package com.securitycontrol.system.base.service.impl;
+package com.securitycontrol.background.service.impl;
 
+import com.securitycontrol.background.service.IProScheduleService;
 import com.securitycontrol.common.core.constant.Constant;
 import com.securitycontrol.common.core.utils.StringUtils;
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
@@ -11,8 +12,7 @@ import com.securitycontrol.entity.system.base.dto.ProScheduleDto;
 import com.securitycontrol.entity.system.base.vo.GxPlanProgressVo;
 import com.securitycontrol.entity.system.base.vo.GxPlanVo;
 import com.securitycontrol.entity.system.base.vo.ProScheduleVo;
-import com.securitycontrol.system.base.mapper.IProScheduleMapper;
-import com.securitycontrol.system.base.service.IProScheduleService;
+import com.securitycontrol.background.mapper.IProScheduleMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -39,7 +39,7 @@ public class ProScheduleServiceImpl implements IProScheduleService {
     @Resource(name = "IProScheduleMapper")
     private IProScheduleMapper mapper;
 
-    @Resource(name = "ValidatorsUtils")
+    @Resource
     private ValidatorsUtils validatorsUtils;
 
     @Override
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/ProServiceImpl.java
similarity index 99%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/ProServiceImpl.java
index 5cfa787..e815dbc 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/ProServiceImpl.java
@@ -1,8 +1,9 @@
-package com.securitycontrol.system.base.service.impl;
+package com.securitycontrol.background.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.securitycontrol.background.service.IProService;
 import com.securitycontrol.common.core.constant.Constant;
 import com.securitycontrol.common.core.constant.HttpStatus;
 import com.securitycontrol.common.core.constant.SecurityConstants;
@@ -21,8 +22,7 @@ import com.securitycontrol.entity.system.base.vo.ProVo;
 import com.securitycontrol.entity.system.vo.ResourceFileVo;
 import com.securitycontrol.system.api.RemoteFileService;
 import com.securitycontrol.system.api.domain.SysFile;
-import com.securitycontrol.system.base.mapper.IProMapper;
-import com.securitycontrol.system.base.service.IProService;
+import com.securitycontrol.background.mapper.IProMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.*;
 
-import static com.securitycontrol.common.core.utils.uuid.IdUtils.*;
+import static com.securitycontrol.common.core.utils.uuid.IdUtils.getuid;
 
 /**
  * @author：cwchen
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamQuEvalServiceImpl.java
similarity index 94%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java
rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamQuEvalServiceImpl.java
index 9adf04d..08d9426 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamQuEvalServiceImpl.java
@@ -1,5 +1,6 @@
-package com.securitycontrol.system.base.service.impl;
+package com.securitycontrol.background.service.impl;
 
+import com.securitycontrol.background.service.ITeamQuEvalService;
 import com.securitycontrol.common.core.utils.StringUtils;
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
 import com.securitycontrol.common.core.utils.uuid.IdUtils;
@@ -7,8 +8,7 @@ import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.security.utils.SecurityUtils;
 import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;
 import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo;
-import com.securitycontrol.system.base.mapper.ITeamQuEvalMapper;
-import com.securitycontrol.system.base.service.ITeamQuEvalService;
+import com.securitycontrol.background.mapper.ITeamQuEvalMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml
index 7141fce..dc66f4f 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml
@@ -39,6 +39,8 @@ jasypt:
     property:
       prefix: CodeSheep(
       suffix: )
-
-
+file:
+  #  upload_path: /data/ahsbs/file
+  temp_file_path: E:\\tempFile
+# 导出sql文件的位置
 
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml
similarity index 99%
rename from securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
rename to securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml
index a1b786d..42475ce 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.system.base.mapper.IProMapper">
+<mapper namespace="com.securitycontrol.background.mapper.IProMapper">
     <!--新增/修改 工程-->
     <insert id="addOrUpdatePro">
         <if test="type == 1">
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProScheduleMapper.xml
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
rename to securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProScheduleMapper.xml
index b4a7695..06beaa6 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProScheduleMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.system.base.mapper.IProScheduleMapper">
+<mapper namespace="com.securitycontrol.background.mapper.IProScheduleMapper">
     <!--填报工序计划进度-->
     <insert id="addGxPlanProgress">
         INSERT INTO tb_project_progress
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/TeamQuEvalMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamQuEvalMapper.xml
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/TeamQuEvalMapper.xml
rename to securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamQuEvalMapper.xml
index 145c4b3..2867559 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/TeamQuEvalMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamQuEvalMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.system.base.mapper.ITeamQuEvalMapper">
+<mapper namespace="com.securitycontrol.background.mapper.ITeamQuEvalMapper">
     <!--新增/修改班组质量评价-->
     <insert id="addOrUpdateTeamEval">
         <if test="type == 1">
diff --git a/securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml
index 95ecbf3..d64f08a 100644
--- a/securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml
+++ b/securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml
@@ -31,13 +31,21 @@ spring:
         # 共享配置
         shared-configs:
           - vsc-dev.yml
+#  data:
+#    mongodb:
+#      host: 192.168.0.56
+#      port: 27017
+#      database: zhgd
+#      username: zhgd
+#      password: Bonus@admin123
   data:
     mongodb:
-      host: 192.168.0.56
+      host: 47.115.207.135
       port: 27017
-      database: zhgd
-      username: zhgd
-      password: Bonus@admin123
+      database: admin
+      username: admin
+      password: Bonus@admin123!
+
 #加密组件
 jasypt:
   encryptor:
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AlarmMgeController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AlarmMgeController.java
index 4346e9e..58749f4 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AlarmMgeController.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AlarmMgeController.java
@@ -2,6 +2,7 @@ package com.securitycontrol.screen.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.securitycontrol.common.core.constant.HttpStatus;
+import com.securitycontrol.common.core.domain.Result;
 import com.securitycontrol.common.core.web.controller.BaseController;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.core.web.page.TableDataInfo;
@@ -15,10 +16,7 @@ import com.securitycontrol.entity.screen.vo.AlarmMgeVo;
 import com.securitycontrol.screen.service.AlarmMgeService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -51,4 +49,17 @@ public class AlarmMgeController extends BaseController {
         }
     }
 
+
+    @ApiOperation(value = "告警处理表")
+    @PostMapping("warnProcess")
+    @Log(title = "告警管理", menu = "告警管理->告警管理", grade = OperationType.QUERY_BUSINESS, details = "查询告警管理列表", type = "业务日志")
+    public Result<String> warnProcess(@RequestBody AlarmMgeDto dto) {
+               return  service.warnProcess(dto);
+
+    }
+
+
+
+
+
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/AlarmMgeMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/AlarmMgeMapper.java
index e26136a..28e3379 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/AlarmMgeMapper.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/AlarmMgeMapper.java
@@ -21,4 +21,11 @@ public interface AlarmMgeMapper {
      * @return
      */
     List<AlarmMgeVo> getAlarmMgeList(AlarmMgeDto dto);
+
+    /**
+     * 预警处理
+     * @param dto
+     * @return
+     */
+    Integer  warnProcess(AlarmMgeDto dto);
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/AlarmMgeService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/AlarmMgeService.java
index 3c0d685..76cd467 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/AlarmMgeService.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/AlarmMgeService.java
@@ -1,5 +1,6 @@
 package com.securitycontrol.screen.service;
 
+import com.securitycontrol.common.core.domain.Result;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.screen.dto.AlarmMgeDto;
 import com.securitycontrol.entity.screen.dto.ScreenParamDto;
@@ -18,4 +19,11 @@ public interface AlarmMgeService {
      * @return
      */
     List<AlarmMgeVo> getAlarmMgeList(AlarmMgeDto dto);
+
+    /**
+     * 告警处置管理
+     * @param dto
+     * @return
+     */
+    Result<String> warnProcess(AlarmMgeDto dto);
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java
index 5445295..e66421e 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java
@@ -1,13 +1,17 @@
 package com.securitycontrol.screen.service.impl;
 
+import com.securitycontrol.common.core.domain.Result;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.common.security.utils.SecurityUtils;
 import com.securitycontrol.entity.background.vo.DutyPlanVo;
 import com.securitycontrol.entity.screen.dto.AlarmMgeDto;
 import com.securitycontrol.entity.screen.dto.ScreenParamDto;
 import com.securitycontrol.entity.screen.vo.AlarmMgeVo;
+import com.securitycontrol.entity.system.SystemGlobal;
 import com.securitycontrol.entity.system.base.vo.ProVo;
 import com.securitycontrol.screen.mapper.AlarmMgeMapper;
 import com.securitycontrol.screen.service.AlarmMgeService;
+import com.securitycontrol.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -39,4 +43,26 @@ public class AlarmMgeServiceImpl implements AlarmMgeService {
         }
         return list;
     }
+
+    /**
+     * 告警处置接口
+     * @param dto
+     * @return
+     */
+    @Override
+    public Result<String> warnProcess(AlarmMgeDto dto) {
+        try{
+            LoginUser user= SecurityUtils.getLoginUser();
+            dto.setUserId(user.getUserid()+"");
+            dto.setUserName(user.getUsername());
+            int  num= mapper.warnProcess(dto);
+            if(num> SystemGlobal.SUCCESS_NUM){
+                return  Result.ok("操作成功","操作成功");
+            }
+            return  Result.fail("操作失败");
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return  Result.fail("操作失败");
+    }
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml
index e7c910a..50daf5f 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.securitycontrol.screen.mapper.AlarmMgeMapper">
+    <update id="warnProcess">
+            update   tb_warn set user_id=#{userId},status=#{status},
+                remark=#{remark}
+                        where  warn_id=#{warnId}
+    </update>
 
     <select id="getAlarmMgeList" resultType="com.securitycontrol.entity.screen.vo.AlarmMgeVo">
         SELECT tw.warn_id as warnId,
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/VscSystemApplication.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/VscSystemApplication.java
index d818081..4455fcb 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/VscSystemApplication.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/VscSystemApplication.java
@@ -4,9 +4,6 @@ package com.securitycontrol.system;
 import com.securitycontrol.common.security.annotation.EnableCustomConfig;
 import com.securitycontrol.common.security.annotation.EnableRyFeignClients;
 import com.securitycontrol.common.swagger.annotation.EnableCustomSwagger2;
-import com.securitycontrol.system.base.service.ExportSqlService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ExportFileController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ExportFileController.java
deleted file mode 100644
index 248807e..0000000
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ExportFileController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.securitycontrol.system.base.controller;
-
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import com.securitycontrol.common.log.annotation.Log;
-import com.securitycontrol.common.log.enums.OperationType;
-import com.securitycontrol.entity.system.base.dto.ProDto;
-import com.securitycontrol.system.export.entity.ProExportVo;
-import com.securitycontrol.entity.system.base.vo.ProVo;
-import com.securitycontrol.system.base.service.IProService;
-import com.securitycontrol.common.core.utils.ExcelStyleUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * @author：cwchen
- * @date：2024-03-11-14:55
- * @version：1.0
- * @description：导出文件-web层
- */
-@RestController
-@RequestMapping("/sys/export/")
-@Slf4j
-public class ExportFileController {
-
-    @Resource(name = "IProService")
-    private IProService service;
-
-    @GetMapping("exportProData")
-    @Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.EXPORT_BUSINESS, details = "导出工程", type = "业务日志")
-    public void exportData(HttpServletRequest request, HttpServletResponse response, ProDto dto) {
-        try {
-            List<ProExportVo> proExportVoList = new ArrayList<>();
-            List<ProVo> proLists = service.getProLists(dto);
-            for (int i = 0; i < proLists.size(); i++) {
-                proLists.get(i).setProId((i + 1) + "");
-                ProExportVo exportVo = new ProExportVo();
-                BeanUtils.copyProperties(proLists.get(i), exportVo);
-                proExportVoList.add(exportVo);
-            }
-            ExportParams exportParams = new ExportParams("工程列表", "工程列表", ExcelType.XSSF);
-            exportParams.setStyle(ExcelStyleUtil.class);
-            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, ProExportVo.class, proExportVoList);
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("工程列表" + ".xlsx", "UTF-8"));
-            ServletOutputStream outputStream = response.getOutputStream();
-            workbook.write(outputStream);
-            outputStream.close();
-            workbook.close();
-        } catch (Exception e) {
-            log.error("导出工程", e);
-        }
-    }
-}
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/RoleController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/RoleController.java
similarity index 96%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/RoleController.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/RoleController.java
index 680b728..76eb66c 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/RoleController.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/RoleController.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.controller;
+package com.securitycontrol.system.controller;
 
 import com.securitycontrol.common.core.web.controller.BaseController;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
@@ -7,7 +7,7 @@ import com.securitycontrol.common.log.annotation.Log;
 import com.securitycontrol.common.log.enums.OperationType;
 import com.securitycontrol.entity.system.dto.RoleDto;
 import com.securitycontrol.entity.system.vo.RoleVo;
-import com.securitycontrol.system.base.service.IRoleService;
+import com.securitycontrol.system.service.IRoleService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SelectController.java
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SelectController.java
index 870d77c..794db55 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SelectController.java
@@ -1,10 +1,10 @@
-package com.securitycontrol.system.base.controller;
+package com.securitycontrol.system.controller;
 
 import com.securitycontrol.common.core.web.controller.BaseController;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.dto.MenuDto;
 import com.securitycontrol.entity.system.dto.SelectDto;
-import com.securitycontrol.system.base.service.ISelectService;
+import com.securitycontrol.system.service.ISelectService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SysLogController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SysLogController.java
similarity index 95%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SysLogController.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SysLogController.java
index 4d8df65..98e1f5c 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SysLogController.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SysLogController.java
@@ -1,8 +1,7 @@
-package com.securitycontrol.system.base.controller;
+package com.securitycontrol.system.controller;
 
 import com.securitycontrol.common.core.domain.Result;
 import com.securitycontrol.common.core.utils.WordUtils;
-import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
 import com.securitycontrol.common.core.web.controller.BaseController;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.core.web.page.TableDataInfo;
@@ -10,8 +9,8 @@ import com.securitycontrol.common.log.annotation.Log;
 import com.securitycontrol.common.log.enums.OperationType;
 import com.securitycontrol.entity.system.SystemGlobal;
 import com.securitycontrol.system.api.domain.SysLog;
-import com.securitycontrol.system.base.service.ExportSqlService;
-import com.securitycontrol.system.base.service.ISysLogService;
+import com.securitycontrol.system.service.ExportSqlService;
+import com.securitycontrol.system.service.ISysLogService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,8 +20,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/UserController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/UserController.java
similarity index 96%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/UserController.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/UserController.java
index 6f0fd46..c8e22a5 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/UserController.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/UserController.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.controller;
+package com.securitycontrol.system.controller;
 
 import com.securitycontrol.common.core.web.controller.BaseController;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
@@ -7,7 +7,7 @@ import com.securitycontrol.common.log.annotation.Log;
 import com.securitycontrol.common.log.enums.OperationType;
 import com.securitycontrol.entity.system.dto.UserDto;
 import com.securitycontrol.entity.system.vo.UserVo;
-import com.securitycontrol.system.base.service.IUserService;
+import com.securitycontrol.system.service.IUserService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IRoleMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/IRoleMapper.java
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IRoleMapper.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/IRoleMapper.java
index 5a0feaf..f27ec33 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IRoleMapper.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/IRoleMapper.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.mapper;
+package com.securitycontrol.system.mapper;
 
 import com.securitycontrol.entity.system.dto.RoleDto;
 import com.securitycontrol.entity.system.vo.RoleVo;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/ISelectMapper.java
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/ISelectMapper.java
index d3efa9c..d0c379a 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/ISelectMapper.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.mapper;
+package com.securitycontrol.system.mapper;
 
 import com.securitycontrol.entity.system.dto.SelectDto;
 import com.securitycontrol.entity.system.vo.SelectVo;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISysLogMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/ISysLogMapper.java
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISysLogMapper.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/ISysLogMapper.java
index 4eb1598..23dc7bf 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISysLogMapper.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/ISysLogMapper.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.mapper;
+package com.securitycontrol.system.mapper;
 
 import cn.afterturn.easypoi.excel.entity.ExportExcelItem;
 import com.securitycontrol.system.api.domain.SysLog;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IUserMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/IUserMapper.java
similarity index 96%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IUserMapper.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/IUserMapper.java
index dc99d0f..2c1e203 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IUserMapper.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/IUserMapper.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.mapper;
+package com.securitycontrol.system.mapper;
 
 import com.securitycontrol.entity.system.dto.UserDto;
 import com.securitycontrol.entity.system.vo.UserVo;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ExportSqlService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ExportSqlService.java
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ExportSqlService.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ExportSqlService.java
index 3380683..fa7d6cf 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ExportSqlService.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ExportSqlService.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service;
+package com.securitycontrol.system.service;
 
 
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IRoleService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/IRoleService.java
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IRoleService.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/IRoleService.java
index bf2552a..331bf2c 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IRoleService.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/IRoleService.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service;
+package com.securitycontrol.system.service;
 
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.dto.RoleDto;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ISelectService.java
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ISelectService.java
index 1893505..6d5f7be 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ISelectService.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service;
+package com.securitycontrol.system.service;
 
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.dto.MenuDto;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISysLogService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ISysLogService.java
similarity index 96%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISysLogService.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ISysLogService.java
index e3912ce..3a03f1c 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISysLogService.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ISysLogService.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service;
+package com.securitycontrol.system.service;
 
 import com.securitycontrol.common.core.domain.Result;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IUserService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/IUserService.java
similarity index 96%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IUserService.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/IUserService.java
index 45700a1..47c2080 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IUserService.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/IUserService.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service;
+package com.securitycontrol.system.service;
 
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.dto.UserDto;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/RoleServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/RoleServiceImpl.java
similarity index 95%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/RoleServiceImpl.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/RoleServiceImpl.java
index 8534171..4945126 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/RoleServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/RoleServiceImpl.java
@@ -1,11 +1,10 @@
-package com.securitycontrol.system.base.service.impl;
+package com.securitycontrol.system.service;
 
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.dto.RoleDto;
 import com.securitycontrol.entity.system.vo.RoleVo;
-import com.securitycontrol.system.base.mapper.IRoleMapper;
-import com.securitycontrol.system.base.service.IRoleService;
+import com.securitycontrol.system.mapper.IRoleMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SelectServiceImpl.java
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SelectServiceImpl.java
index ee8f949..4a286e7 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SelectServiceImpl.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service.impl;
+package com.securitycontrol.system.service;
 
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.TreeBuild;
@@ -6,9 +6,7 @@ import com.securitycontrol.entity.system.dto.MenuDto;
 import com.securitycontrol.entity.system.dto.SelectDto;
 import com.securitycontrol.entity.system.vo.SelectVo;
 import com.securitycontrol.entity.system.vo.TreeNode;
-import com.securitycontrol.system.base.mapper.ISelectMapper;
-import com.securitycontrol.system.base.service.ISelectService;
-import io.swagger.models.auth.In;
+import com.securitycontrol.system.mapper.ISelectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SysLogServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SysLogServiceImpl.java
similarity index 96%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SysLogServiceImpl.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SysLogServiceImpl.java
index 754588f..1a6ac65 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SysLogServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SysLogServiceImpl.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service.impl;
+package com.securitycontrol.system.service;
 
 import com.google.common.collect.Maps;
 import com.securitycontrol.common.core.domain.Result;
@@ -12,22 +12,17 @@ import com.securitycontrol.common.security.utils.SecurityUtils;
 import com.securitycontrol.entity.system.SystemGlobal;
 import com.securitycontrol.system.api.domain.SysLog;
 import com.securitycontrol.system.api.model.LoginUser;
-import com.securitycontrol.system.base.mapper.ISysLogMapper;
-import com.securitycontrol.system.base.service.ISysLogService;
+import com.securitycontrol.system.mapper.ISysLogMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.est.CACertsResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import sun.net.util.IPAddressUtil;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.security.Security;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 /**
  * @author：cwchen
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/UserServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/UserServiceImpl.java
similarity index 95%
rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/UserServiceImpl.java
rename to securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/UserServiceImpl.java
index 87c5456..ddce8af 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/UserServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/UserServiceImpl.java
@@ -1,4 +1,4 @@
-package com.securitycontrol.system.base.service.impl;
+package com.securitycontrol.system.service;
 
 import com.securitycontrol.common.core.constant.Constant;
 import com.securitycontrol.common.core.utils.StringUtils;
@@ -7,8 +7,7 @@ import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.security.utils.SecurityUtils;
 import com.securitycontrol.entity.system.dto.UserDto;
 import com.securitycontrol.entity.system.vo.UserVo;
-import com.securitycontrol.system.base.mapper.IUserMapper;
-import com.securitycontrol.system.base.service.IUserService;
+import com.securitycontrol.system.mapper.IUserMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml
index 4697ac8..e1ccdf1 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml
@@ -47,10 +47,7 @@ log:
     my: debug
   file: logs/sys-back.log
   maxsize: 30MB
-file:
-  #  upload_path: /data/ahsbs/file
-  temp_file_path: E:\\tempFile
-# 导出sql文件的位置
+
 sql:
   dbname: jj_zhgd # 数据库名
   filePath: F:\\File\\  #导出sql文件的位置 win下会直接在项目所在磁盘下建立 data/sql文件
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/RoleMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/RoleMapper.xml
similarity index 97%
rename from securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/RoleMapper.xml
rename to securitycontrol-model/securitycontrol-system/src/main/resources/mapper/RoleMapper.xml
index bad12d2..992586b 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/RoleMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/RoleMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.system.base.mapper.IRoleMapper">
+<mapper namespace="com.securitycontrol.system.mapper.IRoleMapper">
     <!--新增/修改角色-->
     <insert id="addOrUpdateRole">
         <if test="type == 1">
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SelectMapper.xml
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
rename to securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SelectMapper.xml
index 0d3fe08..0263d81 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SelectMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.system.base.mapper.ISelectMapper">
+<mapper namespace="com.securitycontrol.system.mapper.ISelectMapper">
 
     <!--组织机构树-->
     <select id="getOrgTree" resultType="com.securitycontrol.entity.system.vo.TreeNode">
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SysLogMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SysLogMapper.xml
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SysLogMapper.xml
rename to securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SysLogMapper.xml
index df7ebf4..d218a04 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SysLogMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SysLogMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.system.base.mapper.ISysLogMapper">
+<mapper namespace="com.securitycontrol.system.mapper.ISysLogMapper">
 
     <!--保存系统日志-->
     <insert id="saveLogs">
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/UserMapper.xml
similarity index 98%
rename from securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml
rename to securitycontrol-model/securitycontrol-system/src/main/resources/mapper/UserMapper.xml
index 9166e74..dd7f49e 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/UserMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.system.base.mapper.IUserMapper">
+<mapper namespace="com.securitycontrol.system.mapper.IUserMapper">
     <!--新增/修改用户-->
     <insert id="addOrUpdateUser">
         <if test="type == 1">