feat(能源管理系统): 间开制度管理

1.开发定期校准模块-校准周期新增接口,完成接口冒烟测试并生成接口文档;
2.开发定期校准模块-校准周期修改接口,完成接口冒烟测试并生成接口文档;
3.开发定期校准模块-校准周期详情接口,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationService.java

 package pps.core.space.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import pps.core.common.entity.BaseModel;
+import pps.core.common.session.PpsUserSession;
+import pps.core.common.utils.BaseUtils;
 import pps.core.space.entity.SpaceCalibrationHistoryEnt;
 import pps.core.space.entity.SpaceCalibrationHistoryView;
 import pps.core.space.entity.SpaceCalibrationPeriodEnt;
-import pps.core.space.entity.SpaceCalibrationPeriodView;
 import pps.core.space.mapper.SpaceCalibrationHistoryMapper;
 import pps.core.space.mapper.SpaceCalibrationHistoryViewMapper;
 import pps.core.space.mapper.SpaceCalibrationPeriodMapper;
-import pps.core.space.mapper.SpaceCalibrationPeriodViewMapper;
 import pps.core.space.service.data.space_calibration_history.*;
 import pps.core.space.service.data.space_calibration_period.CreateSpaceCalibrationPeriodInput;
 import pps.core.space.service.data.space_calibration_period.GetSpaceCalibrationPeriodViewInput;
 import pps.core.space.service.data.space_calibration_period.GetSpaceCalibrationPeriodViewOutput;
 import pps.core.space.service.data.space_calibration_period.UpdateSpaceCalibrationPeriodInput;
+import pps.core.space.utils.ServiceUtil;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -32,6 +35,7 @@ import xstartup.feature.mybatis.helper.XMapperHelper;
 import xstartup.helper.XTransactionHelper;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 定期校准模块
@@ -54,10 +58,14 @@ public class SpaceCalibrationService {
     @XApiPost
     @XText("校准周期--新增")
     public XServiceResult createSpaceCalibrationPeriod(XContext context, CreateSpaceCalibrationPeriodInput input) {
+        PpsUserSession session = new PpsUserSession();
+        session.setId("123");
+        session.setUserName("ceshi");
+//        PpsUserSession session = context.getSession(PpsUserSession.class);
         return XTransactionHelper.begin(context, () -> {
             SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
-            SpaceCalibrationPeriodEnt entity = new SpaceCalibrationPeriodEnt();
-            XCopyUtils.copyObject(input, entity);
+            SpaceCalibrationPeriodEnt entity = XCopyUtils.copyNewObject(input, SpaceCalibrationPeriodEnt.class);
+            BaseUtils.setBaseModelDefault(entity, session);
             mapper.insert(entity);
             return XServiceResult.OK;
         });
@@ -74,16 +82,24 @@ public class SpaceCalibrationService {
     @XApiPost
     @XText("校准周期--修改")
     public XServiceResult updateSpaceCalibrationPeriod(XContext context, UpdateSpaceCalibrationPeriodInput input) {
+        PpsUserSession session = new PpsUserSession();
+        session.setId("123");
+        session.setUserName("ceshi");
+//        PpsUserSession session = context.getSession(PpsUserSession.class);
+        return XTransactionHelper.begin(context, () -> {
             SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
-        QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceCalibrationPeriodEnt::getId, input.getId());
-        SpaceCalibrationPeriodEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
+            SpaceCalibrationPeriodEnt entity = mapper.selectOne(
+                    new LambdaQueryWrapper<SpaceCalibrationPeriodEnt>()
+                            .eq(BaseModel::getId, input.getId())
+            );
+            if (Objects.isNull(entity)) {
                 return XServiceResult.error(context, XError.NotFound);
             }
             XCopyUtils.copyObject(input, entity);
+            BaseUtils.setBaseModelDefault(entity, session);
             mapper.updateById(entity);
             return XServiceResult.OK;
+        });
     }
 
     /**
@@ -97,15 +113,24 @@ public class SpaceCalibrationService {
     @XApiGet
     @XText("校准周期--详情")
     public XSingleResult<GetSpaceCalibrationPeriodViewOutput> getSpaceCalibrationPeriodView(XContext context, GetSpaceCalibrationPeriodViewInput input) {
-        SpaceCalibrationPeriodViewMapper mapper = context.getBean(SpaceCalibrationPeriodViewMapper.class);
-        SpaceCalibrationPeriodView record = new SpaceCalibrationPeriodView();
-        XCopyUtils.copyObject(input, record);
-        SpaceCalibrationPeriodView view = mapper.selectOne(record);
-        if (view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
+        String lineId = input.getLineId();
+        String ouId = input.getOuId();
+        SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
+        SpaceCalibrationPeriodEnt entity = mapper.selectOne(
+                new LambdaQueryWrapper<SpaceCalibrationPeriodEnt>()
+                        .eq(SpaceCalibrationPeriodEnt::getLineId, lineId)
+                        .eq(SpaceCalibrationPeriodEnt::getOuId, ouId)
+        );
         GetSpaceCalibrationPeriodViewOutput output = new GetSpaceCalibrationPeriodViewOutput();
-        XCopyUtils.copyObject(view, output);
+        if (Objects.nonNull(entity)) {
+            XCopyUtils.copyObject(entity, output);
+        }
+        output.setLineName(
+                ServiceUtil.getPowerLineNameById(context, lineId)
+        );
+        output.setOuName(
+                ServiceUtil.getSysOrgNameById(context, ouId)
+        );
         return XSingleResult.success(output);
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_calibration_period/CreateSpaceCalibrationPeriodInput.java

@@ -18,8 +18,10 @@ public class CreateSpaceCalibrationPeriodInput {
     private String ouId;
 
     @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
     private String lineId;
 
     @XText("天数")
+    @NotBlank(message = "缺少天数")
     private String dayNumber;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_calibration_period/GetSpaceCalibrationPeriodViewInput.java

 package pps.core.space.service.data.space_calibration_period;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import xstartup.annotation.XText;
 
-import java.util.Date;
-
 /**
  * 定期校准
  *
@@ -13,33 +12,12 @@ import java.util.Date;
  */
 @Data
 public class GetSpaceCalibrationPeriodViewInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
 
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
+    @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
+    private String ouId;
 
     @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
     private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_calibration_period/GetSpaceCalibrationPeriodViewOutput.java

@@ -3,8 +3,6 @@ package pps.core.space.service.data.space_calibration_period;
 import lombok.Data;
 import xstartup.annotation.XText;
 
-import java.util.Date;
-
 /**
  * 定期校准
  *
@@ -13,33 +11,28 @@ import java.util.Date;
  */
 @Data
 public class GetSpaceCalibrationPeriodViewOutput {
+
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
+    @XText("组织机构ID")
+    private String ouId;
 
     @XText("线路ID")
     private String lineId;
 
     @XText("天数")
     private String dayNumber;
+
+    /**
+     * 线路名称
+     */
+    @XText("线路名称")
+    private String lineName;
+
+    /**
+     * 组织机构名称
+     */
+    @XText("组织机构名称")
+    private String ouName;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_calibration_period/UpdateSpaceCalibrationPeriodInput.java

@@ -14,6 +14,7 @@ import xstartup.annotation.XText;
 public class UpdateSpaceCalibrationPeriodInput {
 
     @XText("ID")
+    @NotBlank(message = "缺少周期ID")
     private String id;
 
     @XText("组织机构ID")
@@ -21,8 +22,10 @@ public class UpdateSpaceCalibrationPeriodInput {
     private String ouId;
 
     @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
     private String lineId;
 
     @XText("天数")
+    @NotBlank(message = "缺少天数")
     private String dayNumber;
 }