产品关联项目提交

financial_product/src/main/resources/bootstrap.properties

@@ -7,6 +7,9 @@ server.max-http-header-size=104857600
 
 # Nacos 配置
 spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+#正式部署打开
+#spring.cloud.nacos.discovery.ip=47.97.49.1
+
 spring.cloud.nacos.config.namespace=huorantech-microservice-configuration-namespace
 
 # 额外的配置文件

judgment_point/src/main/java/com/huoran/judgment_point/service/impl/LcJudgmentPointServiceImpl.java

@@ -353,6 +353,10 @@ public class LcJudgmentPointServiceImpl extends ServiceImpl<LcJudgmentPointMappe
 
     // 根据输入的字符串和数据集合拼接成名称
     public static String concatenateNames(String idsString, List<StItem> itemNames) {
+        // 验证输入字符串是否只包含逗号分隔的有效数字
+        if (!idsString.matches("\\d+(,\\d+)*")) {
+            return "出现错误！";
+        }
         // 按逗号分割字符串
         String[] ids = idsString.split(",");
 
@@ -497,10 +501,8 @@ public class LcJudgmentPointServiceImpl extends ServiceImpl<LcJudgmentPointMappe
                             case RuleConstant.TWO:
                                 String options = concatenateNames(ruleEmptyTwo, itemNames);
                                 lcRuleRecord.setRuleAnswer(options);
-
                                 String optionsUser = concatenateNames(operationEmptyTwo, itemNames);
                                 lcRuleRecord.setUserAnswer(optionsUser);
-
                                 String[] operationOne = ruleEmptyTwo.split(",");
                                 String[] operationTwo = operationEmptyTwo.split(",");
                                 Arrays.sort(operationOne);

nakadai/src/main/java/com/huoran/nakadai/controller/MallProjectConfigController.java

@@ -0,0 +1,48 @@
+package com.huoran.nakadai.controller;
+
+
+import com.huoran.common.response.R;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.nakadai.service.MallProjectConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 产品关联项目表 前端控制器
+ * </p>
+ *
+ * @author chen
+ * @since 2024-12-18
+ */
+@RestController
+@Api(value = "产品关联项目管理", tags = "M-产品关联项目管理")
+@RequestMapping("/mallProjectConfig")
+public class MallProjectConfigController {
+
+    @Autowired
+    private MallProjectConfigService mallProjectConfigService;
+
+    @ApiOperation(value = "获取商品关联项目系统列表")
+    @GetMapping("/getSystemListOfMall")
+    public R getSystemListOfMall(@NotNull(message = "系统类型") Integer type,HttpServletRequest request) {
+        Integer schoolId = TokenUtils.getSchoolIdByJwtToken(request);
+        return mallProjectConfigService.getSystemListOfMall(schoolId,type);
+    }
+
+
+    @ApiOperation(value = "大赛中 系统id查询商品关联项目")
+    @GetMapping("/getProjectListOfSystem")
+    public R getProjectListOfSystem(@NotNull(message = "系统id不能为空") Integer systemId, HttpServletRequest request) {
+        Integer schoolId = TokenUtils.getSchoolIdByJwtToken(request);
+        return mallProjectConfigService.getProjectListOfSystem(schoolId,systemId);
+    }
+}
+

nakadai/src/main/java/com/huoran/nakadai/controller/ServiceConfigurationController.java

@@ -7,18 +7,15 @@ import com.huoran.common.response.R;
 import com.huoran.nakadai.entity.ServiceConfiguration;
 import com.huoran.nakadai.entity.ServiceSystemType;
 import com.huoran.nakadai.entity.req.ServiceConfigurationReq;
-import com.huoran.nakadai.entity.res.ServiceConfigurationResp;
 import com.huoran.nakadai.service.IServiceConfigurationService;
 import com.huoran.nakadai.service.ServiceSystemTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -47,6 +44,14 @@ public class ServiceConfigurationController {
         return R.ok().put("serviceList",serviceList);
     }
 
+
+    @ApiOperation(value = "获取不同类型系统")
+    @GetMapping("/getServiceOfType")
+    public R getServiceOfType(@NotNull(message = "系统类型") Integer type) {
+        List<ServiceConfiguration> serviceList = serviceConfigurationService.list(new QueryWrapper<ServiceConfiguration>().eq("type",type));
+        return R.ok().put("serviceList",serviceList);
+    }
+
     @ApiOperation(value = "根据系统id获取系统名称 Feign")
     @GetMapping("/getSystemNameBySystemId")
     public String getSystemNameBySystemId(@RequestParam Integer SystemId){

nakadai/src/main/java/com/huoran/nakadai/entity/MallProjectConfig.java

@@ -0,0 +1,69 @@
+package com.huoran.nakadai.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 产品关联项目表
+ * </p>
+ *
+ * @author chen
+ * @since 2024-12-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hr_mall_project_config")
+@ApiModel(value="MallProjectConfig对象", description="产品关联项目表")
+public class MallProjectConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "config_id", type = IdType.AUTO)
+    private Integer configId;
+
+    @ApiModelProperty(value = "商城主键id")
+    private Integer mallId;
+
+    @ApiModelProperty(value = "系统id")
+    private Integer systemId;
+
+    @ApiModelProperty(value = "项目管理表id")
+    private Integer projectId;
+
+    @ApiModelProperty(value = "排序(对项目展示进行排序)")
+    private Integer sort;
+
+    @ApiModelProperty(value = "项目权限(0、练习 1、考核、2大赛)")
+    private Integer permissions;
+
+    @ApiModelProperty(value = "是否展示(默认0展示 1为不展示)")
+    private Integer isShow;
+
+    @ApiModelProperty(value = "是否删除(默认0未删 1为已删除)")
+    private Integer isDel;
+
+    @ApiModelProperty(value = "试卷id")
+    private Integer paperId;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+}

nakadai/src/main/java/com/huoran/nakadai/entity/res/MallProjectConfigRes.java

@@ -0,0 +1,47 @@
+package com.huoran.nakadai.entity.res;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MallProjectConfigRes {
+    @ApiModelProperty(value = "产品id")
+    private Integer mallId;
+
+    @ApiModelProperty(value = "项目名称/试卷名称")
+    private String projectName;
+
+    @ApiModelProperty(value = "项目权限(0、练习 1、考核 2、竞赛)")
+    private Integer permissions;
+
+    @ApiModelProperty(value = "系统名称")
+    private String applicationName;
+
+    @ApiModelProperty(value = "系统名称")
+    private String systemName;
+
+    @ApiModelProperty(value = "排序(对项目展示进行排序)")
+    private Integer sort;
+
+    @ApiModelProperty(value = "项目id")
+    private Integer projectId;
+
+    @ApiModelProperty(value = "配置id")
+    private Integer configId;
+
+    @ApiModelProperty(value = "是否展示(默认0展示 1为不展示)")
+    private Integer isShow;
+
+    @ApiModelProperty(value = "系统id")
+    private Integer systemId;
+
+    @ApiModelProperty(value = "系统类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    //试卷id
+    @ApiModelProperty(value = "试卷id")
+    private Integer paperId;
+}

nakadai/src/main/java/com/huoran/nakadai/entity/vo/GoodsVo.java

@@ -1,7 +1,9 @@
 package com.huoran.nakadai.entity.vo;
 
 import com.huoran.nakadai.entity.*;
+import com.huoran.nakadai.entity.req.ConfigurationReq;
 import com.huoran.nakadai.entity.res.GoodsRes;
+import com.huoran.nakadai.entity.res.MallProjectConfigRes;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -52,5 +54,11 @@ public class GoodsVo implements Serializable {
     @ApiModelProperty(value = "非关联产品链接")
     private List<MallNonAssociatedLinks> mallNonAssociatedLinks;
 
+    @ApiModelProperty(value = "添加数据竞赛配置参数")
+    private List<ConfigurationReq> systemIdByCompetition;
+
+    @ApiModelProperty(value = "产品竞赛配置详情")
+    private List<MallProjectConfigRes> mallProjectConfig;
+
 
 }

nakadai/src/main/java/com/huoran/nakadai/mapper/MallProjectConfigMapper.java

@@ -0,0 +1,25 @@
+package com.huoran.nakadai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huoran.nakadai.entity.MallProjectConfig;
+import com.huoran.nakadai.entity.res.MallProjectConfigRes;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 产品关联项目表 Mapper 接口
+ * </p>
+ *
+ * @author chen
+ * @since 2024-12-18
+ */
+public interface MallProjectConfigMapper extends BaseMapper<MallProjectConfig> {
+
+    List<MallProjectConfigRes> selectMallProjectConfig(@Param("mallId") Integer mallId,@Param("permissions") Integer permissions);
+
+    List<MallProjectConfigRes> getSystemListOfMall(@Param("schoolId")Integer schoolId,@Param("type")Integer type);
+
+    List<MallProjectConfigRes> getProjectListOfSystem(@Param("schoolId")Integer schoolId, @Param("systemId")Integer systemId);
+}

nakadai/src/main/java/com/huoran/nakadai/mapper/xml/MallProjectConfigMapper.xml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huoran.nakadai.mapper.MallProjectConfigMapper">
+
+    <select id="selectMallProjectConfig" resultType="com.huoran.nakadai.entity.res.MallProjectConfigRes">
+        SELECT
+            c.mall_id,
+            c.config_id,
+            c.project_id,
+            c.paper_id,
+            c.permissions,
+            c.is_show,
+            CASE
+                WHEN c.project_id IS NOT NULL THEN
+                    m.project_name
+                WHEN c.paper_id IS NOT NULL THEN
+                    p.NAME
+                END AS projectName,
+            c.sort,
+            s.system_name AS applicationName,
+            s.system_name AS system_name,
+            c.system_id,
+            s.type,
+            IFNULL(
+                    CASE
+
+                        WHEN c.project_id IS NOT NULL THEN
+                            m.remark
+                        WHEN c.paper_id IS NOT NULL THEN
+                            p.NAME
+                        END,
+                    m.project_name
+                ) remark
+        FROM
+            hr_mall_project_config c
+                LEFT JOIN occupationlab.ol_project_manage m ON m.project_id = c.project_id
+                AND m.zt_del = 0
+                LEFT JOIN service_configuration s ON s.system_id = c.system_id
+                LEFT JOIN exam.exam_paper p ON p.paper_id = c.paper_id
+        WHERE
+            c.is_del = 0
+          AND c.permissions = #{permissions}
+          AND c.mall_id = #{mallId}
+        ORDER BY
+            c.sort;
+    </select>
+    <select id="getSystemListOfMall" resultType="com.huoran.nakadai.entity.res.MallProjectConfigRes">
+        SELECT sc.system_id,sc.system_name,sc.type
+        FROM hr_order o
+                 INNER JOIN customer c ON c.customer_id = o.customer_id
+                 INNER JOIN order_other ot ON o.order_id = ot.order_id
+                 INNER JOIN hr_mall_project_config pc ON pc.mall_id = ot.mall_id
+                 INNER JOIN service_configuration sc ON sc.system_id = pc.system_id
+        WHERE o.is_del = 0
+          AND ot.is_del = 0
+          AND ot.is_enable = 1
+          AND c.school_id = #{schoolId}
+          AND o.order_status = 1 and unix_timestamp(ot.start_time) <![CDATA[ <= ]]> unix_timestamp(NOW()) and unix_timestamp(ot.end_time) <![CDATA[ >= ]]> unix_timestamp(NOW())
+        <if test='type != null and type == 1'>
+            AND sc.type != 2 AND sc.type != 3
+        </if>
+        <if test='type != null and type == 3'>
+            AND sc.type = #{type}
+        </if>
+        GROUP BY pc.system_id
+    </select>
+    <select id="getProjectListOfSystem" resultType="com.huoran.nakadai.entity.res.MallProjectConfigRes">
+        SELECT
+            pc.mall_id,
+            pc.config_id,
+            pc.project_id,
+            pc.paper_id,
+            pc.permissions,
+            pc.is_show,
+            CASE
+
+                WHEN pc.project_id IS NOT NULL THEN
+                    m.project_name
+                WHEN pc.paper_id IS NOT NULL THEN
+                    p.NAME
+                END AS projectName,
+            pc.sort,
+            sc.system_name AS applicationName,
+            sc.system_name AS system_name,
+            pc.system_id,
+            sc.type,
+            IFNULL(
+                    CASE
+
+                        WHEN pc.project_id IS NOT NULL THEN
+                            m.remark
+                        WHEN pc.paper_id IS NOT NULL THEN
+                            p.NAME
+                        END,
+                    m.project_name
+                ) remark
+        FROM
+            hr_order o
+                INNER JOIN customer c ON c.customer_id = o.customer_id
+                INNER JOIN order_other ot ON o.order_id = ot.order_id
+                INNER JOIN hr_mall_project_config pc ON pc.mall_id = ot.mall_id
+                INNER JOIN service_configuration sc ON sc.system_id = pc.system_id
+                LEFT JOIN occupationlab.ol_project_manage m ON m.project_id = pc.project_id
+                AND m.zt_del = 0
+                LEFT JOIN exam.exam_paper p ON p.paper_id = pc.paper_id
+        WHERE
+            o.is_del = 0
+          AND ot.is_del = 0
+          AND ot.is_enable = 1
+          AND c.school_id = #{schoolId}
+          AND o.order_status = 1
+          AND pc.is_del = 0
+          AND pc.system_id = #{systemId}
+          AND o.order_status = 1 and unix_timestamp(ot.start_time) <![CDATA[ <= ]]> unix_timestamp(NOW()) and unix_timestamp(ot.end_time) <![CDATA[ >= ]]> unix_timestamp(NOW())
+        ORDER BY
+            pc.sort
+    </select>
+</mapper>

nakadai/src/main/java/com/huoran/nakadai/service/MallProjectConfigService.java

@@ -0,0 +1,20 @@
+package com.huoran.nakadai.service;
+
+import com.huoran.common.response.R;
+import com.huoran.nakadai.entity.MallProjectConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 产品关联项目表 服务类
+ * </p>
+ *
+ * @author chen
+ * @since 2024-12-18
+ */
+public interface MallProjectConfigService extends IService<MallProjectConfig> {
+
+    R getSystemListOfMall(Integer schoolId,Integer type);
+
+    R getProjectListOfSystem(Integer schoolId, Integer systemId);
+}

nakadai/src/main/java/com/huoran/nakadai/service/impl/MallProjectConfigServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huoran.nakadai.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huoran.common.response.R;
+import com.huoran.nakadai.entity.MallProjectConfig;
+import com.huoran.nakadai.entity.res.MallProjectConfigRes;
+import com.huoran.nakadai.mapper.MallProjectConfigMapper;
+import com.huoran.nakadai.service.MallProjectConfigService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 产品关联项目表 服务实现类
+ * </p>
+ *
+ * @author chen
+ * @since 2024-12-18
+ */
+@Service
+public class MallProjectConfigServiceImpl extends ServiceImpl<MallProjectConfigMapper, MallProjectConfig> implements MallProjectConfigService {
+
+    @Override
+    public R getSystemListOfMall(Integer schoolId,Integer type) {
+        List<MallProjectConfigRes> mallProjectConfigRes = baseMapper.getSystemListOfMall(schoolId,type);
+        return R.ok().put("data",mallProjectConfigRes);
+    }
+
+    @Override
+    public R getProjectListOfSystem(Integer schoolId, Integer systemId) {
+        List<MallProjectConfigRes> mallProjectConfigRes = baseMapper.getProjectListOfSystem(schoolId,systemId);
+        return R.ok().put("data",mallProjectConfigRes);
+    }
+}

nakadai/src/main/java/com/huoran/nakadai/service/impl/MallServiceImpl.java

@@ -12,8 +12,10 @@ import com.huoran.common.exception.ExceptionEnum;
 import com.huoran.common.response.R;
 import com.huoran.common.utils.TokenUtils;
 import com.huoran.nakadai.entity.*;
+import com.huoran.nakadai.entity.req.ConfigurationReq;
 import com.huoran.nakadai.entity.req.GoodsListReq;
 import com.huoran.nakadai.entity.res.GoodsRes;
+import com.huoran.nakadai.entity.res.MallProjectConfigRes;
 import com.huoran.nakadai.entity.vo.GoodsVo;
 import com.huoran.nakadai.mapper.*;
 import com.huoran.nakadai.service.MallService;
@@ -76,6 +78,9 @@ public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements Ma
     @Autowired
     private DataProductMapper dataProductMapper;
 
+    @Autowired
+    private MallProjectConfigMapper manaProjectConfigMapper;
+
     @Autowired
     private MallNonAssociatedLinksMapper mallNonAssociatedLinksMapper;
 
@@ -91,6 +96,7 @@ public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements Ma
         List<Integer> supplierIds = goodsVo.getSupplierIds();
         List<Integer> typeIds = goodsVo.getTypeIds();
         List<MallAnnex> mallAnnex = goodsVo.getMallAnnex();
+        List<ConfigurationReq> systemIdByCompetition = goodsVo.getSystemIdByCompetition();
         List<MallNonAssociatedLinks> mallNonAssociatedLinks = goodsVo.getMallNonAssociatedLinks();
 
         CompletableFuture<Integer> goodsFuture = CompletableFuture.supplyAsync(() -> {
@@ -99,6 +105,23 @@ public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements Ma
             return goods.getMallId();
         }, executor);
 
+        CompletableFuture<Void> systemIdByCompetitionFuture = goodsFuture.thenAcceptAsync(mallId -> {
+            //关联项目不为空
+            if (ObjectUtil.isNotNull(systemIdByCompetition)) {
+                for (ConfigurationReq configurationReq : systemIdByCompetition) {
+                    manaProjectConfigMapper.insert(new MallProjectConfig()
+                            .setSort(configurationReq.getSort())
+                            .setProjectId(configurationReq.getProjectId())
+                            .setPaperId(configurationReq.getPaperId())
+                            .setSystemId(configurationReq.getSystemId())
+                            .setMallId(mallId)
+                            .setPermissions(2)
+                            .setIsShow(configurationReq.getIsShow())
+                    );
+                }
+            }
+        }, executor);
+
 
         CompletableFuture<Void> classificationFuture = goodsFuture.thenAcceptAsync(mallId -> {
             //如果产品分类存在，则保存
@@ -194,7 +217,7 @@ public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements Ma
         }, executor);
 
         //等待所有任务都完成
-        CompletableFuture.allOf(classificationFuture,
+        CompletableFuture.allOf(classificationFuture,systemIdByCompetitionFuture,
                 disciplinesFuture, mallPriceFuture,
                 tagsIdsFuture, mallSupplierFuture,
                 mallTypeFuture,mallAnnexFuture,mallNonAssociatedLinksFuture).get();
@@ -377,8 +400,11 @@ public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements Ma
         List<MallAnnex> mallAnnexes = mallAnnexMapper.selectList(new QueryWrapper<MallAnnex>().eq("mall_id", mallId));
         List<MallNonAssociatedLinks> mallNonAssociatedLinks = mallNonAssociatedLinksMapper.selectList(new QueryWrapper<MallNonAssociatedLinks>().eq("mall_id", mallId));
         GoodsRes goodsRes = baseMapper.selectGoods(mallId);
+
+        List<MallProjectConfigRes> mallProjectConfigRes = manaProjectConfigMapper.selectMallProjectConfig(mallId,2);
         mall.setAssociatedProductName(goodsRes.getAssociatedProductName());
         goodsVo.setGoodsRes(goodsRes);
+        goodsVo.setMallProjectConfig(mallProjectConfigRes);
         goodsVo.setClassificationIds(classificationIds);
         goodsVo.setMall(mall);
         goodsVo.setMallPrices(mallPrices);
@@ -414,13 +440,6 @@ public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements Ma
         }
         if (token!=null){
             Integer schoolId = TokenUtils.getSchoolIdByJwtToken(token);            //查询学校购买的课程id
-//            if (schoolId!=null&& schoolId!=0){
-//                List<Integer> list = baseMapper.schoolCourseIds(schoolId);
-//                if (list.contains(mall.getAssociatedProduct())){
-//                    goodsRes.setLogoOfOurSchool(true);
-//                }
-//            }
-
             if (schoolId!=0){
                 List<Integer> list = this.schoolGoods(schoolId);
                 if (list.contains(mallId)){
@@ -444,6 +463,7 @@ public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements Ma
         mallSupplierMapper.delete(new QueryWrapper<MallSupplier>().eq("mall_id", mallId));
         mallAnnexMapper.delete(new QueryWrapper<MallAnnex>().eq("mall_id", mallId));
         mallNonAssociatedLinksMapper.delete(new QueryWrapper<MallNonAssociatedLinks>().eq("mall_id", mallId));
+        manaProjectConfigMapper.delete(new QueryWrapper<MallProjectConfig>().eq("mall_id", mallId));
         int delete = baseMapper.deleteById(mallId);
         return delete > 0;
     }
@@ -490,6 +510,21 @@ public class MallServiceImpl extends ServiceImpl<MallMapper, Mall> implements Ma
         mallSupplierMapper.delete(new QueryWrapper<MallSupplier>().eq("mall_id", mallId));
         mallAnnexMapper.delete(new QueryWrapper<MallAnnex>().eq("mall_id", mallId));
         mallNonAssociatedLinksMapper.delete(new QueryWrapper<MallNonAssociatedLinks>().eq("mall_id", mallId));
+        manaProjectConfigMapper.delete(new QueryWrapper<MallProjectConfig>().eq("mall_id", mallId));
+
+        if (ObjectUtil.isNotNull(goodsVo.getSystemIdByCompetition())) {
+            for (ConfigurationReq configurationReq : goodsVo.getSystemIdByCompetition()) {
+                manaProjectConfigMapper.insert(new MallProjectConfig()
+                        .setSort(configurationReq.getSort())
+                        .setProjectId(configurationReq.getProjectId())
+                        .setPaperId(configurationReq.getPaperId())
+                        .setSystemId(configurationReq.getSystemId())
+                        .setMallId(mallId)
+                        .setPermissions(2)
+                        .setIsShow(configurationReq.getIsShow())
+                );
+            }
+        }
 
         //如果产品分类存在，则保存
         if (ObjectUtil.isNotNull(goodsVo.getClassificationIds())) {

nakadai/src/test/java/com/huoran/nakadai/code/CodeGenerator.java

@@ -63,9 +63,9 @@ public class CodeGenerator {
 
         // 5、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("curriculum_school_class_relation");
+        strategy.setInclude("hr_mall_project_config");
         strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
-        strategy.setTablePrefix(""); //生成实体时去掉表前缀
+        strategy.setTablePrefix("hr_"); //生成实体时去掉表前缀
 
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//数据库表字段映射到实体的命名策略
         strategy.setEntityLombokModel(true); // lombok 模型 @Accessors(chain = true) setter链式操作

occupationlab/src/main/resources/bootstrap.properties

@@ -5,7 +5,7 @@ spring.cloud.nacos.config.namespace=huorantech-microservice-configuration-namesp
 spring.cloud.nacos.config.server-addr=127.0.0.1:8848
 
 #正式部署打开
-spring.cloud.nacos.discovery.ip=47.97.49.1
+#spring.cloud.nacos.discovery.ip=47.97.49.1
 #测试部署打开
 #spring.cloud.nacos.discovery.ip=118.31.167.228