Skip to content

D
dsk-cr20g
Commit 1fc56537 authored by tanyang's avatar tanyang
Browse files
Options

去除pageHelper

parent 28a14a28
Show whitespace changes
Inline Side-by-side
Showing with 212 additions and 209 deletions
dsk-admin/src/main/java/com/dsk/web/controller/common/CaptchaController.java
View file @ 1fc56537
...@@ -13,6 +13,7 @@ import com.dsk.common.enums.CaptchaType; ...@@ -13,6 +13,7 @@ import com.dsk.common.enums.CaptchaType;
import com.dsk.common.exception.user.CaptchaException; import com.dsk.common.exception.user.CaptchaException;
import com.dsk.common.exception.user.CaptchaExpireException; import com.dsk.common.exception.user.CaptchaExpireException;
import com.dsk.common.helper.LoginHelper; import com.dsk.common.helper.LoginHelper;
import com.dsk.common.utils.DingTalkUtil;
import com.dsk.common.utils.MessageUtils; import com.dsk.common.utils.MessageUtils;
import com.dsk.common.utils.StringUtils; import com.dsk.common.utils.StringUtils;
import com.dsk.common.utils.email.MailUtils; import com.dsk.common.utils.email.MailUtils;
...@@ -81,12 +82,14 @@ public class CaptchaController { ...@@ -81,12 +82,14 @@ public class CaptchaController {
// 验证码模板id 自行处理 (查数据库或写死均可) // 验证码模板id 自行处理 (查数据库或写死均可)
LinkedHashMap<String, String> map = new LinkedHashMap<>(1); LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
map.put("code", code); map.put("code", code);
SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA); // SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map); // SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
if (!"OK".equals(smsResponse.getCode())) { // if (!"OK".equals(smsResponse.getCode())) {
log.error("验证码短信发送异常 => {}", smsResponse); // log.error("验证码短信发送异常 => {}", smsResponse);
return R.fail(smsResponse.getMessage()); // return R.fail(smsResponse.getMessage());
} // }
DingTalkUtil.sendDingTalkMsg("短信通知："+phonenumber+"登录验证码："+code+"，请尽快输入验证码完成验证，勿将验证码透露给他人，如非本人操作，请忽略本条短信。");
return R.ok(); return R.ok();
} }
......
dsk-admin/src/main/resources/application-prod.yml
View file @ 1fc56537
...@@ -14,7 +14,7 @@ spring.boot.admin.client: ...@@ -14,7 +14,7 @@ spring.boot.admin.client:
--- # xxl-job 配置 --- # xxl-job 配置
xxl.job: xxl.job:
# 执行器开关 # 执行器开关
enabled: true enabled: false
# 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。 # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
admin-addresses: http://localhost:9100/xxl-job-admin admin-addresses: http://localhost:9100/xxl-job-admin
# 执行器通讯TOKEN：非空时启用 # 执行器通讯TOKEN：非空时启用
...@@ -169,11 +169,11 @@ sms: ...@@ -169,11 +169,11 @@ sms:
#请求地址 默认为 dysmsapi.aliyuncs.com 如无特殊改变可以不用设置 #请求地址 默认为 dysmsapi.aliyuncs.com 如无特殊改变可以不用设置
requestUrl: dysmsapi.aliyuncs.com requestUrl: dysmsapi.aliyuncs.com
#阿里云的accessKey #阿里云的accessKey
accessKeyId: xxxxxxx accessKeyId: LTAIC4Pb2jJZbUmD
#阿里云的accessKeySecret #阿里云的accessKeySecret
accessKeySecret: xxxxxxx accessKeySecret: L7VANFwqaTludkczLsg9jhvidk0e28
#短信签名 #短信签名
signature: 测试 signature: 大司空信息科技
tencent: tencent:
#请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置 #请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置
requestUrl: sms.tencentcloudapi.com requestUrl: sms.tencentcloudapi.com
......
dsk-module/dsk-biz-api/pom.xml
View file @ 1fc56537
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
<artifactId>fastjson2</artifactId> <artifactId>fastjson2</artifactId>
<version>2.0.25</version> <version>2.0.25</version>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId> <artifactId>pagehelper</artifactId>
<version>5.3.2</version> <version>5.3.2</version>
</dependency> </dependency>-->
<!-- <dependency>--> <!-- <dependency>-->
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/MarketAnalysisController.java
View file @ 1fc56537
package com.dsk.search.controller; //package com.dsk.search.controller;
//
import com.alibaba.fastjson2.JSONObject; //import com.alibaba.fastjson2.JSONObject;
import com.dsk.common.constant.HttpStatus; //import com.dsk.common.constant.HttpStatus;
import com.dsk.common.core.controller.BaseController; //import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.AjaxResult; //import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.core.page.TableDataInfo; //import com.dsk.common.core.page.TableDataInfo;
import com.dsk.search.service.MarketAnalysisService; //import com.dsk.search.service.MarketAnalysisService;
import com.github.pagehelper.PageInfo; //import com.github.pagehelper.PageInfo;
import org.springframework.web.bind.annotation.RequestBody; //import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.Calendar; //import java.util.Calendar;
import java.util.List; //import java.util.List;
//
//
/** ///**
* 央企市场分析-统计 // * 央企市场分析-统计
* @author Administrator // * @author Administrator
* // *
*/ // */
@RequestMapping("/marketAnalysis") //@RequestMapping("/marketAnalysis")
@RestController //@RestController
public class MarketAnalysisController extends BaseController { //public class MarketAnalysisController extends BaseController {
//
//
@Resource // @Resource
private MarketAnalysisService marketAnalysisService; // private MarketAnalysisService marketAnalysisService;
//
/* // /*
* 各省份备案企业数量 // * 各省份备案企业数量
*/ // */
@RequestMapping("/areaGroupByProvince") // @RequestMapping("/areaGroupByProvince")
public AjaxResult areaGroupByProvince() { // public AjaxResult areaGroupByProvince() {
//
return marketAnalysisService.areaGroupByProvince(); // return marketAnalysisService.areaGroupByProvince();
} // }
//
/* // /*
* 资质等级按照行业、等级类型分组 // * 资质等级按照行业、等级类型分组
*/ // */
@RequestMapping("/certGroupByMajorAndLevel") // @RequestMapping("/certGroupByMajorAndLevel")
public AjaxResult certGroupByMajorAndLevel() { // public AjaxResult certGroupByMajorAndLevel() {
//
return marketAnalysisService.certGroupByMajorAndLevel(); // return marketAnalysisService.certGroupByMajorAndLevel();
} // }
//
//
/* // /*
* 资质等级按照大类、省份、等级类型分组 // * 资质等级按照大类、省份、等级类型分组
*/ // */
@RequestMapping("/certGroupByMajorProvinceLevel") // @RequestMapping("/certGroupByMajorProvinceLevel")
public AjaxResult certGroupByMajorProvinceLevel() { // public AjaxResult certGroupByMajorProvinceLevel() {
return marketAnalysisService.certGroupByMajorProvinceLevel(); // return marketAnalysisService.certGroupByMajorProvinceLevel();
} // }
//
/* // /*
* 产业结构-按年份选择 各个项目类型项目总数 // * 产业结构-按年份选择 各个项目类型项目总数
*/ // */
@RequestMapping("/bidGroupCountByProjectType") // @RequestMapping("/bidGroupCountByProjectType")
public AjaxResult bidGroupCountByProjectType(@RequestBody JSONObject object) { // public AjaxResult bidGroupCountByProjectType(@RequestBody JSONObject object) {
return marketAnalysisService.bidGroupCountByProjectType(object); // return marketAnalysisService.bidGroupCountByProjectType(object);
} // }
/* // /*
* 产业结构-近两年各个项目类型项目总数及金额占比 // * 产业结构-近两年各个项目类型项目总数及金额占比
*/ // */
@RequestMapping("/bidMoneyGroupByProjectType") // @RequestMapping("/bidMoneyGroupByProjectType")
public AjaxResult bidMoneyGroupByProjectType(@RequestBody JSONObject object) { // public AjaxResult bidMoneyGroupByProjectType(@RequestBody JSONObject object) {
return marketAnalysisService.bidMoneyGroupByProjectType(object); // return marketAnalysisService.bidMoneyGroupByProjectType(object);
} // }
//
//-----------------------------------中标---------------------------------- // //-----------------------------------中标----------------------------------
//
//全攻中标项目统计 // //全攻中标项目统计
@RequestMapping("/countBidByType") // @RequestMapping("/countBidByType")
public AjaxResult countBidByType(@RequestBody JSONObject object) { // public AjaxResult countBidByType(@RequestBody JSONObject object) {
return marketAnalysisService.countBidByType( object); // return marketAnalysisService.countBidByType( object);
} // }
//
/* // /*
* 全国各地区中标统计TOP10 // * 全国各地区中标统计TOP10
*/ // */
@RequestMapping("/countBidGroupByProvince") // @RequestMapping("/countBidGroupByProvince")
public AjaxResult countBidGroupByProvince(@RequestBody JSONObject object) { // public AjaxResult countBidGroupByProvince(@RequestBody JSONObject object) {
return marketAnalysisService.countBidGroupByProvince(object); // return marketAnalysisService.countBidGroupByProvince(object);
} // }
//
//全国中标金额分析 // //全国中标金额分析
@RequestMapping("/rangeBidMoney") // @RequestMapping("/rangeBidMoney")
public AjaxResult rangeBidMoney(@RequestBody JSONObject object) { // public AjaxResult rangeBidMoney(@RequestBody JSONObject object) {
return marketAnalysisService.rangeBidMoney( object); // return marketAnalysisService.rangeBidMoney( object);
} // }
//
//全国中标趋势分析 // //全国中标趋势分析
@RequestMapping("/rangeBidFiveYears") // @RequestMapping("/rangeBidFiveYears")
public AjaxResult rangeBidFiveYears() { // public AjaxResult rangeBidFiveYears() {
return marketAnalysisService.rangeBidFiveYears(); // return marketAnalysisService.rangeBidFiveYears();
} // }
//
//全国中标下浮率分析 // //全国中标下浮率分析
@RequestMapping("/lowerRateByYear") // @RequestMapping("/lowerRateByYear")
public AjaxResult lowerRateByYear(@RequestBody JSONObject object) { // public AjaxResult lowerRateByYear(@RequestBody JSONObject object) {
return marketAnalysisService.lowerRateByYear( object); // return marketAnalysisService.lowerRateByYear( object);
} // }
//
//全国中标业绩项目类型下浮率 // //全国中标业绩项目类型下浮率
@RequestMapping("/lowerRangeTenderType") // @RequestMapping("/lowerRangeTenderType")
public AjaxResult lowerRangeTenderType(@RequestBody JSONObject object) { // public AjaxResult lowerRangeTenderType(@RequestBody JSONObject object) {
return marketAnalysisService.lowerRangeTenderType( object); // return marketAnalysisService.lowerRangeTenderType( object);
} // }
//
//
//-----------------------------------土地---------------------------------- // //-----------------------------------土地----------------------------------
//央企数字化经营系统 土地交易 // //央企数字化经营系统 土地交易
@RequestMapping("/countLandMarketByType") // @RequestMapping("/countLandMarketByType")
public AjaxResult countLandMarketByType(@RequestBody JSONObject object){ // public AjaxResult countLandMarketByType(@RequestBody JSONObject object){
return marketAnalysisService.countLandMarketByType(object); // return marketAnalysisService.countLandMarketByType(object);
} // }
//
//央企数字化经营系统 全国土地交易项目地区 // //央企数字化经营系统 全国土地交易项目地区
@RequestMapping("/countLandMarketByProvince") // @RequestMapping("/countLandMarketByProvince")
public AjaxResult countLandMarketByProvince(@RequestBody JSONObject object){ // public AjaxResult countLandMarketByProvince(@RequestBody JSONObject object){
return marketAnalysisService.countLandMarketByProvince(object); // return marketAnalysisService.countLandMarketByProvince(object);
} // }
//
//央企数字化经营系统 全国土地交易项目地区 // //央企数字化经营系统 全国土地交易项目地区
@RequestMapping("/countLandMarketByYear") // @RequestMapping("/countLandMarketByYear")
public AjaxResult countLandMarketByYear(){ // public AjaxResult countLandMarketByYear(){
return marketAnalysisService.countLandMarketByYear(); // return marketAnalysisService.countLandMarketByYear();
} // }
//
//
//
//
//-----------------------------------招标---------------------------------- // //-----------------------------------招标----------------------------------
//央企数字化经营系统 全国公招项目统计 // //央企数字化经营系统 全国公招项目统计
@RequestMapping("/countNewsBidByYear") // @RequestMapping("/countNewsBidByYear")
public AjaxResult countNewsBidByYear(){ // public AjaxResult countNewsBidByYear(){
return marketAnalysisService.countNewsBidByYear(); // return marketAnalysisService.countNewsBidByYear();
} // }
//
//央企数字化经营系统 招标公告 全国各地区项目统计TOP10 // //央企数字化经营系统 招标公告 全国各地区项目统计TOP10
@RequestMapping("/countNewsBidByProvince") // @RequestMapping("/countNewsBidByProvince")
public AjaxResult countNewsBidByProvince(@RequestBody JSONObject object){ // public AjaxResult countNewsBidByProvince(@RequestBody JSONObject object){
return marketAnalysisService.countNewsBidByProvince(object); // return marketAnalysisService.countNewsBidByProvince(object);
} // }
//
//央企数字化经营系统 招标公告 月度统计 // //央企数字化经营系统 招标公告 月度统计
@RequestMapping("/countNewsBidByMonth") // @RequestMapping("/countNewsBidByMonth")
public AjaxResult countNewsBidByMonth(@RequestBody JSONObject object){ // public AjaxResult countNewsBidByMonth(@RequestBody JSONObject object){
return marketAnalysisService.countNewsBidByMonth(object); // return marketAnalysisService.countNewsBidByMonth(object);
} // }
//
/* // /*
* 招标数量按省份分组 // * 招标数量按省份分组
*/ // */
@RequestMapping("/countGroupByProvince") // @RequestMapping("/countGroupByProvince")
public AjaxResult countGroupByProvince(@RequestBody JSONObject object) { // public AjaxResult countGroupByProvince(@RequestBody JSONObject object) {
return marketAnalysisService.countGroupByProvince(object); // return marketAnalysisService.countGroupByProvince(object);
} // }
//
@RequestMapping("/getYear") // @RequestMapping("/getYear")
public TableDataInfo getYear(){ // public TableDataInfo getYear(){
List<Integer> list = new ArrayList<>(); // List<Integer> list = new ArrayList<>();
Calendar calendar = Calendar.getInstance(); // Calendar calendar = Calendar.getInstance();
int nowYear = calendar.get(Calendar.YEAR); // int nowYear = calendar.get(Calendar.YEAR);
list.add(nowYear); // list.add(nowYear);
for (int i = 1; i < 5; i++) { // for (int i = 1; i < 5; i++) {
list.add(nowYear-i); // list.add(nowYear-i);
} // }
return getDataTable(list); // return getDataTable(list);
} // }
//
/* // /*
* 中标数量按月份分组 // * 中标数量按月份分组
*/ // */
@RequestMapping("/countGroupByMonth") // @RequestMapping("/countGroupByMonth")
public AjaxResult countGroupByMonth(@RequestBody JSONObject object) { // public AjaxResult countGroupByMonth(@RequestBody JSONObject object) {
return marketAnalysisService.countGroupByMonth(object); // return marketAnalysisService.countGroupByMonth(object);
} // }
//
/** // /**
* 响应请求分页数据 // * 响应请求分页数据
*/ // */
@SuppressWarnings({ "rawtypes", "unchecked" }) // @SuppressWarnings({ "rawtypes", "unchecked" })
protected TableDataInfo getDataTable(List<?> list) { // protected TableDataInfo getDataTable(List<?> list) {
TableDataInfo rspData = new TableDataInfo(); // TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS); // rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功"); // rspData.setMsg("查询成功");
rspData.setRows(list); // rspData.setRows(list);
rspData.setTotal(new PageInfo(list).getTotal()); // rspData.setTotal(new PageInfo(list).getTotal());
return rspData; // return rspData;
} // }
} //}
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