Skip to content

D
data-server
Commit c1dcc266 authored by codezwjava's avatar codezwjava
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 6d29445b 74862b8b
Show whitespace changes
Inline Side-by-side
Showing with 317 additions and 48 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
View file @ c1dcc266
......@@ -2,6 +2,7 @@ package cn.wisenergy.mapper;
import cn.wisenergy.model.app.shopZx;
import cn.wisenergy.model.dto.ZxUserDto;
import cn.wisenergy.model.vo.ShopZxUserVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
......@@ -34,7 +35,7 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
/**
* 倒叙查询资讯与用户发布数据
*/
List<ShopZxUserVo> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
List<ZxUserDto> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
//
// /**
// * 用于查询资讯单表全部信息
......
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
View file @ c1dcc266
......@@ -55,7 +55,8 @@
<!--资讯内容倒叙查询-->
<select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.vo.UserVo">
<!--资讯内容倒叙查询-->
<select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.dto.ZxUserDto">
select
b.zx_id as zxid,
b.zx_url as zxUrl,
......@@ -68,7 +69,6 @@
from shop_zx b left join user_info a ON a.invite_code=b.invite_code
WHERE zx_to_examine != 0
AND a.user_id !=0
and a.user_id !=null
order by zxid desc limit #{pageNum},#{pageSize}
</select>
<!--资讯总记录数查询-->
......
wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
View file @ c1dcc266
......@@ -113,9 +113,9 @@
date_format(create_time,'%Y-%m') as yearMonth
FROM
<include refid="table"/>
WHERE date_format(create_time,'%Y-%m') &lt; date_format(now(),'%Y-%m')
and date_format(create_time,'%Y-%m') >= date_format(now() - interval 7 month,'%Y-%m')
and (status=1 or status=3)
WHERE date_format(create_time,'%Y-%m') &lt;= date_format(now(),'%Y-%m')
and date_format(create_time,'%Y-%m') >= date_format(now() - interval 5 month,'%Y-%m')
and (status=1 or status=0)
and user_id=#{userId}
group by user_id ,create_time;
</select>
......
wisenergy-model/src/main/java/cn/wisenergy/model/dto/ZxUserDto.java 0 → 100644
View file @ c1dcc266
package cn.wisenergy.model.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Created by m1991 on 2021/3/29 15:38
*/
@Data
public class ZxUserDto {
/**
* 手机号作为用户账号
*/
@TableField(exist = false)
@ApiModelProperty(name = "user_id", value = "用户id")
private String userId;
/*
* 用户头像
*/
@TableField(exist = false)
@ApiModelProperty(name = "headImage", value = "用户头像")
private String headImage;
/**
* 资讯主键id
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_id", value = "资讯主键id")
private Integer zxid;
/**
* 视频存放地址
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_url", value = "视频/图片存放地址")
private String zxUrl;
/**
* 用户本人邀请码
*/
@TableField(exist = false)
@ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
private String inviteCode;
/**
* 获赞数
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_likes", value = "获赞数")
private Integer zxLikes;
@ApiModelProperty(name = "liked_status", value = "点赞状态")
private Integer likedStatus;
/**
* 资讯文字输入字段
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_field", value = "资讯文字输入字段")
private String zxField;
/**
* 资讯数据创建时间
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
private Long zxDate;
@TableField(exist = false)
private List<String> askImgList;
}
wisenergy-model/src/main/java/cn/wisenergy/model/enums/TradeRecordEnum.java
View file @ c1dcc266
......@@ -12,17 +12,17 @@ public enum TradeRecordEnum {
*/
WITHDRAW_DEPOSIT(1, "提现"),
ORDER_REBATE(2, "订单返佣"),
ORDER_REBATE(2, "返佣奖"),
PLACE_ORDER(3, "订单下单"),
MONTHLY_FERTILIZER(4, "月度肥料"),
MONTHLY_FERTILIZER(4, "月度肥料奖"),
CULTIVATING_PRIZE(5, "培育奖"),
SALARY_REWARD(6, "工资奖励"),
PROGRESS_PRIZE(7, "最大进步奖"),
PROGRESS_PRIZE(7, "进步奖"),
RUN_CENTER_SUBSIDY(8, "运营中心补贴");
private Integer code;
......
wisenergy-model/src/main/java/cn/wisenergy/model/vo/MoneyPackageDetailVo.java
View file @ c1dcc266
......@@ -29,9 +29,9 @@ public class MoneyPackageDetailVo {
List<IncomeDetailVo> list;
/**
* 累计收益
* 本月累计收益
*/
@ApiModelProperty(value = "累计收益", name = "totalIncome")
@ApiModelProperty(value = "本月累计收益", name = "totalIncome")
private BigDecimal totalIncome;
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java
View file @ c1dcc266
......@@ -52,7 +52,7 @@ public interface UploadService {
* @param pageSize
* @return
*/
Map selectPage(Integer pageNum, Integer pageSize,String inviteCode);
Map selectPage(int pageNum, int pageSize,String inviteCode);
/**
* TODO 资讯单表分页全部信息展示
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountServiceImpl.java
View file @ c1dcc266
......@@ -95,7 +95,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
if (!tradeRecord.getTradeNo().equals(version)) {
return R.ok(DOWNLOAD_URL);
}
return R.ok("当前已是最新版本!");
return R.error(1, "当前已是最新版本!");
}
/**
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java
View file @ c1dcc266
......@@ -198,13 +198,6 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
BigDecimal frozenMoney = accountInfo.getFrozenMoney().add(money);
accountInfo.setFrozenMoney(frozenMoney);
BigDecimal earningsMonth = accountInfo.getEarningsMonth().subtract(money);
accountInfo.setEarningsMonth(earningsMonth);
BigDecimal earningsTotal = accountInfo.getEarningsTotal().subtract(money);
accountInfo.setEarningsTotal(earningsTotal);
//4、添加提现交易流水记录
TradeRecord tradeRecord = new TradeRecord();
tradeRecord.setUserId(accountInfo.getUserId());
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
View file @ c1dcc266
......@@ -10,6 +10,7 @@ import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.mapper.userLikesMapper;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.dto.ShopZxUserDto;
import cn.wisenergy.model.dto.ZxUserDto;
import cn.wisenergy.model.vo.ShopZxUserVo;
import com.github.pagehelper.PageInfo;
import org.springframework.core.io.Resource;
......@@ -180,7 +181,7 @@ public class UploadServiceImpl implements UploadService {
//过滤传入的邀请码带有“”的符号
inviteCode = inviteCode.replace("\"", "").replace("\"", "");
//获取上传图片数量，打印在控制台
if(null!=files&&"".equals(files)){
if(null!=files&&!"".equals(files)){
System.out.println("上传图片数量" + files.length);
//创建集合
List<Map<String, Object>> root = new ArrayList<Map<String, Object>>();
......@@ -191,11 +192,11 @@ public class UploadServiceImpl implements UploadService {
Map<String, Object> result = new HashMap<String, Object>();//一个文件上传的结果
String msg = "";//上传结果信息
//上传图片不为空时
long sa = 0;
for (MultipartFile file : files) {
sa = file.getSize();
}
if (sa > 0) {
// long sa = 0;
// for (MultipartFile file : files) {
// sa = file.getSize();
// }
if (null!=files&&!"".equals(files)) {
//遍历图片数据
for (MultipartFile file : files) {
......@@ -263,13 +264,13 @@ public class UploadServiceImpl implements UploadService {
// zxUrl="0";
shopZxMapper.zxadd(zxUrl, zxField, inviteCode, zxDate);
//图片与文字都为null的时候，给前端返回提示！
} else {
} else
if (null == files && null == zxField) {
map.put("code", 1);
map.put("msg", "上传资讯不能为空，请重新上传！");
return map;
}
}
map.put("code", 0);
map.put("msg", "资讯上传成功！");
return map;
......@@ -334,20 +335,28 @@ public class UploadServiceImpl implements UploadService {
* 资讯文件展示
*/
@Override
public Map selectPage(Integer pageNum, Integer pageSize, String inviteCode) {
public Map selectPage(int pageNum, int pageSize, String inviteCode) {
Map map = new HashMap();
pageNum = pageNum - 1;
List<ShopZxUserVo> shopZxList = shopZxMapper.selectPage(pageNum, pageSize);
List<ZxUserDto> shopZxList = shopZxMapper.selectPage(pageNum,pageSize);
for (ZxUserDto shopZx : shopZxList) {
for (ShopZxUserVo shopZx : shopZxList) {
String[] zxUrl = shopZx.getZxUrl().split(",");
ArrayList list = new ArrayList();
if (null != zxUrl) {
if (!"".equals(zxUrl)) {
for (String split : zxUrl) {
if ("".equals(split)){
shopZx.setAskImgList(null);
}else {
boolean arrayList = Collections.addAll(list, split);
shopZx.setAskImgList(list);
}
}
}
int likedId = shopZx.getZxid();
if (shopZx.getUserId() == null && "" != shopZx.getUserId()) {
......@@ -374,6 +383,7 @@ public class UploadServiceImpl implements UploadService {
}
}
}
map.put("data", shopZxList);
return map;
}
......@@ -407,6 +417,8 @@ public class UploadServiceImpl implements UploadService {
return R.ok(info);
}
/**
* 分页处理方法
*
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WalletServiceImpl.java
View file @ c1dcc266
......@@ -132,7 +132,7 @@ public class WalletServiceImpl implements WalletService {
MoneyPackageDetailVo detailVo = new MoneyPackageDetailVo();
detailVo.setUserId(userId);
detailVo.setTotalIncome(accountInfo.getEarningsTotal());
detailVo.setTotalIncome(accountInfo.getEarningsMonth());
//获取本月交易记录
List<TradeRecord> list = getTradeRecordList(userId);
......
wisenergy-service/wisenergy-service.iml
View file @ c1dcc266
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
<module version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="wisenergy-mapper" />
<orderEntry type="module" module-name="wisenergy-model" />
<orderEntry type="module" module-name="wisenergy-common" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.4.3" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.common:wildfly-common:1.5.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.client:wildfly-client-config:1.0.1.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.threads:jboss-threads:3.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:2.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.4" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.20" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.17" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.8.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:30.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.9" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
<orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.11.66.ALL" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
<orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.2.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.18" level="project" />
<orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-core:1.0.7-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-gen:1.0.7.78771202102051104-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-api:1.0.7-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-common:1.0.7-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.5.14" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:opencv:3.4.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flycapture:2.11.3.121-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.5-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect:0.5.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect2:0.2.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:librealsense:1.12.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:videoinput:0.200-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flandmark:1.07-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:leptonica:1.76.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:tesseract:4.0.0-rc2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg-platform:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:android-arm:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:android-arm64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:android-x86:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:android-x86_64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:linux-x86:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:linux-x86_64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:linux-armhf:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:linux-ppc64le:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:macosx-x86_64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:windows-x86:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:windows-x86_64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
</component>
</module>
\ No newline at end of file
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java
View file @ c1dcc266
......@@ -102,11 +102,11 @@ public class UploadController {
* @param pageSize
* @return
*/
@ApiOperation(value = "用户发布已审核资讯信息倒叙展示", notes = "倒叙展示", httpMethod = "POST", produces = "application/json; charset=UTF-8")
@ApiOperation(value = "用户发布已审核资讯信息倒叙展示", notes = "倒叙展示")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "integer"),
@ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = false, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "Integger")})
@ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "Integer")})
@RequestMapping(method = RequestMethod.GET, value = "/zxAll")
public Map selectPage(int pageNum, int pageSize,String inviteCode){
......
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