自定义注解实现接口访问权限2

d3606687 · 伍思炜 · a1a58f89 · d3606687 · d3606687 · d3606687
Commit d3606687 authored Apr 13, 2022 by 伍思炜
17 changed files
--- a/common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java
+++ b/common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java
@@ -113,6 +113,7 @@ public class IntelligenceSendOrders {
        shoolNames.add("广东水利电力职业技术学院（纯wifi）");
        shoolNames.add("广州南洋理工职业学院（纯wifi）");
        shoolNames.add("广州工程技术职业学院（纯wifi）");
+        shoolNames.add("从化清北职业培训学校");
    }
@@ -393,7 +394,7 @@ public class IntelligenceSendOrders {
            order_data.put("付费类型", "预付费"); //预付费、后付费、其他  选填
        }
-        System.out.println(orderViewMap.get("hehuorenId"));
        Map<String, String> school = schoolMapper.selectByHeHuorenId(String.valueOf(orderViewMap.get("hehuorenId")));
        Map<String, Object> packageInformation = new HashMap<>();   //揽装信息
        packageInformation.put("揽装姓名", school.get("lz_user"));
@@ -557,6 +558,13 @@ public class IntelligenceSendOrders {
            attributeList.add(customerPwd);
        }
+        if (businessType == 10) {
+            AttributeList rhSpend = new AttributeList();
+            rhSpend.setName("融合宽带提速");
+            rhSpend.setValue(schoolMap.get("identifying").toString());
+            attributeList.add(rhSpend);
+        }
        AttributeList onlineNumber = new AttributeList();
        onlineNumber.setName("最大在线数");
        onlineNumber.setValue(universityOnlineNumber);
@@ -585,9 +593,9 @@ public class IntelligenceSendOrders {
        if (businessType == 5) {
            orderingProducts.put("AI编码", "DQ_ADSL_CAMPUS");
-        } else if (businessType == 3){
+        } else if (businessType == 3) {
            orderingProducts.put("AI编码", "4B90FBDD2A1A43EE8A4C963115C52F14");
-        }else if (businessType == 10){
+        } else if (businessType == 10) {
            orderingProducts.put("AI编码", "46102E5199DE4B089AC46CBE9B22F9EB");
        }
        order_data.put("订购产品", orderingProducts);
@@ -597,7 +605,7 @@ public class IntelligenceSendOrders {
            order_data.put("业务类型", "融合业务");  //业务类型
        } else if (businessType == 5) {
            order_data.put("业务类型", "单宽业务");  //业务类型
-        }else if (businessType == 10){
+        } else if (businessType == 10) {
            order_data.put("业务类型", "校园宽带提速");  //业务类型
        }
@@ -619,7 +627,7 @@ public class IntelligenceSendOrders {
        broadbandInstalledCapacity.put("装机地址ID", addressID);
        broadbandInstalledCapacity.put("宽带接入号", "新装");
        broadbandInstalledCapacity.put("订购类型", "新装");
-        if (businessType == 10){
+        if (businessType == 10) {
            broadbandInstalledCapacity.put("宽带接入号", "已有");
            broadbandInstalledCapacity.put("订购类型", "已有");
        }
@@ -1053,7 +1061,6 @@ public class IntelligenceSendOrders {
    /**
     * @param orderNum 智能平台订单号
-     *
     * @return
     * @throws Exception
     */
@@ -1092,8 +1099,8 @@ public class IntelligenceSendOrders {
            RestTemplate restTemplate = new RestTemplate();
            log.info("提交参数:" + data);
            Constant.trustEveryone();
-            responese = Unirest.get("http://132.97.20.21/query/query-order-info?" + url_data)
+            //responese = Unirest.get("http://132.97.20.21/query/query-order-info?" + url_data)
-                    //responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data)
+            responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data)
                    .header("Content-Type", "application/json")
                    .header("X-Sign", sign)
                    .asString();

--- a/service-manager/src/main/java/com/winsun/controller/AuthCodeController.java
+++ b/service-manager/src/main/java/com/winsun/controller/AuthCodeController.java
@@ -5,6 +5,7 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.AuthCode;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.AuthCodeMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,7 @@ public class AuthCodeController extends BaseController {
    private static AuthCodeMapper authCodeMapper;
    // 查询验证码
+    @PermissionVerification(value = {"/school-center/authcode/hhrAuthCode"})
    @Permission(menuname = "查询验证码", value = "queryAuthCode", method = RequestMethod.POST)
    public ResponseData<List<AuthCode>> queryAuthCodeList(@RequestParam(name = "id", required = false) String id) {
        ShiroUser shiroUser = getShiroUser();

--- a/service-manager/src/main/java/com/winsun/controller/ExportExcelController.java
+++ b/service-manager/src/main/java/com/winsun/controller/ExportExcelController.java
@@ -9,6 +9,7 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.ExportExcel;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.ExportExcelMapper;
 import com.winsun.service.ExportExcelService;
 import com.winsun.service.impl.ExportExcelServiceImpl;
@@ -46,14 +47,19 @@ public class ExportExcelController extends BaseController {
    }
+    @PermissionVerification(value = {"/school-center/other/exportExcel"})
    @Permission(menuname = "订单excel文件下载", value = "uploadExcel", method = RequestMethod.POST)
    public void uploadExcel(String exportId) {
+        ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "快递公司"))) {
+            return;
+        }
        ExportExcel exportExcel = exportExcelMapper.selectById(exportId);
        HttpServletResponse response = getHttpServletResponse();
        exportExcelService.uploadExcel(exportExcel, response);
    }
+    @PermissionVerification(value = {"/school-center/other/exportExcel"})
    @Permission(menuname = "查询下载列表", value = "listExportExcel", method = RequestMethod.POST)
    public ResponseData<Page<ExportExcel>> listExportExcel(@RequestParam(value = "fileName", required = false) String fileName, @RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize) {
        ShiroUser user = getShiroUser();
@@ -71,8 +77,13 @@ public class ExportExcelController extends BaseController {
        return ResponseData.success(page, "查询成功！");
    }
+    @PermissionVerification(value = {"/school-center/other/exportExcel"})
    @Permission(menuname = "删除文件", value = "deleteExcel", method = RequestMethod.POST)
    public ResponseData<String> deleteExcel(String exportId) {
+        ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }
        ExportExcel exportExcel = exportExcelMapper.selectById(exportId);
        File file = new File(ExportExcelServiceImpl.EXPORT + exportExcel.getExportUrl());
        Boolean flag = false;

--- a/service-manager/src/main/java/com/winsun/controller/ImgController.java
+++ b/service-manager/src/main/java/com/winsun/controller/ImgController.java
@@ -36,7 +36,7 @@ public class ImgController extends BaseController {
    private static String pathPre = "/vdb/springboot/school_center/manager/";
    //menuname = "图片路径"  只支持jpeg 和 png
-    @PermissionVerification(value = {"/school-center/userManager/PartnerManagement","/school-center/order/order"})
+    @PermissionVerification(value = {"/school-center/userManager/PartnerManagement","/school-center/order/order","/school-center/schoolmanager/schoolmanagement","/school-center/productManagement/package","/school-center/uploadVerify/studentCardVerify"})
    @Permission(menuname = "图片查询", value =  "/images", method = RequestMethod.POST,produces ={MediaType.IMAGE_JPEG_VALUE,MediaType.IMAGE_PNG_VALUE})
    public String getbackground(String url) {
        ShiroUser shiroUser = getShiroUser();

--- a/service-manager/src/main/java/com/winsun/controller/KdyListController.java
+++ b/service-manager/src/main/java/com/winsun/controller/KdyListController.java
@@ -8,6 +8,7 @@ import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.bean.KdyList;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.KdyListMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,7 @@ public class KdyListController extends BaseController {
        KdyListController.kdyListMapper = kdyListMapper;
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/kdyList"})
    @Permission(menuname = "查询信息", value = "list", method = RequestMethod.POST)
    public Map<String,Object> dataList(@RequestParam(name = "id",required = false)String id,
                                        @RequestParam(name = "accountNumber",required = false)String accountNumber,
@@ -51,6 +53,8 @@ public class KdyListController extends BaseController {
        map.put("page",ResponseData.success(page,"查询成功！"));
        return map;
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/kdyList"})
    @RequestMapping(value = "addData",method = RequestMethod.POST)
    public ResponseData<String> addData(@RequestParam(name = "id") String id,
                                        @RequestParam(name = "accountNumber") String accountNumber){
@@ -71,6 +75,7 @@ public class KdyListController extends BaseController {
        return ResponseData.success();
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/kdyList"})
    @RequestMapping(value = "deleteData",method = RequestMethod.POST)
    public ResponseData<String> deleteData(@RequestParam(name = "id") String id){
        if(StringUtils.isBlank(id)){

--- a/service-manager/src/main/java/com/winsun/controller/MultimediaAccountController.java
+++ b/service-manager/src/main/java/com/winsun/controller/MultimediaAccountController.java
@@ -8,6 +8,7 @@ import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.bean.MultimediaAccount;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.MultimediaAccountMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,7 @@ public class MultimediaAccountController extends BaseController {
        MultimediaAccountController.multimediaAccountMapper = multimediaAccountMapper;
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/multimediaAccount"})
    @Permission(menuname = "查询信息", value = "list", method = RequestMethod.POST)
    public Map<String,Object> dataList(@RequestParam(name = "id",required = false)String id,
                                       @RequestParam(name = "accountNumber",required = false)String accountNumber,
@@ -55,6 +56,7 @@ public class MultimediaAccountController extends BaseController {
        return map;
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/multimediaAccount"})
    @RequestMapping(value = "addData",method = RequestMethod.POST)
    public ResponseData<String> addData(@RequestParam(name = "id") String id,
                                        @RequestParam(name = "accountNumber") String accountNumber){
@@ -75,6 +77,7 @@ public class MultimediaAccountController extends BaseController {
        return ResponseData.success();
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/multimediaAccount"})
    @RequestMapping(value = "deleteData",method = RequestMethod.POST)
    public ResponseData<String> deleteData(@RequestParam(name = "id") String id){
        if(StringUtils.isBlank(id)){

--- a/service-manager/src/main/java/com/winsun/controller/NetworkPlaceController.java
+++ b/service-manager/src/main/java/com/winsun/controller/NetworkPlaceController.java
@@ -11,6 +11,7 @@ import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.util.IOUtils;
 import com.winsun.bean.NetworkInfo;
 import com.winsun.bean.School;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.NetworkInfoMapper;
 import com.winsun.mapper.SchoolMapper;
 import com.winsun.utils.ExcelDealUtils;
@@ -63,6 +64,7 @@ public class NetworkPlaceController extends BaseController {
    @Autowired
    private NetworkInfoMapper networkInfoMapper;
+    @PermissionVerification(value = {"/school-center/network-place/networkPlace"})
    @Permission(menuname = "获取网点列表数据", value = "list", method = RequestMethod.POST)
    public ResponseData<Page<Map<String,Object>>> getOrderConversionInfo(@RequestParam("networkCode")String networkCode,
                                                 @RequestParam("networkName")String networkName,
@@ -99,6 +101,7 @@ public class NetworkPlaceController extends BaseController {
        return ResponseData.success(page,"查询成功！");
    }
+    @PermissionVerification(value = {"/school-center/network-place/networkPlace"})
    @Permission(menuname = "添加", value = "insertData", method = RequestMethod.POST)
    public ResponseData insertData(@RequestParam("networkCode")String networkCode,
                               @RequestParam("networkName")String networkName,
@@ -148,7 +151,8 @@ public class NetworkPlaceController extends BaseController {
        return ResponseData.success();
    }
-    @Permission(menuname = "添加", value = "updateData", method = RequestMethod.POST)
+    @Permission(menuname = "修改", value = "updateData", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/network-place/networkPlace"})
    public ResponseData updateData(@RequestParam("id")String id,
                                   @RequestParam("networkCode")String networkCode,
                                   @RequestParam("networkName")String networkName,
@@ -196,6 +200,7 @@ public class NetworkPlaceController extends BaseController {
    }
    @Permission(menuname = "导出网点数据", value = "reportDownload", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/network-place/networkPlace"})
    public void outOrderConversionInfo(@RequestParam("networkCode")String networkCode,
                                       @RequestParam("networkName")String networkName,
                                       @RequestParam("schoolName")String schoolName,
@@ -241,6 +246,7 @@ public class NetworkPlaceController extends BaseController {
        }
    }
    @Permission(menuname = "下载上传模板", value = "excelMBOut", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/network-place/networkPlace"})
    public void excelMBOut(){
        Map<String,Object> map = new HashMap<>();
        map.put("networkCode","(例：GZXY*******)");
@@ -276,6 +282,7 @@ public class NetworkPlaceController extends BaseController {
     * @return
     */
    @Permission(menuname = "上传数据", value = "importDate", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/network-place/networkPlace"})
    public ResponseData<String> updateDatas(@RequestParam(name = "file") MultipartFile file) {
        StringBuffer error = new StringBuffer();
        if (!StringUtils.endsWithAny(file.getOriginalFilename(), "xlsx", "xls")) {
@@ -424,6 +431,7 @@ public class NetworkPlaceController extends BaseController {
    @Permission(menuname = "删除网点", value = "deleteId", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/network-place/networkPlace"})
    public ResponseData<Object> deleteId(@Param("id") String id) {
        ShiroUser user = getShiroUser();
        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）"))) {

--- a/service-manager/src/main/java/com/winsun/controller/NewUserController.java
+++ b/service-manager/src/main/java/com/winsun/controller/NewUserController.java
@@ -289,8 +289,6 @@ public class NewUserController extends BaseController {
     * @param substName
     * @return
     */
-    @PermissionVerification(value = {"/school-center/order/salesList", "/school-center/order/clsjSalesList","/school-center/order/yctSalesList","/school-center/order/salesProblemList","/school-center/order/yxtOrder"
-            ,"/school-center/userManager/PartnerManagement","/school-center/userManager/newUser","/school-center/userManager/schoolAllocation"})
    @Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
    public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName) {
        Wrapper<School> schoolWrapper = new EntityWrapper<>();
@@ -308,8 +306,6 @@ public class NewUserController extends BaseController {
     * @param substName
     * @return
     */
-    @PermissionVerification(value = {"/school-center/order/salesList", "/school-center/order/clsjSalesList","/school-center/order/yctSalesList","/school-center/order/salesProblemList","/school-center/order/yxtOrder"
-            ,"/school-center/userManager/PartnerManagement","/school-center/userManager/newUser","/school-center/userManager/schoolAllocation"})
    @Permission(menuname = "初始学校", value = "getSchoolNames", method = RequestMethod.POST)
    public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName) {
        Wrapper<School> schoolWrapper = new EntityWrapper<>();

--- a/service-manager/src/main/java/com/winsun/controller/PackageController.java
+++ b/service-manager/src/main/java/com/winsun/controller/PackageController.java
@@ -11,6 +11,7 @@ import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.Package;
 import com.winsun.bean.SchoolPackage;
 import com.winsun.constant.FilePath;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.PackageMapper;
 import com.winsun.mapper.SchoolPackageMapper;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
@@ -72,6 +73,7 @@ public class PackageController extends BaseController {
     * @param explains
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/package"})
    @Permission(menuname = "添加套餐信息", value = "insert", method = RequestMethod.POST)
    public ResponseData<String> insertPackage(@RequestParam("id") String id
                                            , @RequestParam("packageName") String packageName
@@ -115,6 +117,7 @@ public class PackageController extends BaseController {
     * @param id
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/package"})
    @Permission(menuname = "删除套餐信息", value = "delete", method = RequestMethod.POST)
    public ResponseData<String> deletePackage(@RequestParam("id") int id) {
        Integer integer = packageMapper.deleteById(id);
@@ -143,6 +146,7 @@ public class PackageController extends BaseController {
     * @param explains
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/package"})
    @Permission(menuname = "修改套餐信息", value = "update", method = RequestMethod.POST)
    public ResponseData<String> updatePackage(@RequestParam("id") String id
                                            , @RequestParam("packageName") String packageName
@@ -185,6 +189,7 @@ public class PackageController extends BaseController {
    }
+    @PermissionVerification(value = {"/school-center/productManagement/package"})
    @Permission(menuname = "查询套餐信息", value = "list", method = RequestMethod.POST)
    public ResponseData<Page<Package>> listPackage(@RequestParam("name") String name,
                                                   @RequestParam("monthFee") String monthFee,
@@ -217,6 +222,7 @@ public class PackageController extends BaseController {
        return ResponseData.error("查询套餐信息失败");
    }
+    @PermissionVerification(value = {"/school-center/productManagement/package"})
    @Permission(menuname = "套餐全称列表", value = "packageAllList", method = RequestMethod.POST)
    public ResponseData<List<String>> packageAll() {
        ArrayList<String> arrayList = new ArrayList<>();
@@ -230,6 +236,7 @@ public class PackageController extends BaseController {
    }
+    @PermissionVerification(value = {"/school-center/productManagement/package"})
    @Permission(menuname = "上传背景图", value = "backgroundUpload", method = RequestMethod.POST)
    public ResponseData<String> backgroundUpload(MultipartFile file, @RequestParam(value = "id", required = false) String id) {
        if(!StringUtils.endsWithAny(file.getOriginalFilename(), "jpg", "jpeg", "png", "gif")) {
@@ -274,6 +281,7 @@ public class PackageController extends BaseController {
    }
    //xiaotudUpload
+    @PermissionVerification(value = {"/school-center/productManagement/package"})
    @Permission(menuname = "上传小图", value = "xiaotuUpload", method = RequestMethod.POST)
    public ResponseData<String> xiaotuUpload(@RequestParam(value = "file") MultipartFile file, @RequestParam(value = "id", required = false) String id) {
        if(!StringUtils.endsWithAny(file.getOriginalFilename(), "jpg", "jpeg", "png", "gif")) {
@@ -324,6 +332,7 @@ public class PackageController extends BaseController {
     * @param ids
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/package"})
    @Permission(menuname = "批量下架", value = "batchUpdate", method = RequestMethod.POST)
    public ResponseData<String> batchUpdate(@RequestParam("ids") String ids) {
        Integer integer = packageMapper.delSchoolPackageByPackageId(ids.split(","));

--- a/service-manager/src/main/java/com/winsun/controller/ProductController.java
+++ b/service-manager/src/main/java/com/winsun/controller/ProductController.java
@@ -11,6 +11,7 @@ import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.Product;
 import com.winsun.bean.Regular;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.ProductMapper;
 import com.winsun.mapper.RegularMapper;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
@@ -43,6 +44,7 @@ public class ProductController extends BaseController {
     * @param product 添加对象json字符串
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/product"})
    @Permission(menuname = "添加宽带信息", value = "insert", method = RequestMethod.POST)
    public ResponseData<String> insertProduct(@RequestParam("product") String product) {
        ShiroUser user = getShiroUser();
@@ -65,6 +67,7 @@ public class ProductController extends BaseController {
     * @param id 需要删除的id
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/product"})
    @Permission(menuname = "删除宽带信息", value = "delete/{id}", method = RequestMethod.POST)
    public ResponseData<String> deleteProduct(@PathVariable("id") String id) {
        ShiroUser user = getShiroUser();
@@ -88,6 +91,7 @@ public class ProductController extends BaseController {
     * @param product 编辑对象json字符串
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/product"})
    @Permission(menuname = "修改宽带信息", value = "update", method = RequestMethod.POST)
    public ResponseData<String> updateProduct(@RequestParam("product") String product) {
        ShiroUser user = getShiroUser();
@@ -126,6 +130,7 @@ public class ProductController extends BaseController {
     * @param pageSize
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/product"})
    @Permission(menuname = "查询宽带信息", value = "list", method = RequestMethod.POST)
    public ResponseData<Map<String,Object>> listProduct(@RequestParam(name = "productUniversity", required = false) String productUniversity, @RequestParam(name = "productRegion", required = false) String productRegion,
                                                   @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {

--- a/service-manager/src/main/java/com/winsun/controller/RegularController.java
+++ b/service-manager/src/main/java/com/winsun/controller/RegularController.java
@@ -10,6 +10,7 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.Regular;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.RegularMapper;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -38,6 +39,7 @@ public class RegularController extends BaseController {
     * @param regular 添加对象json字符串
     * @return
     */
+    @PermissionVerification(value = {"/school-center/other/codeManage"})
    @Permission(menuname = "添加正则信息", value = "insert", method = RequestMethod.POST)
    public ResponseData<String> insertProduct(@RequestParam("regular") String regular) {
        ShiroUser user = getShiroUser();
@@ -55,6 +57,7 @@ public class RegularController extends BaseController {
     * @param regularId 需要删除的id
     * @return
     */
+    @PermissionVerification(value = {"/school-center/other/codeManage"})
    @Permission(menuname = "删除正则信息", value = "delete", method = RequestMethod.POST)
    public ResponseData<String> deleteProduct(@RequestParam(name="regularId", required = false) String regularId,@RequestParam(name="isShow", required = false) String isShow) {
        ShiroUser user = getShiroUser();
@@ -75,6 +78,7 @@ public class RegularController extends BaseController {
     * @param regular 编辑对象json字符串
     * @return
     */
+    @PermissionVerification(value = {"/school-center/other/codeManage"})
    @Permission(menuname = "修改正则信息", value = "update", method = RequestMethod.POST)
    public ResponseData<String> updateProduct(@RequestParam("regular") String regular) {
        ShiroUser user = getShiroUser();
@@ -100,6 +104,7 @@ public class RegularController extends BaseController {
     * @param pageSize
     * @return
     */
+    @PermissionVerification(value = {"/school-center/other/codeManage"})
    @Permission(menuname = "查询正则信息", value = "list", method = RequestMethod.POST)
    public ResponseData<Page<Regular>> listProduct(@RequestParam(name = "regularName", required = false) String regularName,
                                                   @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {

--- a/service-manager/src/main/java/com/winsun/controller/RhPhoneController.java
+++ b/service-manager/src/main/java/com/winsun/controller/RhPhoneController.java
@@ -7,8 +7,10 @@ import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.bean.RhPhone;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.RhPhoneMapper;
 import com.winsun.utils.ImportExcel;
+import javafx.scene.chart.ValueAxis;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -37,7 +39,7 @@ public class RhPhoneController extends BaseController {
        RhPhoneController.rhPhoneMapper = rhPhoneMapper;
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/RhPhone"})
    @Permission(menuname = "查询信息", value = "list", method = RequestMethod.POST)
    public Map<String,Object> dataList(@RequestParam(name = "id",required = false)String id,
                                       @RequestParam(name = "phone",required = false)String phone,
@@ -58,6 +60,7 @@ public class RhPhoneController extends BaseController {
        return map;
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/RhPhone"})
    @RequestMapping(value = "addData",method = RequestMethod.POST)
    public ResponseData<String> addData(@RequestParam(name = "phone") String phone){
        Wrapper<RhPhone> wrapper = new EntityWrapper<>();
@@ -76,6 +79,7 @@ public class RhPhoneController extends BaseController {
        return ResponseData.success();
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/RhPhone"})
    @RequestMapping(value = "deleteData",method = RequestMethod.POST)
    public ResponseData<String> deleteData(@RequestParam(name = "id") String id){
        if(StringUtils.isBlank(id)){
@@ -97,7 +101,7 @@ public class RhPhoneController extends BaseController {
     * 导入融合号码数据
     * @return
     */
+    @PermissionVerification(value = {"/school-center/broadbandList/RhPhone"})
    @PostMapping(value = "importAccNbr")
    public ResponseData<String> importAccNbr(@RequestParam(name = "file") MultipartFile file){
        StringBuffer error = new StringBuffer();

--- a/service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
+++ b/service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
@@ -92,6 +92,7 @@ public class SchoolManagementController extends BaseController {
    }
    @Permission(menuname = "添加学校信息", value = "insert", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<String> insertSchool(School school, @RequestParam("chosePages") String chosePages,
                                             @RequestParam(value = "startDateStr", required = false) String startDateStr,
                                             @RequestParam(value = "endDateStr", required = false) String endDateStr) {
@@ -133,6 +134,7 @@ public class SchoolManagementController extends BaseController {
    }
    @Permission(menuname = "修改學校是否为老客户", value = "hidestatus", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<String> deleteSchool(@RequestParam("id") String id, @RequestParam("status") int status) {
        System.out.println(id);
        /*Integer integer = schoolMapper.updateForSet("status=" + status, new EntityWrapper<School>().eq("id", id));
@@ -150,6 +152,7 @@ public class SchoolManagementController extends BaseController {
     * @return
     */
    @Permission(menuname = "修改学校信息", value = "update", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<String> updateSchool(School school, @RequestParam("chosePages") String chosePages,
                                             @RequestParam(value = "startDateStr", required = false) String startDateStr,
                                             @RequestParam(value = "endDateStr", required = false) String endDateStr) {
@@ -198,6 +201,7 @@ public class SchoolManagementController extends BaseController {
     * @return
     */
    @Permission(menuname = "查询学校信息", value = "findByList", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<Page<Map<String, Object>>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
                                                              @RequestParam("schoolName") String schoolName, @RequestParam(name = "pageNo", required = false) int pageIndex,
                                                              @RequestParam(name = "pageSize", required = false) int pageSize,
@@ -238,6 +242,7 @@ public class SchoolManagementController extends BaseController {
    }
    @Permission(menuname = "编辑套餐选择回显数据", value = "choosepages", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<Map<String, Object>> editdisplay(@RequestParam("id") String id) {
        HashMap<String, Object> hashMap = new HashMap<>();
        EntityWrapper<SchoolPackage> schoolPackagewrapper = new EntityWrapper<>();
@@ -253,6 +258,7 @@ public class SchoolManagementController extends BaseController {
    }
    @Permission(menuname = "上传二维码", value = "qrcodeUpload", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<String> xiaotuUpload(@RequestParam(value = "file") MultipartFile file, @RequestParam(value = "id", required = false) String id) {
        String backgroundpath = FilePath.BACKGROUNDIMG.getValue() + "/" + DEFAULTPATH;
        File dir = new File(backgroundpath);
@@ -297,6 +303,7 @@ public class SchoolManagementController extends BaseController {
    }
    @Permission(menuname = "上传二维码", value = "qrcodeUpload2", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<String> xiaotuUpload2(@RequestParam(value = "file") MultipartFile file, @RequestParam(value = "id", required = false) String id) {
        String backgroundpath = FilePath.BACKGROUNDIMG.getValue() + "/" + DEFAULTPATH;
        File dir = new File(backgroundpath);
@@ -342,6 +349,7 @@ public class SchoolManagementController extends BaseController {
    @RequestMapping(name = "获取县分下拉列表", value = "substList", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<List<Map<String, Object>>> substList() {
 //		ShiroUser user = getShiroUser();
 //		if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
@@ -358,7 +366,7 @@ public class SchoolManagementController extends BaseController {
        return ResponseData.success(substNameList, "查询完毕！");
    }
-    @PermissionVerification(value = "/school-center/userManager/PartnerManagement")
+    @PermissionVerification(value = {"/school-center/userManager/PartnerManagement","/school-center/schoolmanager/schoolmanagement"})
    @RequestMapping(name = "获取学校下拉列表", value = "schoolList", method = RequestMethod.POST)
    public ResponseData<List<Map<String, Object>>> schoolList(@RequestParam("substName") String substName) {
 //		ShiroUser user = getShiroUser();
@@ -383,6 +391,7 @@ public class SchoolManagementController extends BaseController {
     * @return
     */
    @Permission(menuname = "上传数据", value = "importDate", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public ResponseData<String> updateDatas(@RequestParam(name = "file") MultipartFile file) {
        StringBuffer error = new StringBuffer();
        if (!StringUtils.endsWithAny(file.getOriginalFilename(), "xlsx", "xls")) {
@@ -535,6 +544,7 @@ public class SchoolManagementController extends BaseController {
     * @return
     */
    @Permission(menuname = "导出学校列表信息", value = "excelOut", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public void excelOut(@Param("networkName") String networkName,
                         @Param("status") String status,
                         @Param("subName") String subName,
@@ -576,6 +586,7 @@ public class SchoolManagementController extends BaseController {
    }
    @Permission(menuname = "下载学校上传模板", value = "excelMBOut", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    public void excelMBOut() {
        Map<String, Object> map = new HashMap<>();
        map.put("subName", "");
@@ -607,6 +618,7 @@ public class SchoolManagementController extends BaseController {
    }
    @Permission(menuname = "删除学校信息", value = "deleteSchoolById", method = RequestMethod.POST)
+    @PermissionVerification(value = {"/school-center/schoolmanager/schoolmanagement"})
    @Transactional
    public ResponseData<String> deleteSchool(@RequestParam("id") String id) {
        ShiroUser user = getShiroUser();

--- a/service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
+++ b/service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
@@ -13,6 +13,7 @@ import com.winsun.auth.core.util.DateUtil;
 import com.winsun.auth.core.util.IOUtils;
 import com.winsun.bean.StudentCard;
 import com.winsun.bean.SysUser;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.StudentCardMapper;
 import com.winsun.mapper.SysUserMapper;
 import com.winsun.utils.DesensitizationUtil;
@@ -190,6 +191,7 @@ public class StudentCardVerifyController extends BaseController {
     * @param state
     * @return
     */
+    @PermissionVerification(value = {"/school-center/uploadVerify/studentCardVerify"})
    @Permission(menuname = "修改学生不限量证件信息", value = "update", method = RequestMethod.POST)
    public ResponseData<String> updateProduct(@RequestParam("ids") String ids, @RequestParam("state") Integer state) {
        ShiroUser user = getShiroUser();
@@ -213,6 +215,7 @@ public class StudentCardVerifyController extends BaseController {
     * @param ids
     * @return
     */
+    @PermissionVerification(value = {"/school-center/uploadVerify/studentCardVerify"})
    @Permission(menuname = "查询学生不限量证件信息", value = "queryById", method = RequestMethod.POST)
    public ResponseData<StudentCard> queryById(@RequestParam("ids") String ids) {
        ShiroUser user = getShiroUser();
@@ -245,6 +248,7 @@ public class StudentCardVerifyController extends BaseController {
     * @param pageSize
     * @return
     */
+    @PermissionVerification(value = {"/school-center/uploadVerify/studentCardVerify"})
    @Permission(menuname = "查询学生证件信息", value = "list", method = RequestMethod.POST)
    public ResponseData<Page<StudentCard>> listProduct(
            @RequestParam(name = "userName", required = false) String userName,
@@ -302,6 +306,7 @@ public class StudentCardVerifyController extends BaseController {
     * @param auditState
     * @throws IOException
     */
+    @PermissionVerification(value = {"/school-center/uploadVerify/studentCardVerify"})
    @Permission(menuname = "导出学生不限量证件信息", value = "excelOut", method = RequestMethod.POST)
    public void excelOut(@RequestParam(name = "userName", required = false) String userName,
                         @RequestParam(name = "orderPhone", required = false) String orderPhone,

--- a/service-manager/src/main/java/com/winsun/controller/TeacherController.java
+++ b/service-manager/src/main/java/com/winsun/controller/TeacherController.java
@@ -7,6 +7,7 @@ import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.bean.Teacher;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.TeacherMapper;
 import com.winsun.mapper.TeacherMapper;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +33,7 @@ public class TeacherController extends BaseController {
    @Autowired
    private TeacherMapper teacherMapper;
+    @PermissionVerification(value = {"/school-center/broadbandList/teacher"})
    @Permission(menuname = "查询信息", value = "list", method = RequestMethod.POST)
    public Map<String,Object> dataList(@RequestParam(name = "id",required = false)String id,
                                       @RequestParam(name = "stuNumber",required = false)String stuNumber,
@@ -55,6 +56,7 @@ public class TeacherController extends BaseController {
        return map;
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/teacher"})
    @RequestMapping(value = "addData",method = RequestMethod.POST)
    public ResponseData<String> addData(@RequestParam(name = "stuNumber") String stuNumber,
                                        @RequestParam(name = "stuName") String stuName){
@@ -75,6 +77,7 @@ public class TeacherController extends BaseController {
        return ResponseData.success();
    }
+    @PermissionVerification(value = {"/school-center/broadbandList/teacher"})
    @RequestMapping(value = "deleteData",method = RequestMethod.POST)
    public ResponseData<String> deleteData(@RequestParam(name = "id") String id){
        if(StringUtils.isBlank(id)){

--- a/service-manager/src/main/java/com/winsun/controller/UniversityInfoController.java
+++ b/service-manager/src/main/java/com/winsun/controller/UniversityInfoController.java
@@ -13,6 +13,7 @@ import com.winsun.bean.Product;
 import com.winsun.bean.Regular;
 import com.winsun.bean.School;
 import com.winsun.bean.UniversityInfo;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.ProductMapper;
 import com.winsun.mapper.RegularMapper;
 import com.winsun.mapper.SchoolMapper;
@@ -54,6 +55,7 @@ public class UniversityInfoController extends BaseController {
     * @param university 添加对象的json字符串
     * @return
     */
+    @PermissionVerification(value = {"school-center/productManagement/university"})
    @Permission(menuname = "添加大学宽带信息", value = "insert", method = RequestMethod.POST)
    public ResponseData<String> insertUniversityInfo(@RequestParam("university") String university) {
        ShiroUser user = getShiroUser();
@@ -75,6 +77,7 @@ public class UniversityInfoController extends BaseController {
     * @param id  需要删除的id
     * @return
     */
+    @PermissionVerification(value = {"school-center/productManagement/university"})
    @Permission(menuname = "删除大学宽带信息", value = "delete/{id}", method = RequestMethod.POST)
    public ResponseData<String> deleteUniversityInfo(@PathVariable("id") Integer id) {
        ShiroUser user = getShiroUser();
@@ -90,6 +93,7 @@ public class UniversityInfoController extends BaseController {
     * @param university 编辑对象的json字符串
     * @return
     */
+    @PermissionVerification(value = {"school-center/productManagement/university"})
    @Permission(menuname = "修改宽带信息", value = "update", method = RequestMethod.POST)
    public ResponseData<String> updateUniversityInfo(@RequestParam("university") String university) {
        ShiroUser user = getShiroUser();
@@ -127,6 +131,7 @@ public class UniversityInfoController extends BaseController {
     * @param pageSize
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/university"})
    @Permission(menuname = "查询宽带信息", value = "list", method = RequestMethod.POST)
    public ResponseData<Page<UniversityInfo>> listUniversityInfo(@RequestParam("universityName") String universityName, @RequestParam("universityRegion") String universityRegion,
                                                         @RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize) {
@@ -151,6 +156,7 @@ public class UniversityInfoController extends BaseController {
     * @param pageSize
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/broadband"})
    @Permission(menuname = "查询宽带配置信息列表", value = "broadbandConfigList", method = RequestMethod.POST)
    public ResponseData<Map<String, Object>> broadbandConfigList(@RequestParam(value = "productUniversity", required = false) String productUniversity,
                                                                   @RequestParam(value = "productRegion", required = false) String productRegion,
@@ -177,6 +183,7 @@ public class UniversityInfoController extends BaseController {
     * @param universityId
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/broadband"})
    @Permission(menuname = "查询宽带配置信息", value="broadbandConfigData", method=RequestMethod.POST)
    public ResponseData<Map<String, Object>> broadbandConfigData(@RequestParam("universityId") Integer universityId) {
@@ -208,6 +215,7 @@ public class UniversityInfoController extends BaseController {
     * @param broadBandConfig
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/broadband"})
    @Permission(menuname = "保存宽带配置", value= "saveBroadBandConfig", method = RequestMethod.POST)
    public ResponseData<String> saveBroadBandConfig(HttpServletRequest request,
                   @RequestBody BroadBandConfig broadBandConfig) {
@@ -260,6 +268,7 @@ public class UniversityInfoController extends BaseController {
     * 宽带适用学校
     * @return
     */
+    @PermissionVerification(value = {"/school-center/productManagement/product"})
    @Permission(menuname = "单宽学校名称", value = "universitySchool", method = RequestMethod.POST)
    public ResponseData< List<UniversityInfo>> universitySchool(){
        Wrapper<UniversityInfo> wrapper = new EntityWrapper();

--- a/service-manager/src/main/java/com/winsun/controller/UserDeployController.java
+++ b/service-manager/src/main/java/com/winsun/controller/UserDeployController.java
@@ -13,6 +13,7 @@ import com.winsun.bean.School;
 import com.winsun.bean.SysUser;
 import com.winsun.bean.UserDeploy;
 import com.winsun.bean.UserSchool;
+import com.winsun.interfaces.PermissionVerification;
 import com.winsun.mapper.SchoolMapper;
 import com.winsun.mapper.SysUserMapper;
 import com.winsun.mapper.UserDeployMapper;
@@ -51,6 +52,7 @@ public class UserDeployController extends BaseController {
     * @param userDeploy 编辑对象json字符串
     * @return
     */
+    @PermissionVerification(value = {"/school-center/other/userDeploy"})
    @Permission(menuname = "修改或者添加合伙人配置信息", value = "addOrUpdate", method = RequestMethod.POST)
    public ResponseData<String> updateProduct(@RequestParam("userDeploy") String userDeploy) {
        ShiroUser user = getShiroUser();
@@ -69,6 +71,7 @@ public class UserDeployController extends BaseController {
        return ResponseData.success("新增成功！");
    }
+    @PermissionVerification(value = {"/school-center/other/userDeploy"})
    @RequestMapping(value = "/delete")
    @ResponseBody
    public ResponseData<String> delete(Integer id) {
@@ -88,6 +91,7 @@ public class UserDeployController extends BaseController {
     * @param pageSize
     * @return
     */
+    @PermissionVerification(value = {"/school-center/other/userDeploy"})
    @Permission(menuname = "查询合伙人配置信息", value = "list", method = RequestMethod.POST)
    public ResponseData<Page<UserDeploy>> listProduct(
            @RequestParam(name = "name", required = false) String name, @RequestParam(name = "hhrNames", required = false) String hhrNames,