feat(能源管理系统): 基础信息配置

1.优化基础信息配置-柴发设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseDieselGeneratorService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import pps.core.base.entity.BaseDieselGeneratorEnt;
 import pps.core.base.entity.BasePowerLineDieselEnt;
 import pps.core.base.mapper.BaseDieselGeneratorMapper;
@@ -25,6 +26,7 @@ import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
+import xstartup.helper.XTransactionHelper;
 
 import java.util.List;
 import java.util.Objects;
@@ -42,26 +44,25 @@ public class BaseDieselGeneratorService extends BaseService {
     @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseDieselGenerator(XContext context, CreateBaseDieselGeneratorInput input) {
+        return XTransactionHelper.begin(context, () -> {
             BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
-        BaseDieselGeneratorEnt entity = new BaseDieselGeneratorEnt();
-        XCopyUtils.copyObject(input, entity);
+            BaseDieselGeneratorEnt entity = XCopyUtils.copyNewObject(input, BaseDieselGeneratorEnt.class);
             PpsUserSession session = context.getSession(PpsUserSession.class);
             BaseUtils.setBaseModelDefault(entity, session);
             mapper.insert(entity);
             return XServiceResult.OK;
+        });
     }
 
     @XText("更新")
     @XApiAnonymous
     @XApiPost
     public XServiceResult updateBaseDieselGenerator(XContext context, UpdateBaseDieselGeneratorInput input) {
+        return XTransactionHelper.begin(context, () -> {
             BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
-        QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda()
-                .eq(BaseDieselGeneratorEnt::getId, input.getId())
-                .eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE);
-        BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
+            BaseDieselGeneratorEnt entity = mapper.selectOne(new LambdaUpdateWrapper<BaseDieselGeneratorEnt>()
+                    .eq(BaseDieselGeneratorEnt::getId, input.getId()));
+            if (Objects.isNull(entity)) {
                 return XServiceResult.error(context, XError.NotFound);
             }
             XCopyUtils.copyObject(input, entity);
@@ -69,6 +70,7 @@ public class BaseDieselGeneratorService extends BaseService {
             BaseUtils.setBaseModelDefault(entity, session);
             mapper.updateById(entity);
             return XServiceResult.OK;
+        });
     }
 
     @XText("删除")
@@ -79,22 +81,21 @@ public class BaseDieselGeneratorService extends BaseService {
         if (this.checkDieselIsReference(context, dieselId)) {
             return XServiceResult.error(992, "当前柴发设备已被引用");
         }
+        return XTransactionHelper.begin(context, () -> {
             BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
-        QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda()
-                .eq(BaseDieselGeneratorEnt::getId, input.getId())
-                .eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE);
-        BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
+            BaseDieselGeneratorEnt entity = mapper.selectOne(new LambdaUpdateWrapper<BaseDieselGeneratorEnt>()
+                    .eq(BaseDieselGeneratorEnt::getId, dieselId));
             if (Objects.isNull(entity)) {
                 return XServiceResult.error(context, XError.NotFound);
             }
             entity = new BaseDieselGeneratorEnt();
-        entity.setId(input.getId());
+            entity.setId(dieselId);
             entity.setIsDeleted(BusinessConstant.ZERO);
             PpsUserSession session = context.getSession(PpsUserSession.class);
             BaseUtils.setBaseModelDefault(entity, session);
             mapper.updateById(entity);
             return XServiceResult.OK;
+        });
     }
 
     @XText("根据id获取详情")
@@ -102,16 +103,12 @@ public class BaseDieselGeneratorService extends BaseService {
     @XApiGet
     public XSingleResult<GetBaseDieselGeneratorOutput> getBaseDieselGenerator(XContext context, GetBaseDieselGeneratorInput input) {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
-        QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda()
-                .eq(BaseDieselGeneratorEnt::getId, input.getId())
-                .eq(BaseDieselGeneratorEnt::getIsDeleted, BusinessConstant.ONE);
-        BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
+        BaseDieselGeneratorEnt entity = mapper.selectOne(new LambdaUpdateWrapper<BaseDieselGeneratorEnt>()
+                .eq(BaseDieselGeneratorEnt::getId, input.getId()));
+        if (Objects.isNull(entity)) {
             return XSingleResult.error(context, XError.NotFound);
         }
-        GetBaseDieselGeneratorOutput output = new GetBaseDieselGeneratorOutput();
-        XCopyUtils.copyObject(entity, output);
+        GetBaseDieselGeneratorOutput output = XCopyUtils.copyNewObject(entity, GetBaseDieselGeneratorOutput.class);
         return XSingleResult.success(output);
     }