4.9

yanghb

2024-04-09 3d779f1856c2ba5110a8e1911ba27253036e58d8

4.9

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/VersionAddDto.java

@@ -0,0 +1,27 @@
package cn.stylefeng.guns.modular.business.dto;

import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class VersionAddDto {
    @ApiModelProperty(value = "版本号")
    private String version;
    @ApiModelProperty(value = "备注")
    private String remark;
    @TableField("ios_user")
    @ApiModelProperty(value = "ios用户端")
    private String iosUser;
    @TableField("ios_employee")
    @ApiModelProperty(value = "ios员工端")
    private String iosEmployee;
    @TableField("android_user")
    @ApiModelProperty(value = "安卓用户端")
    private String androidUser;
    @TableField("android_employee")
    @ApiModelProperty(value = "安卓员工端")
    private String androidEmployee;

}

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalTestTopicMapper.xml

@@ -8,10 +8,11 @@
            AND status_flag = 1
            AND is_delete = 0
            <if test="classIdList != null and classIdList.size != 0">
                AND
                <foreach collection="classIdList" item="item" index="index" open="(" separator=" OR " close=")">
                    FIND_IN_SET(#{item}, class_id) > 0
                AND ( 1 = 2
                <foreach collection="classIdList" item="item" index="index" separator=",">
                    OR FIND_IN_SET( #{item}, class_id ) > 0
                </foreach>
                )
            </if>
            <if test="title != null and title != ''">
                AND o.title LIKE CONCAT('%', #{title}, '%')

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/OrderMentalTestServiceImpl.java

@@ -18,6 +18,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

@@ -77,20 +78,8 @@
        MentalTestTopic topic = mentalTestTopicService.getById(topicId);
        Assert.notNull(topic, "题库不存在");

        // 获取用户是否有后台添加订单
        long isBackCount = this.count(
                Wrappers.<OrderMentalTest>lambdaQuery()
                        .eq(OrderMentalTest::getUserId, userId)
                        .eq(OrderMentalTest::getGoodsId, topicId)
                        .eq(OrderMentalTest::getIsBack, 1)
        );
        if (isBackCount > 0) {
            // 有，则以后全部为后台添加标记
            isBack = true;
        }

        // 获取用户最近创建的待支付订单
        OrderMentalTest o = this.getOne(
        OrderMentalTest o = this.baseMapper.selectOne(
                Wrappers.<OrderMentalTest>lambdaQuery()
                        .eq(OrderMentalTest::getUserId, userId)
                        .eq(OrderMentalTest::getGoodsId, topicId)

 common-buiness/src/main/java/cn/stylefeng/guns/utils/ReqDebugUtil.java

@@ -26,7 +26,7 @@
 * @author goupan
 */
@Slf4j
//@Component
@Component
public class ReqDebugUtil implements Filter {

    private static final ImmutableSet<String> IGNORED_HEADERS;

 generator/src/main/java/com/mindant/generator/action/GunsCodeBatchGenerator.java

@@ -23,13 +23,13 @@
        // 数据库名
        String dbName = "xlzx";
        // 数据库连接
        String url = "jdbc:mysql://1.95.0.51:8306/"
        String url = "jdbc:mysql://127.0.0.1:3306/"
                + dbName
                + "?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true";
        // 用户名
        String userName = "root";
        // 密码
        String password = "Root2024!";
        String password = "123456";

        // 查询数据库表名、注释
        String tableSql = "SELECT TABLE_NAME AS tableName,TABLE_COMMENT AS tableComment FROM information_schema.`TABLES` WHERE TABLE_SCHEMA = '" + dbName + "'" +
@@ -58,7 +58,7 @@
//                "hr_org_approver",
//                "hr_organization",
//                "hr_position",
                "t_counselling_user"
                "t_version"

        };

@@ -87,14 +87,14 @@
        // 表名
        genQo.setTableName(tableName);
        // 作者
        genQo.setAuthor("guohongjin");
        genQo.setAuthor("luodangjia");
        // 数据库名
        genQo.setDbName(dbName);
        // 项目包
        genQo.setProjectPackage("cn.stylefeng.guns");
        genQo.setModuleName("business");
        // 代码生成位置
        genQo.setProjectPath("D:\\code\\xinlizixun_dev\\common-buiness");
        genQo.setProjectPath("D:\\study\\PsychologicalCounseling\\common-buiness");
        // 用户信息
        genQo.setBizName(tableCommentMap.get(tableName));
        genQo.setControllerSwitch(true);

 generator/src/main/java/com/mindant/generator/action/GunsCodeGenerator.java

@@ -29,11 +29,11 @@
//        gunsGeneratorConfig.doGunsGeneration();
        GenQo genQo = new GenQo();
        //数据库url
        genQo.setUrl("jdbc:mysql://1.95.0.51:8306/fbwl?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true");
        genQo.setUrl("jdbc:mysql://rm-2vc47rysl5jt6gv312o.mysql.cn-chengdu.rds.aliyuncs.com:3306/fbwl?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true");
        //数据库密码
        genQo.setPassword("Root2024!");
        genQo.setPassword("00aabb00");
        //数据库用户名
        genQo.setUserName("root");
        genQo.setUserName("root_dev");
        //表名
        genQo.setTableName("t_area");
        genQo.setAuthor("guohongjin");