xiug

project_data/sql/0.0.4/soc/soc.sql

@@ -191,6 +191,14 @@ delete  from sys_config where  config_key='is_display_password';
 INSERT INTO sys_config ( config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark )
 VALUES
     ( '是否显示修改资料和修改密码', 'is_display_password', 'Y', 'Y', 'jwx', now(), 'jwx', now(), 'Y不显示，N显示' );
+DELETE FROM `sys_menu` WHERE id IN(1714247486990786561,2126,01717081639428923393,01717081756911378434);
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark)
+VALUES (1714247486990786561, '撤回计划', 2052, 9, '', null, null, 1, 0, 'F', '0', '0', 'core:accessPlan:withdraw', '1', null, null, null, now(), '', null, '');
+INSERT INTO `sys_menu` VALUES (2126, '下发任务', 2052, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:accessPlan:release', '1', '#', NULL, '超级管理员', '2023-09-04 17:54:35', '', NULL, '');
+INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (01717081639428923393, '下发', 1717076927401005058, 7, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:distribute', '1', NULL, NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (01717081756911378434, '撤回', 1717076927401005058, 8, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:withdraw', '1', NULL, NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 -- 修改菜单排序
 UPDATE `sys_menu` SET `order_num` = 2 WHERE `menu_name` = '驾驶舱';
 UPDATE `sys_menu` SET `order_num` = 4 WHERE `menu_name` = '日常履职';

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrgExtend.java

@@ -100,6 +100,7 @@ public class SysOrgExtend extends BaseEntity {
     /**
      * 值守方式
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "值守方式")
     private Integer dutyMode;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/TMonitoringRetrievalPlanController.java

@@ -75,7 +75,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
         } else if (SecurityUtils.getUserId() == 1) {
             admin = true;
         }
-        ajax.put("check", admin);
+     //   ajax.put("check", admin);
         ajax.put("isEdit", sysOrg.getId());
         return ajax;
     }
@@ -84,7 +84,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 下发
      */
     @ApiOperation(value = "下发")
-    @RequiresPermissions("core:accessPlan:add")
+    @RequiresPermissions("core:accessPlan:release")
     @GetMapping(value = "/distribute/{id}")
     public AjaxResult distribute(@PathVariable(value = "id", required = false) Long id) throws ParseException {
         return success(tMonitoringRetrievalPlanService.distribute(id));
@@ -94,7 +94,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 撤回
      */
     @ApiOperation(value = "撤回")
-    @RequiresPermissions("core:accessPlan:add")
+    @RequiresPermissions("core:accessPlan:withdraw")
     @GetMapping(value = "/withdraw/{id}")
     public AjaxResult withdraw(@PathVariable(value = "id", required = false) Long id) {
         return success(tMonitoringRetrievalPlanService.withdraw(id));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluatePlanController.java

@@ -122,14 +122,14 @@ public class CoreEvaluatePlanController extends BaseController {
      * 下发
      */
     @ApiOperation(value = "下发")
-    @RequiresPermissions("core:evaluatePlan:add")
+    @RequiresPermissions("core:evaluatePlan:distribute")
     @GetMapping(value = "/distribute/{id}")
     public AjaxResult distribute(@PathVariable(value = "id", required = false) Long id) {
         return toAjax(coreEvaluatePlanService.distribute(id));
     }
 
     @ApiOperation(value = "取消下发")
-    @RequiresPermissions("core:evaluatePlan:remove")
+    @RequiresPermissions("core:evaluatePlan:withdraw")
     @GetMapping(value = "/withdraw/{id}")
     public AjaxResult withdraw(@PathVariable(value = "id", required = false) Long id) {
         return toAjax(coreEvaluatePlanService.withdraw(id));