Skip to content

D
data-center
Commit 6f408b1b authored by user01's avatar user01
Browse files
Options

1.修改名称

parent 2dda5080
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 22 deletions
dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/dao/AreaDao.java → dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/dao/AreaInformationDao.java
View file @ 6f408b1b
package com.mortals.xhx.modules.area.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.base.system.area.model.AreaEntity;
import com.mortals.xhx.modules.area.model.AreaInformationEntity;
/**
* <p>Title: 地区表</p>
......@@ -10,6 +10,6 @@ import com.mortals.xhx.base.system.area.model.AreaEntity;
* @version 1.0.0
*/
public interface AreaDao extends ICRUDDao<AreaEntity,Long>{
public interface AreaInformationDao extends ICRUDDao<AreaInformationEntity,Long>{
}
dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/dao/ibatis/AreaDaoImpl.java → dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/dao/ibatis/AreaInformationDaoImpl.java
View file @ 6f408b1b
package com.mortals.xhx.modules.area.dao.ibatis;
import com.mortals.xhx.base.system.area.dao.AreaDao;
import com.mortals.xhx.base.system.area.model.AreaEntity;
import com.mortals.xhx.modules.area.dao.AreaInformationDao;
import com.mortals.xhx.modules.area.model.AreaInformationEntity;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
......@@ -11,7 +11,7 @@ import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
* @author
* @version 1.0.0
*/
@Repository("areaDao")
public class AreaDaoImpl extends BaseCRUDDaoMybatis<AreaEntity,Long> implements AreaDao {
@Repository("areaInformationDao")
public class AreaInformationDaoImpl extends BaseCRUDDaoMybatis<AreaInformationEntity,Long> implements AreaInformationDao {
}
dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/model/AreaEntity.java → dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/model/AreaInformationEntity.java
View file @ 6f408b1b
......@@ -6,7 +6,7 @@ import com.mortals.framework.model.BaseEntityLong;
* Description:Area
* date: 2021-8-10 13:22:19
*/
public class AreaEntity extends BaseEntityLong{
public class AreaInformationEntity extends BaseEntityLong{
private static final long serialVersionUID = 1628572939315L;
......@@ -85,7 +85,7 @@ public class AreaEntity extends BaseEntityLong{
*/
private String areaDesc;
public AreaEntity(){
public AreaInformationEntity(){
}
/**
......@@ -307,8 +307,8 @@ public class AreaEntity extends BaseEntityLong{
public boolean equals(Object obj) {
if (obj == null)
return false;
if (obj instanceof AreaEntity) {
AreaEntity tmp = (AreaEntity) obj;
if (obj instanceof AreaInformationEntity) {
AreaInformationEntity tmp = (AreaInformationEntity) obj;
if (this.getId().longValue() == tmp.getId().longValue()) {
return true;
}
......
dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/model/AreaQuery.java → dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/model/AreaInformationQuery.java
View file @ 6f408b1b
......@@ -7,7 +7,7 @@ import java.util.List;
* Description:Area
* date: 2021-8-10 13:22:19
*/
public class AreaQuery extends AreaEntity{
public class AreaInformationQuery extends AreaInformationEntity {
private static final long serialVersionUID = 1628572939325L;
/** 主键ID */
......@@ -59,13 +59,13 @@ public class AreaQuery extends AreaEntity{
private List<String> areaDescList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AreaQuery> orConditionList;
private List<AreaInformationQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<AreaQuery> andConditionList;
private List<AreaInformationQuery> andConditionList;
public AreaQuery(){
public AreaInformationQuery(){
}
/**
......@@ -313,7 +313,7 @@ public class AreaQuery extends AreaEntity{
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<AreaQuery> getOrConditionList(){
public List<AreaInformationQuery> getOrConditionList(){
return this.orConditionList;
}
......@@ -321,7 +321,7 @@ public class AreaQuery extends AreaEntity{
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<AreaQuery> orConditionList){
public void setOrConditionList(List<AreaInformationQuery> orConditionList){
this.orConditionList = orConditionList;
}
......@@ -329,7 +329,7 @@ public class AreaQuery extends AreaEntity{
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<AreaQuery> getAndConditionList(){
public List<AreaInformationQuery> getAndConditionList(){
return this.andConditionList;
}
......@@ -337,7 +337,7 @@ public class AreaQuery extends AreaEntity{
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<AreaQuery> andConditionList){
public void setAndConditionList(List<AreaInformationQuery> andConditionList){
this.andConditionList = andConditionList;
}
......
dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/service/AreaService.java → dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/service/AreaInformationService.java
View file @ 6f408b1b
package com.mortals.xhx.modules.area.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.base.system.area.model.AreaEntity;
import com.mortals.xhx.modules.area.model.AreaInformationEntity;
/**
* <p>Title: 地区表</p>
......@@ -10,6 +10,6 @@ import com.mortals.xhx.base.system.area.model.AreaEntity;
* @version 1.0.0
*/
public interface AreaService extends ICRUDService<AreaEntity,Long>{
public interface AreaInformationService extends ICRUDService<AreaInformationEntity,Long>{
}
\ No newline at end of file
dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/service/impl/AreaServiceImpl.java → dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/service/impl/AreaInformationServiceImpl.java
View file @ 6f408b1b
package com.mortals.xhx.modules.area.service.impl;
import com.mortals.xhx.base.system.area.model.AreaEntity;
import com.mortals.xhx.modules.area.dao.AreaDao;
import com.mortals.xhx.modules.area.service.AreaService;
import com.mortals.xhx.modules.area.dao.AreaInformationDao;
import com.mortals.xhx.modules.area.model.AreaInformationEntity;
import com.mortals.xhx.modules.area.service.AreaInformationService;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
......@@ -12,7 +12,7 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
@Service("areaService")
public class AreaServiceImpl extends AbstractCRUDServiceImpl<AreaDao, AreaEntity, Long> implements AreaService {
@Service("areaInformationService")
public class AreaInformationServiceImpl extends AbstractCRUDServiceImpl<AreaInformationDao, AreaInformationEntity, Long> implements AreaInformationService {
}
\ No newline at end of file
dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/web/AreaController.java → dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/web/AreaInformationController.java
View file @ 6f408b1b
package com.mortals.xhx.modules.area.web;
import com.mortals.xhx.base.system.area.model.AreaEntity;
import com.mortals.xhx.modules.area.service.AreaService;
import com.mortals.xhx.modules.area.model.AreaInformationEntity;
import com.mortals.xhx.modules.area.service.AreaInformationService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.mortals.framework.web.BaseCRUDJsonMappingController;
......@@ -17,10 +17,10 @@ import com.mortals.framework.web.BaseCRUDJsonMappingController;
*/
@RestController
@RequestMapping("area")
public class AreaController extends BaseCRUDJsonMappingController<AreaService,AreaForm, AreaEntity,Long> {
public class AreaInformationController extends BaseCRUDJsonMappingController<AreaInformationService, AreaInformationForm, AreaInformationEntity,Long> {
public AreaController(){
super.setFormClass(AreaForm.class);
public AreaInformationController(){
super.setFormClass(AreaInformationForm.class);
super.setModuleDesc("地区表");
}
......
dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/web/AreaForm.java → dataCenter-manager/src/main/java/com/mortals/xhx/modules/area/web/AreaInformationForm.java
View file @ 6f408b1b
package com.mortals.xhx.modules.area.web;
import com.mortals.framework.web.BaseCRUDFormLong;
import com.mortals.xhx.base.system.area.model.AreaEntity;
import com.mortals.xhx.base.system.area.model.AreaQuery;
import com.mortals.xhx.modules.area.model.AreaInformationEntity;
import com.mortals.xhx.modules.area.model.AreaInformationQuery;
/**
* <p>Title: 地区表</p>
......@@ -10,31 +10,31 @@ import com.mortals.xhx.base.system.area.model.AreaQuery;
* @author
* @version 1.0.0
*/
public class AreaForm extends BaseCRUDFormLong<AreaEntity> {
private AreaEntity area = new AreaEntity();
private AreaQuery query = new AreaQuery();
public AreaForm(){
public class AreaInformationForm extends BaseCRUDFormLong<AreaInformationEntity> {
private AreaInformationEntity area = new AreaInformationEntity();
private AreaInformationQuery query = new AreaInformationQuery();
public AreaInformationForm(){
}
@Override
public AreaEntity getEntity() {
public AreaInformationEntity getEntity() {
return area;
}
public AreaEntity getArea() {
public AreaInformationEntity getArea() {
return area;
}
public void setArea(AreaEntity area) {
public void setArea(AreaInformationEntity area) {
this.area = area;
}
@Override
public AreaQuery getQuery() {
public AreaInformationQuery getQuery() {
return query;
}
public void setQuery(AreaQuery query) {
public void setQuery(AreaInformationQuery query) {
this.query = query;
}
}
\ No newline at end of file
dataCenter-manager/src/main/resources/sqlmap/area/area.xml → dataCenter-manager/src/main/resources/sqlmap/area/areaInformation.xml
View file @ 6f408b1b
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.modules.area.dao.ibatis.AreaDaoImpl">
<mapper namespace="com.mortals.xhx.modules.area.dao.ibatis.AreaInformationDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="AreaEntity" id="AreaEntity-Map">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment