From 25db770e621f1259b8d5b7fd514207f7481c2d0f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 30 十月 2024 11:25:37 +0800
Subject: [PATCH] blade_cps路径改为smis

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/DeviceTypeController.java            |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MyTestController.java                |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java         |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ApplySettingsController.java         |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MalfunctionTypeController.java       |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckItemController.java             |    4 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckProjectController.java          |    4 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java             |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java               |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java           |   10 -
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsController.java        |    4 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWorkbenchController.java  |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EmployeeController.java              |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectController.java       |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectItemController.java   |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java           |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CalendarController.java              |    4 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CollectTemplateController.java       |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java          |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java   |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CommonGroupController.java           |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java                  |    2 
 /dev/null                                                                                                     |  171 ----------------------------------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java          |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java         |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EnterpriseInformationController.java |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainItemController.java          |    2 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftController.java                 |    4 
 28 files changed, 33 insertions(+), 210 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ApplySettingsController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ApplySettingsController.java
index 5c6f7c8..8866463 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ApplySettingsController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ApplySettingsController.java
@@ -16,7 +16,7 @@
 
 @Api(value = "搴旂敤璁剧疆", tags = {"搴旂敤璁剧疆"})
 @RestController
-@ApiResource({"blade-cps/apply-settings"})
+@ApiResource({"smis/apply-settings"})
 @NonDS
 public class ApplySettingsController extends BladeController {
     private final ICommonGroupService groupService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomMaterialController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomMaterialController.java
deleted file mode 100644
index b9d594e..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomMaterialController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.qianwen.smartman.modules.cps.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import java.util.Map;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.scanner.modular.annotation.DeleteResource;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.smartman.modules.cps.entity.BomMaterial;
-import com.qianwen.smartman.modules.cps.service.IBomMaterialService;
-import com.qianwen.smartman.modules.cps.vo.BomMaterialDetailVO;
-import com.qianwen.smartman.modules.cps.vo.BomMaterialVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@Api(value = "bom鐗╂枡绠＄悊", tags = {"bom鐗╂枡绠＄悊"})
-@ApiResource({"blade-cps/bom-material"})
-@RestController
-public class BomMaterialController extends BladeController {
-    private IBomMaterialService bomMaterialService;
-
-    public BomMaterialController(final IBomMaterialService bomMaterialService) {
-        this.bomMaterialService = bomMaterialService;
-    }
-
-    @ApiOperationSupport(order = 1)
-    @GetResource({"/get/{id}"})
-    @ApiOperation(value = "bom鐗╂枡璇︽儏", notes = "浼犲叆bomMaterial")
-    public R<BomMaterialDetailVO> detail(@PathVariable String id) {
-        return R.data(this.bomMaterialService.detail(Long.valueOf(id)));
-    }
-
-    @ApiOperationSupport(order = 2)
-    @ApiImplicitParams({@ApiImplicitParam(name = "versionId", value = "bom鐗堟湰ID", paramType = "query", dataType = "string")})
-    @GetResource({"/list"})
-    @ApiOperation(value = "bom鐗╂枡鍒楄〃", notes = "浼犲叆map")
-    public R<List<BomMaterialDetailVO>> list(@RequestParam @ApiIgnore Map<String, Object> params) {
-        return R.data(this.bomMaterialService.list(params));
-    }
-
-    @ApiOperationSupport(order = 3)
-    @ApiImplicitParams({@ApiImplicitParam(name = "versionId", value = "bom鐗堟湰ID", paramType = "query", dataType = "string")})
-    @GetResource({"/count"})
-    @ApiOperation(value = "bom鐗╂枡缁熻鍊�", notes = "浼犲叆map")
-    public R<Long> count(@RequestParam @ApiIgnore Map<String, Object> params) {
-        long count = this.bomMaterialService.count(Condition.getQueryWrapper(params, BomMaterial.class));
-        return R.data(Long.valueOf(count));
-    }
-
-    @ApiOperationSupport(order = 4)
-    @ApiImplicitParams({@ApiImplicitParam(name = "versionId", value = "bom鐗堟湰ID", paramType = "query", dataType = "string")})
-    @GetResource({"/page"})
-    @ApiOperation(value = "bom鐗╂枡鍒嗛〉", notes = "浼犲叆map")
-    public R<IPage<BomMaterialDetailVO>> page(@RequestParam @ApiIgnore Map<String, Object> params, Query query) {
-        return R.data(this.bomMaterialService.page(Condition.getPage(query), params));
-    }
-
-    @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
-    @PostResource({"/insert"})
-    @ApiOperation(value = "bom鐗╂枡鏂板", notes = "浼犲叆bomMaterialVO")
-    public R<Boolean> insert(@Valid @RequestBody BomMaterialVO bomMaterialVO) {
-        return R.data(this.bomMaterialService.insert(bomMaterialVO));
-    }
-
-    @ApiOperationSupport(order = 6)
-    @DeleteResource({"/remove/{id}"})
-    @ApiOperation(value = "bom鐗╂枡鍒犻櫎", notes = "浼犲叆ids")
-    public R<Boolean> removeBomMaterial(@PathVariable String id) {
-        return R.status(this.bomMaterialService.removeBomMaterial(Long.valueOf(id)).booleanValue());
-    }
-
-    @ApiOperationSupport(order = 7)
-    @ApiImplicitParams({@ApiImplicitParam(name = "versionId", value = "bom鐗堟湰ID", paramType = "query", dataType = "string")})
-    @GetResource({"/tree"})
-    @ApiOperation(value = "bom鐗╂枡鍒楄〃(鏍�)", notes = "浼犲叆map")
-    public R<List<BomMaterialDetailVO>> tree(@RequestParam @ApiIgnore Map<String, Object> params) {
-        return R.data(this.bomMaterialService.list(params));
-    }
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomProcessController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomProcessController.java
deleted file mode 100644
index 2c097bd..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomProcessController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.qianwen.smartman.modules.cps.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import java.util.Map;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.scanner.modular.annotation.DeleteResource;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.smartman.modules.cps.entity.BomProcess;
-import com.qianwen.smartman.modules.cps.service.IBomProcessService;
-import com.qianwen.smartman.modules.cps.vo.BomProcessAddVO;
-import com.qianwen.smartman.modules.cps.vo.BomProcessDeleteVO;
-import com.qianwen.smartman.modules.cps.vo.BomProcessDetailVO;
-import com.qianwen.smartman.modules.cps.vo.BomProcessVO;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@Api(value = "bom鐗╂枡宸ュ簭绠＄悊", tags = {"bom鐗╂枡宸ュ簭绠＄悊"})
-@ApiResource({"blade-cps/bom-process"})
-@RestController
-public class BomProcessController extends BladeController {
-    private IBomProcessService bomProcessService;
-
-    public BomProcessController(final IBomProcessService bomProcessService) {
-        this.bomProcessService = bomProcessService;
-    }
-
-    @ApiOperationSupport(order = 1)
-    @ApiImplicitParams({@ApiImplicitParam(name = "bomMaterialId", value = "bom鐗╂枡ID", paramType = "query", dataType = "string")})
-    @GetResource({"/list"})
-    @ApiOperation(value = "bom鐗╂枡宸ュ簭鍒楄〃", notes = "浼犲叆map")
-    public R<List<BomProcessDetailVO>> list(@RequestParam @ApiIgnore Map<String, Object> params) {
-        return R.data(this.bomProcessService.getBomProcessDetailVOList(params));
-    }
-
-    @ApiOperationSupport(order = 2)
-    @ApiImplicitParams({@ApiImplicitParam(name = "bomMaterialId", value = "bom鐗╂枡ID", paramType = "query", dataType = "string")})
-    @GetResource({"/count"})
-    @ApiOperation(value = "bom鐗╂枡宸ュ簭缁熻鍊�", notes = "浼犲叆map")
-    public R<Long> count(@RequestParam @ApiIgnore Map<String, Object> params) {
-        long count = this.bomProcessService.count(Condition.getQueryWrapper(params, BomProcess.class));
-        return R.data(Long.valueOf(count));
-    }
-
-    @ApiOperationSupport(order = 3)
-    @ApiImplicitParams({@ApiImplicitParam(name = "bomMaterialId", value = "bom鐗╂枡ID", paramType = "query", dataType = "string")})
-    @GetResource({"/page"})
-    @ApiOperation(value = "bom鐗╂枡宸ュ簭鍒嗛〉", notes = "浼犲叆map")
-    public R<IPage<BomProcessDetailVO>> page(@RequestParam @ApiIgnore Map<String, Object> params, Query query) {
-        return R.data(this.bomProcessService.getBomProcessDetailVOPage(Condition.getPage(query), params));
-    }
-
-    @ApiOperationSupport(order = 4)
-    @PostResource({"/insert"})
-    @ApiOperation(value = "bom鐗╂枡宸ュ簭鏂板", notes = "浼犲叆bomProcessAddVO")
-    public R<BomProcessVO> insert(@Valid @RequestBody BomProcessAddVO bomProcessAddVO) {
-        return R.data(this.bomProcessService.addBomProcess(bomProcessAddVO));
-    }
-
-    @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
-    @DeleteResource({"/remove"})
-    @ApiOperation(value = "bom鐗╂枡宸ュ簭鍒犻櫎", notes = "bomProcessDeleteVO")
-    public R<Boolean> remove(@Valid @RequestBody BomProcessDeleteVO bomProcessDeleteVO) {
-        return R.status(this.bomProcessService.removeBomProcessById(bomProcessDeleteVO).booleanValue());
-    }
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomVersionController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomVersionController.java
deleted file mode 100644
index 7a70368..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomVersionController.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.qianwen.smartman.modules.cps.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import java.util.Map;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.scanner.modular.annotation.DeleteResource;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.annotation.PutResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.smartman.modules.cps.convert.BomVersionConvert;
-import com.qianwen.smartman.modules.cps.entity.BomVersion;
-import com.qianwen.smartman.modules.cps.service.IBomVersionService;
-import com.qianwen.smartman.modules.cps.vo.BomVersionDetailVO;
-import com.qianwen.smartman.modules.cps.vo.BomVersionUpdateVO;
-import com.qianwen.smartman.modules.cps.vo.BomVersionVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@Api(value = "bom鐗堟湰绠＄悊", tags = {"bom鐗堟湰绠＄悊"})
-@ApiResource({"blade-cps/bom-version"})
-@RestController
-public class BomVersionController extends BladeController {
-    private IBomVersionService bomVersionService;
-
-    public BomVersionController(final IBomVersionService bomVersionService) {
-        this.bomVersionService = bomVersionService;
-    }
-
-    @ApiOperationSupport(order = 1)
-    @GetResource({"/get/{id}"})
-    @ApiOperation(value = "bom鐗堟湰璇︽儏", notes = "浼犲叆bomVersion")
-    public R<BomVersionVO> detail(@PathVariable String id) {
-        BomVersion bomVersion = (BomVersion) this.bomVersionService.getById(id);
-        return R.data(BomVersionConvert.INSTANCE.convert(bomVersion));
-    }
-
-    @ApiOperationSupport(order = 2)
-    @ApiImplicitParams({@ApiImplicitParam(name = "productId", value = "浜у搧Id", paramType = "query", dataType = "string")})
-    @GetResource({"/list"})
-    @ApiOperation(value = "bom鐗堟湰鍒楄〃", notes = "浼犲叆map")
-    public R<List<BomVersionVO>> list(@RequestParam @ApiIgnore Map<String, Object> params) {
-        List<BomVersion> list = this.bomVersionService.list(Condition.getQueryWrapper(params, BomVersion.class));
-        return R.data(BomVersionConvert.INSTANCE.convert(list));
-    }
-
-    @ApiOperationSupport(order = 2)
-    @ApiImplicitParams({@ApiImplicitParam(name = "productId", value = "浜у搧Id", paramType = "query", dataType = "string")})
-    @GetResource({"/count"})
-    @ApiOperation(value = "bom鐗堟湰缁熻鍊�", notes = "浼犲叆map")
-    public R<Long> count(@RequestParam @ApiIgnore Map<String, Object> params) {
-        long count = this.bomVersionService.count(Condition.getQueryWrapper(params, BomVersion.class));
-        return R.data(Long.valueOf(count));
-    }
-
-    @ApiOperationSupport(order = 3)
-    @ApiImplicitParams({@ApiImplicitParam(name = "productId", value = "浜у搧Id", paramType = "query", dataType = "string")})
-    @GetResource({"/page"})
-    @ApiOperation(value = "bom鐗堟湰鍒嗛〉", notes = "浼犲叆map")
-    public R<IPage<BomVersionVO>> page(@RequestParam @ApiIgnore Map<String, Object> params, Query query) {
-        IPage<BomVersion> pages = this.bomVersionService.page(Condition.getPage(query), Condition.getQueryWrapper(params, BomVersion.class));
-        return R.data(BomVersionConvert.INSTANCE.convert(pages));
-    }
-
-    @ApiOperationSupport(order = 4)
-    @PostResource({"/insert"})
-    @ApiOperation(value = "bom鐗堟湰鏂板", notes = "浼犲叆bomVersionVO")
-    public R<BomVersionVO> insert(@Valid @RequestBody BomVersionVO bomVersionVO) {
-        return R.data(BomVersionConvert.INSTANCE.convert(this.bomVersionService.insert(bomVersionVO)));
-    }
-
-    @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
-    @PutMapping({"/update"})
-    @ApiOperation(value = "bom鐗堟湰淇敼", notes = "浼犲叆bomVersionUpdateVO")
-    public R<BomVersionVO> update(@Valid @RequestBody BomVersionUpdateVO bomVersionUpdateVO) {
-        return R.data(this.bomVersionService.update(bomVersionUpdateVO));
-    }
-
-    @ApiOperationSupport(order = 6)
-    @DeleteResource({"/remove/{id}"})
-    @ApiOperation(value = "bom鐗堟湰鍒犻櫎", notes = "浼犲叆id")
-    public R<Boolean> remove(@PathVariable String id) {
-        return R.status(this.bomVersionService.remove(Long.valueOf(id)).booleanValue());
-    }
-
-    @ApiOperationSupport(order = 7)
-    @GetResource({"/get-version/{id}"})
-    @ApiOperation(value = "浜у搧Bom鐗堟湰璇︽儏", notes = "浼犲叆id")
-    public R<BomVersionDetailVO> getVersionById(@PathVariable String id) {
-        return R.data(this.bomVersionService.getVersionById(Long.valueOf(id)));
-    }
-
-    @ApiOperationSupport(order = 7)
-    @PutResource({"/fix-version/{id}"})
-    @ApiOperation(value = "bom鐗堟湰瀹氱増", notes = "浼犲叆id")
-    public R<Boolean> fixVersion(@PathVariable String id) {
-        return R.data(this.bomVersionService.fixVersion(Long.valueOf(id)));
-    }
-
-    @ApiOperationSupport(order = 8)
-    @PutResource({"/cancel-fix-version/{id}"})
-    @ApiOperation(value = "bom鐗堟湰鍙栨秷瀹氱増", notes = "浼犲叆id")
-    public R<Boolean> cancelFixVersion(@PathVariable String id) {
-        return R.data(this.bomVersionService.cancelFixVersion(Long.valueOf(id)));
-    }
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CalendarController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CalendarController.java
index e870622..d9736b1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CalendarController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CalendarController.java
@@ -38,8 +38,8 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-@ApiResource({"blade-cps/calendar"})
-@Api(value = "鐢熶骇鏃ュ巻controller", tags = {"鐢熶骇鏃ュ巻controller"})
+@ApiResource({"smis/calendar"})
+@Api(value = "鐢熶骇鏃ュ巻", tags = {"鐢熶骇鏃ュ巻"})
 @RestController
 public class CalendarController extends BladeController {
     private final ICalendarService calendarService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckItemController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckItemController.java
index ec73ec7..f316de6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckItemController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckItemController.java
@@ -23,8 +23,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-@ApiResource({"blade-cps/check-item"})
-@Api(value = "鐐规椤筩ontroller", tags = {"鐐规椤筩ontroller"})
+@ApiResource({"smis/check-item"})
+@Api(value = "鐐规椤�", tags = {"鐐规椤�"})
 @RestController
 public class CheckItemController {
     private final ICheckItemService checkItemService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckProjectController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckProjectController.java
index 9448701..5bcb1ad 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckProjectController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckProjectController.java
@@ -28,8 +28,8 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-@ApiResource({"blade-cps/check-project"})
-@Api(value = "鐐规椤圭洰controller", tags = {"鐐规椤圭洰controller"})
+@ApiResource({"smis/check-project"})
+@Api(value = "鐐规椤圭洰", tags = {"鐐规椤圭洰"})
 @RestController
 public class CheckProjectController {
     private final ICheckProjectService checkProjectService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CollectTemplateController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CollectTemplateController.java
index c2948f6..393c185 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CollectTemplateController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CollectTemplateController.java
@@ -35,7 +35,7 @@
 
 @Api(value = "閲囬泦妯℃澘", tags = {"閲囬泦妯℃澘"})
 @RestController
-@ApiResource({"smart-collect/tpl"})
+@ApiResource({"smis/collecttpl"})
 @NonDS
 public class CollectTemplateController {
 	@Autowired
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CommonGroupController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CommonGroupController.java
index dc72ea7..6fc9518 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CommonGroupController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CommonGroupController.java
@@ -54,7 +54,7 @@
 import io.swagger.annotations.ApiParam;
 import springfox.documentation.annotations.ApiIgnore;
 
-@ApiResource({"blade-cps/group"})
+@ApiResource({"smis/group"})
 @Api(value = "缁�", tags = {"缁�"})
 @RestController
 public class CommonGroupController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/DeviceTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/DeviceTypeController.java
index 8fb326f..eb58818 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/DeviceTypeController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/DeviceTypeController.java
@@ -39,7 +39,7 @@
 
 @Api(value = "鏈哄櫒绫诲瀷", tags = {"鏈哄櫒绫诲瀷"})
 @RestController
-@ApiResource({"blade-cps/device-types"})
+@ApiResource({"smis/device-types"})
 @NonDS
 @Validated
 public class DeviceTypeController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EmployeeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EmployeeController.java
index 3d9ea7d..5b6bcc0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EmployeeController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EmployeeController.java
@@ -49,7 +49,7 @@
 
 @Api(value = "鍛樺伐绠＄悊", tags = {"鍛樺伐绠＄悊"})
 @RestController
-@ApiResource({"blade-cps/employee"})
+@ApiResource({"smis/employee"})
 @NonDS
 public class EmployeeController extends BladeController {
     private final IEmployeeService employeeService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EnterpriseInformationController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EnterpriseInformationController.java
index 27e74dc..6213396 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EnterpriseInformationController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EnterpriseInformationController.java
@@ -18,7 +18,7 @@
 
 @Api(value = "浼佷笟logo绠＄悊", tags = {"浼佷笟logo"})
 @RestController
-@ApiResource({"blade-cps/enterprise"})
+@ApiResource({"smis/enterprise"})
 @NonDS
 public class EnterpriseInformationController {
     private final IEnterpriseInformationService informationService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java
index 7e64652..133de4f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java
@@ -40,7 +40,7 @@
 
 @Api(value = "鍏ㄥ眬宸ュ喌", tags = {"鍏ㄥ眬宸ュ喌"})
 @RestController
-@ApiResource({"blade-cps/global_wcs"})
+@ApiResource({"smis/global_wcs"})
 @NonDS
 public class GlobalWcsController {
     private final IGlobalWcsService globalWcsService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java
index 3593c0a..75f0d49 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java
@@ -31,7 +31,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-@RequestMapping({"blade-cps/init"})
+@RequestMapping({"smis/init"})
 @Api(value = "寮曞椤靛垵濮嬪寲", tags = {"寮曞椤靛垵濮嬪寲"})
 @RestController
 @Validated
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java
index daad1cc..94d422e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java
@@ -44,7 +44,7 @@
 
 @Api(value = "鏈哄櫒绠＄悊", tags = {"鏈哄櫒绠＄悊"})
 @RestController
-@ApiResource({"blade-cps/machine"})
+@ApiResource({"smis/machine"})
 @NonDS
 public class MachineController {
     private final IMachineService machineService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainItemController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainItemController.java
index c0d394f..50269da 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainItemController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainItemController.java
@@ -36,7 +36,7 @@
 
 @Api(value = "淇濆吇椤�", tags = {"淇濆吇椤�"})
 @RestController
-@ApiResource({"blade-cps/maintain-item"})
+@ApiResource({"smis/maintain-item"})
 @NonDS
 @Validated
 public class MaintainItemController extends BladeController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectController.java
index ce6eb23..27934d1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectController.java
@@ -27,7 +27,7 @@
 
 @Api(value = "淇濆吇椤圭洰", tags = {"淇濆吇椤圭洰"})
 @RestController
-@ApiResource({"blade-cps/maintain-project"})
+@ApiResource({"smis/maintain-project"})
 @NonDS
 @Validated
 public class MaintainProjectController extends BladeController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectItemController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectItemController.java
index 2563cc9..428d79e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectItemController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectItemController.java
@@ -26,7 +26,7 @@
 
 @Api(value = "淇濆吇椤圭洰淇濆吇椤�", tags = {"淇濆吇椤圭洰淇濆吇椤�"})
 @RestController
-@ApiResource({"blade-cps/maintain-project-item"})
+@ApiResource({"smis/maintain-project-item"})
 @NonDS
 @Validated
 public class MaintainProjectItemController extends BladeController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MalfunctionTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MalfunctionTypeController.java
index b3d2602..4afceb7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MalfunctionTypeController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MalfunctionTypeController.java
@@ -34,7 +34,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-@ApiResource({"blade-cps/malfunction"})
+@ApiResource({"smis/malfunction"})
 @Api(value = "鏁呴殰绫诲瀷", tags = {"鏁呴殰绫诲瀷"})
 @RestController
 public class MalfunctionTypeController extends BladeController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialController.java
deleted file mode 100644
index a09d4c6..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.qianwen.smartman.modules.cps.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.enums.PropertyEnum;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.excel.util.ExcelUtil;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.core.scanner.modular.annotation.DeleteResource;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.annotation.PutResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.secure.annotation.PreAuth;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.smartman.modules.cps.convert.MaterialConvert;
-import com.qianwen.smartman.modules.cps.entity.Material;
-import com.qianwen.smartman.modules.cps.excel.MaterialImport;
-import com.qianwen.smartman.modules.cps.service.IMaterialService;
-import com.qianwen.smartman.modules.cps.vo.MaterialAddVO;
-import com.qianwen.smartman.modules.cps.vo.MaterialQueryVO;
-import com.qianwen.smartman.modules.cps.vo.MaterialUpdateVO;
-import com.qianwen.smartman.modules.cps.vo.MaterialVO;
-import com.qianwen.smartman.modules.cps.vo.SynchronizedProductMaterialVO;
-import com.qianwen.smartman.modules.resource.enums.TemplateEnum;
-import com.qianwen.smartman.modules.resource.service.ISystemResourceService;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-@ApiResource({"blade-cps/material"})
-@Api(value = "鐗╂枡", tags = {"鐗╂枡"})
-@RestController
-public class MaterialController extends BladeController {
-    private final IMaterialService materialService;
-    private final ISystemResourceService systemResourceService;
-
-    public MaterialController(final IMaterialService materialService, final ISystemResourceService systemResourceService) {
-        this.materialService = materialService;
-        this.systemResourceService = systemResourceService;
-    }
-
-    @GetResource({"/listBySparePart"})
-    @ApiOperation("鏌ヨ澶囧搧澶囦欢鐗╂枡")
-    public R<List<MaterialVO>> listBySparePart() {
-        return R.data(this.materialService.listByProperty(Integer.valueOf(PropertyEnum.SPAR_PART.getKey())));
-    }
-
-    @GetResource({"/get-material"})
-    @ApiOperation("鏌ヨ鐗╂枡")
-    public R<MaterialVO> getMaterial(@RequestParam @ApiParam(value = "id", required = true) String id) {
-        return R.data(MaterialConvert.INSTANCE.convert((Material) this.materialService.getById(id)));
-    }
-
-    @PreAuth
-    @GetResource({"/page"})
-    @ApiOperation(value = "鏌ヨ鍒嗛〉", notes = "鏌ヨ鍒嗛〉")
-    public R<IPage<MaterialVO>> getPageMaterial(MaterialQueryVO materialQueryVO, Query query) {
-        return R.data(this.materialService.getPageMaterial(materialQueryVO, query));
-    }
-
-    @PreAuth
-    @PostResource({"/create-material"})
-    @ApiOperation("鏂板鐗╂枡")
-    public R<MaterialVO> createMaterial(@Valid @RequestBody MaterialAddVO materialAddVO) {
-        return R.data(this.materialService.createMaterial(materialAddVO));
-    }
-
-    @PreAuth
-    @PutResource({"/update-material"})
-    @ApiOperation("淇敼鐗╂枡")
-    public R<MaterialVO> updateMaterial(@Valid @RequestBody MaterialUpdateVO materialUpdateVO) {
-        return R.data(this.materialService.updateMaterial(materialUpdateVO));
-    }
-
-    @PreAuth
-    @DeleteResource({"/delete-material"})
-    @ApiOperation("鍒犻櫎鐗╂枡锛堟敮鎸佹壒閲忥級")
-    public R<Boolean> deleteMaterial(@RequestParam(value = "ids", required = true) List<String> ids, @RequestParam("type") @ApiParam("鍒犻櫎浼�0 鍋滅敤浼�1") Integer type) {
-        return R.data(Boolean.valueOf(this.materialService.deleteMaterial(ids, type)));
-    }
-
-    @PreAuth
-    @GetResource({"/export-template"})
-    @ApiOperation("瀵煎嚭妯℃澘")
-    public R<BladeFile> exportTemplate() {
-        return R.data(this.systemResourceService.getBusinessTemplateInfo(TemplateEnum.MATERIAL));
-    }
-
-    @PreAuth
-    @PostResource({"/import-material"})
-    @ApiOperation("瀵煎叆鐗╂枡淇℃伅")
-    public R<BladeFile> importMaterial(MultipartFile file) {
-        List<MaterialImport> data = ExcelUtil.read(file, 0, 2, MaterialImport.class);
-        return R.data(this.materialService.importMaterial(data));
-    }
-
-    @PreAuth
-    @PostResource({"/export-material"})
-    @ApiOperation("瀵煎嚭鐗╂枡淇℃伅")
-    public R<BladeFile> exportMaterial(@RequestBody MaterialQueryVO materialQueryVO, HttpServletResponse response) {
-        return R.data(this.materialService.exportMaterial(materialQueryVO, response));
-    }
-
-    @PostResource({"/synchronized-product-material"})
-    @ApiOperation(value = "鍚屾浜у搧鐗╂枡", notes = "鍚屾浜у搧鐗╂枡")
-    public R synchronizedProductMaterial(@Valid @RequestBody SynchronizedProductMaterialVO synchronizedProductMaterialVO) {
-        return R.data(this.materialService.synchronizedMaterial(synchronizedProductMaterialVO));
-    }
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java
deleted file mode 100644
index e2bb9c2..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.qianwen.smartman.modules.cps.controller;
-
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.scanner.modular.annotation.DeleteResource;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.annotation.PutResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.secure.annotation.PreAuth;
-import com.qianwen.core.secure.utils.AuthUtil;
-import com.qianwen.core.tenant.mp.TenantEntity;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.modules.cps.convert.MaterialTypeConvert;
-import com.qianwen.smartman.modules.cps.entity.MaterialType;
-import com.qianwen.smartman.modules.cps.service.IMaterialTypeService;
-import com.qianwen.smartman.modules.cps.vo.MaterialTypeAddVO;
-import com.qianwen.smartman.modules.cps.vo.MaterialTypeUpdateVO;
-import com.qianwen.smartman.modules.cps.vo.MaterialTypeVO;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@ApiResource({"blade-cps/material-type"})
-@Api(value = "鐗╂枡绫诲瀷", tags = {"鐗╂枡绫诲瀷"})
-@RestController
-public class MaterialTypeController extends BladeController {
-    private final IMaterialTypeService materialTypeService;
-
-
-    public MaterialTypeController(final IMaterialTypeService materialTypeService) {
-        this.materialTypeService = materialTypeService;
-    }
-
-    @PreAuth
-    @GetResource({"/list"})
-    @ApiOperation(value = "鏌ヨ鐗╂枡绫诲瀷鍒楄〃锛堜笉鍒嗛〉锛�", notes = "鏌ヨ鐗╂枡绫诲瀷鍒楄〃锛堜笉鍒嗛〉锛�")
-    public R<List<MaterialTypeVO>> getMaterialTypeList(@RequestParam(value = "keyWord", required = false) String keyWord, @RequestParam(value = "status", required = false) Integer status) {
-        if (Func.isNull(status)) {
-            status = CommonConstant.ENABLE;
-        }
-        List<MaterialType> list = this.materialTypeService.list(Wrappers.<MaterialType>query().lambda()
-                .eq(MaterialType::getStatus, status)
-                .eq(Func.isNotEmpty(AuthUtil.getTenantId()), TenantEntity::getTenantId, AuthUtil.getTenantId())
-                .and(Func.isNotEmpty(keyWord), i -> i.likeRight(MaterialType::getCode, keyWord).or().likeRight(MaterialType::getName, keyWord)
-                .orderByDesc(MaterialType::getCreateTime)));
-            return R.data(MaterialTypeConvert.INSTANCE.convert(list));
-    }
-
-    @PreAuth
-    @GetResource({"/page"})
-    @ApiOperation(value = "鏌ヨ鍒嗛〉", notes = "鏌ヨ鍒嗛〉")
-    public R<IPage<MaterialTypeVO>> getPageMaterialType(Query query, @RequestParam(value = "keyWord", required = false) String keyWord, @RequestParam(value = "status", required = false) Integer status) {
-        return R.data(MaterialTypeConvert.INSTANCE.convert(this.materialTypeService.getPageMaterialType(query, keyWord, Func.isNull(status) ? CommonConstant.ENABLE : status)));
-    }
-
-    @PreAuth
-    @PostResource({"/create-material-type"})
-    @ApiOperation("鏂板鐗╂枡绫诲瀷")
-    public R<MaterialTypeVO> createMaterialType(@Valid @RequestBody MaterialTypeAddVO materialTypeAddVO) {
-        return R.data(this.materialTypeService.createMaterialType(materialTypeAddVO));
-    }
-
-    @PreAuth
-    @PutResource({"/update-material-type"})
-    @ApiOperation("淇敼鐗╂枡绫诲瀷")
-    public R<MaterialTypeVO> updateMaterialType(@Valid @RequestBody MaterialTypeUpdateVO materialTypeUpdateVO) {
-        return R.data(this.materialTypeService.updateMaterialType(materialTypeUpdateVO));
-    }
-
-    @ApiOperationSupport(order = 3)
-    @ApiOperation("鍒犻櫎鐗╂枡绫诲瀷锛堟敮鎸佹壒閲忥級")
-    @PreAuth
-    @DeleteResource({"/delete-material-type"})
-    public R<List<String>> deleteMaterialType(@RequestParam(value = "ids", required = true) List<String> ids, @RequestParam("type") @ApiParam("鍒犻櫎浼�0 鍋滅敤浼�1") Integer type) {
-        this.materialTypeService.deleteMaterialType(ids, type);
-        return R.data(ids);
-    }
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MyTestController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MyTestController.java
index b3ba665..80a4dc3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MyTestController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MyTestController.java
@@ -47,7 +47,7 @@
 
 @Api(value = "test", tags = {"test"})
 @RestController
-@ApiResource({"blade-cps/test"})
+@ApiResource({"smis/test"})
 public class MyTestController {// extends BladeController
     
     @Autowired
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java
index 9805a18..add774a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java
@@ -33,7 +33,7 @@
 
 @Api(value = "缁勭粐缁撴瀯", tags = {"缁勭粐缁撴瀯"})
 @RestController
-@ApiResource({"blade-cps/organization"})
+@ApiResource({"smis/organization"})
 @NonDS
 public class OrganizationController extends BladeController {
     private final IOrganizationService organizationService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftController.java
index 5df4e0c..317b998 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftController.java
@@ -42,8 +42,8 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-@ApiResource({"blade-cps/shift"})
-@Api(value = "鐝controller", tags = {"鐝controller"})
+@ApiResource({"smis/shift"})
+@Api(value = "鐝", tags = {"鐝"})
 @RestController
 public class ShiftController extends BladeController {
     private final IShiftModelService shiftModelService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java
index e20579f..4fea00b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java
@@ -29,7 +29,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api(value = "ShiftOffDay绠＄悊", tags = {"ShiftOffDay绠＄悊"})
+@Api(value = "鐝浼戞伅鏃�", tags = {"鐝浼戞伅鏃�"})
 @ApiResource({"blade-cps/shift-off-day"})
 @RestController
 public class ShiftOffDayController extends BladeController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java
deleted file mode 100644
index 5f3168b..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.qianwen.smartman.modules.cps.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.util.List;
-import java.util.Map;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.enums.StatusType;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.scanner.modular.annotation.DeleteResource;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.annotation.PutResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.secure.annotation.PreAuth;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.smartman.modules.cps.convert.StockInTypeConvert;
-import com.qianwen.smartman.modules.cps.entity.StockInType;
-import com.qianwen.smartman.modules.cps.service.IStockInTypeService;
-import com.qianwen.smartman.modules.cps.vo.StockInTypeVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@Api(value = "StockInType绠＄悊", tags = {"StockInType绠＄悊"})
-@ApiResource({"blade-cps/stock-in-type"})
-@RestController
-public class StockInTypeController extends BladeController {
-    private final IStockInTypeService stockInTypeService;
-
-    public StockInTypeController(final IStockInTypeService stockInTypeService) {
-        this.stockInTypeService = stockInTypeService;
-    }
-
-    @ApiOperationSupport(order = 1)
-    @GetResource({"/get/{id}"})
-    @ApiOperation(value = "鍏ュ簱绫诲瀷璇︽儏", notes = "浼犲叆stockInType")
-    public R<StockInTypeVO> detail(@PathVariable String id) {
-        StockInType stockInType = (StockInType) this.stockInTypeService.getById(id);
-        return R.data(StockInTypeConvert.INSTANCE.convert(stockInType));
-    }
-
-    @ApiOperationSupport(order = 2)
-    @GetResource({"/list"})
-    @ApiOperation(value = "鍏ュ簱绫诲瀷鍒楄〃", notes = "浼犲叆map")
-    public R<List<StockInTypeVO>> list(@RequestParam @ApiIgnore Map<String, Object> params) {
-        List<StockInType> list = this.stockInTypeService.list(Condition.getQueryWrapper(params, StockInType.class));
-        return R.data(StockInTypeConvert.INSTANCE.convert(list));
-    }
-
-    @ApiOperationSupport(order = 3)
-    @GetResource({"/page"})
-    @ApiOperation(value = "鍏ュ簱绫诲瀷鍒嗛〉", notes = "浼犲叆map")
-    @PreAuth
-    public R<IPage<StockInTypeVO>> page(Query query, @RequestParam(value = "key", required = false) String key, @RequestParam(value = "status", required = false) Integer status) {
-        return R.data(this.stockInTypeService.pageStockInType(query, key, Func.isNull(status) ? CommonConstant.ENABLE : status));
-    }
-
-    @ApiOperationSupport(order = 4)
-    @PostResource({"/insert"})
-    @ApiOperation(value = "鍏ュ簱绫诲瀷鏂板", notes = "浼犲叆stockInTypeVO")
-    @PreAuth
-    public R<StockInTypeVO> insert(@Valid @RequestBody StockInTypeVO stockInTypeVO) {
-        StockInType stockInType = this.stockInTypeService.createStockInType(stockInTypeVO);
-        return R.data(StockInTypeConvert.INSTANCE.convert(stockInType));
-    }
-
-    @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
-    @PutResource({"/update"})
-    @ApiOperation(value = "鍏ュ簱绫诲瀷淇敼", notes = "浼犲叆stockInTypeVO")
-    @PreAuth
-    public R<StockInTypeVO> update(@Valid @RequestBody StockInTypeVO vo) {
-        return R.data(this.stockInTypeService.updateStockIn(vo));
-    }
-
-    @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "鍏ュ簱绫诲瀷鍒犻櫎", notes = "浼犲叆ids")
-    @PreAuth
-    @DeleteResource({"/remove"})
-    public R<Boolean> remove(@ApiParam(value = "涓婚敭", required = true) @RequestBody List<String> ids, @RequestParam("type") @ApiParam("鍒犻櫎浼�0 鍋滅敤浼�1") Integer type) {
-        if (ids.isEmpty()) {
-            return R.status(false);
-        }
-        if (StatusType.REMOVE.getType().equals(type)) {
-            return R.data(Boolean.valueOf(this.stockInTypeService.removeByIds(Func.toLongList(ids))));
-        }
-        return R.data(Boolean.valueOf(this.stockInTypeService.changeStatus(Func.toLongList(ids), CommonConstant.DEACTIVATE)));
-    }
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java
deleted file mode 100644
index 6502ee9..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.qianwen.smartman.modules.cps.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.util.List;
-import java.util.Map;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.enums.StatusType;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.scanner.modular.annotation.DeleteResource;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.annotation.PutResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.secure.annotation.PreAuth;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.smartman.modules.cps.convert.StockOutTypeConvert;
-import com.qianwen.smartman.modules.cps.entity.StockOutType;
-import com.qianwen.smartman.modules.cps.service.IStockOutTypeService;
-import com.qianwen.smartman.modules.cps.vo.StockOutTypeVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@Api(value = "StockOutType绠＄悊", tags = {"StockOutType绠＄悊"})
-@ApiResource({"blade-cps/stock-out-type"})
-@RestController
-public class StockOutTypeController extends BladeController {
-    private final IStockOutTypeService stockOutTypeService;
-
-    public StockOutTypeController(final IStockOutTypeService stockOutTypeService) {
-        this.stockOutTypeService = stockOutTypeService;
-    }
-
-    @ApiOperationSupport(order = 1)
-    @GetResource({"/get/{id}"})
-    @ApiOperation(value = "鍑哄簱绫诲瀷璇︽儏", notes = "浼犲叆stockOutType")
-    public R<StockOutTypeVO> detail(@PathVariable String id) {
-        StockOutType stockOutType = (StockOutType) this.stockOutTypeService.getById(id);
-        return R.data(StockOutTypeConvert.INSTANCE.convert(stockOutType));
-    }
-
-    @ApiOperationSupport(order = 2)
-    @GetResource({"/list"})
-    @ApiOperation(value = "鍑哄簱绫诲瀷鍒楄〃", notes = "浼犲叆map")
-    public R<List<StockOutTypeVO>> list(@RequestParam @ApiIgnore Map<String, Object> params) {
-        List<StockOutType> list = this.stockOutTypeService.list(Condition.getQueryWrapper(params, StockOutType.class));
-        return R.data(StockOutTypeConvert.INSTANCE.convert(list));
-    }
-
-    @ApiOperationSupport(order = 3)
-    @GetResource({"/page"})
-    @ApiOperation(value = "鍑哄簱绫诲瀷鍒嗛〉", notes = "浼犲叆map")
-    @PreAuth
-    public R<IPage<StockOutTypeVO>> page(Query query, @RequestParam(value = "key", required = false) String key, @RequestParam(value = "status", required = false) Integer status) {
-        return R.data(this.stockOutTypeService.pageStockOutType(query, key, Func.isNull(status) ? CommonConstant.ENABLE : status));
-    }
-
-    @ApiOperationSupport(order = 4)
-    @PostResource({"/insert"})
-    @ApiOperation(value = "鍑哄簱绫诲瀷鏂板", notes = "浼犲叆stockOutTypeVO")
-    @PreAuth
-    public R<StockOutTypeVO> insert(@Valid @RequestBody StockOutTypeVO stockOutTypeVO) {
-        StockOutType stockOutType = this.stockOutTypeService.createStockOutType(stockOutTypeVO);
-        return R.data(StockOutTypeConvert.INSTANCE.convert(stockOutType));
-    }
-
-    @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
-    @PutResource({"/update"})
-    @ApiOperation(value = "鍑哄簱绫诲瀷淇敼", notes = "浼犲叆stockOutTypeVO")
-    @PreAuth
-    public R<StockOutTypeVO> update(@Valid @RequestBody StockOutTypeVO vo) {
-        return R.data(this.stockOutTypeService.updateStockOut(vo));
-    }
-
-    @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "鍑哄簱绫诲瀷鍒犻櫎", notes = "浼犲叆ids")
-    @PreAuth
-    @DeleteResource({"/remove"})
-    public R<Boolean> remove(@ApiParam(value = "涓婚敭", required = true) @RequestBody List<String> ids, @RequestParam("type") @ApiParam("鍒犻櫎浼�0 鍋滅敤浼�1") Integer type) {
-        if (ids.isEmpty()) {
-            return R.data(false);
-        }
-        if (StatusType.REMOVE.getType().equals(type)) {
-            return R.data(Boolean.valueOf(this.stockOutTypeService.removeByIds(Func.toLongList(ids))));
-        }
-        return R.data(Boolean.valueOf(this.stockOutTypeService.changeStatus(Func.toLongList(ids), CommonConstant.DEACTIVATE)));
-    }
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java
deleted file mode 100644
index 72f1a79..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.qianwen.smartman.modules.cps.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import javax.validation.Valid;
-import com.qianwen.core.boot.ctrl.BladeController;
-import com.qianwen.core.log.annotation.ApiLog;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.scanner.modular.annotation.DeleteResource;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.secure.annotation.PreAuth;
-import com.qianwen.core.tenant.annotation.NonDS;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.smartman.modules.cps.service.ISupplierService;
-import com.qianwen.smartman.modules.cps.vo.SupplierDetailVO;
-import com.qianwen.smartman.modules.cps.vo.SupplierSaveVO;
-import com.qianwen.smartman.modules.cps.vo.SupplierVO;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api(value = "渚涘簲鍟嗙鐞�", tags = {"渚涘簲鍟嗙鐞�"})
-@RestController
-@ApiResource({"blade-cps/supplier"})
-@NonDS
-@Validated
-public class SupplierController extends BladeController {
-    private final ISupplierService supplierService;
-
-    public SupplierController(final ISupplierService supplierService) {
-        this.supplierService = supplierService;
-    }
-
-    @ApiOperationSupport(order = 1)
-    @ApiLog("渚涘簲鍟嗗垎椤靛垪琛�")
-    @GetResource({"/page"})
-    @ApiOperation("鍒嗛〉鏌ヨ渚涘簲鍟�")
-    @PreAuth
-    public R<IPage<SupplierVO>> page(Query query, @RequestParam(value = "keyword", required = false) String keyword) {
-        return R.data(this.supplierService.listPage(query, keyword));
-    }
-
-    @ApiOperationSupport(order = 2)
-    @PostResource({"/save"})
-    @ApiOperation("鏂板鎴栨洿鏀逛緵搴斿晢淇℃伅")
-    @PreAuth
-    public R<SupplierDetailVO> save(@Valid @RequestBody SupplierSaveVO supplierSaveVO) {
-        return R.data(this.supplierService.insert(supplierSaveVO));
-    }
-
-    @ApiOperationSupport(order = 3)
-    @ApiOperation("鍒犻櫎渚涘簲鍟嗕俊鎭�")
-    @PreAuth
-    @DeleteResource({"/remove"})
-    public R<Boolean> delete(@RequestParam String supplierIds) {
-        return R.data(this.supplierService.delete(Func.toLongList(supplierIds)));
-    }
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java
index ef7d2fc..3972f6f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java
@@ -18,7 +18,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @Api(value = "闄勪欢鏂囦欢绠＄悊", tags = {"闄勪欢鏂囦欢绠＄悊"})
-@ApiResource({"blade-cps/tool-appendix"})
+@ApiResource({"smis/tool-appendix"})
 @RestController
 public class ToolAppendixController extends BladeController {
     private final IToolAppendixService toolAppendixService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java
index 3a72655..1ad2d3a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java
@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@ApiResource({"blade-cps/test"})
+@ApiResource({"smis/test"})
 @Api(value = "娴嬭瘯websocket", tags = {"娴嬭瘯websocket"})
 @RestController
 public class WebSocketTestController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java
index c1245a5..af0014c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java
@@ -53,7 +53,7 @@
 
 @Api(value = "宸ヤ綅绠＄悊", tags = {"宸ヤ綅绠＄悊"})
 @RestController
-@ApiResource({"blade-cps/workstation"})
+@ApiResource({"smis/workstation"})
 @NonDS
 @Validated
 public class WorkstationController extends BladeController {
@@ -64,13 +64,7 @@
     @Autowired
     private ISystemResourceService systemResourceService;
 
-    /*
-    public WorkstationController(final IWorkstationService workstationService, final IDmpVariablesService dmpVariablesService, final ISystemResourceService systemResourceService) {
-        this.workstationService = workstationService;
-        this.dmpVariablesService = dmpVariablesService;
-        this.systemResourceService = systemResourceService;
-    }*/
-
+    
     @PreAuth
     @PostResource({"/submit"})
     @ApiOperation("鏂板鎴栨洿鏀瑰伐浣嶄俊鎭�")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java
index 9c385b1..966a878 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java
@@ -49,7 +49,7 @@
 
 @Api(value = "宸ヤ綅绠＄悊", tags = {"宸ヤ綅绠＄悊"})
 @RestController
-@ApiResource({"blade-cps/workstation"})
+@ApiResource({"smis/workstation"})
 @NonDS
 @Validated
 public class WorkstationDpController extends BladeController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsController.java
index 8e9871d..1b1fdcc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsController.java
@@ -24,9 +24,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api(value = "宸ュ喌鍙傛暟绠＄悊", tags = {"宸ュ喌鍙傛暟绠＄悊"})
+@Api(value = "宸ヤ綅宸ュ喌鍙傛暟", tags = {"宸ヤ綅宸ュ喌鍙傛暟"})
 @RestController
-@ApiResource({"blade-cps/workstation-wcs"})
+@ApiResource({"smis/workstation-wcs"})
 @NonDS
 @Validated
 public class WorkstationWcsController extends BladeController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java
index 5f34075..5499fa4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java
@@ -29,7 +29,7 @@
 
 @Api(value = "鑾峰彇鏁版嵁鏁版嵁鏍囩", tags = {"鑾峰彇鏁版嵁鏁版嵁鏍囩"})
 @RestController
-@ApiResource({"blade-cps/workstation-wcs-usage"})
+@ApiResource({"smis/workstation-wcs-usage"})
 @Validated
 public class WorkstationWcsUsageController extends BladeController {
     private final IWorkstationWcsUsageService workstationWcsUsageService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWorkbenchController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWorkbenchController.java
index 8d7a6be..c5facd8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWorkbenchController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWorkbenchController.java
@@ -23,7 +23,7 @@
 
 @Api(value = "宸ヤ綅宸ヤ綔鍙扮鐞�", tags = {"宸ヤ綅宸ヤ綔鍙扮鐞�"})
 @RestController
-@ApiResource({"blade-cps/workstation-workbench"})
+@ApiResource({"smis/workstation-workbench"})
 @NonDS
 @Validated
 public class WorkstationWorkbenchController {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/desk/controller/DashBoardController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/desk/controller/DashBoardController.java
deleted file mode 100644
index 3ecb63d..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/desk/controller/DashBoardController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.qianwen.smartman.modules.desk.controller;
-
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.FmsConstant;
-import com.qianwen.core.tenant.annotation.NonDS;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.core.tool.support.Kv;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@RequestMapping({"blade-desk"})
-@Api(value = "棣栭〉", tags = {"棣栭〉"})
-@ApiIgnore
-@RestController
-@NonDS
-public class DashBoardController {
-    @ApiOperationSupport(order = 1)
-    @GetMapping({"/dashboard/activities"})
-    @ApiOperation(value = "娲昏穬鐢ㄦ埛", notes = "娲昏穬鐢ㄦ埛")
-    public R activities() {
-        List<Map<String, Object>> list = new ArrayList<>();
-        Map<String, Object> map1 = new HashMap<>(16);
-        map1.put("id", "trend-1");
-        map1.put("updatedAt", "2019-01-01");
-        map1.put("user", Kv.create().set("name", "鏇蹭附涓�").set("avatar", "https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"));
-        map1.put("group", Kv.create().set("name", "楂橀�兼牸璁捐澶╁洟").set("link", "http://github.com/"));
-        map1.put("project", Kv.create().set("name", "鍏湀杩唬").set("link", "http://github.com/"));
-        map1.put("template", "鍦� @{group} 鏂板缓椤圭洰 @{project}");
-        list.add(map1);
-        Map<String, Object> map2 = new HashMap<>(16);
-        map2.put("id", "trend-2");
-        map2.put("updatedAt", "2019-01-01");
-        map2.put("user", Kv.create().set("name", "浠樺皬灏�").set("avatar", "https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"));
-        map2.put("group", Kv.create().set("name", "楂橀�兼牸璁捐澶╁洟").set("link", "http://github.com/"));
-        map2.put("project", Kv.create().set("name", "涓冩湀鏈堣凯浠�").set("link", "http://github.com/"));
-        map2.put("template", "鍦�  @{group} 鏂板缓椤圭洰 @{project}");
-        list.add(map2);
-        return R.data(list);
-    }
-
-    @ApiOperationSupport(order = 2)
-    @GetMapping({"/dashboard/info"})
-    @ApiOperation(value = "鐢ㄦ埛淇℃伅", notes = "鐢ㄦ埛淇℃伅")
-    public R info() {
-        Map<String, Object> map = new HashMap<>(16);
-        map.put("id", "trend-1");
-        map.put("updatedAt", "2019-01-01");
-        map.put("user", Kv.create().set("name", "鏇蹭附涓�").set("avatar", "https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"));
-        map.put("group", Kv.create().set("name", "楂橀�兼牸璁捐澶╁洟").set("link", "http://github.com/"));
-        map.put("project", Kv.create().set("name", "鍏湀杩唬").set("link", "http://github.com/"));
-        map.put("template", "鍦� @{group} 鏂板缓椤圭洰 @{project}");
-        return R.data(map);
-    }
-
-    @PostMapping({"/dashboard/sign"})
-    @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "绛惧悕淇℃伅", notes = "绛惧悕淇℃伅")
-    public R sign() {
-        Map<String, Object> map = new HashMap<>(16);
-        map.put("user", Kv.create().set("name", "鏇蹭附涓�").set("avatar", "https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"));
-        return R.data(map);
-    }
-
-    @ApiOperationSupport(order = 4)
-    @GetMapping({"/notice/notices"})
-    @ApiOperation(value = "娑堟伅", notes = "娑堟伅")
-    public R notices() {
-        List<Map<String, String>> list = new ArrayList<>();
-        Map<String, String> map1 = new HashMap<>(16);
-        map1.put("logo", "https://spring.io/img/homepage/icon-spring-framework.svg");
-        map1.put("title", "SpringBoot");
-        map1.put("description", "鐜板湪鐨剋eb椤圭洰鍑犱箮閮戒細鐢ㄥ埌spring妗嗘灦锛岃�岃浣跨敤spring闅惧厤闇�瑕侀厤缃ぇ閲忕殑xml閰嶇疆鏂囦欢锛岃�� springboot鐨勫嚭鐜拌В   鍐充簡杩欎竴闂锛屼竴涓」鐩敋鑷充笉鐢ㄩ儴缃插埌鏈嶅姟鍣ㄤ笂鐩存帴寮�璺戯紝鐪熷儚springboot鎵�璇达細鈥渏ust run鈥濄��");
-        map1.put("member", "Chill");
-        map1.put("href", "http://spring.io/projects/spring-boot");
-        list.add(map1);
-        Map<String, String> map2 = new HashMap<>(16);
-        map2.put("logo", "https://spring.io/img/homepage/icon-spring-cloud.svg");
-        map2.put("title", "SpringCloud");
-        map2.put("description", "SpringCloud鏄熀浜嶴pringBoot鐨勪竴鏁村瀹炵幇寰湇鍔＄殑妗嗘灦銆備粬鎻愪緵浜嗗井鏈嶅姟寮�鍙戞墍闇�鐨勯厤缃鐞嗐�佹湇鍔″彂鐜般�佹柇璺櫒銆佹櫤鑳借矾鐢便�佸井浠ｇ悊銆佹帶鍒舵�荤嚎銆佸叏灞�閿併�佸喅绛栫珵閫夈�佸垎甯冨紡浼氳瘽鍜岄泦缇ょ姸鎬佺鐞嗙瓑缁勪欢銆�");
-        map2.put("member", "Chill");
-        map2.put("href", "http://spring.io/projects/spring-cloud");
-        list.add(map2);
-        Map<String, String> map3 = new HashMap<>(16);
-        map3.put("logo", "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1546359961068&di=05ff9406e6675ca9a58a525a7e7950b9&imgtype=jpg&src=http%3A%2F%2Fimg0.imgtn.bdimg.com%2Fit%2Fu%3D575314515%2C4268715674%26fm%3D214%26gp%3D0.jpg");
-        map3.put("title", "Mybatis");
-        map3.put("description", "MyBatis 鏄竴娆句紭绉�鐨勬寔涔呭眰妗嗘灦锛屽畠鏀寔瀹氬埗鍖� SQL銆佸瓨鍌ㄨ繃绋嬩互鍙婇珮绾ф槧灏勩�侻yBatis 閬垮厤浜嗗嚑涔庢墍鏈夌殑 JDBC 浠ｇ爜鍜屾墜鍔ㄨ缃弬鏁颁互鍙婅幏鍙栫粨鏋滈泦銆侻yBatis 鍙互浣跨敤绠�鍗曠殑 XML 鎴栨敞瑙ｆ潵閰嶇疆鍜屾槧灏勫師鐢熶俊鎭紝灏嗘帴鍙ｅ拰 Java 鐨� POJOs(Plain Old Java Objects,鏅�氱殑 Java瀵硅薄)鏄犲皠鎴愭暟鎹簱涓殑璁板綍銆�");
-        map3.put("member", "Chill");
-        map3.put("href", "http://www.mybatis.org/mybatis-3/getting-started.html");
-        list.add(map3);
-        Map<String, String> map4 = new HashMap<>(16);
-        map4.put("logo", "https://gw.alipayobjects.com/zos/rmsportal/kZzEzemZyKLKFsojXItE.png");
-        map4.put("title", "React");
-        map4.put("description", "React 璧锋簮浜� Facebook 鐨勫唴閮ㄩ」鐩紝鍥犱负璇ュ叕鍙稿甯傚満涓婃墍鏈� JavaScript MVC 妗嗘灦锛岄兘涓嶆弧鎰忥紝灏卞喅瀹氳嚜宸卞啓涓�濂楋紝鐢ㄦ潵鏋惰Instagram 鐨勭綉绔欍�傚仛鍑烘潵浠ュ悗锛屽彂鐜拌繖濂椾笢瑗垮緢濂界敤锛屽氨鍦�2013骞�5鏈堝紑婧愪簡銆�");
-        map4.put("member", "Chill");
-        map4.put("href", "https://reactjs.org/");
-        list.add(map4);
-        Map<String, String> map5 = new HashMap<>(16);
-        map5.put("logo", "https://gw.alipayobjects.com/zos/rmsportal/dURIMkkrRFpPgTuzkwnB.png");
-        map5.put("title", "Ant Design");
-        map5.put("description", "铓傝殎閲戞湇浣撻獙鎶�鏈儴缁忚繃澶ч噺鐨勯」鐩疄璺靛拰鎬荤粨锛屾矇娣�鍑鸿璁¤瑷� Ant Design锛岃繖鍙笉鍗曠函鍙槸璁捐鍘熷垯銆佹帶浠惰鑼冨拰瑙嗚灏哄锛岃繕閰嶅鏈夊墠绔唬鐮佸疄鐜版柟妗堛�備篃灏辨槸璇撮噰鐢ˋnt Design鍚庯紝UI璁捐鍜屽墠绔晫闈㈢爺鍙戝彲鍚屾瀹屾垚锛屾晥鐜囧ぇ澶ф彁鍗囥��");
-        map5.put("member", "Chill");
-        map5.put("href", "https://ant.design/docs/spec/introduce-cn");
-        list.add(map5);
-        Map<String, String> map6 = new HashMap<>(16);
-        map6.put("logo", "https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png");
-        map6.put("title", "Ant Design Pro");
-        map6.put("description", "Ant Design Pro 鏄竴涓紒涓氱骇寮�绠卞嵆鐢ㄧ殑涓悗鍙板墠绔�/璁捐瑙ｅ喅鏂规銆傜鍚堥樋閲岃拷姹傜殑'鏁忔嵎鐨勫墠绔�+寮哄ぇ鐨勪腑鍙�'鐨勬�濇兂銆�");
-        map6.put("member", "Chill");
-        map6.put("href", "https://pro.ant.design");
-        list.add(map6);
-        return R.data(list);
-    }
-
-    @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
-    @GetMapping({"/notice/my-notices"})
-    @ApiOperation(value = "娑堟伅", notes = "娑堟伅")
-    public R myNotices() {
-        List<Map<String, String>> list = new ArrayList<>();
-        Map<String, String> map1 = new HashMap<>(16);
-        map1.put("id", "000000001");
-        map1.put("avatar", "https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png");
-        map1.put("title", "浣犳敹鍒颁簡 14 浠芥柊鍛ㄦ姤");
-        map1.put("datetime", "2018-08-09");
-        map1.put("type", "notification");
-        list.add(map1);
-        Map<String, String> map2 = new HashMap<>(16);
-        map2.put("id", "000000002");
-        map2.put("avatar", "https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png");
-        map2.put("title", "浣犳帹鑽愮殑 鏇插Ξ濡� 宸查�氳繃绗笁杞潰璇�");
-        map2.put("datetime", "2018-08-08");
-        map2.put("type", "notification");
-        list.add(map2);
-        Map<String, String> map3 = new HashMap<>(16);
-        map3.put("id", "000000003");
-        map3.put("avatar", "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg");
-        map3.put("title", "鏇蹭附涓� 璇勮浜嗕綘");
-        map3.put("description", "鎻忚堪淇℃伅鎻忚堪淇℃伅鎻忚堪淇℃伅");
-        map3.put("datetime", "2018-08-07");
-        map3.put("type", "message");
-        map3.put("clickClose", FmsConstant.AUTOMATIC);
-        list.add(map3);
-        Map<String, String> map4 = new HashMap<>(16);
-        map4.put("id", "000000004");
-        map4.put("avatar", "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg");
-        map4.put("title", "鏈卞亸鍙� 鍥炲浜嗕綘");
-        map4.put("description", "杩欑妯℃澘鐢ㄤ簬鎻愰啋璋佷笌浣犲彂鐢熶簡浜掑姩锛屽乏渚ф斁銆庤皝銆忕殑澶村儚");
-        map4.put("type", "message");
-        map4.put("datetime", "2018-08-07");
-        map4.put("clickClose", FmsConstant.AUTOMATIC);
-        list.add(map4);
-        Map<String, String> map5 = new HashMap<>(16);
-        map5.put("id", "000000005");
-        map5.put("title", "浠诲姟鍚嶇О");
-        map5.put("description", "浠诲姟闇�瑕佸湪 2018-01-12 20:00 鍓嶅惎鍔�");
-        map5.put("extra", "鏈紑濮�");
-        map5.put("status", "todo");
-        map5.put("type", "event");
-        list.add(map5);
-        return R.data(list);
-    }
-}

--
Gitblit v1.9.3