1、仿真任务置信度统计、仿真任务难度系数统计的feign接口返回值指定类型

2、新增报工

project/src/main/java/com/sdm/project/controller/SimulationTaskController.java

@@ -1,5 +1,6 @@
 package com.sdm.project.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.entity.req.task.TaskExportExcelFormat;
 import com.sdm.common.feign.inter.project.ISimulationTaskFeignClient;
@@ -221,7 +222,7 @@ public class SimulationTaskController implements ISimulationTaskFeignClient {
     @SysLog("仿真任务置信度统计")
     @GetMapping("/getTaskConfidenceStatistics")
     @Operation(summary = "仿真任务置信度统计", description = "仿真任务置信度统计")
-    public SdmResponse getTaskConfidenceStatistics() {
+    public SdmResponse<List<JSONObject>> getTaskConfidenceStatistics() {
         return taskService.getTaskConfidenceStatistics();
     }
 
@@ -231,7 +232,7 @@ public class SimulationTaskController implements ISimulationTaskFeignClient {
     @SysLog("仿真任务难度系数统计")
     @GetMapping("/getTaskDifficultStatistics")
     @Operation(summary = "仿真任务难度系数统计", description = "仿真任务难度系数统计")
-    public SdmResponse getTaskDifficultStatistics() {
+    public SdmResponse<List<JSONObject>> getTaskDifficultStatistics() {
         return taskService.getTaskDifficultStatistics();
     }
 

project/src/main/java/com/sdm/project/controller/SimulationWorkController.java

@@ -0,0 +1,28 @@
+package com.sdm.project.controller;
+
+import com.sdm.common.common.SdmResponse;
+import com.sdm.project.model.req.SpdmWorkReq;
+import com.sdm.project.service.ISimulationWorkService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/work")
+@Tag(name = "仿真工时管理", description = "仿真工时管理")
+public class SimulationWorkController {
+
+    @Autowired
+    private ISimulationWorkService simulationWorkService;
+
+    @PostMapping("/add")
+    @Operation(summary = "新增报工", description = "新增报工")
+    public SdmResponse add(@RequestBody SpdmWorkReq req) {
+        return simulationWorkService.add(req);
+    }
+
+}

project/src/main/java/com/sdm/project/dao/SimulationWorkMapper.java

@@ -0,0 +1,16 @@
+package com.sdm.project.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sdm.project.model.entity.SimulationWork;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-11-03
+ */
+public interface SimulationWorkMapper extends BaseMapper<SimulationWork> {
+
+}

project/src/main/java/com/sdm/project/model/entity/SimulationWork.java

@@ -0,0 +1,88 @@
+package com.sdm.project.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author author
+ * @since 2025-12-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("simulation_work")
+@ApiModel(value = "SimulationWork对象", description = "")
+public class SimulationWork implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "应完成任务")
+    @TableField("planFinishTask")
+    private String planFinishTask;
+
+    @ApiModelProperty(value = "实际完成任务")
+    @TableField("actualFinishTask")
+    private String actualFinishTask;
+
+    @ApiModelProperty(value = "计划工时")
+    @TableField("planWorkHour")
+    private Integer planWorkHour;
+
+    @ApiModelProperty(value = "实际工时")
+    @TableField("actualWorkHour")
+    private Integer actualWorkHour;
+
+    @ApiModelProperty(value = "报工状态")
+    @TableField("status")
+    private byte status;
+
+    @ApiModelProperty(value = "负责人（只能有一个）")
+    @TableField("owner")
+    private Long owner;
+
+    @ApiModelProperty(value = "描述")
+    @TableField("description")
+    private String description;
+
+    @ApiModelProperty(value = "任务开始时间")
+    @TableField("beginTime")
+    private String beginTime;
+
+    @ApiModelProperty(value = "任务完成时间")
+    @TableField("finishTime")
+    private String finishTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("creator")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("createTime")
+    private String createTime;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("updater")
+    private Long updater;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("updateTime")
+    private String updateTime;
+
+
+}

project/src/main/java/com/sdm/project/model/req/SpdmWorkReq.java

@@ -0,0 +1,27 @@
+package com.sdm.project.model.req;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.sdm.common.entity.pojo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpdmWorkReq {
+
+    private String planFinishTask;
+
+    private String actualFinishTask;
+
+    private Integer planWorkHour;
+
+    private Integer actualWorkHour;
+
+    private byte status;
+
+    private Long owner;
+
+    private String description;
+
+}

project/src/main/java/com/sdm/project/service/ISimulationWorkService.java

@@ -0,0 +1,21 @@
+package com.sdm.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sdm.common.common.SdmResponse;
+import com.sdm.project.model.entity.SimulationWork;
+import com.sdm.project.model.req.SpdmWorkReq;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-12-17
+ */
+public interface ISimulationWorkService extends IService<SimulationWork> {
+
+
+    SdmResponse add(SpdmWorkReq req);
+
+}

project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java

@@ -0,0 +1,33 @@
+package com.sdm.project.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sdm.common.common.SdmResponse;
+import com.sdm.project.dao.SimulationWorkMapper;
+import com.sdm.project.model.entity.SimulationWork;
+import com.sdm.project.model.req.SpdmWorkReq;
+import com.sdm.project.service.ISimulationWorkService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2025-11-03
+ */
+@Service
+public class SimulationWorkServiceImpl extends ServiceImpl<SimulationWorkMapper, SimulationWork> implements ISimulationWorkService {
+
+    @Override
+    public SdmResponse add(SpdmWorkReq req) {
+        SimulationWork simulationWork = new SimulationWork();
+        BeanUtils.copyProperties(req,simulationWork);
+        if (!this.save(simulationWork)) {
+            return SdmResponse.failed("新增报工失败");
+        }
+        return SdmResponse.success("新增报工成功");
+    }
+
+}