添加外部api新增区域与站点

base-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java

@@ -61,11 +61,9 @@ public class AuthUserInterceptor extends BaseInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
-        //response.setContentType("application/json");
         String referer = request.getHeader("Referer");
         RedisTemplate<String, String> redisTemplate = cacheService.selectDbRedisTemplate(portalDb);
         String trustedReferer =redisTemplate.opsForValue().get(RedisKey.KEY_REFERERS_CACHE);
-       // String referer = cacheService.get(RedisKey.KEY_REFERERS_CACHE);
         if (!ObjectUtils.isEmpty(referer)) {
             //校验host即可
             URI host = URLUtil.getHost(new URL(referer));
@@ -79,20 +77,6 @@ public class AuthUserInterceptor extends BaseInterceptor {
                 }
             }
         }
-
-        HttpServletResponse httpResponse = response;
-        Cookie[] cookies = request.getCookies();
-        if (cookies != null) {
-            for (Cookie cookie : cookies) {
-                cookie.setHttpOnly(true);
-                cookie.setSecure(true);
-                cookie.setPath("/");
-                cookie.setMaxAge(3600);
-                httpResponse.addCookie(cookie);
-            }
-        }
-
-
         if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -58,14 +58,8 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
     @Autowired
     private ICacheService cacheService;
     @Autowired
-    private MatterService matterService;
-    @Autowired
-    private DeptService deptService;
-    @Autowired
     private SiteService siteService;
     @Autowired
-    private SiteMatterService siteMatterService;
-    @Autowired
     private AreaService areaService;
 
     public SiteController() {
@@ -536,4 +530,41 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         return jsonObject.toJSONString();
     }
 
+
+    /**
+     * 外部站点添加
+     */
+    @PostMapping(value = "api/add")
+    @UnAuth
+    public String apiAdd(@RequestBody SiteEntity siteEntity) {
+        JSONObject jsonObject = new JSONObject();
+        String busiDesc = "外部站点添加" + this.getModuleDesc();
+        try {
+            if (ObjectUtils.isEmpty(siteEntity.getAreaCode())) {
+                throw new AppException("区域编码不能为空！");
+            }
+
+            SiteEntity one = this.service.selectOne(new SiteQuery().areaCode(siteEntity.getAreaCode()).siteName(siteEntity.getSiteName()), getContext());
+            if(!ObjectUtils.isEmpty(one)) throw new AppException("当前区域下站点名称已存在！");
+
+            AreaEntity areaEntity = areaService.selectOne(new AreaQuery().areaCode(siteEntity.getAreaCode()), getContext());
+            if (!ObjectUtils.isEmpty(areaEntity)) {
+                siteEntity.setAreaID(areaEntity.getIid());
+                siteEntity.setAreaName(areaEntity.getName());
+                siteEntity.setAreaLevel(areaEntity.getAreaLevel());
+            }
+
+            SiteEntity save = this.service.save(siteEntity, getContext());
+            recordSysLog(request, busiDesc + " 【成功】");
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            jsonObject.put(KEY_RESULT_DATA, save);
+            jsonObject.put(KEY_RESULT_MSG, "外部站点添加成功！");
+        } catch (Exception e) {
+            log.error("外部站点添加", e);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return jsonObject.toJSONString();
+    }
+
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -217,7 +217,7 @@ Content-Type: application/json
 
 {
   "page":1,
-  "secondOrganize": "hongqi"
+  "name": "%domain%"
 
 }