Merge branch 'master' into feature-management-2021-9-16

# Conflicts:
#	fiveep-controller/src/main/java/com/bizmatics/controller/web/WcBlackoutPlanController.java
#	fiveep-model/src/main/java/com/bizmatics/model/WcBlackoutPlan.java
#	fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/WcBlackoutPlanMapper.java
#	fiveep-service/src/main/java/com/bizmatics/service/WcBlackoutPlanService.java
#	fiveep-service/src/main/java/com/bizmatics/service/impl/WcBlackoutPlanServiceImpl.java

fiveep-controller/src/main/java/com/bizmatics/controller/web/WcAccessTokenController.java

@@ -1,22 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@RestController
-@RequestMapping("/wcAccessToken")
-public class WcAccessTokenController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/WcKeySecretController.java

@@ -1,22 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@RestController
-@RequestMapping("/wcKeySecret")
-public class WcKeySecretController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/WcMeasTypeController.java

@@ -1,22 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@RestController
-@RequestMapping("/wcMeasType")
-public class WcMeasTypeController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/WcUserController.java

@@ -1,22 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@RestController
-@RequestMapping("/wcUser")
-public class WcUserController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/WcUserTokenController.java

@@ -1,22 +0,0 @@
-package com.bizmatics.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@RestController
-@RequestMapping("/wcUserToken")
-public class WcUserTokenController {
-
-}
-

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/BaseController.java

@@ -72,7 +72,7 @@ public class BaseController {
      * @param rows 影响行数
      * @return 操作结果
      */
-    protected ApiResult toAjax(int rows) {
+    protected ApiResult<Void> toAjax(int rows) {
         return rows > 0 ? ApiResult.success() : ApiResult.error(BusinessErrorCode.BIZ_MODIFY_FAIL.getCode(), BusinessErrorCode.BIZ_MODIFY_FAIL.getDefaultMessage());
     }
 }

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysConfigController.java

@@ -38,15 +38,6 @@ public class SysConfigController extends BaseController
         List<SysConfig> list = configService.selectConfigList(config);
         return getDataTable(list);
     }
-    
-//    @PreAuthorize("@ss.hasPermi('system:config:export')")
-//    @GetMapping("/export")
-//    public ApiResult export(SysConfig config)
-//    {
-//        List<SysConfig> list = configService.selectConfigList(config);
-//        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
-//        return util.exportExcel(list, "参数数据");
-//    }
 
     /**
      * 根据参数编号获取详细信息

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysDictDataController.java

@@ -40,15 +40,6 @@ public class SysDictDataController extends BaseController
         return getDataTable(list);
     }
 
-//    @PreAuthorize("@ss.hasPermi('system:dict:export')")
-//    @GetMapping("/export")
-//    public ApiResult export(SysDictData dictData)
-//    {
-//        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-//        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
-//        return util.exportExcel(list, "字典数据");
-//    }
-
     /**
      * 查询字典数据详细
      */

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysDictTypeController.java

@@ -35,15 +35,6 @@ public class SysDictTypeController extends BaseController
         return getDataTable(list);
     }
 
-//    @PreAuthorize("@ss.hasPermi('system:dict:export')")
-//    @GetMapping("/export")
-//    public ApiResult export(SysDictType dictType)
-//    {
-//        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-//        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
-//        return util.exportExcel(list, "字典类型");
-//    }
-
     /**
      * 查询字典类型详细
      */

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysLoginController.java

@@ -4,11 +4,12 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.mvc.utils.ServletUtils;
 import com.bizmatics.model.system.SysMenu;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.RouterVo;
+import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.system.ISysMenuService;
 import com.bizmatics.service.system.impl.SysLoginService;
 import com.bizmatics.service.system.impl.SysPermissionService;
 import com.bizmatics.service.system.impl.TokenService;
-import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.vo.LoginBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -49,7 +50,7 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    public ApiResult login(@RequestBody LoginBody loginBody)
+    public ApiResult<String> login(@RequestBody LoginBody loginBody)
     {
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
@@ -63,7 +64,7 @@ public class SysLoginController
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    public ApiResult getInfo()
+    public ApiResult<Map<String,Object>> getInfo()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
@@ -84,7 +85,7 @@ public class SysLoginController
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public ApiResult getRouters()
+    public ApiResult<List<RouterVo>> getRouters()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         // 用户信息

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysPostController.java

@@ -39,15 +39,6 @@ public class SysPostController extends BaseController
         return getDataTable(list);
     }
 
-//    @PreAuthorize("@ss.hasPermi('system:post:export')")
-//    @GetMapping("/export")
-//    public ApiResult export(SysPost post)
-//    {
-//        List<SysPost> list = postService.selectPostList(post);
-//        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
-//        return util.exportExcel(list, "岗位数据");
-//    }
-
     /**
      * 根据岗位编号获取详细信息
      */

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysRegisterController.java

@@ -1,36 +0,0 @@
-//package com.bizmatics.controller.web.system;
-//
-//import com.bizmatics.common.core.bean.ApiResult;
-//import com.bizmatics.service.system.ISysConfigService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.util.StringUtils;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//
-///**
-// * 注册验证
-// *
-// * @author ruoyi
-// */
-//@RestController
-//public class SysRegisterController extends BaseController
-//{
-//    @Autowired
-//    private SysRegisterService registerService;
-//
-//    @Autowired
-//    private ISysConfigService configService;
-//
-//    @PostMapping("/register")
-//    public ApiResult register(@RequestBody RegisterBody user)
-//    {
-//        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
-//        {
-//            return error("当前系统没有开启注册功能！");
-//        }
-//        String msg = registerService.register(user);
-//        return StringUtils.isEmpty(msg) ? success() : error(msg);
-//    }
-//}

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysRoleController.java

@@ -53,15 +53,6 @@ public class SysRoleController extends BaseController
         return getDataTable(list);
     }
 
-//    @PreAuthorize("@ss.hasPermi('system:role:export')")
-//    @GetMapping("/export")
-//    public ApiResult export(SysRole role)
-//    {
-//        List<SysRole> list = roleService.selectRoleList(role);
-//        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
-//        return util.exportExcel(list, "角色数据");
-//    }
-
     /**
      * 根据角色编号获取详细信息
      */

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysUserController.java

@@ -45,11 +45,11 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysUser user)
+    public ApiResult<TableDataInfo> list(SysUser user)
     {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**
@@ -57,7 +57,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
-    public ApiResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    public ApiResult<Map<String,Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
         Map<String,Object> ajax = new HashMap<>();
         List<SysRole> roles = roleService.selectRoleAll();
@@ -77,7 +77,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @PostMapping
-    public ApiResult add(@Validated @RequestBody SysUser user)
+    public ApiResult<Void> add(@Validated @RequestBody SysUser user)
     {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
         {
@@ -103,7 +103,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysUser user)
+    public ApiResult<Void> edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
@@ -125,7 +125,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @DeleteMapping("/{userIds}")
-    public ApiResult remove(@PathVariable Long[] userIds)
+    public ApiResult<Void> remove(@PathVariable Long[] userIds)
     {
         return toAjax(userService.deleteUserByIds(userIds));
     }
@@ -135,7 +135,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @PutMapping("/resetPwd")
-    public ApiResult resetPwd(@RequestBody SysUser user)
+    public ApiResult<Void> resetPwd(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -148,7 +148,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping("/changeStatus")
-    public ApiResult changeStatus(@RequestBody SysUser user)
+    public ApiResult<Void> changeStatus(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -160,7 +160,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public ApiResult authRole(@PathVariable("userId") Long userId)
+    public ApiResult<Map<String,Object>> authRole(@PathVariable("userId") Long userId)
     {
         Map<String,Object> ajax = new HashMap<>();
         SysUser user = userService.selectUserById(userId);
@@ -175,7 +175,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping("/authRole")
-    public ApiResult insertAuthRole(Long userId, Long[] roleIds)
+    public ApiResult<Void> insertAuthRole(Long userId, Long[] roleIds)
     {
         userService.insertUserAuth(userId, roleIds);
         return ApiResult.success();

fiveep-controller/src/main/resources/application-prod.properties

@@ -19,7 +19,7 @@ spring.datasource.dynamic.primary=fiveep
 spring.datasource.dynamic.datasource.fiveep.url=jdbc:mysql://124.71.145.219:3306/smart_electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
 spring.datasource.dynamic.datasource.fiveep.username=root
 spring.datasource.dynamic.datasource.fiveep.password=Wjzn2021Db
-spring.datasource.dynamic.druid.initial-size=5                                                                       
+spring.datasource.dynamic.druid.initial-size=5
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30
 spring.datasource.dynamic.druid.max-wait=60000

fiveep-controller/src/main/resources/static/doc/search.js

@@ -31,244 +31,741 @@ api[0].list.push({
     desc: '运行状态',
 });
 api.push({
-    alias: 'DeviceController',
+    alias: 'DeviceAttributeController',
     order: '2',
+    link: '<p>设备属性_前端控制器</p>',
+    desc: '<p>设备属性 前端控制器</p>',
+    list: []
+})
+api.push({
+    alias: 'DeviceController',
+    order: '3',
     link: '设备',
     desc: '设备',
     list: []
 })
-api[1].list.push({
+api[2].list.push({
     order: '1',
     desc: '查询设备总数',
 });
-api[1].list.push({
+api[2].list.push({
     order: '2',
     desc: '查询不同类型的设备数量',
 });
-api[1].list.push({
+api[2].list.push({
     order: '3',
     desc: '',
 });
+api[2].list.push({
+    order: '4',
+    desc: '',
+});
 api.push({
     alias: 'DeviceStatusController',
-    order: '3',
+    order: '4',
     link: '设备状态',
     desc: '设备状态',
     list: []
 })
 api.push({
-    alias: 'FacilityController',
+    alias: 'RtAnalogControllerWeb',
+    order: '5',
+    link: '',
+    desc: '',
+    list: []
+})
+api[4].list.push({
+    order: '1',
+    desc: '',
+});
+api[4].list.push({
+    order: '2',
+    desc: '',
+});
+api[4].list.push({
+    order: '3',
+    desc: '',
+});
+api[4].list.push({
     order: '4',
+    desc: '',
+});
+api[4].list.push({
+    order: '5',
+    desc: '',
+});
+api[4].list.push({
+    order: '6',
+    desc: '',
+});
+api.push({
+    alias: 'FacilityController',
+    order: '6',
     link: 'object',
     desc: 'object',
     list: []
 })
-api[3].list.push({
+api[5].list.push({
     order: '1',
     desc: '查询不同设备的数量',
 });
+api.push({
+    alias: 'HadSiteStaticController',
+    order: '7',
+    link: '<p>_前端控制器</p>',
+    desc: '<p> 前端控制器</p>',
+    list: []
+})
 api.push({
     alias: 'HtAnalogDataController',
-    order: '5',
+    order: '8',
     link: '历史消费组模拟量',
     desc: '历史消费组模拟量',
     list: []
 })
-api[4].list.push({
+api[7].list.push({
     order: '1',
     desc: '首页日/月/年用电量',
 });
-api[4].list.push({
+api[7].list.push({
     order: '2',
     desc: '今日/昨日用电趋势',
 });
-api[4].list.push({
+api[7].list.push({
     order: '3',
-    desc: '站点日/月/年用电量',
+    desc: '当月用电趋势图',
 });
-api[4].list.push({
+api[7].list.push({
     order: '4',
-    desc: '分时电量',
+    desc: '站点日/月/年用电量',
 });
-api[4].list.push({
+api[7].list.push({
     order: '5',
-    desc: '需量趋势图',
+    desc: '分时电量',
 });
-api[4].list.push({
+api[7].list.push({
     order: '6',
+    desc: '需量趋势图',
+});
+api[7].list.push({
+    order: '7',
     desc: '历史记录电流电压',
 });
 api.push({
     alias: 'HtSwitchDataController',
-    order: '6',
+    order: '9',
     link: '历史消费组开关',
     desc: '历史消费组开关',
     list: []
 })
+api.push({
+    alias: 'JobController',
+    order: '10',
+    link: '',
+    desc: '',
+    list: []
+})
+api[9].list.push({
+    order: '1',
+    desc: '',
+});
 api.push({
     alias: 'PersonnelController',
-    order: '7',
+    order: '11',
     link: '人员信息',
     desc: '人员信息',
     list: []
 })
-api[6].list.push({
+api[10].list.push({
     order: '1',
     desc: '查询不同种类的人员信息',
 });
 api.push({
     alias: 'RouteController',
-    order: '8',
+    order: '12',
     link: '线路表',
     desc: '线路表',
     list: []
 })
 api.push({
     alias: 'RtAnalogDataController',
-    order: '9',
+    order: '13',
     link: '实时消费组模拟量',
     desc: '实时消费组模拟量',
     list: []
 })
-api[8].list.push({
+api[12].list.push({
     order: '1',
     desc: '重载/轻载/正常',
 });
-api[8].list.push({
+api[12].list.push({
     order: '2',
     desc: '查看实时数据详情',
 });
-api[8].list.push({
+api[12].list.push({
     order: '3',
     desc: '实时负荷',
 });
-api[8].list.push({
+api[12].list.push({
     order: '4',
     desc: '',
 });
-api[8].list.push({
+api[12].list.push({
     order: '5',
     desc: '',
 });
-api[8].list.push({
+api[12].list.push({
     order: '6',
     desc: '',
 });
 api.push({
     alias: 'RtSwitchDataController',
-    order: '10',
+    order: '14',
     link: '实时消费组开关',
     desc: '实时消费组开关',
     list: []
 })
-api[9].list.push({
+api[13].list.push({
     order: '1',
     desc: '查看单个信息',
 });
-api[9].list.push({
+api[13].list.push({
     order: '2',
     desc: '',
 });
 api.push({
     alias: 'SiteController',
-    order: '11',
+    order: '15',
     link: '站点',
     desc: '站点',
     list: []
 })
-api[10].list.push({
+api[14].list.push({
     order: '1',
     desc: '查看不同状态的站点数量',
 });
-api[10].list.push({
+api[14].list.push({
     order: '2',
     desc: '查看站点列表',
 });
-api[10].list.push({
+api[14].list.push({
     order: '3',
     desc: '',
 });
-api[10].list.push({
+api[14].list.push({
     order: '4',
     desc: '查看站点详情',
 });
+api[14].list.push({
+    order: '5',
+    desc: '查看站点列表',
+});
+api[14].list.push({
+    order: '6',
+    desc: '',
+});
+api[14].list.push({
+    order: '7',
+    desc: '',
+});
+api[14].list.push({
+    order: '8',
+    desc: '',
+});
+api[14].list.push({
+    order: '9',
+    desc: '',
+});
 api.push({
     alias: 'SitedtlController',
-    order: '12',
+    order: '16',
     link: '站点详情',
     desc: '站点详情',
     list: []
 })
+api.push({
+    alias: 'SiteDynamicPropertiesController',
+    order: '17',
+    link: '<p>站点动态属性表_前端控制器</p>',
+    desc: '<p>站点动态属性表 前端控制器</p>',
+    list: []
+})
+api.push({
+    alias: 'SiteGroupingController',
+    order: '18',
+    link: '<p>_前端控制器</p>',
+    desc: '<p> 前端控制器</p>',
+    list: []
+})
+api[17].list.push({
+    order: '1',
+    desc: '',
+});
+api[17].list.push({
+    order: '2',
+    desc: '',
+});
 api.push({
     alias: 'SiteObjectController',
-    order: '13',
+    order: '19',
     link: '',
     desc: '',
     list: []
 })
+api.push({
+    alias: 'SiteTypeController',
+    order: '20',
+    link: '<p>_前端控制器</p>',
+    desc: '<p> 前端控制器</p>',
+    list: []
+})
+api.push({
+    alias: 'CaptchaController',
+    order: '21',
+    link: '验证码操作处理',
+    desc: '验证码操作处理',
+    list: []
+})
+api[20].list.push({
+    order: '1',
+    desc: '生成验证码',
+});
+api.push({
+    alias: 'SysConfigController',
+    order: '22',
+    link: '参数配置_信息操作处理',
+    desc: '参数配置 信息操作处理',
+    list: []
+})
+api[21].list.push({
+    order: '1',
+    desc: '获取参数配置列表',
+});
+api[21].list.push({
+    order: '2',
+    desc: '根据参数编号获取详细信息',
+});
+api[21].list.push({
+    order: '3',
+    desc: '根据参数键名查询参数值',
+});
+api[21].list.push({
+    order: '4',
+    desc: '新增参数配置',
+});
+api[21].list.push({
+    order: '5',
+    desc: '修改参数配置',
+});
+api[21].list.push({
+    order: '6',
+    desc: '删除参数配置',
+});
+api[21].list.push({
+    order: '7',
+    desc: '刷新参数缓存',
+});
+api.push({
+    alias: 'SysDeptController',
+    order: '23',
+    link: '部门信息',
+    desc: '部门信息',
+    list: []
+})
+api[22].list.push({
+    order: '1',
+    desc: '获取部门列表',
+});
+api[22].list.push({
+    order: '2',
+    desc: '查询部门列表（排除节点）',
+});
+api[22].list.push({
+    order: '3',
+    desc: '根据部门编号获取详细信息',
+});
+api[22].list.push({
+    order: '4',
+    desc: '获取部门下拉树列表',
+});
+api[22].list.push({
+    order: '5',
+    desc: '加载对应角色部门列表树',
+});
+api[22].list.push({
+    order: '6',
+    desc: '新增部门',
+});
+api[22].list.push({
+    order: '7',
+    desc: '修改部门',
+});
+api[22].list.push({
+    order: '8',
+    desc: '删除部门',
+});
+api.push({
+    alias: 'SysDictDataController',
+    order: '24',
+    link: '数据字典信息',
+    desc: '数据字典信息',
+    list: []
+})
+api[23].list.push({
+    order: '1',
+    desc: '',
+});
+api[23].list.push({
+    order: '2',
+    desc: '查询字典数据详细',
+});
+api[23].list.push({
+    order: '3',
+    desc: '根据字典类型查询字典数据信息',
+});
+api[23].list.push({
+    order: '4',
+    desc: '新增字典类型',
+});
+api[23].list.push({
+    order: '5',
+    desc: '修改保存字典类型',
+});
+api[23].list.push({
+    order: '6',
+    desc: '删除字典类型',
+});
+api.push({
+    alias: 'SysDictTypeController',
+    order: '25',
+    link: '数据字典信息',
+    desc: '数据字典信息',
+    list: []
+})
+api[24].list.push({
+    order: '1',
+    desc: '',
+});
+api[24].list.push({
+    order: '2',
+    desc: '查询字典类型详细',
+});
+api[24].list.push({
+    order: '3',
+    desc: '新增字典类型',
+});
+api[24].list.push({
+    order: '4',
+    desc: '修改字典类型',
+});
+api[24].list.push({
+    order: '5',
+    desc: '删除字典类型',
+});
+api[24].list.push({
+    order: '6',
+    desc: '刷新字典缓存',
+});
+api[24].list.push({
+    order: '7',
+    desc: '获取字典选择框列表',
+});
+api.push({
+    alias: 'SysLoginController',
+    order: '26',
+    link: '登录验证',
+    desc: '登录验证',
+    list: []
+})
+api[25].list.push({
+    order: '1',
+    desc: '登录方法',
+});
+api[25].list.push({
+    order: '2',
+    desc: '获取用户信息',
+});
+api[25].list.push({
+    order: '3',
+    desc: '获取路由信息',
+});
+api.push({
+    alias: 'SysMenuController',
+    order: '27',
+    link: '菜单信息',
+    desc: '菜单信息',
+    list: []
+})
+api[26].list.push({
+    order: '1',
+    desc: '获取菜单列表',
+});
+api[26].list.push({
+    order: '2',
+    desc: '根据菜单编号获取详细信息',
+});
+api[26].list.push({
+    order: '3',
+    desc: '获取菜单下拉树列表',
+});
+api[26].list.push({
+    order: '4',
+    desc: '加载对应角色菜单列表树',
+});
+api[26].list.push({
+    order: '5',
+    desc: '新增菜单',
+});
+api[26].list.push({
+    order: '6',
+    desc: '修改菜单',
+});
+api[26].list.push({
+    order: '7',
+    desc: '删除菜单',
+});
+api.push({
+    alias: 'SysNoticeController',
+    order: '28',
+    link: '公告_信息操作处理',
+    desc: '公告 信息操作处理',
+    list: []
+})
+api[27].list.push({
+    order: '1',
+    desc: '获取通知公告列表',
+});
+api[27].list.push({
+    order: '2',
+    desc: '根据通知公告编号获取详细信息',
+});
+api[27].list.push({
+    order: '3',
+    desc: '新增通知公告',
+});
+api[27].list.push({
+    order: '4',
+    desc: '修改通知公告',
+});
+api[27].list.push({
+    order: '5',
+    desc: '删除通知公告',
+});
+api.push({
+    alias: 'SysPostController',
+    order: '29',
+    link: '岗位信息操作处理',
+    desc: '岗位信息操作处理',
+    list: []
+})
+api[28].list.push({
+    order: '1',
+    desc: '获取岗位列表',
+});
+api[28].list.push({
+    order: '2',
+    desc: '根据岗位编号获取详细信息',
+});
+api[28].list.push({
+    order: '3',
+    desc: '新增岗位',
+});
+api[28].list.push({
+    order: '4',
+    desc: '修改岗位',
+});
+api[28].list.push({
+    order: '5',
+    desc: '删除岗位',
+});
+api[28].list.push({
+    order: '6',
+    desc: '获取岗位选择框列表',
+});
+api.push({
+    alias: 'SysProfileController',
+    order: '30',
+    link: '个人信息_业务处理',
+    desc: '个人信息 业务处理',
+    list: []
+})
+api[29].list.push({
+    order: '1',
+    desc: '个人信息',
+});
+api[29].list.push({
+    order: '2',
+    desc: '修改用户',
+});
+api[29].list.push({
+    order: '3',
+    desc: '重置密码',
+});
+api.push({
+    alias: 'SysRoleController',
+    order: '31',
+    link: '角色信息',
+    desc: '角色信息',
+    list: []
+})
+api[30].list.push({
+    order: '1',
+    desc: '',
+});
+api[30].list.push({
+    order: '2',
+    desc: '根据角色编号获取详细信息',
+});
+api[30].list.push({
+    order: '3',
+    desc: '新增角色',
+});
+api[30].list.push({
+    order: '4',
+    desc: '修改保存角色',
+});
+api[30].list.push({
+    order: '5',
+    desc: '修改保存数据权限',
+});
+api[30].list.push({
+    order: '6',
+    desc: '状态修改',
+});
+api[30].list.push({
+    order: '7',
+    desc: '删除角色',
+});
+api[30].list.push({
+    order: '8',
+    desc: '获取角色选择框列表',
+});
+api[30].list.push({
+    order: '9',
+    desc: '查询已分配用户角色列表',
+});
+api[30].list.push({
+    order: '10',
+    desc: '查询未分配用户角色列表',
+});
+api[30].list.push({
+    order: '11',
+    desc: '取消授权用户',
+});
+api[30].list.push({
+    order: '12',
+    desc: '批量取消授权用户',
+});
+api[30].list.push({
+    order: '13',
+    desc: '批量选择用户授权',
+});
+api.push({
+    alias: 'SysUserController',
+    order: '32',
+    link: '用户信息',
+    desc: '用户信息',
+    list: []
+})
+api[31].list.push({
+    order: '1',
+    desc: '获取用户列表',
+});
+api[31].list.push({
+    order: '2',
+    desc: '根据用户编号获取详细信息',
+});
+api[31].list.push({
+    order: '3',
+    desc: '新增用户',
+});
+api[31].list.push({
+    order: '4',
+    desc: '修改用户',
+});
+api[31].list.push({
+    order: '5',
+    desc: '删除用户',
+});
+api[31].list.push({
+    order: '6',
+    desc: '重置密码',
+});
+api[31].list.push({
+    order: '7',
+    desc: '状态修改',
+});
+api[31].list.push({
+    order: '8',
+    desc: '根据用户编号获取授权角色',
+});
+api[31].list.push({
+    order: '9',
+    desc: '用户授权角色',
+});
 api.push({
     alias: 'UserController',
-    order: '14',
+    order: '33',
     link: '用户',
     desc: '用户',
     list: []
 })
-api[13].list.push({
+api[32].list.push({
     order: '1',
     desc: '',
 });
 api.push({
     alias: 'UserSiteController',
-    order: '15',
+    order: '34',
     link: '用户站点信息',
     desc: '用户站点信息',
     list: []
 })
 api.push({
     alias: 'WcAccessTokenController',
-    order: '16',
+    order: '35',
     link: '<p>_前端控制器</p>',
     desc: '<p> 前端控制器</p>',
     list: []
 })
 api.push({
     alias: 'WcBlackoutPlanController',
-    order: '17',
+    order: '36',
     link: '<p>_前端控制器</p>',
     desc: '<p> 前端控制器</p>',
     list: []
 })
 api.push({
     alias: 'WcKeySecretController',
-    order: '18',
+    order: '37',
     link: '<p>_前端控制器</p>',
     desc: '<p> 前端控制器</p>',
     list: []
 })
 api.push({
     alias: 'WcMeasTypeController',
-    order: '19',
+    order: '38',
     link: '<p>_前端控制器</p>',
     desc: '<p> 前端控制器</p>',
     list: []
 })
 api.push({
     alias: 'WcUserController',
-    order: '20',
+    order: '39',
     link: '<p>_前端控制器</p>',
     desc: '<p> 前端控制器</p>',
     list: []
 })
 api.push({
     alias: 'WcUserTokenController',
-    order: '21',
+    order: '40',
     link: '<p>_前端控制器</p>',
     desc: '<p> 前端控制器</p>',
     list: []
 })
 api.push({
     alias: 'dict',
-    order: '22',
+    order: '41',
     link: 'dict_list',
     desc: '数据字典',
     list: []

fiveep-model/src/main/java/com/bizmatics/model/Test.java

@@ -1,8 +0,0 @@
-package com.bizmatics.model;
-
-/**
- * @author yq
- * @date 2021/7/5 18:12
- */
-public class Test {
-}

fiveep-model/src/main/java/com/bizmatics/model/WcAccessToken.java

@@ -1,40 +0,0 @@
-package com.bizmatics.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class WcAccessToken implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 微信接口token
-     */
-    private String accessToken;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-
-}

fiveep-model/src/main/java/com/bizmatics/model/WcKeySecret.java

@@ -1,50 +0,0 @@
-package com.bizmatics.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class WcKeySecret implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 微信key
-     */
-    private String wcKey;
-
-    /**
-     * 微信secret
-     */
-    private String wcSecret;
-
-    /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-
-}

fiveep-model/src/main/java/com/bizmatics/model/WcMeasType.java

@@ -1,36 +0,0 @@
-package com.bizmatics.model;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class WcMeasType implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    private Integer id;
-
-    /**
-     * 告警名称
-     */
-    private String measName;
-
-    /**
-     * 告警名称描述
-     */
-    private String measDesc;
-
-
-}

fiveep-model/src/main/java/com/bizmatics/model/WcUser.java

@@ -1,58 +0,0 @@
-package com.bizmatics.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class WcUser implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 公众号用户表ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 手机号/用户名
-     */
-    private String phone;
-
-    /**
-     * 公众号openid
-     */
-    private String openId;
-
-    /**
-     * 类型：wx、app
-     */
-    private String registrationType;
-
-    /**
-     * 添加时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 使能标识：1可用；0不可用
-     */
-    private Integer enable;
-
-
-}

fiveep-model/src/main/java/com/bizmatics/model/WcUserToken.java

@@ -1,43 +0,0 @@
-package com.bizmatics.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class WcUserToken implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 用户token表
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 用户token
-     */
-    private String token;
-
-    /**
-     * token生成时间
-     */
-    private LocalDateTime createTime;
-
-
-}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/WcAccessTokenMapper.java

@@ -1,16 +0,0 @@
-package com.bizmatics.persistence.mapper;
-
-import com.bizmatics.model.WcAccessToken;
-import com.bizmatics.common.mvc.base.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcAccessTokenMapper extends CrudMapper<WcAccessToken> {
-
-}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/WcKeySecretMapper.java

@@ -1,16 +0,0 @@
-package com.bizmatics.persistence.mapper;
-
-import com.bizmatics.model.WcKeySecret;
-import com.bizmatics.common.mvc.base.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcKeySecretMapper extends CrudMapper<WcKeySecret> {
-
-}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/WcMeasTypeMapper.java

@@ -1,16 +0,0 @@
-package com.bizmatics.persistence.mapper;
-
-import com.bizmatics.model.WcMeasType;
-import com.bizmatics.common.mvc.base.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcMeasTypeMapper extends CrudMapper<WcMeasType> {
-
-}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/WcUserMapper.java

@@ -1,16 +0,0 @@
-package com.bizmatics.persistence.mapper;
-
-import com.bizmatics.model.WcUser;
-import com.bizmatics.common.mvc.base.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcUserMapper extends CrudMapper<WcUser> {
-
-}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/WcUserTokenMapper.java

@@ -1,16 +0,0 @@
-package com.bizmatics.persistence.mapper;
-
-import com.bizmatics.model.WcUserToken;
-import com.bizmatics.common.mvc.base.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcUserTokenMapper extends CrudMapper<WcUserToken> {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/WcAccessTokenService.java

@@ -1,16 +0,0 @@
-package com.bizmatics.service;
-
-import com.bizmatics.model.WcAccessToken;
-import com.bizmatics.common.mvc.base.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcAccessTokenService extends CrudService<WcAccessToken> {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/WcKeySecretService.java

@@ -1,16 +0,0 @@
-package com.bizmatics.service;
-
-import com.bizmatics.model.WcKeySecret;
-import com.bizmatics.common.mvc.base.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcKeySecretService extends CrudService<WcKeySecret> {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/WcMeasTypeService.java

@@ -1,16 +0,0 @@
-package com.bizmatics.service;
-
-import com.bizmatics.model.WcMeasType;
-import com.bizmatics.common.mvc.base.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcMeasTypeService extends CrudService<WcMeasType> {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/WcUserService.java

@@ -1,16 +0,0 @@
-package com.bizmatics.service;
-
-import com.bizmatics.model.WcUser;
-import com.bizmatics.common.mvc.base.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcUserService extends CrudService<WcUser> {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/WcUserTokenService.java

@@ -1,16 +0,0 @@
-package com.bizmatics.service;
-
-import com.bizmatics.model.WcUserToken;
-import com.bizmatics.common.mvc.base.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-public interface WcUserTokenService extends CrudService<WcUserToken> {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/impl/WcAccessTokenServiceImpl.java

@@ -1,20 +0,0 @@
-package com.bizmatics.service.impl;
-
-import com.bizmatics.model.WcAccessToken;
-import com.bizmatics.persistence.mapper.WcAccessTokenMapper;
-import com.bizmatics.service.WcAccessTokenService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Service
-public class WcAccessTokenServiceImpl extends AbstractCrudService<WcAccessTokenMapper, WcAccessToken> implements WcAccessTokenService {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/impl/WcKeySecretServiceImpl.java

@@ -1,20 +0,0 @@
-package com.bizmatics.service.impl;
-
-import com.bizmatics.model.WcKeySecret;
-import com.bizmatics.persistence.mapper.WcKeySecretMapper;
-import com.bizmatics.service.WcKeySecretService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Service
-public class WcKeySecretServiceImpl extends AbstractCrudService<WcKeySecretMapper, WcKeySecret> implements WcKeySecretService {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/impl/WcMeasTypeServiceImpl.java

@@ -1,20 +0,0 @@
-package com.bizmatics.service.impl;
-
-import com.bizmatics.model.WcMeasType;
-import com.bizmatics.persistence.mapper.WcMeasTypeMapper;
-import com.bizmatics.service.WcMeasTypeService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Service
-public class WcMeasTypeServiceImpl extends AbstractCrudService<WcMeasTypeMapper, WcMeasType> implements WcMeasTypeService {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/impl/WcUserServiceImpl.java

@@ -1,20 +0,0 @@
-package com.bizmatics.service.impl;
-
-import com.bizmatics.model.WcUser;
-import com.bizmatics.persistence.mapper.WcUserMapper;
-import com.bizmatics.service.WcUserService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Service
-public class WcUserServiceImpl extends AbstractCrudService<WcUserMapper, WcUser> implements WcUserService {
-
-}

fiveep-service/src/main/java/com/bizmatics/service/impl/WcUserTokenServiceImpl.java

@@ -1,20 +0,0 @@
-package com.bizmatics.service.impl;
-
-import com.bizmatics.model.WcUserToken;
-import com.bizmatics.persistence.mapper.WcUserTokenMapper;
-import com.bizmatics.service.WcUserTokenService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author ya
- * @since 2021-07-07
- */
-@Service
-public class WcUserTokenServiceImpl extends AbstractCrudService<WcUserTokenMapper, WcUserToken> implements WcUserTokenService {
-
-}