【需求】初步完成创建车间接口

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetController.java

@@ -4,6 +4,7 @@ import com.chanjet.openapi.sdk.java.exception.ChanjetApiException;
 import com.chanjet.openapi.sdk.java.response.GetTokenResponse;
 import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
 import com.chanko.yunxi.mes.framework.tenant.core.aop.TenantIgnore;
+import com.chanko.yunxi.mes.module.biz.controller.admin.workshop.vo.WorkshopSaveReqVO;
 import com.chanko.yunxi.mes.module.biz.manager.ChanjetManager;
 import com.chanko.yunxi.mes.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
 import io.swagger.v3.oas.annotations.Operation;
@@ -56,11 +57,17 @@ public class ChanjetController {
         return response;
     }
 
-    @PostMapping("create")
+    @PostMapping("/dept/create")
     @Operation(summary = "创建部门")
     @PreAuthorize("@ss.hasPermission('system:dept:create')")
     public CommonResult<Long> createDept(@Valid @RequestBody DeptSaveReqVO createReqVO) throws ChanjetApiException {
         return success(chanjetManager.createDepartment(createReqVO));
     }
 
+    @PostMapping("/workshop/create")
+    @Operation(summary = "创建车间")
+    @PreAuthorize("@ss.hasPermission('biz:workshop:create')")
+    public CommonResult<Long> createWorkshop(@Valid @RequestBody WorkshopSaveReqVO createReqVO) throws ChanjetApiException {
+        return success(chanjetManager.createWorkshop(createReqVO));
+    }
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/job/SyncChanjetJob.java

@@ -2,7 +2,7 @@ package com.chanko.yunxi.mes.module.biz.job;
 
 import com.chanko.yunxi.mes.framework.quartz.core.handler.JobHandler;
 import com.chanko.yunxi.mes.framework.tenant.core.job.TenantJob;
-import com.chanko.yunxi.mes.module.biz.service.screen.ScreenService;
+import com.chanko.yunxi.mes.module.biz.manager.ChanjetManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -19,16 +19,14 @@ import javax.annotation.Resource;
 public class SyncChanjetJob implements JobHandler {
 
     @Resource
-    private ScreenService screenService;
+    private ChanjetManager chanjetManager;
 
     @Override
     @TenantJob
     public String execute(String param) throws Exception {
 
         try {
-            screenService.generateData();
         }catch (Exception e){
-            log.error("SyncScreenDataJob execute error: {}", e.getMessage(), e);
         }
         return null;
     }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -4,6 +4,9 @@ import com.chanjet.openapi.sdk.java.exception.ChanjetApiException;
 import com.chanko.yunxi.mes.module.biz.chanjet.ChanjetSpi;
 import com.chanko.yunxi.mes.module.biz.chanjet.vo.CreateDepartmentVO;
 import com.chanko.yunxi.mes.module.biz.chanjet.vo.SimpleChanjetResponse;
+import com.chanko.yunxi.mes.module.biz.controller.admin.workshop.vo.WorkshopSaveReqVO;
+import com.chanko.yunxi.mes.module.biz.dal.dataobject.workshop.WorkshopDO;
+import com.chanko.yunxi.mes.module.biz.service.workshop.WorkshopService;
 import com.chanko.yunxi.mes.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
 import com.chanko.yunxi.mes.module.system.service.dept.DeptService;
@@ -29,6 +32,8 @@ public class ChanjetManager {
     private ChanjetSpi chanjetSpi;
     @Resource
     private DeptService deptService;
+    @Resource
+    private WorkshopService workshopService;
 
     /**
      * 创建部门
@@ -51,4 +56,25 @@ public class ChanjetManager {
         return deptId;
     }
 
+    /**
+     * 创建车间
+     * @param createReqVO
+     * @return
+     * @throws ChanjetApiException
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Long createWorkshop(WorkshopSaveReqVO createReqVO) throws ChanjetApiException {
+        Long workshopId = workshopService.createWorkshop(createReqVO);
+
+        WorkshopDO workshop = workshopService.getWorkshop(workshopId);
+
+        CreateDepartmentVO.DepartmentVO departmentVO = new CreateDepartmentVO.DepartmentVO(String.valueOf(workshop.getCode()), workshop.getName(), new HashMap<String, String>(1) {{
+            put("Code", String.valueOf(workshop.getDeptId()));
+        }});
+        SimpleChanjetResponse response = (SimpleChanjetResponse) chanjetSpi.execute(CREATE_DEPARTMENT, new CreateDepartmentVO(departmentVO));
+        if(!response.isSuccess()){
+            throw new RuntimeException(response.getMessage());
+        }
+        return workshopId;
+    }
 }

mes-ui/mes-ui-admin-vue3/src/api/biz/workshop/index.ts

@@ -22,7 +22,7 @@ export const getWorkshop = async (id: number) => {
 
 // 新增车间
 export const createWorkshop = async (data: WorkshopVO) => {
-  return await request.post({ url: `/biz/workshop/create`, data })
+  return await request.post({ url: `/biz/chanjet/workshop/create`, data })
 }
 
 // 修改车间

mes-ui/mes-ui-admin-vue3/src/api/system/dept/index.ts

@@ -29,7 +29,7 @@ export const getDept = async (id: number) => {
 
 // 新增部门
 export const createDept = async (data: DeptVO) => {
-  return await request.post({ url: '/system/dept/create', data: data })
+  return await request.post({ url: '/biz/chanjet/dept/create', data: data })
 }
 
 // 修改部门