将原来olap开头的类改名

src/main/java/com/yihu/quota/controller/OlapDimensionController.java

@@ -3,10 +3,10 @@ package com.yihu.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.model.olap.OlapDimension;
import com.yihu.quota.model.olap.OlapDimensionMember;
import com.yihu.quota.service.olap.OlapDimensionMemberService;
import com.yihu.quota.service.olap.OlapDimensionService;
import com.yihu.quota.model.dimension.Dimension;
import com.yihu.quota.model.dimension.DimensionMember;
import com.yihu.quota.service.dimension.DimensionMemberService;
import com.yihu.quota.service.dimension.DimensionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -25,15 +25,15 @@ import java.util.List;
 */
@RestController
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "OlapDimensionController", description = "OLAP-维度表", tags = {"OLAP-维度表"})
public class OlapDimensionController extends BaseController {
@Api(value = "DimensionController", description = "OLAP-维度表", tags = {"OLAP-维度表"})
public class DimensionController extends BaseController {
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private OlapDimensionService olapDimensionService;
    private DimensionService dimensionService;
    @Autowired
    private OlapDimensionMemberService olapDimensionMemberService;
    private DimensionMemberService dimensionMemberService;
    @RequestMapping(value = "/olap/searchOlapDimension", method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件查询,具有分页功能;filters='id=1'")
@@ -49,12 +49,12 @@ public class OlapDimensionController extends BaseController {
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page) throws Exception {
        Envelop envelop = new Envelop();
        List<OlapDimension> search = olapDimensionService.search(fields, filters, sorts, page, size);
        List<Dimension> search = dimensionService.search(fields, filters, sorts, page, size);
        if (null != search && search.size() > 0) {
            for (OlapDimension dimension : search) {
                List<OlapDimensionMember> list = olapDimensionMemberService.search("dimensionId=" + dimension.getId());
            for (Dimension dimension : search) {
                List<DimensionMember> list = dimensionMemberService.search("dimensionId=" + dimension.getId());
                if (null != list && list.size() > 0) {
                    dimension.setOlapDimensionMembers(list);
                    dimension.setDimensionMembers(list);
                }
            }
        }
@@ -69,15 +69,15 @@ public class OlapDimensionController extends BaseController {
            @ApiParam(name = "model", value = "json数据模型", defaultValue = "")
            @RequestParam String model) throws Exception {
        Envelop envelop = new Envelop();
        OlapDimension dimension = objectMapper.readValue(URLDecoder.decode(model, "UTF-8"), OlapDimension.class);
        Dimension dimension = objectMapper.readValue(URLDecoder.decode(model, "UTF-8"), Dimension.class);
        if (null == dimension.getId()) {
            // 新增
            Integer id = olapDimensionService.saveOlapDimension(dimension);
            Integer id = dimensionService.saveOlapDimension(dimension);
            if (null != id) {
                envelop.setSuccessFlg(true);
            }
        } else {
            olapDimensionService.save(dimension);
            dimensionService.save(dimension);
            envelop.setSuccessFlg(true);
        }
@@ -90,7 +90,7 @@ public class OlapDimensionController extends BaseController {
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") Integer id) throws Exception {
        Envelop envelop = new Envelop();
        olapDimensionService.deleteOlapDimension(id);
        dimensionService.deleteOlapDimension(id);
        envelop.setSuccessFlg(true);
        return envelop;
    }

src/main/java/com/yihu/quota/controller/OlapDimensionMemberController.java

@@ -3,8 +3,8 @@ package com.yihu.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.model.olap.OlapDimensionMember;
import com.yihu.quota.service.olap.OlapDimensionMemberService;
import com.yihu.quota.model.dimension.DimensionMember;
import com.yihu.quota.service.dimension.DimensionMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -23,13 +23,13 @@ import java.util.List;
 */
@RestController
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "OlapDimensionMemberController", description = "OLAP-维度成员表", tags = {"OLAP-维度成员表"})
public class OlapDimensionMemberController extends BaseController {
@Api(value = "DimensionMemberController", description = "OLAP-维度成员表", tags = {"OLAP-维度成员表"})
public class DimensionMemberController extends BaseController {
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private OlapDimensionMemberService olapDimensionMemberService;
    private DimensionMemberService dimensionMemberService;
    @RequestMapping(value = "/olap/searchOlapDimensionMenber", method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件查询,具有分页功能;filters='id=1'")
@@ -45,7 +45,7 @@ public class OlapDimensionMemberController extends BaseController {
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page) throws Exception {
        Envelop envelop = new Envelop();
        List<OlapDimensionMember> search = olapDimensionMemberService.search(fields, filters, sorts, page, size);
        List<DimensionMember> search = dimensionMemberService.search(fields, filters, sorts, page, size);
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(search);
        return envelop;
@@ -57,13 +57,13 @@ public class OlapDimensionMemberController extends BaseController {
            @ApiParam(name = "model", value = "json数据模型", defaultValue = "")
            @RequestParam String model) throws Exception {
        Envelop envelop = new Envelop();
        OlapDimensionMember dimensionMember = objectMapper.readValue(URLDecoder.decode(model, "UTF-8"), OlapDimensionMember.class);
        DimensionMember dimensionMember = objectMapper.readValue(URLDecoder.decode(model, "UTF-8"), DimensionMember.class);
        if (null == dimensionMember.getId()) {
            // 新增
            olapDimensionMemberService.save(dimensionMember);
            dimensionMemberService.save(dimensionMember);
            envelop.setSuccessFlg(true);
        } else {
            olapDimensionMemberService.save(dimensionMember);
            dimensionMemberService.save(dimensionMember);
            envelop.setSuccessFlg(true);
        }
        return envelop;
@@ -75,7 +75,7 @@ public class OlapDimensionMemberController extends BaseController {
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") Integer id) throws Exception {
        Envelop envelop = new Envelop();
        olapDimensionMemberService.delete(id);
        dimensionMemberService.delete(id);
        envelop.setSuccessFlg(true);
        return envelop;
    }

src/main/java/com/yihu/quota/dao/dimension/DimensionDao.java

@@ -0,0 +1,11 @@
package com.yihu.quota.dao.dimension;
import com.yihu.quota.model.dimension.Dimension;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by wxw on 2018/9/7.
 * @author wxw
 */
public interface DimensionDao extends PagingAndSortingRepository<Dimension, Integer> {
}

src/main/java/com/yihu/quota/dao/olap/OlapDimensionMemberDao.java

@@ -1,18 +1,20 @@
package com.yihu.quota.dao.jpa.olap;
package com.yihu.quota.dao.dimension;
import com.yihu.quota.model.olap.OlapDimensionMember;
import com.yihu.quota.model.dimension.DimensionMember;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
/**
 * Created by wxw on 2018/9/7.
 * @author wxw
 */
public interface OlapDimensionMemberDao extends PagingAndSortingRepository<OlapDimensionMember, Integer> {
public interface DimensionMemberDao extends PagingAndSortingRepository<DimensionMember, Integer> {
    @Modifying
    @Query("delete from OlapDimensionMember where dimensionId = :dimensionId")
    @Transactional
    @Query("delete from DimensionMember where dimensionId = :dimensionId")
    void deleteByDimensionId(@Param("dimensionId") Integer dimensionId);
}

src/main/java/com/yihu/quota/dao/olap/OlapDimensionDao.java

@@ -1,10 +0,0 @@
package com.yihu.quota.dao.olap;
import com.yihu.quota.model.olap.OlapDimension;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by wxw on 2018/9/7.
 */
public interface OlapDimensionDao extends PagingAndSortingRepository<OlapDimension, Integer> {
}

src/main/java/com/yihu/quota/model/olap/OlapDimension.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.olap;
package com.yihu.quota.model.dimension;
import javax.persistence.*;
@@ -10,7 +10,7 @@ import java.util.List;
 */
@Entity
@Table(name = "olap_dimension")
public class OlapDimension {
public class Dimension {
    private Integer id;
    private String name;
    private String code;
@@ -19,7 +19,7 @@ public class OlapDimension {
    private String algorithm;
    // 临时字段
    private List<OlapDimensionMember> olapDimensionMembers;
    private List<DimensionMember> dimensionMembers;
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -73,11 +73,11 @@ public class OlapDimension {
    }
    @Transient
    public List<OlapDimensionMember> getOlapDimensionMembers() {
        return olapDimensionMembers;
    public List<DimensionMember> getDimensionMembers() {
        return dimensionMembers;
    }
    public void setOlapDimensionMembers(List<OlapDimensionMember> olapDimensionMembers) {
        this.olapDimensionMembers = olapDimensionMembers;
    public void setDimensionMembers(List<DimensionMember> dimensionMembers) {
        this.dimensionMembers = dimensionMembers;
    }
}

src/main/java/com/yihu/quota/model/olap/OlapDimensionMember.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.olap;
package com.yihu.quota.model.dimension;
import javax.persistence.*;
@@ -8,7 +8,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "olap_dimension_member")
public class OlapDimensionMember {
public class DimensionMember {
    private Integer id;
    private String name;
    private String code;

src/main/java/com/yihu/quota/service/dimension/DimensionMemberService.java

@@ -0,0 +1,16 @@
package com.yihu.quota.service.dimension;
import com.yihu.ehr.query.BaseJpaService;
import com.yihu.quota.dao.dimension.DimensionMemberDao;
import com.yihu.quota.model.dimension.DimensionMember;
import org.springframework.stereotype.Service;
/**
 * Created by wxw on 2018/9/7.
 * @author wxw
 */
@Service
public class DimensionMemberService extends BaseJpaService<DimensionMember, DimensionMemberDao> {
}

src/main/java/com/yihu/quota/service/dimension/DimensionService.java

@@ -0,0 +1,38 @@
package com.yihu.quota.service.dimension;
import com.yihu.ehr.query.BaseJpaService;
import com.yihu.quota.dao.dimension.DimensionDao;
import com.yihu.quota.dao.dimension.DimensionMemberDao;
import com.yihu.quota.model.dimension.Dimension;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by wxw on 2018/9/7.
 * @author wxw
 */
@Service
public class DimensionService extends BaseJpaService<Dimension, DimensionDao> {
    @Autowired
    private DimensionDao dimensionDao;
    @Autowired
    private DimensionMemberDao dimensionMemberDao;
    /**
     * 保存接口
     * @param dimension
     * @return 保存之后的id
     */
    public Integer saveOlapDimension(Dimension dimension) {
        dimension = dimensionDao.save(dimension);
        return dimension.getId();
    }
    public void deleteOlapDimension(Integer id) {
        dimensionDao.delete(id);
        // 同时删掉隶属于该维度的成员
        dimensionMemberDao.deleteByDimensionId(id);
    }
}

src/main/java/com/yihu/quota/service/olap/OlapDimensionMemberService.java

@@ -1,16 +0,0 @@
package com.yihu.quota.service.olap;
import com.yihu.ehr.query.BaseJpaService;
import com.yihu.quota.dao.jpa.olap.OlapDimensionMemberDao;
import com.yihu.quota.model.olap.OlapDimensionMember;
import org.springframework.stereotype.Service;
/**
 * Created by wxw on 2018/9/7.
 * @author wxw
 */
@Service
public class OlapDimensionMemberService extends BaseJpaService<OlapDimensionMember, OlapDimensionMemberDao> {
}

src/main/java/com/yihu/quota/service/olap/OlapDimensionService.java

@@ -1,37 +0,0 @@
package com.yihu.quota.service.olap;
import com.yihu.ehr.query.BaseJpaService;
import com.yihu.quota.dao.olap.OlapDimensionDao;
import com.yihu.quota.dao.jpa.olap.OlapDimensionMemberDao;
import com.yihu.quota.model.olap.OlapDimension;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by wxw on 2018/9/7.
 */
@Service
public class OlapDimensionService extends BaseJpaService<OlapDimension, OlapDimensionDao> {
    @Autowired
    private OlapDimensionDao olapDimensionDao;
    @Autowired
    private OlapDimensionMemberDao olapDimensionMemberDao;
    /**
     * 保存接口
     * @param olapDimension
     * @return 保存之后的id
     */
    public Integer saveOlapDimension(OlapDimension olapDimension) {
        olapDimension = olapDimensionDao.save(olapDimension);
        return olapDimension.getId();
    }
    public void deleteOlapDimension(Integer id) {
        olapDimensionDao.delete(id);
        // 同时删掉隶属于该维度的成员
        olapDimensionMemberDao.deleteByDimensionId(id);
    }
}