add domain change

吴健

2024-11-19 a7cef0a252f9aeebf383e5bc5b208969e57288ff

add domain change

 billion-admin/src/main/java/com/billion/RuoYiApplication.java

@@ -18,15 +18,5 @@
    {
        // System.setProperty("spring.devtools.restart.enabled", "false");
        SpringApplication.run(RuoYiApplication.class, args);
        System.out.println("(♥◠‿◠)ﾉﾞ  è‹¥ä¾å¯åŠ¨æˆåŠŸ   áƒš(´ڡ`ლ)ﾞ  \n" +
                " .-------.       ____     __        \n" +
                " |  _ _   \\      \\   \\   /  /    \n" +
                " | ( ' )  |       \\  _. /  '       \n" +
                " |(_ o _) /        _( )_ .'         \n" +
                " | (_,_).' __  ___(_ o _)'          \n" +
                " |  |\\ \\  |  ||   |(_,_)'         \n" +
                " |  | \\ `'   /|   `-'  /           \n" +
                " |  |  \\    /  \\      /           \n" +
                " ''-'   `'-'    `-..-'              ");
    }
}

 billion-main/src/main/java/com/billion/main/common/BaseEntity.java

ÎļþÃû´Ó billion-main/src/main/java/common/BaseEntity.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package common;
package com.billion.main.common;

import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;

 billion-main/src/main/java/com/billion/main/common/Constant.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.billion.main.common;

/**
 * ç®€ä»‹è¯´æ˜Ž:常量类
 *
 * @author: Eric
 * @date: 2024-11-19 13:44:48
 * @version: 1.0
 */

public class Constant {

}

 billion-main/src/main/java/com/billion/main/controller/DaParamCollectionController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.billion.main.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.billion.common.core.controller.BaseController;
import com.billion.common.core.domain.R;
import com.billion.main.domain.DaParamCollection;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.billion.main.service.DaParamCollectionService;

import javax.annotation.Resource;

/**
 * ç®€ä»‹è¯´æ˜Ž:
 *
 * @author: Eric
 * @date: 2024-11-16 11:07:06
 * @version: 1.0
 */
@RestController
@RequestMapping("/daParamCollection")
public class DaParamCollectionController extends BaseController {

    @Resource
    private DaParamCollectionService daParamCollectionService;

    @GetMapping("/getPage")
    public R getDaParamCollectionPage(@RequestParam int current,@RequestParam int size ){
        Page<DaParamCollection> pageQuery = new Page<>(current,size);
        Page<DaParamCollection> page = daParamCollectionService.page(pageQuery,null);
        return R.ok(page);
    }
}

 billion-main/src/main/java/com/billion/main/controller/ScCollectionParamConfController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.billion.main.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * ç®€ä»‹è¯´æ˜Ž:
 *
 * @author: Eric
 * @date: 2024-11-16 11:08:39
 * @version: 1.0
 */
@RestController
@RequestMapping("/scCollectionConf")
public class ScCollectionParamConfController {
}

 billion-main/src/main/java/com/billion/main/domain/DaMaterialCollection.java

ÎļþÃû´Ó billion-main/src/main/java/domain/DaMaterialCollection.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package domain;
package com.billion.main.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +7,7 @@
import java.io.Serializable;
import java.util.Date;

import com.billion.main.common.BaseEntity;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.StringSerializer;
import lombok.Data;

 billion-main/src/main/java/com/billion/main/domain/DaParamCollection.java

ÎļþÃû´Ó billion-main/src/main/java/domain/DaParamCollection.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package domain;
package com.billion.main.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

 billion-main/src/main/java/com/billion/main/domain/DaStationCollection.java

ÎļþÃû´Ó billion-main/src/main/java/domain/DaStationCollection.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package domain;
package com.billion.main.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

 billion-main/src/main/java/com/billion/main/domain/DaTightenCollection.java

ÎļþÃû´Ó billion-main/src/main/java/domain/DaTightenCollection.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package domain;
package com.billion.main.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

 billion-main/src/main/java/com/billion/main/domain/ScCollectionParamConf.java

ÎļþÃû´Ó billion-main/src/main/java/domain/ScCollectionParamConf.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package domain;
package com.billion.main.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

 billion-main/src/main/java/com/billion/main/mapper/DaMaterialCollectionMapper.java

ÎļþÃû´Ó billion-main/src/main/java/mapper/DaMaterialCollectionMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package mapper;
package com.billion.main.mapper;

import domain.DaMaterialCollection;
import com.billion.main.domain.DaMaterialCollection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 billion-main/src/main/java/com/billion/main/mapper/DaParamCollectionMapper.java

ÎļþÃû´Ó billion-main/src/main/java/mapper/DaParamCollectionMapper.java ÐÞ¸Ä
@@ -1,7 +1,8 @@
package mapper;
package com.billion.main.mapper;

import domain.DaParamCollection;
import com.billion.main.domain.DaParamCollection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
* @author Dell
@@ -9,6 +10,7 @@
* @createDate 2024-11-16 10:33:43
* @Entity generator.domain.DaParamCollection
*/
@Mapper
public interface DaParamCollectionMapper extends BaseMapper<DaParamCollection> {

}

 billion-main/src/main/java/com/billion/main/mapper/DaStationCollectionMapper.java

ÎļþÃû´Ó billion-main/src/main/java/mapper/DaStationCollectionMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package mapper;
package com.billion.main.mapper;

import domain.DaStationCollection;
import com.billion.main.domain.DaStationCollection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 billion-main/src/main/java/com/billion/main/mapper/DaTightenCollectionMapper.java

ÎļþÃû´Ó billion-main/src/main/java/mapper/DaTightenCollectionMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package mapper;
package com.billion.main.mapper;

import domain.DaTightenCollection;
import com.billion.main.domain.DaTightenCollection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 billion-main/src/main/java/com/billion/main/mapper/ScCollectionParamConfMapper.java

ÎļþÃû´Ó billion-main/src/main/java/mapper/ScCollectionParamConfMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package mapper;
package com.billion.main.mapper;

import domain.ScCollectionParamConf;
import com.billion.main.domain.ScCollectionParamConf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 billion-main/src/main/java/com/billion/main/service/DaMaterialCollectionService.java

ÎļþÃû´Ó billion-main/src/main/java/service/DaMaterialCollectionService.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package service;
package com.billion.main.service;

import domain.DaMaterialCollection;
import com.billion.main.domain.DaMaterialCollection;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 billion-main/src/main/java/com/billion/main/service/DaParamCollectionService.java

ÎļþÃû´Ó billion-main/src/main/java/service/DaParamCollectionService.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package service;
package com.billion.main.service;

import domain.DaParamCollection;
import com.billion.main.domain.DaParamCollection;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 billion-main/src/main/java/com/billion/main/service/DaStationCollectionService.java

ÎļþÃû´Ó billion-main/src/main/java/service/DaStationCollectionService.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package service;
package com.billion.main.service;

import domain.DaStationCollection;
import com.billion.main.domain.DaStationCollection;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 billion-main/src/main/java/com/billion/main/service/DaTightenCollectionService.java

ÎļþÃû´Ó billion-main/src/main/java/service/DaTightenCollectionService.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package service;
package com.billion.main.service;

import domain.DaTightenCollection;
import com.billion.main.domain.DaTightenCollection;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 billion-main/src/main/java/com/billion/main/service/ScCollectionParamConfService.java

ÎļþÃû´Ó billion-main/src/main/java/service/ScCollectionParamConfService.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package service;
package com.billion.main.service;

import domain.ScCollectionParamConf;
import com.billion.main.domain.ScCollectionParamConf;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.billion.main.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.billion.common.core.domain.R;
import com.billion.main.mapper.DaMaterialCollectionMapper;
import com.billion.main.domain.DaMaterialCollection;
import com.billion.main.service.DaMaterialCollectionService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
* @author Dell
* @description é’ˆå¯¹è¡¨ã€da_material_collection(拧紧采集)】的数据库操作Service实现
* @createDate 2024-11-16 10:33:43
*/
@Service
public class DaMaterialCollectionServiceImpl extends ServiceImpl<DaMaterialCollectionMapper, DaMaterialCollection>
    implements DaMaterialCollectionService{

    public R getData(){}


}





 billion-main/src/main/java/com/billion/main/service/impl/DaParamCollectionServiceImpl.java

ÎļþÃû´Ó billion-main/src/main/java/service/impl/DaParamCollectionServiceImpl.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package service.impl;
package com.billion.main.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import domain.DaParamCollection;
import service.DaParamCollectionService;
import mapper.DaParamCollectionMapper;
import com.billion.main.mapper.DaParamCollectionMapper;
import com.billion.main.domain.DaParamCollection;
import com.billion.main.service.DaParamCollectionService;
import org.springframework.stereotype.Service;

/**

 billion-main/src/main/java/com/billion/main/service/impl/DaStationCollectionServiceImpl.java

ÎļþÃû´Ó billion-main/src/main/java/service/impl/DaStationCollectionServiceImpl.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package service.impl;
package com.billion.main.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import domain.DaStationCollection;
import service.DaStationCollectionService;
import mapper.DaStationCollectionMapper;
import com.billion.main.domain.DaStationCollection;
import com.billion.main.mapper.DaStationCollectionMapper;
import com.billion.main.service.DaStationCollectionService;
import org.springframework.stereotype.Service;

/**
@@ -13,7 +13,7 @@
*/
@Service
public class DaStationCollectionServiceImpl extends ServiceImpl<DaStationCollectionMapper, DaStationCollection>
    implements DaStationCollectionService{
    implements DaStationCollectionService {

}


 billion-main/src/main/java/com/billion/main/service/impl/DaTightenCollectionServiceImpl.java

ÎļþÃû´Ó billion-main/src/main/java/service/impl/DaTightenCollectionServiceImpl.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package service.impl;
package com.billion.main.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import domain.DaTightenCollection;
import service.DaTightenCollectionService;
import mapper.DaTightenCollectionMapper;
import com.billion.main.domain.DaTightenCollection;
import com.billion.main.mapper.DaTightenCollectionMapper;
import com.billion.main.service.DaTightenCollectionService;
import org.springframework.stereotype.Service;

/**
@@ -13,7 +13,7 @@
*/
@Service
public class DaTightenCollectionServiceImpl extends ServiceImpl<DaTightenCollectionMapper, DaTightenCollection>
    implements DaTightenCollectionService{
    implements DaTightenCollectionService {

}


 billion-main/src/main/java/com/billion/main/service/impl/ScCollectionParamConfServiceImpl.java

ÎļþÃû´Ó billion-main/src/main/java/service/impl/ScCollectionParamConfServiceImpl.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package service.impl;
package com.billion.main.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import domain.ScCollectionParamConf;
import service.ScCollectionParamConfService;
import mapper.ScCollectionParamConfMapper;
import com.billion.main.domain.ScCollectionParamConf;
import com.billion.main.mapper.ScCollectionParamConfMapper;
import com.billion.main.service.ScCollectionParamConfService;
import org.springframework.stereotype.Service;

/**
@@ -13,7 +13,7 @@
*/
@Service
public class ScCollectionParamConfServiceImpl extends ServiceImpl<ScCollectionParamConfMapper, ScCollectionParamConf>
    implements ScCollectionParamConfService{
    implements ScCollectionParamConfService {

}


 billion-main/src/main/java/service/impl/DaMaterialCollectionServiceImpl.java

ÎļþÒÑɾ³ý

 billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="mapper.DaMaterialCollectionMapper">
<mapper namespace="com.billion.main.mapper.DaMaterialCollectionMapper">

    <resultMap id="BaseResultMap" type="domain.DaMaterialCollection">
    <resultMap id="BaseResultMap" type="com.billion.main.domain.DaMaterialCollection">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
            <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
@@ -19,4 +19,7 @@
        param_code,param_name,param_value,
        collect_time
    </sql>



</mapper>

 billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="mapper.DaParamCollectionMapper">
<mapper namespace="com.billion.main.mapper.DaParamCollectionMapper">

    <resultMap id="BaseResultMap" type="domain.DaParamCollection">
    <resultMap id="BaseResultMap" type="com.billion.main.domain.DaParamCollection">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
            <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>

 billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="mapper.DaStationCollectionMapper">
<mapper namespace="com.billion.main.mapper.DaStationCollectionMapper">

    <resultMap id="BaseResultMap" type="domain.DaStationCollection">
    <resultMap id="BaseResultMap" type="com.billion.main.domain.DaStationCollection">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
            <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>

 billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="mapper.DaTightenCollectionMapper">
<mapper namespace="com.billion.main.mapper.DaTightenCollectionMapper">

    <resultMap id="BaseResultMap" type="domain.DaTightenCollection">
    <resultMap id="BaseResultMap" type="com.billion.main.domain.DaTightenCollection">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
            <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>

 billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="mapper.ScCollectionParamConfMapper">
<mapper namespace="com.billion.main.mapper.ScCollectionParamConfMapper">

    <resultMap id="BaseResultMap" type="domain.ScCollectionParamConf">
    <resultMap id="BaseResultMap" type="com.billion.main.domain.ScCollectionParamConf">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="productCode" column="product_code" jdbcType="VARCHAR"/>
            <result property="productType" column="product_type" jdbcType="VARCHAR"/>

 pom.xml

@@ -236,8 +236,6 @@
        <module>billion-generator</module>
        <module>billion-common</module>
        <module>billion-main</module>
        <module>billion-main</module>
        <module>billion-main</module>
    </modules>
    <packaging>pom</packaging>