更新字段

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java

@@ -26,7 +26,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
  * 工单信息
  *
  * @author gejunhao
- * @date 2025-01-10
+ * @date 2025-01-13
  */
 @Validated
 @RequiredArgsConstructor
@@ -59,13 +59,13 @@ public class WorkOrderInfoController extends BaseController {
     /**
      * 获取工单信息详细信息
      *
-     * @param workOrderId 主键
+     * @param id 主键
      */
     @SaCheckPermission("platform:workorder:query")
-    @GetMapping("/{workOrderId}")
+    @GetMapping("/{id}")
     public R<WorkOrderInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long workOrderId) {
+                                      @PathVariable String id) {
-        return R.ok(workOrderInfoService.queryById(workOrderId));
+        return R.ok(workOrderInfoService.queryById(id));
     }
 
     /**
@@ -93,13 +93,13 @@ public class WorkOrderInfoController extends BaseController {
     /**
      * 删除工单信息
      *
-     * @param workOrderIds 主键串
+     * @param ids 主键串
      */
     @SaCheckPermission("platform:workorder:remove")
     @Log(title = "工单信息", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{workOrderIds}")
+    @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] workOrderIds) {
+                          @PathVariable String[] ids) {
-        return toAjax(workOrderInfoService.deleteWithValidByIds(List.of(workOrderIds), true));
+        return toAjax(workOrderInfoService.deleteWithValidByIds(List.of(ids), true));
     }
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java

@@ -13,7 +13,7 @@ import java.io.Serial;
  * 工单信息对象 work_order_info
  *
  * @author gejunhao
- * @date 2025-01-10
+ * @date 2025-01-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -26,8 +26,8 @@ public class WorkOrderInfo extends TenantEntity {
     /**
      * 工单ID
      */
-    @TableId(value = "work_order_id")
+    @TableId(value = "id")
-    private Long workOrderId;
+    private String id;
 
     /**
      * 所属项目
@@ -114,10 +114,5 @@ public class WorkOrderInfo extends TenantEntity {
      */
     private String longitude;
 
-    /**
-     * 创建人
-     */
-    private String creator;
-
 
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java

@@ -1,5 +1,7 @@
 package org.dromara.platform.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import org.dromara.platform.domain.WorkOrderInfo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -15,7 +17,7 @@ import org.dromara.common.translation.constant.TransConstant;
  * 工单信息业务对象 work_order_info
  *
  * @author gejunhao
- * @date 2025-01-10
+ * @date 2025-01-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -25,8 +27,9 @@ public class WorkOrderInfoBo extends BaseEntity {
     /**
      * 工单ID
      */
-    @NotNull(message = "工单ID不能为空", groups = { EditGroup.class })
+    //@NotBlank(message = "工单ID不能为空", groups = { EditGroup.class })
-    private Long workOrderId;
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
 
     /**
      * 所属项目
@@ -130,11 +133,5 @@ public class WorkOrderInfoBo extends BaseEntity {
     @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String longitude;
 
-    /**
-     * 创建人
-     */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
 
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java

@@ -20,7 +20,7 @@ import java.util.Date;
  * 工单信息视图对象 work_order_info
  *
  * @author gejunhao
- * @date 2025-01-10
+ * @date 2025-01-13
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -34,7 +34,7 @@ public class WorkOrderInfoVo implements Serializable {
      * 工单ID
      */
     @ExcelProperty(value = "工单ID")
-    private Long workOrderId;
+    private String id;
 
     /**
      * 所属项目
@@ -143,11 +143,5 @@ public class WorkOrderInfoVo implements Serializable {
     @ExcelProperty(value = "经度")
     private String longitude;
 
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
 
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java

@@ -12,17 +12,17 @@ import java.util.List;
  * 工单信息Service接口
  *
  * @author gejunhao
- * @date 2025-01-10
+ * @date 2025-01-13
  */
 public interface IWorkOrderInfoService {
 
     /**
      * 查询工单信息
      *
-     * @param workOrderId 主键
+     * @param id 主键
      * @return 工单信息
      */
-    WorkOrderInfoVo queryById(Long workOrderId);
+    WorkOrderInfoVo queryById(String id);
 
     /**
      * 分页查询工单信息列表
@@ -64,5 +64,5 @@ public interface IWorkOrderInfoService {
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
      */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.Collection;
  * 工单信息Service业务层处理
  *
  * @author gejunhao
- * @date 2025-01-10
+ * @date 2025-01-13
  */
 @RequiredArgsConstructor
 @Service
@@ -34,12 +34,12 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
     /**
      * 查询工单信息
      *
-     * @param workOrderId 主键
+     * @param id 主键
      * @return 工单信息
      */
     @Override
-    public WorkOrderInfoVo queryById(Long workOrderId){
+    public WorkOrderInfoVo queryById(String id){
-        return baseMapper.selectVoById(workOrderId);
+        return baseMapper.selectVoById(id);
     }
 
     /**
@@ -88,7 +88,6 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         lqw.eq(bo.getIsDispatched() != null, WorkOrderInfo::getIsDispatched, bo.getIsDispatched());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), WorkOrderInfo::getLatitude, bo.getLatitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), WorkOrderInfo::getLongitude, bo.getLongitude());
-        lqw.eq(StringUtils.isNotBlank(bo.getCreator()), WorkOrderInfo::getCreator, bo.getCreator());
         return lqw;
     }
 
@@ -101,10 +100,10 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
     @Override
     public Boolean insertByBo(WorkOrderInfoBo bo) {
         WorkOrderInfo add = MapstructUtils.convert(bo, WorkOrderInfo.class);
-        validEntityBeforeSave(add);
+        //validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
-            bo.setWorkOrderId(add.getWorkOrderId());
+            bo.setId(add.getId());
         }
         return flag;
     }
@@ -137,7 +136,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
      * @return 是否删除成功
      */
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }