Merge remote-tracking branch 'origin/develop' into develop

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/PartnerController.java

+package com.luhu.computility.module.biz.controller.admin.partner;
+
+import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoPageReqVO;
+import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoRespVO;
+import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.luhu.computility.framework.common.pojo.PageParam;
+import com.luhu.computility.framework.common.pojo.PageResult;
+import com.luhu.computility.framework.common.pojo.CommonResult;
+import com.luhu.computility.framework.common.util.object.BeanUtils;
+import static com.luhu.computility.framework.common.pojo.CommonResult.success;
+
+import com.luhu.computility.framework.excel.core.util.ExcelUtils;
+
+import com.luhu.computility.framework.apilog.core.annotation.ApiAccessLog;
+import static com.luhu.computility.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.luhu.computility.module.biz.controller.admin.partner.vo.*;
+import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
+import com.luhu.computility.module.biz.service.partner.PartnerService;
+
+@Tag(name = "管理后台 - 合作伙伴管理")
+@RestController
+@RequestMapping("/biz/partner")
+@Validated
+public class PartnerController {
+
+    @Resource
+    private PartnerService partnerService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建合作伙伴管理")
+    @PreAuthorize("@ss.hasPermission('biz:partner:create')")
+    public CommonResult<Long> createPartner(@Valid @RequestBody PartnerSaveReqVO createReqVO) {
+        return success(partnerService.createPartner(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新合作伙伴管理")
+    @PreAuthorize("@ss.hasPermission('biz:partner:update')")
+    public CommonResult<Boolean> updatePartner(@Valid @RequestBody PartnerSaveReqVO updateReqVO) {
+        partnerService.updatePartner(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除合作伙伴管理")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('biz:partner:delete')")
+    public CommonResult<Boolean> deletePartner(@RequestParam("id") Long id) {
+        partnerService.deletePartner(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除合作伙伴管理")
+                @PreAuthorize("@ss.hasPermission('biz:partner:delete')")
+    public CommonResult<Boolean> deletePartnerList(@RequestParam("ids") List<Long> ids) {
+        partnerService.deletePartnerListByIds(ids);
+        return success(true);
+    }
+
+//    @GetMapping("/get")
+//    @Operation(summary = "获得合作伙伴管理")
+//    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+//    @PreAuthorize("@ss.hasPermission('biz:partner:query')")
+//    public CommonResult<PartnerRespVO> getPartner(@RequestParam("id") Long id) {
+//        PartnerDO partner = partnerService.getPartner(id);
+//        return success(BeanUtils.toBean(partner, PartnerRespVO.class));
+//    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得合作伙伴管理")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<PartnerRespVO> getPartner(@RequestParam("id") Long id) {
+        PartnerDO partner = partnerService.getPartner(id);
+        PartnerRespVO respVO = BeanUtils.toBean(partner, PartnerRespVO.class);
+        // 将存储的逗号分隔字符串转换为列表
+        if (partner.getImage() != null && !partner.getImage().isEmpty()) {
+            List<String> images = Arrays.asList(partner.getImage().split(","));
+            respVO.setImages(images);
+        }
+        return success(respVO);
+    }
+
+//    @GetMapping("/page")
+//    @Operation(summary = "获得合作伙伴管理分页")
+//    @PreAuthorize("@ss.hasPermission('biz:partner:query')")
+//    public CommonResult<PageResult<PartnerRespVO>> getPartnerPage(@Valid PartnerPageReqVO pageReqVO) {
+//        PageResult<PartnerDO> pageResult = partnerService.getPartnerPage(pageReqVO);
+//        return success(BeanUtils.toBean(pageResult, PartnerRespVO.class));
+//    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得合作伙伴管理分页")
+//    @PreAuthorize("@ss.hasPermission('biz:partner:query')")
+    public CommonResult<PageResult<PartnerRespVO>> getPartnerPage(@Valid PartnerPageReqVO pageReqVO) {
+        PageResult<PartnerDO> pageResult = partnerService.getPartnerPage(pageReqVO);
+        PageResult<PartnerRespVO> respResult = BeanUtils.toBean(pageResult, PartnerRespVO.class);
+
+        // 处理图片列表转换
+        if (respResult.getList() != null) {
+            respResult.getList().forEach(partner -> {
+                PartnerDO original = pageResult.getList().stream()
+                        .filter(item -> item.getId().equals(partner.getId()))
+                        .findFirst()
+                        .orElse(null);
+                if (original != null && original.getImage() != null && !original.getImage().isEmpty()) {
+                    List<String> images = Arrays.asList(original.getImage().split(","));
+                    partner.setImages(images);
+                }
+            });
+        }
+
+        return success(respResult);
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出合作伙伴管理 Excel")
+    @PreAuthorize("@ss.hasPermission('biz:partner:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportPartnerExcel(@Valid PartnerPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<PartnerDO> list = partnerService.getPartnerPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "合作伙伴管理.xls", "数据", PartnerRespVO.class,
+                        BeanUtils.toBean(list, PartnerRespVO.class));
+    }
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/vo/PartnerPageReqVO.java

+package com.luhu.computility.module.biz.controller.admin.partner.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.luhu.computility.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.luhu.computility.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 合作伙伴管理分页 Request VO")
+@Data
+public class PartnerPageReqVO extends PageParam {
+
+    @Schema(description = "内容")
+    private String information;
+
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "链接地址", example = "https://www.iocoder.cn")
+    private String url;
+
+    @Schema(description = "描述内容", example = "随便")
+    private String description;
+
+    @Schema(description = "排序值")
+    private Integer orderNum;
+
+    @Schema(description = "状态：0-已隐藏，1-已显示", example = "1")
+    private Integer showStatus;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/vo/PartnerRespVO.java

+package com.luhu.computility.module.biz.controller.admin.partner.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 合作伙伴管理 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PartnerRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28362")
+    private Long id;
+
+    @Schema(description = "展示图地址")
+    @ExcelProperty("展示图地址")
+    private List<String> images;
+
+    @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("内容")
+    private String information;
+
+    @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("标题")
+    private String title;
+
+    @Schema(description = "链接地址", example = "https://www.iocoder.cn")
+    @ExcelProperty("链接地址")
+    private String url;
+
+    @Schema(description = "描述内容", example = "随便")
+    @ExcelProperty("描述内容")
+    private String description;
+
+    @Schema(description = "排序值")
+    @ExcelProperty("排序值")
+    private Integer orderNum;
+
+    @Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("状态：0-已隐藏，1-已显示")
+    private Integer showStatus;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/vo/PartnerSaveReqVO.java

+package com.luhu.computility.module.biz.controller.admin.partner.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 合作伙伴管理新增/修改 Request VO")
+@Data
+public class PartnerSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28362")
+    private Long id;
+
+    @Schema(description = "展示图地址")
+    private List<String> images;
+
+    @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "内容不能为空")
+    private String information;
+
+    @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "标题不能为空")
+    private String title;
+
+    @Schema(description = "链接地址", example = "https://www.iocoder.cn")
+    private String url;
+
+    @Schema(description = "描述内容", example = "随便")
+    private String description;
+
+    @Schema(description = "排序值")
+    private Integer orderNum;
+
+    @Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "状态：0-已隐藏，1-已显示不能为空")
+    private Integer showStatus;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/dataobject/partner/PartnerDO.java

+package com.luhu.computility.module.biz.dal.dataobject.partner;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 合作伙伴管理 DO
+ *
+ * @author ljq
+ */
+@TableName("biz_partner")
+@KeySequence("biz_partner_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PartnerDO extends BaseDO {
+
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 展示图地址
+     */
+    private String image;
+    /**
+     * 内容
+     */
+    private String information;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 链接地址
+     */
+    private String url;
+    /**
+     * 描述内容
+     */
+    private String description;
+    /**
+     * 排序值
+     */
+    private Integer orderNum;
+    /**
+     * 状态：0-已隐藏，1-已显示
+     */
+    private Integer showStatus;
+    /**
+     * 更新者
+     */
+    private String updateBy;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/mysql/partner/PartnerMapper.java

+package com.luhu.computility.module.biz.dal.mysql.partner;
+
+import java.util.*;
+
+import com.luhu.computility.framework.common.pojo.PageResult;
+import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
+import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.luhu.computility.module.biz.controller.admin.partner.vo.*;
+
+/**
+ * 合作伙伴管理 Mapper
+ *
+ * @author ljq
+ */
+@Mapper
+public interface PartnerMapper extends BaseMapperX<PartnerDO> {
+
+    default PageResult<PartnerDO> selectPage(PartnerPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PartnerDO>()
+                .eqIfPresent(PartnerDO::getInformation, reqVO.getInformation())
+                .eqIfPresent(PartnerDO::getTitle, reqVO.getTitle())
+                .eqIfPresent(PartnerDO::getUrl, reqVO.getUrl())
+                .eqIfPresent(PartnerDO::getDescription, reqVO.getDescription())
+                .eqIfPresent(PartnerDO::getOrderNum, reqVO.getOrderNum())
+                .eqIfPresent(PartnerDO::getShowStatus, reqVO.getShowStatus())
+                .betweenIfPresent(PartnerDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(PartnerDO::getRemark, reqVO.getRemark())
+                .orderByDesc(PartnerDO::getId));
+    }
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/enums/ErrorCodeConstants.java

@@ -18,5 +18,6 @@ public interface ErrorCodeConstants {
 
     ErrorCode INFORMATION_NOT_EXISTS = new ErrorCode(1_040_014_000, "活动资讯管理不存在");
 
+    ErrorCode PARTNER_NOT_EXISTS = new ErrorCode(1_040_015_000, "合作伙伴管理不存在");
 
 }

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/partner/PartnerService.java

+package com.luhu.computility.module.biz.service.partner;
+
+import java.util.*;
+import javax.validation.*;
+import com.luhu.computility.module.biz.controller.admin.partner.vo.*;
+import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
+import com.luhu.computility.framework.common.pojo.PageResult;
+import com.luhu.computility.framework.common.pojo.PageParam;
+
+/**
+ * 合作伙伴管理 Service 接口
+ *
+ * @author ljq
+ */
+public interface PartnerService {
+
+    /**
+     * 创建合作伙伴管理
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createPartner(@Valid PartnerSaveReqVO createReqVO);
+
+    /**
+     * 更新合作伙伴管理
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updatePartner(@Valid PartnerSaveReqVO updateReqVO);
+
+    /**
+     * 删除合作伙伴管理
+     *
+     * @param id 编号
+     */
+    void deletePartner(Long id);
+
+    /**
+    * 批量删除合作伙伴管理
+    *
+    * @param ids 编号
+    */
+    void deletePartnerListByIds(List<Long> ids);
+
+    /**
+     * 获得合作伙伴管理
+     *
+     * @param id 编号
+     * @return 合作伙伴管理
+     */
+    PartnerDO getPartner(Long id);
+
+    /**
+     * 获得合作伙伴管理分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 合作伙伴管理分页
+     */
+    PageResult<PartnerDO> getPartnerPage(PartnerPageReqVO pageReqVO);
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/partner/PartnerServiceImpl.java

+package com.luhu.computility.module.biz.service.partner;
+
+import cn.hutool.core.collection.CollUtil;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.luhu.computility.module.biz.controller.admin.partner.vo.*;
+import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
+import com.luhu.computility.framework.common.pojo.PageResult;
+import com.luhu.computility.framework.common.pojo.PageParam;
+import com.luhu.computility.framework.common.util.object.BeanUtils;
+
+import com.luhu.computility.module.biz.dal.mysql.partner.PartnerMapper;
+
+import static com.luhu.computility.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.luhu.computility.framework.common.util.collection.CollectionUtils.convertList;
+import static com.luhu.computility.framework.common.util.collection.CollectionUtils.diffList;
+import static com.luhu.computility.module.biz.enums.ErrorCodeConstants.*;
+
+/**
+ * 合作伙伴管理 Service 实现类
+ *
+ * @author ljq
+ */
+@Service
+@Validated
+public class PartnerServiceImpl implements PartnerService {
+
+    @Resource
+    private PartnerMapper partnerMapper;
+
+    @Override
+    public Long createPartner(PartnerSaveReqVO createReqVO) {
+        // 插入
+        PartnerDO partner = BeanUtils.toBean(createReqVO, PartnerDO.class);
+        // 将图片列表转换为JSON字符串存储
+        if (createReqVO.getImages() != null && !createReqVO.getImages().isEmpty()) {
+            partner.setImage(String.join(",", createReqVO.getImages()));
+        }
+        partnerMapper.insert(partner);
+
+        // 返回
+        return partner.getId();
+    }
+
+    @Override
+    public void updatePartner(PartnerSaveReqVO updateReqVO) {
+        // 校验存在
+        validatePartnerExists(updateReqVO.getId());
+        // 更新
+        PartnerDO updateObj = BeanUtils.toBean(updateReqVO, PartnerDO.class);
+        // 将图片列表转换为JSON字符串存储
+        if (updateReqVO.getImages() != null && !updateReqVO.getImages().isEmpty()) {
+            updateObj.setImage(String.join(",", updateReqVO.getImages()));
+        }
+        partnerMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deletePartner(Long id) {
+        // 校验存在
+        validatePartnerExists(id);
+        // 删除
+        partnerMapper.deleteById(id);
+    }
+
+    @Override
+        public void deletePartnerListByIds(List<Long> ids) {
+        // 删除
+        partnerMapper.deleteByIds(ids);
+        }
+
+
+    private void validatePartnerExists(Long id) {
+        if (partnerMapper.selectById(id) == null) {
+            throw exception(PARTNER_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public PartnerDO getPartner(Long id) {
+        return partnerMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<PartnerDO> getPartnerPage(PartnerPageReqVO pageReqVO) {
+        return partnerMapper.selectPage(pageReqVO);
+    }
+
+}
\ No newline at end of file

computility-server/src/main/resources/application.yaml

@@ -285,6 +285,7 @@ computility:
       - biz_computility_information
       - biz_industry_application
       - biz_information
+      - biz_partner
       - system_tenant
       - system_tenant_package
       - system_dict_data