diff --git a/src/main/java/com/ycwl/basic/controller/pc/RenderWorkerController.java b/src/main/java/com/ycwl/basic/controller/pc/RenderWorkerController.java deleted file mode 100644 index d200d86..0000000 --- a/src/main/java/com/ycwl/basic/controller/pc/RenderWorkerController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ycwl.basic.controller.pc; - -import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; -import com.ycwl.basic.model.pc.renderWorker.req.RenderWorkerReqQuery; -import com.ycwl.basic.service.pc.RenderWorkerService; -import com.ycwl.basic.utils.ApiResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @Author:longbinbin - * @Date:2024/12/3 14:59 - */ -@RestController -@RequestMapping("/api/renderWorker/v1") -// 渲染机管理 -public class RenderWorkerController { - - @Autowired - private RenderWorkerService renderWorkerService; - - // 分页查询渲染机 - @PostMapping("/page") - public ApiResponse pageQuery(@RequestBody RenderWorkerReqQuery renderWorkerReqQuery){ - return renderWorkerService.pageQuery(renderWorkerReqQuery); - } - // 渲染机列表查询 - @PostMapping("/list") - public ApiResponse list(@RequestBody RenderWorkerReqQuery renderWorkerReqQuery){ - return renderWorkerService.list(renderWorkerReqQuery); - } - // 渲染机详情查询 - @GetMapping("/detail/{id}") - public ApiResponse detail(@PathVariable Long id){ - return renderWorkerService.detail(id); - } - - // 渲染机新增 - @PostMapping("/add") - public ApiResponse add(@RequestBody RenderWorkerEntity renderWorker){ - return renderWorkerService.add(renderWorker); - } - - // 渲染机删除 - @DeleteMapping("/delete/{id}") - public ApiResponse deleteById(@PathVariable Long id){ - return renderWorkerService.deleteById(id); - } - - // 渲染机修改 - @PostMapping("/update") - public ApiResponse update(@RequestBody RenderWorkerEntity renderWorker){ - return renderWorkerService.update(renderWorker); - } - - // 渲染机修改状态 - @PutMapping("/updateStatus/{id}") - public ApiResponse updateStatus(@PathVariable Long id) { - return renderWorkerService.updateStatus(id); - } -} diff --git a/src/main/java/com/ycwl/basic/mapper/RenderWorkerMapper.java b/src/main/java/com/ycwl/basic/mapper/RenderWorkerMapper.java deleted file mode 100644 index b74da68..0000000 --- a/src/main/java/com/ycwl/basic/mapper/RenderWorkerMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ycwl.basic.mapper; - -import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; -import com.ycwl.basic.model.pc.renderWorker.req.RenderWorkerReqQuery; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @Author:longbinbin - * @Date:2024/11/29 17:22 - * 渲染机管理表 - */ -@Mapper -public interface RenderWorkerMapper { - List list(RenderWorkerReqQuery renderWorkerReqQuery); - int add(RenderWorkerEntity renderWorker); - int deleteById(Long id); - int update(RenderWorkerEntity renderWorker); - int updateStatus(Long id); - -} diff --git a/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java index d9917ae..fcf8986 100644 --- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java @@ -14,9 +14,7 @@ import java.util.Date; * 渲染机管理表 */ @Data -@TableName("render_worker") public class RenderWorkerEntity { - @TableId private Long id; /** * 渲染机名称 diff --git a/src/main/java/com/ycwl/basic/service/pc/RenderWorkerService.java b/src/main/java/com/ycwl/basic/service/pc/RenderWorkerService.java deleted file mode 100644 index 21f03fa..0000000 --- a/src/main/java/com/ycwl/basic/service/pc/RenderWorkerService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ycwl.basic.service.pc; - -import com.github.pagehelper.PageInfo; -import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; -import com.ycwl.basic.model.pc.renderWorker.req.RenderWorkerReqQuery; -import com.ycwl.basic.model.pc.renderWorker.resp.RenderWorkerRespVO; -import com.ycwl.basic.utils.ApiResponse; - -import java.util.List; - -/** - * @Author:longbinbin - * @Date:2024/12/3 15:07 - */ -public interface RenderWorkerService { - ApiResponse> pageQuery(RenderWorkerReqQuery renderWorkerReqQuery); - ApiResponse> list(RenderWorkerReqQuery renderWorkerReqQuery); - ApiResponse detail(Long id); - ApiResponse add(RenderWorkerEntity renderWorker); - ApiResponse deleteById(Long id); - ApiResponse update(RenderWorkerEntity renderWorker); - ApiResponse updateStatus(Long id); -} diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/RenderWorkerServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/RenderWorkerServiceImpl.java deleted file mode 100644 index aadcb24..0000000 --- a/src/main/java/com/ycwl/basic/service/pc/impl/RenderWorkerServiceImpl.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.ycwl.basic.service.pc.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.ycwl.basic.mapper.RenderWorkerMapper; -import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; -import com.ycwl.basic.model.pc.renderWorker.req.RenderWorkerReqQuery; -import com.ycwl.basic.model.pc.renderWorker.resp.RenderWorkerRespVO; -import com.ycwl.basic.model.task.req.ClientStatusReqVo; -import com.ycwl.basic.repository.RenderWorkerRepository; -import com.ycwl.basic.service.pc.RenderWorkerService; -import com.ycwl.basic.utils.ApiResponse; -import com.ycwl.basic.utils.SnowFlakeUtil; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.List; - -/** - * @Author:longbinbin - * @Date:2024/12/3 15:09 - */ -@Service -public class RenderWorkerServiceImpl implements RenderWorkerService { - - @Autowired - private RenderWorkerMapper renderWorkerMapper; - @Autowired - private RenderWorkerRepository renderWorkerRepository; - - @Override - public ApiResponse> pageQuery(RenderWorkerReqQuery renderWorkerReqQuery) { - PageHelper.startPage(renderWorkerReqQuery.getPageNum(), renderWorkerReqQuery.getPageSize()); - List list = renderWorkerMapper.list(renderWorkerReqQuery); - List workerList = list.stream().map(worker -> { - RenderWorkerRespVO resp = new RenderWorkerRespVO(); - resp.setId(worker.getId()); - resp.setName(worker.getName()); - resp.setAccessKey(worker.getAccessKey()); - resp.setStatus(worker.getStatus()); - resp.setCreateAt(worker.getCreateAt()); - resp.setUpdateAt(worker.getUpdateAt()); - ClientStatusReqVo clientStatus = renderWorkerRepository.getWorkerHostStatus(worker.getId()); - if (clientStatus == null) { - return resp; - } - resp.setCpuCount(clientStatus.getCpu_count()); - resp.setCpuUsage(clientStatus.getCpu_usage()); - // 上报的是字节,存储的是兆 - resp.setMemoryAvailable(clientStatus.getMemory_available().divide(BigDecimal.valueOf(1024 * 1024), RoundingMode.CEILING)); - resp.setMemoryTotal(clientStatus.getMemory_total().divide(BigDecimal.valueOf(1024 * 1024), RoundingMode.CEILING)); - - resp.setPlatform(clientStatus.getPlatform()); - resp.setRuntimeVersion(clientStatus.getRuntime_version()); - resp.setSupportFeature(String.join(",", clientStatus.getSupport_feature())); - resp.setVersion(clientStatus.getVersion()); - resp.setUpdateAt(clientStatus.getUpdateAt()); - return resp; - }).toList(); - PageInfo pageInfo = new PageInfo<>(workerList); - return ApiResponse.success(pageInfo); - } - - @Override - public ApiResponse> list(RenderWorkerReqQuery renderWorkerReqQuery) { - List list = renderWorkerMapper.list(renderWorkerReqQuery); - List workerList = list.stream().map(worker -> { - RenderWorkerRespVO resp = new RenderWorkerRespVO(); - resp.setId(worker.getId()); - resp.setName(worker.getName()); - resp.setAccessKey(worker.getAccessKey()); - resp.setStatus(worker.getStatus()); - resp.setCreateAt(worker.getCreateAt()); - resp.setUpdateAt(worker.getUpdateAt()); - ClientStatusReqVo clientStatus = renderWorkerRepository.getWorkerHostStatus(worker.getId()); - if (clientStatus == null) { - return resp; - } - resp.setCpuCount(clientStatus.getCpu_count()); - resp.setCpuUsage(clientStatus.getCpu_usage()); - // 上报的是字节,存储的是兆 - resp.setMemoryAvailable(clientStatus.getMemory_available().divide(BigDecimal.valueOf(1024 * 1024), RoundingMode.CEILING)); - resp.setMemoryTotal(clientStatus.getMemory_total().divide(BigDecimal.valueOf(1024 * 1024), RoundingMode.CEILING)); - - resp.setPlatform(clientStatus.getPlatform()); - resp.setRuntimeVersion(clientStatus.getRuntime_version()); - resp.setSupportFeature(String.join(",", clientStatus.getSupport_feature())); - resp.setVersion(clientStatus.getVersion()); - resp.setUpdateAt(clientStatus.getUpdateAt()); - return resp; - }).toList(); - return ApiResponse.success(workerList); - } - - @Override - public ApiResponse detail(Long id) { - RenderWorkerEntity worker = renderWorkerRepository.getWorker(id); - - RenderWorkerRespVO resp = new RenderWorkerRespVO(); - resp.setId(worker.getId()); - resp.setName(worker.getName()); - resp.setAccessKey(worker.getAccessKey()); - resp.setStatus(worker.getStatus()); - resp.setCreateAt(worker.getCreateAt()); - resp.setUpdateAt(worker.getUpdateAt()); - - ClientStatusReqVo clientStatus = renderWorkerRepository.getWorkerHostStatus(worker.getId()); - if (clientStatus != null) { - resp.setCpuCount(clientStatus.getCpu_count()); - resp.setCpuUsage(clientStatus.getCpu_usage()); - // 上报的是字节,存储的是兆 - resp.setMemoryAvailable(clientStatus.getMemory_available().divide(BigDecimal.valueOf(1024 * 1024), RoundingMode.CEILING)); - resp.setMemoryTotal(clientStatus.getMemory_total().divide(BigDecimal.valueOf(1024 * 1024), RoundingMode.CEILING)); - - resp.setPlatform(clientStatus.getPlatform()); - resp.setRuntimeVersion(clientStatus.getRuntime_version()); - resp.setSupportFeature(String.join(",", clientStatus.getSupport_feature())); - resp.setVersion(clientStatus.getVersion()); - resp.setUpdateAt(clientStatus.getUpdateAt()); - } - return ApiResponse.success(resp); - } - - @Override - public ApiResponse add(RenderWorkerEntity renderWorker) { - renderWorker.setId(SnowFlakeUtil.getLongId()); - if (StringUtils.isEmpty(renderWorker.getAccessKey())) { - renderWorker.setAccessKey(SnowFlakeUtil.getId()); - } - renderWorker.setStatus(0); - int add = renderWorkerMapper.add(renderWorker); - if (add == 0) { - return ApiResponse.fail("渲染机添加失败"); - }else { - return ApiResponse.success(add); - } - } - - @Override - public ApiResponse deleteById(Long id) { - return ApiResponse.success(renderWorkerMapper.deleteById(id)); - } - - @Override - public ApiResponse update(RenderWorkerEntity renderWorker) { - int update = renderWorkerMapper.update(renderWorker); - if (update == 0) { - return ApiResponse.fail("渲染机修改失败"); - }else { - return ApiResponse.success(update); - } - } - - @Override - public ApiResponse updateStatus(Long id) { - return ApiResponse.success(renderWorkerMapper.updateStatus(id)); - } -} diff --git a/src/main/resources/mapper/RenderWorkerMapper.xml b/src/main/resources/mapper/RenderWorkerMapper.xml deleted file mode 100644 index 4e47bf2..0000000 --- a/src/main/resources/mapper/RenderWorkerMapper.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - insert into render_worker(id, `name`, platform, runtime_version, version, access_key, - cpu_count, cpu_usage, memory_total, memory_available, support_feature, scenic_only, test_only, `online`, `status`) - VALUES (#{id}, #{name}, #{platform}, #{runtimeVersion}, #{version}, #{accessKey}, - #{cpuCount}, #{cpuUsage}, #{memoryTotal}, #{memoryAvailable}, #{supportFeature}, #{scenicOnly}, #{testOnly}, #{online}, #{status}) - - - - update render_worker - - - name = #{name}, - - - platform = #{platform}, - - - runtime_version = #{runtimeVersion}, - - - version = #{version}, - - - access_key = #{accessKey}, - - - cpu_count = #{cpuCount}, - - - cpu_usage = #{cpuUsage}, - - - memory_total = #{memoryTotal}, - - - memory_available = #{memoryAvailable}, - - - support_feature = #{supportFeature}, - - - scenic_only = #{scenicOnly}, - - - test_only = #{testOnly}, - - - `online` = #{online}, - - - where id = #{id} - - - update render_worker - set status = (CASE - status - WHEN 1 THEN - 0 - WHEN 0 THEN - 1 - ELSE null - END) - where id = #{id} - - - update render_worker - set platform = #{status.platform}, - runtime_version = #{status.runtimeVersion}, - version = #{status.version}, - cpu_count = #{status.cpuCount}, - cpu_usage = #{status.cpuUsage}, - memory_total = #{status.memoryTotal}, - memory_available = #{status.memoryAvailable}, - support_feature = #{status.supportFeature}, - update_at = #{status.updateAt} - where id = #{id} - - - delete from render_worker where id = #{id} - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml index dbfa2ee..6274ca5 100644 --- a/src/main/resources/mapper/TaskMapper.xml +++ b/src/main/resources/mapper/TaskMapper.xml @@ -84,13 +84,6 @@ from task where status = 0 and worker_id is null - and NOT EXISTS ( - SELECT 1 - FROM render_worker rw - WHERE - rw.status = 1 - AND FIND_IN_SET(task.scenic_id, rw.scenic_only) > 0 -- 检查scenic_id是否在逗号分隔的字符串中 - ) limit 1