diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 22427a81f..d88b3deb5 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -1,187 +1,187 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue index 021de8eb4..5e87b6c2d 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue @@ -1,84 +1,84 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index ac32e6350..9daa94ba6 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -65,8 +65,8 @@ export default { codeUrl: "", cookiePassword: "", loginForm: { - username: "admin", - password: "admin123", + username: "", + password: "", rememberMe: false, code: "", uuid: "" diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java index ee03b6b09..09885ddc8 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java @@ -1,31 +1,41 @@ package com.ruoyi.project.data.cases.controller; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.framework.web.page.TableSupport; +import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase; +import com.ruoyi.project.data.cases.service.IOriginalNewHouseCaseService; +import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +/** + * 案例Controller + * + * @author lihe + */ @RestController @RequestMapping("/data/cases") -public class CasesController { +public class CasesController extends BaseController { + + @Autowired + private IOriginalNewHouseCaseService originalNewHouseCaseService; /** - * 原始办公挂牌案例 + * 一手房成交案例 */ - public void originalOfficeOpeningCase() { - + @PreAuthorize("@ss.hasPermi('cases:newHouse:list')") + @GetMapping("/newHouse/list") + public TableDataInfo list(OriginalNewHouseCase originalNewHouseCase) { + int total = originalNewHouseCaseService.selectCount(originalNewHouseCase); + List list = + originalNewHouseCaseService.selectList(originalNewHouseCase); + return getDataTable(list, total); } - - /** - * 原始住宅销售挂牌案例 - */ - public void originalResidenceSalesOpeningCase(){ - - } - - /** - * 原始住宅销售挂牌案例 - */ - public void originalResidenceSalesClosingCase(){ - - } - } diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalNewHouseCase.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalNewHouseCase.java index da364bf90..3c396ea5d 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalNewHouseCase.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalNewHouseCase.java @@ -14,6 +14,9 @@ import java.util.Date; */ public class OriginalNewHouseCase { private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + private Integer pageIndex; + private Integer pageSize; + private Integer yearMonth; /** * 案例id @@ -248,4 +251,20 @@ public class OriginalNewHouseCase { public void setCaseLabel(String caseLabel) { this.caseLabel = caseLabel; } + + public Integer getPageIndex() { + return pageIndex; + } + + public void setPageIndex(Integer pageIndex) { + this.pageIndex = pageIndex; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } } diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalNewHouseCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalNewHouseCaseMapper.java index 778baa2b8..3f0626574 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalNewHouseCaseMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalNewHouseCaseMapper.java @@ -47,5 +47,21 @@ public interface OriginalNewHouseCaseMapper { */ int insertSecondTable(OriginalNewHouseCase originalNewHouseCase); + /** + * 分页总数 + * + * @param originalNewHouseCase + * @return + */ + int pageCount(OriginalNewHouseCase originalNewHouseCase); + + /** + * 分页列表 + * + * @param originalNewHouseCase + * @return + */ + List pageList(OriginalNewHouseCase originalNewHouseCase); + } diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalNewHouseCaseService.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalNewHouseCaseService.java new file mode 100644 index 000000000..46f608f67 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalNewHouseCaseService.java @@ -0,0 +1,29 @@ +package com.ruoyi.project.data.cases.service; + +import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase; +import com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice; + +import java.util.List; + +/** + * 一手房成交案例Service + * + * @author lihe + */ +public interface IOriginalNewHouseCaseService { + + /** + * @param originalNewHouseCase + * @return + */ + List selectList(OriginalNewHouseCase originalNewHouseCase); + + /** + * 分页总数 + * + * @param originalNewHouseCase + * @return + */ + int selectCount(OriginalNewHouseCase originalNewHouseCase); + +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalNewHouseCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalNewHouseCaseServiceImpl.java new file mode 100644 index 000000000..aa7702426 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalNewHouseCaseServiceImpl.java @@ -0,0 +1,38 @@ +package com.ruoyi.project.data.cases.service.impl; + +import com.ruoyi.common.constant.LabelConstants; +import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase; +import com.ruoyi.project.data.cases.mapper.OriginalNewHouseCaseMapper; +import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalNewHouseCaseMapper; +import com.ruoyi.project.data.cases.service.IOriginalNewHouseCaseService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +/** + * 一手房成交案例Service + * + * @author lihe + */ +@Service +public class OriginalNewHouseCaseServiceImpl implements IOriginalNewHouseCaseService { + + @Autowired + private OriginalNewHouseCaseMapper originalNewHouseCaseMapper; + + @Override + public List selectList(OriginalNewHouseCase originalNewHouseCase) { + return originalNewHouseCaseMapper.pageList(originalNewHouseCase); + } + + @Override + public int selectCount(OriginalNewHouseCase originalNewHouseCase) { + return originalNewHouseCaseMapper.pageCount(originalNewHouseCase); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceRentPriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceRentPriceService.java index 8786032d3..4c040b398 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceRentPriceService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceRentPriceService.java @@ -32,6 +32,8 @@ public interface IArtificialResidenceRentPriceService { List selectList(ArtificialResidenceRentBasePrice officeBasePriceUltimate); /** + * 分页总数 + * * @param officeBasePriceUltimate * @return */ @@ -51,6 +53,7 @@ public interface IArtificialResidenceRentPriceService { /** * 更新 + * * @param officeBasePriceUltimate * @return */ diff --git a/ruoyi/src/main/resources/mybatis/data/OriginalNewHouseCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/OriginalNewHouseCaseMapper.xml index a79be726a..11e74b0f1 100644 --- a/ruoyi/src/main/resources/mybatis/data/OriginalNewHouseCaseMapper.xml +++ b/ruoyi/src/main/resources/mybatis/data/OriginalNewHouseCaseMapper.xml @@ -163,4 +163,51 @@ ) + + \ No newline at end of file