fix mj车队

netflix-dao/src/main/java/com/cyksj/mapper/MidjourneySessionMapper.java

@@ -0,0 +1,11 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.MidjourneySession;
+
+/**
+ * @author zwhui
+ * @date 2024/8/14 17:08
+ */
+public interface MidjourneySessionMapper extends BaseMapper<MidjourneySession> {
+}

netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneySession.java

@@ -0,0 +1,80 @@
+package com.cyksj.model.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Data;
+
+/**
+ * @author zwhui
+ * @date 2024/8/14 17:07
+ */
+@Data
+@TableName("midjourney_session")
+@SearchBean(tables = "midjourney_session")
+public class MidjourneySession extends BaseEntity {
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 状态 1有效 1无效
+     */
+    private Integer status;
+
+    /**
+     * 是否为plus会员
+     */
+    @TableField("isPlus")
+    private Integer isPlus;
+
+    /**
+     * accountId
+     */
+    @TableField("accountId")
+    private Long accountId;
+
+    @TableField("isCar")
+    private Boolean isCar;
+
+    /**
+     * 车id
+     */
+    @TableField("carID")
+    private String carId;
+
+    /**
+     * 车名称
+     */
+    private String carName;
+
+    /**
+     * 官方session
+     */
+    @TableField("officialSession")
+    private String officialSession;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 快速时长
+     */
+    private Long fastTime;
+
+
+}

netflix-dao/src/main/java/com/cyksj/model/views/MidjourneyCarSessionView.java

@@ -0,0 +1,80 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: ChatgptCarSessionView
+ * 创建者: JavaZou
+ * 创建时间:2024/4/12 10:28
+ */
+@Getter
+@Setter
+@SearchBean(tables = "midjourney_session cs")
+public class MidjourneyCarSessionView {
+	@DbField("cs.id")
+	private Long id;
+
+	/**
+	 * 账号
+	 */
+	@DbField("cs.email")
+	private String email;
+
+	@DbField("cs.password")
+	private String password;
+
+	@DbField("cs.carID")
+	private String carId;
+
+
+	/**
+	 * 状态 1有效 1无效
+	 */
+	@DbField("cs.status")
+	private Integer status;
+
+	/**
+	 * 是否为plus会员
+	 */
+	@DbField("isPlus")
+	private Integer isPlus;
+
+	/**
+	 * 车名称
+	 */
+	@DbField("cs.car_name")
+	private String carName;
+
+	/**
+	 * 官方session
+	 */
+	@DbField("cs.officialSession")
+	private String officialSession;
+
+	/**
+	 * 分数
+	 */
+	@DbField("cs.score")
+	private Double score;
+
+	/**
+	 * 备注
+	 */
+	@DbField("cs.remark")
+	private String remark;
+
+	/**
+	 * 快速时长
+	 */
+	@DbField("cs.fastTime")
+	private Long fastTime;
+
+	@DbField("cs.created_time")
+	private Date createdTime;
+}

netflix-web/src/main/java/com/cyksj/web/controller/manage/mj/MidJourneyController.java

@@ -1,11 +1,22 @@
 package com.cyksj.web.controller.manage.mj;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.MidjourneySessionMapper;
+import com.cyksj.model.entity.ChatgptSession;
 import com.cyksj.model.entity.MidjourneyAccount;
+import com.cyksj.model.entity.MidjourneySession;
 import com.cyksj.model.manage.views.AccountView;
+import com.cyksj.model.views.ChatgptCarSessionView;
 import com.cyksj.model.views.MidjourneyAccountView;
+import com.cyksj.model.views.MidjourneyCarSessionView;
+import com.cyksj.redis.RedisService;
 import com.cyksj.service.midjourney.MidjourneyAccountService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -17,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Optional;
 
 /**
  * @author zwhui
@@ -34,6 +46,10 @@ public class MidJourneyController {
 
     private final MidjourneyAccountService midjourneyAccountService;
 
+    private final MidjourneySessionMapper midjourneySessionMapper;
+
+    private final RedisService redisService;
+
 
     /**
      * 移入MJ账号池
@@ -103,4 +119,63 @@ public class MidJourneyController {
 
 
 
+    /**
+     * 获取镜像车队账号列表
+     */
+    @GetMapping("/get/midjourneyCar")
+    public Result<SearchResult<MidjourneyCarSessionView>> getMirrorCarSession() {
+        SearchResult<MidjourneyCarSessionView> search = beanSearcher.search(MidjourneyCarSessionView.class, MapUtils.flatBuilder(request.getParameterMap())
+                .orderBy(MidjourneyCarSessionView::getId).desc()
+                .build());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+    }
+
+    /**
+     * 编辑镜像车队账号列表
+     */
+    @PutMapping("/update/midjourneyCar")
+    public Result<String> updateMirrorCarSession(@RequestBody MidjourneySession midjourneySession) {
+        Integer selectCount = midjourneySessionMapper.selectCount(Wrappers.lambdaQuery(MidjourneySession.class)
+                .and(e -> e.eq(MidjourneySession::getEmail, midjourneySession.getEmail())
+                        .or().eq(MidjourneySession::getCarId, midjourneySession.getCarId()))
+                .ne(MidjourneySession::getId, midjourneySession.getId()));
+        if (selectCount > 0) {
+            throw BusinessRuntimeException.getInstance("请检验车队ID或账号是否已存在");
+        }
+        midjourneySessionMapper.updateById(midjourneySession);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
+    /**
+     * 删除镜像车队账号
+     */
+    @DeleteMapping("/delete/midjourneyCar/{id}")
+    public Result<String> deleteMirrorCarSession(@PathVariable Long id) {
+        Optional.ofNullable(midjourneySessionMapper.selectById(id))
+                .ifPresent(e -> {
+                    String carId = e.getCarId();
+                    if (StrUtil.isNotBlank(carId)) {
+                        midjourneySessionMapper.deleteById(e.getId());
+                        String carKey = RedisService.key.MIDJOURNEY_CAR_TASK.getName() + carId;
+                        //从zSet中删除车队
+                        redisService.del(carKey);
+                    }
+                });
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
+    /**
+     * 新增镜像车队账号
+     */
+    @PostMapping("/post/midjourney/car/session")
+    public Result<String> postMirrorCarSession(@RequestBody MidjourneySession midjourneySession) {
+        Integer selectCount = midjourneySessionMapper.selectCount(Wrappers.lambdaQuery(MidjourneySession.class)
+                .eq(MidjourneySession::getCarId, midjourneySession.getCarId()).or().eq(MidjourneySession::getEmail, midjourneySession.getEmail()));
+        if (selectCount > 0) {
+            throw BusinessRuntimeException.getInstance("请检验车队ID或账号是否已存在");
+        }
+        midjourneySessionMapper.insert(midjourneySession);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
 }