From 1312d0a191b8240f62c39c5528a97d9af451f82f Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sun, 15 Aug 2021 17:14:14 +0800 Subject: [PATCH 1/4] . --- .../ReportCaseV2AppResoureController.java | 279 ++++++++++++++++++ .../dao/reportcase/v2/IReportCaseV2Dao.java | 17 ++ .../reportcase/v2/IReportCaseV2Service.java | 15 + .../v2/impl/ReportCaseV2ServiceImpl.java | 16 + .../reportcase/v2/reportcase-v2-mapper.xml | 75 +++++ 5 files changed, 402 insertions(+) create mode 100644 src/main/java/com/cm/systemcity/controller/app/resources/reportcasev2/ReportCaseV2AppResoureController.java diff --git a/src/main/java/com/cm/systemcity/controller/app/resources/reportcasev2/ReportCaseV2AppResoureController.java b/src/main/java/com/cm/systemcity/controller/app/resources/reportcasev2/ReportCaseV2AppResoureController.java new file mode 100644 index 0000000..d49580e --- /dev/null +++ b/src/main/java/com/cm/systemcity/controller/app/resources/reportcasev2/ReportCaseV2AppResoureController.java @@ -0,0 +1,279 @@ +package com.cm.systemcity.controller.app.resources.reportcasev2; + + +import com.cm.common.base.AbstractController; +import com.cm.common.constants.ISystemConstant; +import com.cm.common.plugin.pojo.bos.UserResourceBO; +import com.cm.common.pojo.ListPage; +import com.cm.common.result.ErrorResult; +import com.cm.common.result.SuccessResultList; +import com.cm.systemcity.pojo.dtos.reportcase.v2.ReportCaseV2DTO; +import com.cm.systemcity.service.reportcase.v2.IReportCaseV2Service; +import com.cm.systemcity.utils.BigDataResult; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * @ClassName: ReportCaseV2AppResoureController + * @Description: 环保案件统计 + * @Author: admin + * @Date: 2021-08-12 14:56:15 + * @Version: 1.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "环保案件统计接口") +@RestController +@RequestMapping(ISystemConstant.APP_PREFIX + "/reportcase/v2/"+ISystemConstant.APP_RELEASE_SUFFIX ) +public class ReportCaseV2AppResoureController extends AbstractController { + + @Autowired + private IReportCaseV2Service reportCaseV2Service; + + + + + @ApiOperation(value = "统计本月总上报案件数量", notes = "统计总上报案件数量接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count-month-now-total") + public BigDataResult countReportCaseTotal(){ + BigDataResult result = new BigDataResult(); + Map params = new HashMap<>(); + params.put("month","month"); + Integer count = reportCaseV2Service.countMonthNow(params); + params.clear(); + params.put("value",count); + result.setData(params); + return result; + } + + + + @ApiOperation(value = "统计案件-分状态", notes = "统计案件-分状态接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count-casestatus") + public BigDataResult countCaseStatus(){ + BigDataResult result = new BigDataResult(); + List> list = new ArrayList<>(); + //待受理 + Map params0 = new HashMap<>(); + params0.put("caseStatus","0"); + Integer count0 = reportCaseV2Service.countMonthNow(params0); + params0.clear(); + params0.put("name","待受理"); + params0.put("value",count0); + list.add(params0); + //受理 + Map params1 = new HashMap<>(); + params1.put("caseStatus","1"); + Integer count1 = reportCaseV2Service.countMonthNow(params1); + params1.clear(); + params1.put("name","受理"); + params1.put("value",count1); + list.add(params1); + //立案 + Map params2 = new HashMap<>(); + params2.put("caseStatus","2"); + Integer count2 = reportCaseV2Service.countMonthNow(params2); + params2.clear(); + params2.put("name","立案"); + params2.put("value",count2); + list.add(params2); + //下派 + Map params3 = new HashMap<>(); + params3.put("caseStatus","3"); + Integer count3 = reportCaseV2Service.countMonthNow(params3); + params3.clear(); + params3.put("name","下派"); + params3.put("value",count3); + list.add(params3); + //检查 + Map params4 = new HashMap<>(); + params4.put("caseStatus","4"); + Integer count4 = reportCaseV2Service.countMonthNow(params4); + params4.clear(); + params4.put("name","检查"); + params4.put("value",count4); + list.add(params4); + //结案 + Map params5 = new HashMap<>(); + params5.put("caseStatus","5"); + Integer count5 = reportCaseV2Service.countMonthNow(params5); + params5.clear(); + params5.put("name","结案"); + params5.put("value",count5); + list.add(params5); + //归档 + Map params6 = new HashMap<>(); + params6.put("caseStatus","6"); + Integer count6 = reportCaseV2Service.countMonthNow(params6); + params6.clear(); + params6.put("name","归档"); + params6.put("value",count6); + list.add(params6); + //异常 + Map paramsError = new HashMap<>(); + paramsError.put("caseStatus","-1"); + Integer countError = reportCaseV2Service.countMonthNow(paramsError); + paramsError.clear(); + paramsError.put("name","异常"); + paramsError.put("value",countError); + list.add(paramsError); + + result.setList(list); + return result; + } + + + + @ApiOperation(value = "案件列表", notes = "案件列表接口") + @GetMapping("reportcaselistpage") + public SuccessResultList> reportCaseListPage(ListPage page){ + Map params = requestParams(); + page.setParams(params); + SuccessResultList> listSuccessResultList = reportCaseV2Service.listBigData(page); + + for (ReportCaseV2DTO row : listSuccessResultList.getRows()) { + row.setCaseSource(setSource(row.getCaseSource())); + row.setCaseStatus(setStatus(row.getCaseStatus())); + } + + return listSuccessResultList; + } + + + public String setSource(String source){ + if(source.equals("1")){ + return "群众举报"; + } + if(source.equals("2")){ + return "巡检采集"; + } + if(source.equals("3")){ + return "专管员上报"; + } + return "未知"; + } + + public String setStatus(String Status){ + if(Status.equals("0")){ + return "待受理"; + } + if(Status.equals("1")){ + return "待立案"; + } + if(Status.equals("2")){ + return "待下派"; + } + if(Status.equals("3")){ + return "待处理"; + } + if(Status.equals("4")){ + return "待检查"; + } + if(Status.equals("5")){ + return "待结案"; + } + if(Status.equals("6")){ + return "已归档"; + } + return "异常"; + } + + @ApiOperation(value = "状态查询按钮组1", notes = "状态查询按钮组接口") + @GetMapping("countcasestatusbutton-one") + public BigDataResult countCaseStatusButtonOne(){ + BigDataResult result = new BigDataResult(); + List> list = new ArrayList<>(); + //待受理 + Map params0 = new HashMap<>(); + params0.put("caseStatus","0"); + Integer count0 = reportCaseV2Service.countMonthNow(params0); + params0.clear(); + params0.put("id","0"); + params0.put("name","待受理（"+count0+"）"); + list.add(params0); + //受理 + Map params1 = new HashMap<>(); + params1.put("caseStatus","1"); + Integer count1 = reportCaseV2Service.countMonthNow(params1); + params1.clear(); + params1.put("id","1"); + params1.put("name","受理（"+count1+"）"); + list.add(params1); + //立案 + Map params2 = new HashMap<>(); + params2.put("caseStatus","2"); + Integer count2 = reportCaseV2Service.countMonthNow(params2); + params2.clear(); + params2.put("id","2"); + params2.put("name","立案（"+count2+"）"); + list.add(params2); + //下派 + Map params3 = new HashMap<>(); + params3.put("caseStatus","3"); + Integer count3 = reportCaseV2Service.countMonthNow(params3); + params3.clear(); + params3.put("id","3"); + params3.put("name","下派（"+count3+"）"); + list.add(params3); + + result.setList(list); + return result; + + + } + + + @ApiOperation(value = "状态查询按钮组2", notes = "状态查询按钮组接口") + @GetMapping("countcasestatusbutton-two") + public BigDataResult countCaseStatusButtonTwo(){ + BigDataResult result = new BigDataResult(); + List> list = new ArrayList<>(); + //检查 + Map params4 = new HashMap<>(); + params4.put("caseStatus","4"); + Integer count4 = reportCaseV2Service.countMonthNow(params4); + params4.clear(); + params4.put("id","4"); + params4.put("name","检查（"+count4+"）"); + list.add(params4); + //结案 + Map params5 = new HashMap<>(); + params5.put("caseStatus","5"); + Integer count5 = reportCaseV2Service.countMonthNow(params5); + params5.clear(); + params5.put("id","5"); + params5.put("name","结案（"+count5+"）"); + list.add(params5); + //归档 + Map params6 = new HashMap<>(); + params6.put("caseStatus","6"); + Integer count6 = reportCaseV2Service.countMonthNow(params6); + params6.clear(); + params6.put("id","6"); + params6.put("name","归档（"+count6+"）"); + list.add(params6); + //异常 + Map paramsError = new HashMap<>(); + paramsError.put("caseStatus","-1"); + Integer countError = reportCaseV2Service.countMonthNow(paramsError); + paramsError.clear(); + paramsError.put("id","-1"); + paramsError.put("name","异常（"+countError+"）"); + list.add(paramsError); + + result.setList(list); + return result; + + + } + +} diff --git a/src/main/java/com/cm/systemcity/dao/reportcase/v2/IReportCaseV2Dao.java b/src/main/java/com/cm/systemcity/dao/reportcase/v2/IReportCaseV2Dao.java index cab71b4..a8c9075 100644 --- a/src/main/java/com/cm/systemcity/dao/reportcase/v2/IReportCaseV2Dao.java +++ b/src/main/java/com/cm/systemcity/dao/reportcase/v2/IReportCaseV2Dao.java @@ -309,4 +309,21 @@ public interface IReportCaseV2Dao { * @return */ List listCaseStatisticRatio(Map params); + + /** + * 本月案件数量 + * @param params + * @return + * @throws SearchException + */ + Integer countMonthNow(Map params) throws SearchException; + + /** + * 大数据案件列表 + * @param params + * @return + * @throws SearchException + */ + List listBigData(Map params) throws SearchException; + } diff --git a/src/main/java/com/cm/systemcity/service/reportcase/v2/IReportCaseV2Service.java b/src/main/java/com/cm/systemcity/service/reportcase/v2/IReportCaseV2Service.java index c4fc536..7c05bb7 100644 --- a/src/main/java/com/cm/systemcity/service/reportcase/v2/IReportCaseV2Service.java +++ b/src/main/java/com/cm/systemcity/service/reportcase/v2/IReportCaseV2Service.java @@ -47,6 +47,21 @@ public interface IReportCaseV2Service { */ int IS_SELF = 1; + + /** + * 大数据案件列表 + * @param page + * @return + * @throws SearchException + */ + SuccessResultList> listBigData(ListPage page) throws SearchException; + /** + * 统计本月案件数量 + * @param params + * @return + */ + Integer countMonthNow(Map params); + /** * 新增上报案件 * diff --git a/src/main/java/com/cm/systemcity/service/reportcase/v2/impl/ReportCaseV2ServiceImpl.java b/src/main/java/com/cm/systemcity/service/reportcase/v2/impl/ReportCaseV2ServiceImpl.java index d54a202..d42afae 100644 --- a/src/main/java/com/cm/systemcity/service/reportcase/v2/impl/ReportCaseV2ServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/reportcase/v2/impl/ReportCaseV2ServiceImpl.java @@ -65,6 +65,22 @@ public class ReportCaseV2ServiceImpl extends BaseService implements IReportCaseV @Autowired private IDocumentV2Service documentV2Service; + public Integer countMonthNow(Map params){ + return reportCaseV2Dao.countMonthNow(params); + } + + @Override + public SuccessResultList> listBigData(ListPage page) throws SearchException { + PageHelper.startPage(page.getPage(), page.getRows()); + List reportCaseDTOs = reportCaseV2Dao.listBigData(page.getParams()); + PageInfo pageInfo = new PageInfo<>(reportCaseDTOs); + return new SuccessResultList<>(reportCaseDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + + + + @Override public SuccessResult saveReportCase(Map params) throws SaveException { params.put("caseReporter", securityComponent.getCurrentUser().getUserName()); diff --git a/src/main/resources/mybatis/mapper/reportcase/v2/reportcase-v2-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/v2/reportcase-v2-mapper.xml index c75d494..8bf2561 100644 --- a/src/main/resources/mybatis/mapper/reportcase/v2/reportcase-v2-mapper.xml +++ b/src/main/resources/mybatis/mapper/reportcase/v2/reportcase-v2-mapper.xml @@ -1428,4 +1428,79 @@ case_status 0 + + + + + + + + + \ No newline at end of file From 0916425aa975f6f582cb0efe185b3dd59935b38d Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Mon, 16 Aug 2021 22:31:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0docker=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=92=8C=E9=9B=86=E5=AE=81=E7=8E=AF=E4=BF=9D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-jnhb | 4 + src/main/resources/application-jnhb.yml | 148 ++++++++++++++++++++++++ src/main/resources/application-test.yml | 14 +-- 3 files changed, 159 insertions(+), 7 deletions(-) create mode 100644 Dockerfile-jnhb create mode 100644 src/main/resources/application-jnhb.yml diff --git a/Dockerfile-jnhb b/Dockerfile-jnhb new file mode 100644 index 0000000..4876c16 --- /dev/null +++ b/Dockerfile-jnhb @@ -0,0 +1,4 @@ +FROM openjdk:8u292-jre-buster +ARG JAR_FILE=/target/*.jar +COPY ${JAR_FILE} system-city.jar +ENTRYPOINT ["java","-jar","-Dspring.profiles.active=jnhb","/system-city.jar"] \ No newline at end of file diff --git a/src/main/resources/application-jnhb.yml b/src/main/resources/application-jnhb.yml new file mode 100644 index 0000000..92d5fea --- /dev/null +++ b/src/main/resources/application-jnhb.yml @@ -0,0 +1,148 @@ +server: + port: 7002 + url: http://106.12.218.237:8001/servicecity + title: 生态环保网格化监督平台 + servlet: + context-path: /servicecity + tomcat: + uri-encoding: UTF-8 + max-threads: 500 + max-connections: 10000 + +spring: + thymeleaf: + prefix: classpath:/templates/ + suffix: .html + mode: HTML5 + encoding: UTF-8 + cache: false + main: + allow-bean-definition-overriding: true + servlet: + multipart: + max-file-size: 1GB + max-request-size: 1GB + datasource: + druid: + url: jdbc:mysql://localhost:8668/db_cloud_v2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false + db-type: mysql + driver-class-name: com.mysql.jdbc.Driver + username: root + password: TSkj@0471.123 + initial-size: 2 + min-idle: 2 + max-active: 10 + max-wait: 60000 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 10 + filter: + commons-log: + connection-logger-name: stat,wall,log4j + stat: + log-slow-sql: true + slow-sql-millis: 2000 + connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + use-global-data-source-stat: true + + cache: + type: ehcache + ehcache: + config: classpath:ehcache.xml + +# 数据库 +mybatis: + config-location: classpath:mybatis/mybatis-config.xml + mapper-locations: classpath*:mybatis/mapper/**/*.xml + +# 文档 +swagger: + title: 接口文档 + description: 生态环保网格化监督平台接口文档 + service-url: http://106.12.218.237:8001/servicecity + version: 1.0 + swagger-base-package: com.cm + +# 文件 +file: + uploadPath: /projects/uploadFiles/ + imageTypes: png,jpg,jpeg,gif,blob + videoTypes: mp4,rmvb + audioTypes: mp3,wmv,wav + fileTypes: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk + +# 安全 +security: + oauth2: + oauth-server: http://106.12.218.237:8001/usercenter + oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} + client: + client-id: c024a89b35b04d4d8b5b4ea4d66a8acb + client-secret: MlMzaC9sYkxKMDZtQzlRLzJwVGVMbnhaVmhTZEJQR1BiT0c4SDgrRjd5VW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== + user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize + access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token + grant-type: authorization_code + resource: + jwt: + key-uri: ${security.oauth2.oauth-server}/oauth_client/token_key + token-info-uri: ${security.oauth2.oauth-server}/oauth_client/check_token + user-info-uri: ${security.oauth2.oauth-server}/user + authorization: + check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key + +api-path: + user-center: ${security.oauth2.oauth-server} + +# 访问控制 +access-control: + pass-paths: + - /index + - /index.html + - /logout.html + - /default.html + - /app/** + - /assets/** + save-paths: + - /save*/** + - /add*/** + delete-paths: + - /delete*/** + - /remove*/** + update-paths: + - /update*/** + - /edit*/** + query-paths: + - /get*/** + - /query*/** + - /find*/** + - /list*/** + - /count*/** + - /map*/** + - /select*/** + +# 日志 +logging: + file: /projects/logs/servicecity/logs.log + level: + root: error + com.cm: debug + +socket: + central-control: + active: false + client: + client-id: 09991939-25af-4423-9128-f28ef1a1bce1 + client-secret: BJ5Z5FxAuCTIUXkZHNh50R7zPrJMjE+LbesNFSg9WC6NdSFL9bxaQzSVpOcItgV1 + host: 49.233.36.36 + port: 8888 + max-reconnect-count: 20 + reconnect-time-step: 1 + delay-ping-seconds: 3 + send-client-info-active: false + # 上报服务器数据时间 + send-client-info-second: 30 \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 49e27e1..c1c6668 100755 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,6 +1,6 @@ server: - port: 8083 - url: http://192.168.0.109:8083/servicecity + port: 8091 + url: http://49.233.36.36:58091/servicecity title: 稀土高新区社会治理综合管理平台 servlet: context-path: /servicecity @@ -26,7 +26,7 @@ spring: druid: # url: jdbc:mysql://49.233.36.36:6688/db_cloud_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false # url: jdbc:mysql://127.0.0.1:3306/db_cloud_servicecity?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false - url: jdbc:mysql://192.168.0.151:3306/db_cloud_system_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/db_cloud_v2_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false db-type: mysql driver-class-name: com.mysql.jdbc.Driver # username: wanggeng @@ -74,7 +74,7 @@ swagger: # 文件 file: - uploadPath: D:\ideaWorkspace\uploadfiles\pianzhang + uploadPath: /Users/wanggeng/Desktop/UploadFiles imageTypes: png,jpg,jpeg,gif,blob videoTypes: mp4,rmvb audioTypes: mp3,wmv,wav @@ -83,7 +83,7 @@ file: # 安全 security: oauth2: - oauth-server: http://219.147.99.164:8082/usercenter + oauth-server: http://49.233.36.36:58090/usercenter oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} client: client-id: c024a89b35b04d4d8b5b4ea4d66a8acb @@ -100,7 +100,7 @@ security: check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key api-path: - user-center: http://219.147.99.164:8082/usercenter + user-center: http://49.233.36.36:58090/usercenter # 访问控制 access-control: @@ -135,7 +135,7 @@ access-control: # 日志 logging: - file: D:\ideaWorkspace\logs\pianzhang\pianzhang-logs.log + file: /Users/wanggeng/Desktop/UploadFiles/logs/systemcity/logs.log level: root: error com.cm: debug From 2f934de38b89dba37ef79b81c508e75803f2117f Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Thu, 19 Aug 2021 18:34:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?docker=20=E6=96=87=E4=BB=B6=E4=B8=AD=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-jnhb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile-jnhb b/Dockerfile-jnhb index 4876c16..9888b9d 100644 --- a/Dockerfile-jnhb +++ b/Dockerfile-jnhb @@ -1,4 +1,7 @@ FROM openjdk:8u292-jre-buster ARG JAR_FILE=/target/*.jar COPY ${JAR_FILE} system-city.jar -ENTRYPOINT ["java","-jar","-Dspring.profiles.active=jnhb","/system-city.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","-Dspring.profiles.active=jnhb","/system-city.jar"] + +# 时区问题 +RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone \ No newline at end of file From 208749f088628d32acb9e6318208640e993a7b06 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Tue, 7 Sep 2021 17:17:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A5=E4=BA=BA=E6=89=BE=E6=88=BF?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E6=88=BF=E6=89=BE=E4=BA=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buildinghouse/building-house-mapper.xml | 6 + .../route/buildinghouse/list-check.html | 229 ++++++++++++++++ .../static/route/buildinghouse/list-view.html | 257 ++++++++++++++++++ .../route/buildinghouseuser/list-view.html | 69 +++++ 4 files changed, 561 insertions(+) create mode 100644 src/main/resources/static/route/buildinghouse/list-check.html create mode 100644 src/main/resources/static/route/buildinghouse/list-view.html create mode 100644 src/main/resources/static/route/buildinghouseuser/list-view.html diff --git a/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml b/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml index 52facb4..75a0b76 100644 --- a/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml +++ b/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml @@ -213,6 +213,8 @@ 1 FROM city_building_house t1 + LEFT JOIN city_building_house_user t2 ON t1.building_house_id = t2.building_house_id + AND t2.is_delete = 0 WHERE t1.is_delete = 0 @@ -221,9 +223,13 @@ OR t1.district_name LIKE CONCAT('%', #{keywords}, '%') OR + t1.house_number LIKE CONCAT('%', #{keywords}, '%') + OR t1.owner_name LIKE CONCAT('%', #{keywords}, '%') OR t1.owner_card LIKE CONCAT('%', #{keywords}, '%') + OR + t2.card_number LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/static/route/buildinghouse/list-check.html b/src/main/resources/static/route/buildinghouse/list-check.html new file mode 100644 index 0000000..dc07726 --- /dev/null +++ b/src/main/resources/static/route/buildinghouse/list-check.html @@ -0,0 +1,229 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/buildinghouse/list-view.html b/src/main/resources/static/route/buildinghouse/list-view.html new file mode 100644 index 0000000..fabb090 --- /dev/null +++ b/src/main/resources/static/route/buildinghouse/list-view.html @@ -0,0 +1,257 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/buildinghouseuser/list-view.html b/src/main/resources/static/route/buildinghouseuser/list-view.html new file mode 100644 index 0000000..b3a22fa --- /dev/null +++ b/src/main/resources/static/route/buildinghouseuser/list-view.html @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + +
+
+
以人找房
+
+ + +
+
请输入居民身份证号查询
+
+
+ + + + + + + \ No newline at end of file