xioayue
/
szwh
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

代码调整

master
xyiege 3 years ago
parent
a7f595dd4c
commit
62e585ca06
5 changed files with 117 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/main/java/cn/chjyj/szwh/Interceptor/ChInterceptor.java
  2. 99
      src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java
  3. 2
      src/main/java/cn/chjyj/szwh/service/GoodsService.java
  4. 58
      src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
  5. 12
      src/main/java/cn/chjyj/szwh/utils/AjaxResult.java

3
src/main/java/cn/chjyj/szwh/Interceptor/ChInterceptor.java
View File

@ -24,7 +24,7 @@ public class ChInterceptor implements HandlerInterceptor {
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
String uri = request.getRequestURI(); String uri = request.getRequestURI();
// 判断是否是数据库监控的 // 判断是否是数据库监控的
if(uri.contains("/druid/**")){ if(uri.contains("/druid/**") || uri.contains("/api/**")){
return true; return true;
} }
// 从请求头中获取token // 从请求头中获取token
@ -46,7 +46,6 @@ public class ChInterceptor implements HandlerInterceptor {
else { else {
// 执行认证 // 执行认证
if (token == null) { if (token == null) {
log.error("header token为空");
throw new ChException("token为空，token为必须参数"); throw new ChException("token为空，token为必须参数");
}else{ }else{
log.info("token正常"); log.info("token正常");

99
src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java
View File

@ -1,9 +1,12 @@
package cn.chjyj.szwh.controller.api; package cn.chjyj.szwh.controller.api;
import cn.chjyj.szwh.annotation.PassToken;
import cn.chjyj.szwh.bean.Goods; import cn.chjyj.szwh.bean.Goods;
import cn.chjyj.szwh.controller.BaseController; import cn.chjyj.szwh.controller.BaseController;
import cn.chjyj.szwh.service.GoodsService; import cn.chjyj.szwh.service.GoodsService;
import cn.chjyj.szwh.utils.AjaxResult; import cn.chjyj.szwh.utils.AjaxResult;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -11,6 +14,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -69,21 +73,16 @@ public class GoodsController extends BaseController {
* @return * @return
*/ */
@RequestMapping("/getTypeGoods") @RequestMapping("/getTypeGoods")
public JSONObject getTypeGoods(String type,String createtime,String goods_type){ public JSONObject getTypeGoods(String type, String createtime, String goods_type){
//10长的时间戳 //10长的时间戳
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
List<Goods> goodsList = goodsService.getTypeGoods(type,createtime,goods_type); List<Goods> goodsList = goodsService.getTypeGoods(type,createtime,goods_type);
long endtime = System.currentTimeMillis(); long endtime = System.currentTimeMillis();
JSONObject outjson = new JSONObject(); JSONObject outjson = new JSONObject();
if(goodsList!=null){ outjson.put("code",200);
outjson.put("code","00000000"); outjson.put("msg","成功");
outjson.put("msg","成功"); outjson.put("userTime",(endtime-startTime)/1000);
outjson.put("useTime",(endtime-startTime)/1000l+"ms"); outjson.put("data",goodsList);
outjson.put("data",goodsList);
}else{
outjson.put("code","failure");
outjson.put("msg","请求失败");
}
return outjson; return outjson;
} }
@ -92,16 +91,8 @@ public class GoodsController extends BaseController {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
List<Goods> goodsList = goodsService.getTypeGoods(type,"",""); List<Goods> goodsList = goodsService.getTypeGoods(type,"","");
long endtime = System.currentTimeMillis(); long endtime = System.currentTimeMillis();
JSONObject outjson = new JSONObject(); long howUse = (endtime-startTime)/1000l;
if(goodsList!=null){ JSONObject outjson = AjaxResult.success("成功",howUse,goodsList);
outjson.put("code","00000000");
outjson.put("msg","成功");
outjson.put("useTime",(endtime-startTime)/1000l+"ms");
outjson.put("data",goodsList);
}else{
outjson.put("code","failure");
outjson.put("msg","请求失败");
}
return outjson; return outjson;
} }
/** /**
@ -109,37 +100,49 @@ public class GoodsController extends BaseController {
* @return * @return
*/ */
@RequestMapping("/searchGoods") @RequestMapping("/searchGoods")
public JSONObject searchGoods(@RequestBody String reqstr){ public JSONObject searchGoods(HttpServletRequest request){
//{"pay_type":1,"goods_status":1,"record_type":"","entrust_name":"clytest1012-1","entrust_user_name":"","page":1,"limit":8} //{"pay_type":1,"goods_status":1,"record_type":"","entrust_name":"clytest1012-1",
log.info("查询委托信息接口："+reqstr); // "entrust_user_name":"","page":1,"limit":8}
JSONObject reqjson = JSONObject.parseObject(reqstr);
Map qmap = new HashMap<>(); //查询条件 Map qmap = new HashMap<>(); //查询条件
qmap.put("is_delete",0);//正常状态的 qmap.put("is_delete",0);//正常状态的
if(StringUtils.isNotBlank(reqstr)){ String payType = request.getParameter("pay_tyep");
Integer ipage = reqjson.getInteger("page"); if(StringUtils.isNotBlank(payType)){
if(ipage==null){ qmap.put("pay_type",payType);
ipage=1; }
} String goodsStatus=request.getParameter("goods_status");
String limit = reqjson.getString("limit"); if(StringUtils.isNotBlank(goodsStatus)){
int ilimit = (StringUtils.isBlank(limit))?8:Integer.valueOf(limit); qmap.put("goods_status",goodsStatus);
//搜索关键词 }
String entrustName = reqjson.getString("entrust_name"); String entrustName = request.getParameter("entrust_name");
if(StringUtils.isNotBlank(entrustName)){ if(StringUtils.isNotBlank(entrustName)){
qmap.put("gd.goods_name",entrustName); qmap.put("gd.goods_name",entrustName);
} }
//排序方式 String recordType = request.getParameter("record_type");
String orderType=reqjson.getString("record_type"); if(StringUtils.isNotBlank(recordType)){
if(StringUtils.isNotBlank(orderType)){ qmap.put("gd.goods_type",recordType);
qmap.put("orderway",orderType); }
} String entrustUser= request.getParameter("entrust_user_name");
if(StringUtils.isNotBlank(entrustUser)){
qmap.put("username",entrustUser);
}
String limit = request.getParameter("limit");
int ilimit = (StringUtils.isBlank(limit))?20:Integer.valueOf(limit);
String page = request.getParameter("page");
Integer ipage =StringUtils.isBlank(page)?1:Integer.valueOf(page);
Map retmap =goodsService.getGoodsByMap(qmap,ipage,ilimit);
//抽取出分页信息
JSONObject tmpjson = new JSONObject(retmap);
JSONArray jsonArray = tmpjson.getJSONArray("data");
Map retmap =goodsService.getGoodsByMap(qmap,ipage,ilimit); JSONObject retjson = new JSONObject();
// 结果转为json retjson.put("code","200");
JSONObject retjson = new JSONObject(retmap); retjson.put("msg","成功");
return AjaxResult.success("成功",retjson); retjson.put("page",page);
}else{ retjson.put("limit",limit);
return AjaxResult.error("参数为空"); retjson.put("userTime","2");
} retjson.put("data",jsonArray);
return retjson;
} }
} }

2
src/main/java/cn/chjyj/szwh/service/GoodsService.java
View File

@ -103,7 +103,7 @@ public interface GoodsService {
* @param goods_type * @param goods_type
* @return * @return
*/ */
List<Goods> getTypeGoods(String type,String createtime,String goods_type); List getTypeGoods(String type,String createtime,String goods_type);
/** /**
* 商品状态 * 商品状态

58
src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
View File

@ -506,7 +506,7 @@ public class GoodsServiceImpl implements GoodsService {
} }
@Override @Override
public List<Goods> getTypeGoods(String type, String createtime, String goods_type) { public List getTypeGoods(String type, String createtime, String goods_type) {
List<Goods> glist = new ArrayList<>(); List<Goods> glist = new ArrayList<>();
String where = "";//查询条件 String where = "";//查询条件
if ("1".equals(type)) { if ("1".equals(type)) {
@ -519,8 +519,62 @@ public class GoodsServiceImpl implements GoodsService {
where = "is_recommend=1 and goods_status=1"; where = "is_recommend=1 and goods_status=1";
glist = goodsMapper.getGoodsByCondition(where, 8, "recommend_sort", "DESC"); glist = goodsMapper.getGoodsByCondition(where, 8, "recommend_sort", "DESC");
} }
//填充信息
List retlist =new ArrayList();
for(Goods g:glist){
//goods detail
GoodsDetail gd =goodsDetailMapper.getGoodsDetailBygid(g.getGoodsDetailId());
// goods source
List<GoodsSource> gslist = goodsSourceMapper.getGoodsSourceByIsli(g.getGoodsIslicode());
Map tgmap = new HashMap();
tgmap.put("goods_islicode",g.getGoodsIslicode());
tgmap.put("goods_name",gd.getGoodsName());
tgmap.put("goods_status",g.getGoodsStatus());
tgmap.put("createtime",g.getCreateTime());
tgmap.put("canceltime",g.getCancelTime());
tgmap.put("goods_type",gd.getGoodsType());
tgmap.put("contractual_period",gd.getContractualPeriod());
tgmap.put("contract",gd.getContract());
tgmap.put("transaction_class",gd.getTransactionClass());
tgmap.put("goods_entrust",gd.getGoodsEntrust());
tgmap.put("charges_type",gd.getChargesType());
tgmap.put("price",gd.getPrice());
tgmap.put("goods_ownership",gd.getGoodsOwnership());
tgmap.put("otherIdentifiers",gd.getOtherIdentifiers());
tgmap.put("classification",gd.getClassification());
// tgmap.put("servicecode",null);
// tgmap.put("linkcode",null);
// tgmap.put("publisherId",null);
// tgmap.put("registrant",null);
// tgmap.put("resolution_url",null);
// tgmap.put("source_type",null);
// tgmap.put("source_name_type",null);
// tgmap.put("source_name",null);
// tgmap.put("sourceIdentify",null);
// tgmap.put("source_fragment",null);
// tgmap.put("target_name",null);
// tgmap.put("target_name_type",null);
// tgmap.put("targetIdentify",null);
// tgmap.put("target_fragment",null);
// tgmap.put("targetFormat",null);
// tgmap.put("source_data",null);
// tgmap.put("target_data",null);
// tgmap.put("metadataXml",null);
// tgmap.put("allocationtime",null);
tgmap.put("cancellationtime",g.getCancelTime());
tgmap.put("cancellation_reason",null);
tgmap.put("sale_count",g.getSaleCount());
tgmap.put("click_count",g.getClickCount());
tgmap.put("stock",gd.getStock());
tgmap.put("goods_image",gd.getGoodsImage());
tgmap.put("source",gslist);
retlist.add(tgmap);
}
return glist; return retlist;
} }
@Override @Override

12
src/main/java/cn/chjyj/szwh/utils/AjaxResult.java
View File

@ -1,20 +1,24 @@
package cn.chjyj.szwh.utils; package cn.chjyj.szwh.utils;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import java.util.List;
public class AjaxResult { public class AjaxResult {
/** /**
* 接口返回数据 * 接口返回数据
* @param msg * @param msg
* @param jsonArray * @param userTime
* @param dataList
* @return * @return
*/ */
public static JSONObject success(String msg, JSONArray jsonArray){ public static JSONObject success(String msg,long userTime, List dataList){
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("code",200); result.put("code",200);
result.put("msg",msg); result.put("msg",msg);
result.put("data",jsonArray); result.put("userTime",userTime);
result.put("data",dataList);
return result; return result;
} }

Write Preview
Loading…
Cancel
Save