admin

src/main/java/com/smcic/api/neican/aspect/AclAspect.java → src/main/java/com/smcic/api/admin/aspect/AclAspect.java

@@ -1,21 +1,18 @@
-package com.smcic.api.neican.aspect;
+package com.smcic.api.admin.aspect;
 
-import com.smcic.api.neican.service.impl.RoleAclModuleServiceImpl;
+import com.smcic.api.admin.service.impl.RoleAclModuleServiceImpl;
 import com.smcic.core.advice.APIException;
 import com.smcic.core.auth.HttpContextUtil;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
 
 @Aspect
 @Component
@@ -24,7 +21,7 @@ public class AclAspect {
     @Resource
     private RoleAclModuleServiceImpl roleAclModuleService;
 
-    @Pointcut("execution(* com.smcic.api.neican.controller.*Controller.*(..))")
+    @Pointcut("execution(* com.smcic.api.admin.controller.*Controller.*(..))")
     public void logPointCut(){}
 
     /** 前置通知 */

src/main/java/com/smcic/api/neican/controller/AdminRoleController.java → src/main/java/com/smcic/api/admin/controller/AdminRoleController.java

@@ -1,10 +1,10 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.smcic.api.neican.dto.NamePageDTO;
-import com.smcic.api.neican.entity.AdminRole;
-import com.smcic.api.neican.service.impl.AdminRoleServiceImpl;
+import com.smcic.api.admin.dto.NamePageDTO;
+import com.smcic.api.admin.entity.AdminRole;
+import com.smcic.api.admin.service.impl.AdminRoleServiceImpl;
 import com.smcic.core.auth.LoginRequired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/smcic/api/neican/controller/AdminUserRoleController.java → src/main/java/com/smcic/api/admin/controller/AdminUserRoleController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/AdminUsersController.java → src/main/java/com/smcic/api/admin/controller/AdminUsersController.java

@@ -1,12 +1,12 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.smcic.api.neican.dto.LoginDto;
-import com.smcic.api.neican.dto.NamePageDTO;
-import com.smcic.api.neican.dto.TokenDto;
-import com.smcic.api.neican.entity.AdminUsers;
-import com.smcic.api.neican.service.impl.AdminUsersServiceImpl;
+import com.smcic.api.admin.dto.LoginDto;
+import com.smcic.api.admin.dto.NamePageDTO;
+import com.smcic.api.admin.dto.TokenDto;
+import com.smcic.api.admin.entity.AdminUsers;
+import com.smcic.api.admin.service.impl.AdminUsersServiceImpl;
 import com.smcic.core.auth.LoginRequired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/smcic/api/neican/controller/ArticleCollectController.java → src/main/java/com/smcic/api/admin/controller/ArticleCollectController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/ArticleController.java → src/main/java/com/smcic/api/admin/controller/ArticleController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/ArticleQuoteController.java → src/main/java/com/smcic/api/admin/controller/ArticleQuoteController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/AuditFlowController.java → src/main/java/com/smcic/api/admin/controller/AuditFlowController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/CategoryController.java → src/main/java/com/smcic/api/admin/controller/CategoryController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/CheckController.java → src/main/java/com/smcic/api/admin/controller/CheckController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/LeadersController.java → src/main/java/com/smcic/api/admin/controller/LeadersController.java

@@ -1,9 +1,9 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import com.google.common.collect.ImmutableMap;
-import com.smcic.api.neican.entity.Leaders;
-import com.smcic.api.neican.service.impl.LeadersServiceImpl;
+import com.smcic.api.admin.entity.Leaders;
+import com.smcic.api.admin.service.impl.LeadersServiceImpl;
 import com.smcic.core.auth.LoginRequired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/smcic/api/neican/controller/LifeServiceController.java → src/main/java/com/smcic/api/admin/controller/LifeServiceController.java

@@ -1,10 +1,10 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.smcic.api.neican.dto.NamePageDTO;
-import com.smcic.api.neican.entity.LifeService;
-import com.smcic.api.neican.service.impl.LifeServiceServiceImpl;
+import com.smcic.api.admin.dto.NamePageDTO;
+import com.smcic.api.admin.entity.LifeService;
+import com.smcic.api.admin.service.impl.LifeServiceServiceImpl;
 import com.smcic.core.auth.LoginRequired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/smcic/api/neican/controller/LiveStreamController.java → src/main/java/com/smcic/api/admin/controller/LiveStreamController.java

@@ -1,9 +1,8 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
-import com.smcic.api.neican.entity.LiveStream;
-import com.smcic.api.neican.service.impl.LiveStreamServiceImpl;
-import com.smcic.core.auth.LoginRequired;
+import com.smcic.api.admin.entity.LiveStream;
+import com.smcic.api.admin.service.impl.LiveStreamServiceImpl;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/smcic/api/neican/controller/MenuModuleController.java → src/main/java/com/smcic/api/admin/controller/MenuModuleController.java

@@ -1,8 +1,8 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
-import com.smcic.api.neican.entity.MenuModule;
-import com.smcic.api.neican.service.impl.MenuModuleServiceImpl;
+import com.smcic.api.admin.entity.MenuModule;
+import com.smcic.api.admin.service.impl.MenuModuleServiceImpl;
 import com.smcic.core.auth.LoginRequired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/smcic/api/admin/controller/NetworkMediaController.java

@@ -0,0 +1,59 @@
+package com.smcic.api.admin.controller;
+
+
+import com.google.common.collect.ImmutableMap;
+import com.smcic.api.admin.entity.NetworkMedia;
+import com.smcic.api.admin.service.impl.NetworkMediaServiceImpl;
+import com.smcic.core.auth.LoginRequired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 网媒管理 前端控制器
+ * </p>
+ *
+ * @author syj
+ * @since 2023-11-16
+ */
+@RestController
+@RequestMapping("/admin/network-media")
+public class NetworkMediaController {
+
+    @Resource
+    private NetworkMediaServiceImpl networkMediaService;
+
+    @GetMapping("/list")
+    public List<NetworkMedia> list() {
+        return networkMediaService.list();
+    }
+
+    @PostMapping("/add")
+    @LoginRequired
+    public void add(@RequestBody NetworkMedia networkMedia) {
+        networkMediaService.add(networkMedia);
+    }
+
+    @PostMapping("/update")
+    @LoginRequired
+    public void update(@RequestBody NetworkMedia networkMedia) {
+        networkMediaService.update(networkMedia);
+    }
+
+    @DeleteMapping("/delete/{id}")
+    @LoginRequired
+    public void delete(@PathVariable Long id) {
+        networkMediaService.removeById(id);
+    }
+
+    @RequestMapping("upload")
+    @LoginRequired
+    public Map<String, String> upload(@RequestParam(value = "file", required = false) MultipartFile file){
+        return ImmutableMap.of("url", networkMediaService.upload(file));
+    }
+
+}

src/main/java/com/smcic/api/neican/controller/NewspapersController.java → src/main/java/com/smcic/api/admin/controller/NewspapersController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/NoticesController.java → src/main/java/com/smcic/api/admin/controller/NoticesController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/OrganController.java → src/main/java/com/smcic/api/admin/controller/OrganController.java

@@ -1,10 +1,10 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.smcic.api.neican.dto.NamePageDTO;
-import com.smcic.api.neican.entity.Organ;
-import com.smcic.api.neican.service.impl.OrganServiceImpl;
+import com.smcic.api.admin.dto.NamePageDTO;
+import com.smcic.api.admin.entity.Organ;
+import com.smcic.api.admin.service.impl.OrganServiceImpl;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/smcic/api/neican/controller/RegionController.java → src/main/java/com/smcic/api/admin/controller/RegionController.java

@@ -1,8 +1,8 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
-import com.smcic.api.neican.entity.Region;
-import com.smcic.api.neican.service.impl.RegionServiceImpl;
+import com.smcic.api.admin.entity.Region;
+import com.smcic.api.admin.service.impl.RegionServiceImpl;
 import com.smcic.core.auth.LoginRequired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/RoleAclDataController.java → src/main/java/com/smcic/api/admin/controller/RoleAclDataController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/RoleAclModuleController.java → src/main/java/com/smcic/api/admin/controller/RoleAclModuleController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/admin/controller/UserDeviceController.java

@@ -0,0 +1,42 @@
+package com.smcic.api.admin.controller;
+
+
+import com.smcic.api.admin.dto.DeviceDTO;
+import com.smcic.api.admin.service.impl.UserDeviceServiceImpl;
+import com.smcic.core.auth.LoginRequired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author syj
+ * @since 2023-11-16
+ */
+@RestController
+@RequestMapping("/admin/user-device")
+public class UserDeviceController {
+
+    @Resource
+    private UserDeviceServiceImpl userDeviceService;
+
+    @PostMapping("/add")
+    @LoginRequired
+    public void add(@RequestBody DeviceDTO deviceDTO) {
+        userDeviceService.add(deviceDTO);
+    }
+
+    @PostMapping("/delete")
+    @LoginRequired
+    public void delete(@RequestBody DeviceDTO deviceDTO) {
+        userDeviceService.delete(deviceDTO);
+    }
+
+}

src/main/java/com/smcic/api/neican/controller/UserRelationController.java → src/main/java/com/smcic/api/admin/controller/UserRelationController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/UserRoleController.java → src/main/java/com/smcic/api/admin/controller/UserRoleController.java

@@ -1,8 +1,8 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
-import com.smcic.api.neican.dto.UserRoleDTO;
-import com.smcic.api.neican.service.impl.UserRoleServiceImpl;
+import com.smcic.api.admin.dto.UserRoleDTO;
+import com.smcic.api.admin.service.impl.UserRoleServiceImpl;
 import com.smcic.core.auth.LoginRequired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/smcic/api/neican/controller/UserThirdController.java → src/main/java/com/smcic/api/admin/controller/UserThirdController.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/smcic/api/neican/controller/UsersController.java → src/main/java/com/smcic/api/admin/controller/UsersController.java

@@ -1,11 +1,11 @@
-package com.smcic.api.neican.controller;
+package com.smcic.api.admin.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.smcic.api.neican.dto.NamePageDTO;
-import com.smcic.api.neican.dto.PwdResetDTO;
-import com.smcic.api.neican.entity.Users;
-import com.smcic.api.neican.service.impl.UsersServiceImpl;
+import com.smcic.api.admin.dto.NamePageDTO;
+import com.smcic.api.admin.dto.PwdResetDTO;
+import com.smcic.api.admin.entity.Users;
+import com.smcic.api.admin.service.impl.UsersServiceImpl;
 import com.smcic.core.auth.LoginRequired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/smcic/api/admin/dto/DeviceDTO.java

@@ -0,0 +1,12 @@
+package com.smcic.api.admin.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeviceDTO {
+    private Long userId;
+
+    private List<String> deviceCodes;
+}

src/main/java/com/smcic/api/neican/dto/LoginDto.java → src/main/java/com/smcic/api/admin/dto/LoginDto.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.dto;
+package com.smcic.api.admin.dto;
 
 import lombok.Data;
 

src/main/java/com/smcic/api/neican/dto/NamePageDTO.java → src/main/java/com/smcic/api/admin/dto/NamePageDTO.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.dto;
+package com.smcic.api.admin.dto;
 
 import lombok.Data;
 

src/main/java/com/smcic/api/neican/dto/PwdResetDTO.java → src/main/java/com/smcic/api/admin/dto/PwdResetDTO.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.dto;
+package com.smcic.api.admin.dto;
 
 import lombok.Data;
 

src/main/java/com/smcic/api/neican/dto/TokenDto.java → src/main/java/com/smcic/api/admin/dto/TokenDto.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.dto;
+package com.smcic.api.admin.dto;
 
 import lombok.Data;
 

src/main/java/com/smcic/api/neican/dto/UserRoleDTO.java → src/main/java/com/smcic/api/admin/dto/UserRoleDTO.java

@@ -1,13 +1,11 @@
-package com.smcic.api.neican.dto;
+package com.smcic.api.admin.dto;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.smcic.api.neican.entity.MenuModule;
-import com.smcic.api.neican.entity.UserRole;
+import com.smcic.api.admin.entity.MenuModule;
+import com.smcic.api.admin.entity.UserRole;
 import com.smcic.core.advice.APIException;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 

src/main/java/com/smcic/api/neican/entity/AdminRole.java → src/main/java/com/smcic/api/admin/entity/AdminRole.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/smcic/api/neican/entity/AdminUserRole.java → src/main/java/com/smcic/api/admin/entity/AdminUserRole.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

src/main/java/com/smcic/api/neican/entity/AdminUsers.java → src/main/java/com/smcic/api/admin/entity/AdminUsers.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/smcic/api/neican/entity/Article.java → src/main/java/com/smcic/api/admin/entity/Article.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/ArticleCollect.java → src/main/java/com/smcic/api/admin/entity/ArticleCollect.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/ArticleQuote.java → src/main/java/com/smcic/api/admin/entity/ArticleQuote.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/AuditFlow.java → src/main/java/com/smcic/api/admin/entity/AuditFlow.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/Category.java → src/main/java/com/smcic/api/admin/entity/Category.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/Leaders.java → src/main/java/com/smcic/api/admin/entity/Leaders.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/LifeService.java → src/main/java/com/smcic/api/admin/entity/LifeService.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/LiveStream.java → src/main/java/com/smcic/api/admin/entity/LiveStream.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

src/main/java/com/smcic/api/neican/entity/MenuModule.java → src/main/java/com/smcic/api/admin/entity/MenuModule.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -43,6 +43,12 @@ public class MenuModule implements Serializable {
      */
     private Integer type;
 
+    /**
+     * 1. 展示菜单 2.隐藏菜单
+     * */
+    private Integer displayed;
+
+
     @TableField(exist = false)
     private List<MenuModule> children;
 

src/main/java/com/smcic/api/neican/entity/NetworkMedia.java → src/main/java/com/smcic/api/admin/entity/NetworkMedia.java

@@ -1,5 +1,7 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import lombok.Getter;
@@ -20,6 +22,7 @@ public class NetworkMedia implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "media_id", type = IdType.AUTO)
     private Long mediaId;
 
     private String name;

src/main/java/com/smcic/api/neican/entity/Newspapers.java → src/main/java/com/smcic/api/admin/entity/Newspapers.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;

src/main/java/com/smcic/api/neican/entity/Notices.java → src/main/java/com/smcic/api/admin/entity/Notices.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;

src/main/java/com/smcic/api/neican/entity/Organ.java → src/main/java/com/smcic/api/admin/entity/Organ.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/smcic/api/neican/entity/Region.java → src/main/java/com/smcic/api/admin/entity/Region.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/com/smcic/api/neican/entity/RoleAclData.java → src/main/java/com/smcic/api/admin/entity/RoleAclData.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

src/main/java/com/smcic/api/neican/entity/RoleAclModule.java → src/main/java/com/smcic/api/admin/entity/RoleAclModule.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

src/main/java/com/smcic/api/neican/entity/UserDevice.java → src/main/java/com/smcic/api/admin/entity/UserDevice.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/UserRelation.java → src/main/java/com/smcic/api/admin/entity/UserRelation.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/UserRole.java → src/main/java/com/smcic/api/admin/entity/UserRole.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/UserThird.java → src/main/java/com/smcic/api/admin/entity/UserThird.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/smcic/api/neican/entity/Users.java → src/main/java/com/smcic/api/admin/entity/Users.java

@@ -1,4 +1,4 @@
-package com.smcic.api.neican.entity;
+package com.smcic.api.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/smcic/api/neican/mapper/AdminRoleMapper.java → src/main/java/com/smcic/api/admin/mapper/AdminRoleMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.AdminRole;
+import com.smcic.api.admin.entity.AdminRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/AdminUserRoleMapper.java → src/main/java/com/smcic/api/admin/mapper/AdminUserRoleMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.AdminUserRole;
+import com.smcic.api.admin.entity.AdminUserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/AdminUsersMapper.java → src/main/java/com/smcic/api/admin/mapper/AdminUsersMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.AdminUsers;
+import com.smcic.api.admin.entity.AdminUsers;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/ArticleCollectMapper.java → src/main/java/com/smcic/api/admin/mapper/ArticleCollectMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.ArticleCollect;
+import com.smcic.api.admin.entity.ArticleCollect;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/ArticleMapper.java → src/main/java/com/smcic/api/admin/mapper/ArticleMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.Article;
+import com.smcic.api.admin.entity.Article;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/ArticleQuoteMapper.java → src/main/java/com/smcic/api/admin/mapper/ArticleQuoteMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.ArticleQuote;
+import com.smcic.api.admin.entity.ArticleQuote;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/AuditFlowMapper.java → src/main/java/com/smcic/api/admin/mapper/AuditFlowMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.AuditFlow;
+import com.smcic.api.admin.entity.AuditFlow;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/CategoryMapper.java → src/main/java/com/smcic/api/admin/mapper/CategoryMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.Category;
+import com.smcic.api.admin.entity.Category;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/LeadersMapper.java → src/main/java/com/smcic/api/admin/mapper/LeadersMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.Leaders;
+import com.smcic.api.admin.entity.Leaders;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/LifeServiceMapper.java → src/main/java/com/smcic/api/admin/mapper/LifeServiceMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.LifeService;
+import com.smcic.api.admin.entity.LifeService;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/LiveStreamMapper.java → src/main/java/com/smcic/api/admin/mapper/LiveStreamMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.LiveStream;
+import com.smcic.api.admin.entity.LiveStream;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/MenuModuleMapper.java → src/main/java/com/smcic/api/admin/mapper/MenuModuleMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.MenuModule;
+import com.smcic.api.admin.entity.MenuModule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/NetworkMediaMapper.java → src/main/java/com/smcic/api/admin/mapper/NetworkMediaMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.NetworkMedia;
+import com.smcic.api.admin.entity.NetworkMedia;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/NewspapersMapper.java → src/main/java/com/smcic/api/admin/mapper/NewspapersMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.Newspapers;
+import com.smcic.api.admin.entity.Newspapers;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/NoticesMapper.java → src/main/java/com/smcic/api/admin/mapper/NoticesMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.Notices;
+import com.smcic.api.admin.entity.Notices;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/OrganMapper.java → src/main/java/com/smcic/api/admin/mapper/OrganMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.Organ;
+import com.smcic.api.admin.entity.Organ;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/RegionMapper.java → src/main/java/com/smcic/api/admin/mapper/RegionMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.Region;
+import com.smcic.api.admin.entity.Region;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/RoleAclDataMapper.java → src/main/java/com/smcic/api/admin/mapper/RoleAclDataMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.RoleAclData;
+import com.smcic.api.admin.entity.RoleAclData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/RoleAclModuleMapper.java → src/main/java/com/smcic/api/admin/mapper/RoleAclModuleMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.RoleAclModule;
+import com.smcic.api.admin.entity.RoleAclModule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/UserDeviceMapper.java → src/main/java/com/smcic/api/admin/mapper/UserDeviceMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.UserDevice;
+import com.smcic.api.admin.entity.UserDevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/UserRelationMapper.java → src/main/java/com/smcic/api/admin/mapper/UserRelationMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.UserRelation;
+import com.smcic.api.admin.entity.UserRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/UserRoleMapper.java → src/main/java/com/smcic/api/admin/mapper/UserRoleMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.UserRole;
+import com.smcic.api.admin.entity.UserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/UserThirdMapper.java → src/main/java/com/smcic/api/admin/mapper/UserThirdMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.UserThird;
+import com.smcic.api.admin.entity.UserThird;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/mapper/UsersMapper.java → src/main/java/com/smcic/api/admin/mapper/UsersMapper.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.mapper;
+package com.smcic.api.admin.mapper;
 
-import com.smcic.api.neican.entity.Users;
+import com.smcic.api.admin.entity.Users;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/smcic/api/neican/service/IAdminRoleService.java → src/main/java/com/smcic/api/admin/service/IAdminRoleService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.AdminRole;
+import com.smcic.api.admin.entity.AdminRole;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IAdminUserRoleService.java → src/main/java/com/smcic/api/admin/service/IAdminUserRoleService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.AdminUserRole;
+import com.smcic.api.admin.entity.AdminUserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IAdminUsersService.java → src/main/java/com/smcic/api/admin/service/IAdminUsersService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.AdminUsers;
+import com.smcic.api.admin.entity.AdminUsers;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IArticleCollectService.java → src/main/java/com/smcic/api/admin/service/IArticleCollectService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.ArticleCollect;
+import com.smcic.api.admin.entity.ArticleCollect;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IArticleQuoteService.java → src/main/java/com/smcic/api/admin/service/IArticleQuoteService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.ArticleQuote;
+import com.smcic.api.admin.entity.ArticleQuote;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IArticleService.java → src/main/java/com/smcic/api/admin/service/IArticleService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.Article;
+import com.smcic.api.admin.entity.Article;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IAuditFlowService.java → src/main/java/com/smcic/api/admin/service/IAuditFlowService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.AuditFlow;
+import com.smcic.api.admin.entity.AuditFlow;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/ICategoryService.java → src/main/java/com/smcic/api/admin/service/ICategoryService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.Category;
+import com.smcic.api.admin.entity.Category;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/ILeadersService.java → src/main/java/com/smcic/api/admin/service/ILeadersService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.Leaders;
+import com.smcic.api.admin.entity.Leaders;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/ILifeServiceService.java → src/main/java/com/smcic/api/admin/service/ILifeServiceService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.LifeService;
+import com.smcic.api.admin.entity.LifeService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/ILiveStreamService.java → src/main/java/com/smcic/api/admin/service/ILiveStreamService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.LiveStream;
+import com.smcic.api.admin.entity.LiveStream;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IMenuModuleService.java → src/main/java/com/smcic/api/admin/service/IMenuModuleService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.MenuModule;
+import com.smcic.api.admin.entity.MenuModule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/INetworkMediaService.java → src/main/java/com/smcic/api/admin/service/INetworkMediaService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.NetworkMedia;
+import com.smcic.api.admin.entity.NetworkMedia;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/INewspapersService.java → src/main/java/com/smcic/api/admin/service/INewspapersService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.Newspapers;
+import com.smcic.api.admin.entity.Newspapers;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/INoticesService.java → src/main/java/com/smcic/api/admin/service/INoticesService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.Notices;
+import com.smcic.api.admin.entity.Notices;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IOrganService.java → src/main/java/com/smcic/api/admin/service/IOrganService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.Organ;
+import com.smcic.api.admin.entity.Organ;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IRegionService.java → src/main/java/com/smcic/api/admin/service/IRegionService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.Region;
+import com.smcic.api.admin.entity.Region;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IRoleAclDataService.java → src/main/java/com/smcic/api/admin/service/IRoleAclDataService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.RoleAclData;
+import com.smcic.api.admin.entity.RoleAclData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IRoleAclModuleService.java → src/main/java/com/smcic/api/admin/service/IRoleAclModuleService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.RoleAclModule;
+import com.smcic.api.admin.entity.RoleAclModule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/smcic/api/neican/service/IUserDeviceService.java → src/main/java/com/smcic/api/admin/service/IUserDeviceService.java

@@ -1,6 +1,6 @@
-package com.smcic.api.neican.service;
+package com.smcic.api.admin.service;
 
-import com.smcic.api.neican.entity.UserDevice;
+import com.smcic.api.admin.entity.UserDevice;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**