Jinquan_Ou
2023-03-18 c8aea93bb0abfa8b118b631c1edf74c031386b7e
导出数据
4个文件已修改
81 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
@@ -60,9 +60,9 @@
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "家庭资产记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response)
    public void export(HttpServletResponse response,@RequestBody ZfProperty zfProperty)
    {
        List<ZfProperty> list = zfPropertyService.list();
        List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
        ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
        util.exportExcel(response, list, "家庭资产记录数据");
    }
ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
@@ -20,8 +20,8 @@
    @Test
    public void test01() {
        //创建一个代码生成器
        FastAutoGenerator.create("jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8",
                        "root", "123456")
        FastAutoGenerator.create("jdbc:mysql://192.168.88.68:3306/mall_sms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8",
                        "root", "root")
                //全局配置(GlobalConfig)
                .globalConfig(builder -> {
                    builder.author("ojq") // 设置作者,可以写自己名字
@@ -29,40 +29,33 @@
                            .fileOverride() // 覆盖已生成文件
                            .dateType(DateType.TIME_PACK) //时间策略
                            .commentDate("yyyy-MM-dd") //注释日期
                            .outputDir("F:\\IDEAWorkSpace\\src\\main\\java"); // 指定输出目录,一般指定到java目录
                            .outputDir("F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\java"); // 指定输出目录,一般指定到java目录
                })
                //包配置(PackageConfig)
                .packageConfig(builder -> {
                    builder.parent("com.ojq") // 设置父包名
                            .moduleName("") // 设置父包模块名,这里一般不设置
                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "F:\\IDEAWorkSpace\\src\\main\\resources\\com\\ojq\\mapper")); // 设置mapperXml生成路径,这里是Mapper配置文件的路径,建议使用绝对路径
                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\resources\\com\\ojq\\mapper")); // 设置mapperXml生成路径,这里是Mapper配置文件的路径,建议使用绝对路径
                })
                //策略配置(StrategyConfig)
                .strategyConfig(builder -> {
//                    builder.addInclude("zf_clean") // 设置需要生成的表名
//                            .addInclude("zf_collection") // 设置需要生成的表名
                            builder.addInclude("z_abroad") // 设置需要生成的表名
                            .addInclude("z_autobiography") // 设置需要生成的表名
                            .addInclude("z_certificate") // 设置需要生成的表名
                            .addInclude("z_child") // 设置需要生成的表名
                            .addInclude("z_dict") // 设置需要生成的表名
                            .addInclude("z_experience") // 设置需要生成的表名
                            .addInclude("z_health_base") // 设置需要生成的表名
                            .addInclude("z_health_habit") // 设置需要生成的表名
                            .addInclude("z_health_info") // 设置需要生成的表名
                            .addInclude("z_honor") // 设置需要生成的表名
                            .addInclude("z_idea") // 设置需要生成的表名
                            .addInclude("z_info_user") // 设置需要生成的表名
                            .addInclude("z_login_user") // 设置需要生成的表名
                            .addInclude("z_marry") // 设置需要生成的表名
                            .addInclude("z_property") // 设置需要生成的表名
                            .addInclude("z_secret") // 设置需要生成的表名
                            .addInclude("z_self_note") // 设置需要生成的表名
                            .addInclude("z_stay_out") // 设置需要生成的表名
                            .addInclude("z_travel_base") // 设置需要生成的表名
                            .addInclude("z_travel_price") // 设置需要生成的表名
                            .addInclude("z_year_health") // 设置需要生成的表名
                            .addInclude("z_year_info"); // 设置需要生成的表名
                    builder.addInclude("sms_coupon") // 设置需要生成的表名
                            .addInclude("sms_coupon_history") // 设置需要生成的表名
                            .addInclude("sms_coupon_spu_category_relation") // 设置需要生成的表名
                            .addInclude("sms_coupon_spu_relation") // 设置需要生成的表名
                            .addInclude("sms_home_adv") // 设置需要生成的表名
                            .addInclude("sms_home_subject") // 设置需要生成的表名
                            .addInclude("sms_home_subject_spu") // 设置需要生成的表名
                            .addInclude("sms_member_price") // 设置需要生成的表名
                            .addInclude("sms_seckill_promotion") // 设置需要生成的表名
                            .addInclude("sms_seckill_session") // 设置需要生成的表名
                            .addInclude("sms_seckill_sku_notice") // 设置需要生成的表名
                            .addInclude("sms_seckill_sku_relation") // 设置需要生成的表名
                            .addInclude("sms_sku_full_reduction") // 设置需要生成的表名
                            .addInclude("sms_sku_ladder") // 设置需要生成的表名
                            .addInclude("sms_spu_bounds"); // 设置需要生成的表名
                    builder.serviceBuilder()
@@ -71,7 +64,7 @@
                    builder.controllerBuilder()
                            .enableRestStyle(); // 开启生成@RestController 控制器,不配置这个默认是Controller注解,RestController是返回Json字符串的,多用于前后端分离项目。
                    builder.mapperBuilder()
                            .enableMapperAnnotation() ;//开启 @Mapper 注解,也就是在dao接口上添加一个@Mapper注解,这个注解的作用是开启注解模式,就可以在接口的抽象方法上面直接使用@Select和@Insert和@Update和@Delete注解。
                            .enableMapperAnnotation();//开启 @Mapper 注解,也就是在dao接口上添加一个@Mapper注解,这个注解的作用是开启注解模式,就可以在接口的抽象方法上面直接使用@Select和@Insert和@Update和@Delete注解。
                })
//                .templateEngine(new FreemarkerTemplateEngine()) // 使用Freemarker引擎模板,默认的是Velocity引擎模板
                .templateEngine(new VelocityTemplateEngine())
zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
@@ -16,6 +16,9 @@
 */
public interface IZfPropertyService extends IService<ZfProperty>
{
    List<ZfProperty> selectByCondition(ZfProperty zfProperty);
    AjaxResult selectUserList(ZfProperty zfProperty,Integer pageNum,Integer pageSize);
}
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -23,16 +23,27 @@
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
    @Override
    public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
        LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty);
        return list(lambdaQueryWrapper);
    }
    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
        lqw.like(!StringUtils.isEmpty(zfProperty.getType()),ZfProperty::getType, zfProperty.getType());
        lqw.like(!StringUtils.isEmpty(zfProperty.getTitle()),ZfProperty::getTitle, zfProperty.getTitle());
        lqw.like(!StringUtils.isEmpty(zfProperty.getLocation()),ZfProperty::getLocation, zfProperty.getLocation());
        lqw.like(!StringUtils.isEmpty(zfProperty.getHolder()),ZfProperty::getHolder, zfProperty.getHolder());
        lqw.like(!StringUtils.isEmpty(zfProperty.getAddress()),ZfProperty::getAddress, zfProperty.getAddress());
        lqw.like(!StringUtils.isEmpty(zfProperty.getRemark()),ZfProperty::getRemark, zfProperty.getRemark());
        lqw.like(zfProperty.getCreateTime()!=null,ZfProperty::getCreateTime, zfProperty.getCreateTime());
        return lqw;
    }
    @Override
    public AjaxResult selectUserList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
        lqw.like(!StringUtils.isEmpty(zfProperty.getType()),ZfProperty::getType,zfProperty.getType());
        lqw.like(!StringUtils.isEmpty(zfProperty.getTitle()),ZfProperty::getTitle,zfProperty.getTitle());
        lqw.like(!StringUtils.isEmpty(zfProperty.getLocation()),ZfProperty::getLocation,zfProperty.getLocation());
        lqw.like(!StringUtils.isEmpty(zfProperty.getHolder()),ZfProperty::getHolder,zfProperty.getHolder());
        lqw.like(!StringUtils.isEmpty(zfProperty.getAddress()),ZfProperty::getAddress,zfProperty.getAddress());
        lqw.like(!StringUtils.isEmpty(zfProperty.getRemark()),ZfProperty::getRemark,zfProperty.getRemark());
        lqw.like(zfProperty.getCreateTime()!=null,ZfProperty::getCreateTime,zfProperty.getCreateTime());
        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
        Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
        Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);