yangys
2024-10-30 25db770e621f1259b8d5b7fd514207f7481c2d0f
blade_cps路径改为smis
已修改27个文件
已删除9个文件
1008 ■■■■■ 文件已修改
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ApplySettingsController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomMaterialController.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomProcessController.java 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomVersionController.java 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CalendarController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckItemController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CheckProjectController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CollectTemplateController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CommonGroupController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/DeviceTypeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EmployeeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EnterpriseInformationController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainItemController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaintainProjectItemController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MalfunctionTypeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialController.java 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MyTestController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsUsageController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWorkbenchController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/desk/controller/DashBoardController.java 171 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomMaterialController.java
ÎļþÒÑɾ³ý
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomProcessController.java
ÎļþÒÑɾ³ý
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomVersionController.java
ÎļþÒÑɾ³ý
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;
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 = "点检项controller", tags = {"点检项controller"})
@ApiResource({"smis/check-item"})
@Api(value = "点检项", tags = {"点检项"})
@RestController
public class CheckItemController {
    private final ICheckItemService checkItemService;
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;
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
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 {
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 {
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;
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;
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;
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
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;
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 {
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 {
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 {
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 {
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialController.java
ÎļþÒÑɾ³ý
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java
ÎļþÒÑɾ³ý
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
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;
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;
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 {
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java
ÎļþÒÑɾ³ý
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java
ÎļþÒÑɾ³ý
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java
ÎļþÒÑɾ³ý
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;
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 {
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,12 +64,6 @@
    @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"})
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 {
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 {
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;
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 {
smart-man-boot/src/main/java/com/qianwen/smartman/modules/desk/controller/DashBoardController.java
ÎļþÒÑɾ³ý