xuao
/
ipdz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部分功能模块代码调试

Browse Source
master
xuao 2 months ago
parent 6dd3848647
commit ef40348586
12 changed files with 194 additions and 152 deletions
Show Stats Download Patch File Download Diff File

6
.idea/data_source_mapping.xml
Unescape Escape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourcePerFileMappings">
<file url="file://$PROJECT_DIR$/src/main/resources/mapper/SpellbuyrecordMapper.xml" value="3eeebd62-d629-4a35-9a6e-5e8c08285615" />
</component>
</project>

18
.idea/inspectionProfiles/Project_Default.xml
Unescape Escape View File

@ -0,0 +1,18 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
<option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,com.github.pagehelper.page.PageMethod,startPage" />
</inspection_tool>
<inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
<option name="myValues">
<value>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="_blank" />
</list>
</value>
</option>
<option name="myCustomValuesEnabled" value="true" />
</inspection_tool>
</profile>
</component>

6
.idea/jsLibraryMappings.xml
Unescape Escape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptLibraryMappings">
<file url="file://$PROJECT_DIR$" libraries="{header, jquery181}" />
</component>
</project>

2
.idea/misc.xml
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration"> <component name="FrameworkDetectionExcludesConfiguration" detection-enabled="false">
<file type="web" url="file://$PROJECT_DIR$/src/main/resources/webapp/web/WEB-INF/web.xml" /> <file type="web" url="file://$PROJECT_DIR$/src/main/resources/webapp/web/WEB-INF/web.xml" />
</component> </component>
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">

12
.idea/webContexts.xml
Unescape Escape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WebContextManager">
<option name="state">
<map>
<entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/help/ship.jsp" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/help" />
<entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/index/index-new.jsp" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/index" />
<entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/index/index.jsp" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/index" />
</map>
</option>
</component>
</project>

41
src/main/java/me/mofun/config/LocalFileSystemConfig.java
Unescape Escape View File

@ -0,0 +1,41 @@
package me.mofun.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class LocalFileSystemConfig implements WebMvcConfigurer {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
// 获取操作系统信息
String os = System.getProperty("os.name").toLowerCase();
// 根据不同操作系统设置不同的基础路径
String basePath;
if (os.contains("win")) {
// Windows系统路径
basePath = "file:D:/work/code/ipdz/src/main/webapp/";
} else {
// Linux/Unix系统路径
basePath = "file:/home/user/work/code/ipdz/src/main/webapp/";
}
// 映射productImg目录
registry.addResourceHandler("/productImg/**")
.addResourceLocations(basePath + "productImg/");
// 映射Images目录
registry.addResourceHandler("/Images/**")
.addResourceLocations(basePath + "Images/");
// 映射uploads目录
registry.addResourceHandler("/uploads/**")
.addResourceLocations(basePath + "uploads/");
System.out.println("操作系统: " + os);
System.out.println("基础路径: " + basePath);
System.out.println("静态资源映射配置完成");
}
}

42
src/main/java/me/mofun/config/UserSessionConfig.java
Unescape Escape View File

@ -1,42 +0,0 @@
package me.mofun.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.Resource;
/**
* 用户状态拦截器注册
*
* @author xuao
*/
@Configuration
public class UserSessionConfig implements WebMvcConfigurer {
@Resource
private UserSessionInterceptor usInterceptor;
@Override
public void addInterceptors(InterceptorRegistry registry) {
//拦截了所有的请求 登录请求放过去
registry.addInterceptor(usInterceptor)
.addPathPatterns("/**")
.excludePathPatterns("/userManagement/login", "/user/role", "/static/file/**", "/clock/getWXPhone", "/applet/getOpenId", "/applet/getPhone",
"/applet/login", "/swagger-resources/**", "/webjars/**", "/v2/**",
"/swagger-ui.html/**", "/doc.html/**", "/druid/login.html", "/car/test", "/car/getCourseCarInfo", "/constantDrivingTrack/constantDriving", "/vehicleWarning/earlyWarningOfKeyVehicles", "/tBayonetDetail/test", "/keyVehicles/checkKeyVehicles");
}
/**
* 添加静态资源文件，外部可以直接访问地址
*
* @param registry
*/
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
System.out.println("file:" + Global.getProfile());
registry.addResourceHandler("/static/file/**").addResourceLocations("file:" + Global.getProfile() + "/");
}
}

139
src/main/java/me/mofun/controller/IndexController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package me.mofun.controller;
import me.mofun.entity.*; import me.mofun.entity.*;
import me.mofun.entity.dto.ProductSpellbuyproductDTO; import me.mofun.entity.dto.ProductSpellbuyproductDTO;
import me.mofun.entity.dto.SpellbuyrecordDTO;
import me.mofun.entity.pojo.BuyHistoryJSON; import me.mofun.entity.pojo.BuyHistoryJSON;
import me.mofun.entity.pojo.ProductJSON; import me.mofun.entity.pojo.ProductJSON;
import me.mofun.entity.pojo.UserJSON; import me.mofun.entity.pojo.UserJSON;
@ -10,7 +11,6 @@ import me.mofun.service.*;
import me.mofun.util.ApplicationListenerImpl; import me.mofun.util.ApplicationListenerImpl;
import me.mofun.util.MemCachedClientHelp; import me.mofun.util.MemCachedClientHelp;
import me.mofun.util.UserNameUtil; import me.mofun.util.UserNameUtil;
import me.mofun.utils.ViewUtils;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -90,30 +90,30 @@ public class IndexController {
this.userService = userService; this.userService = userService;
} }
@Autowired
private ViewUtils viewUtils;
private final String module = "index";
/** /**
* 首页 * 首页
*/ */
@GetMapping("/") @GetMapping("/")
public String index(Model model) { public ModelAndView index() {
ModelAndView mav = new ModelAndView();
// 检查系统授权 // 检查系统授权
if (!ApplicationListenerImpl.sysConfigureAuth) { if (!ApplicationListenerImpl.sysConfigureAuth) {
model.addAttribute("errorMsg", "该系统授权已过期，请联系管理员重新授权！谢谢合作。"); mav.addObject("errorMsg", "该系统授权已过期，请联系管理员重新授权！谢谢合作。");
return "error/authorization"; mav.setViewName("/WEB-INF/template/error/authorization");
return mav;
} }
// 初始化首页数据 // 初始化首页数据
initNewProductList(model); initNewProductList(mav);
initLatestLotteryList(model); initLatestLotteryList(mav);
initRecommendProduct(model); initRecommendProduct(mav);
initNewsList(model); initNewsList(mav);
initIndexImgList(model); initIndexImgList(mav);
// initUpcomingProducts(model); // initUpcomingProducts(mav);
return "WEB-INF/template/my/index/index-new"; mav.setViewName("/WEB-INF/template/my/index/index-new");
return mav;
} }
/** /**
@ -208,8 +208,8 @@ public class IndexController {
if (isCacheExpired(beginDateByNowBuyProduct, nowDateByNowBuyProduct)) { if (isCacheExpired(beginDateByNowBuyProduct, nowDateByNowBuyProduct)) {
beginDateByNowBuyProduct = System.currentTimeMillis(); beginDateByNowBuyProduct = System.currentTimeMillis();
Pagination page = spellbuyrecordService.getNowBuyList(0, PAGE_SIZE_XXLARGE); Pagination page = spellbuyrecordService.getNowBuyList(0, PAGE_SIZE_XXLARGE);
List<ProductSpellbuyproductDTO> nowBuyList = (List<ProductSpellbuyproductDTO>) page.getList(); List<SpellbuyrecordDTO> nowBuyList = (List<SpellbuyrecordDTO>) page.getList();
nowBuyProductList = convertToNowBuyProductList(nowBuyList); nowBuyProductList = convertToNowBuyProductUserList(nowBuyList);
} }
return nowBuyProductList; return nowBuyProductList;
} }
@ -227,26 +227,32 @@ public class IndexController {
* 邀请授权页 * 邀请授权页
*/ */
@GetMapping("/referAuth") @GetMapping("/referAuth")
public String referAuth(HttpServletRequest request, Model model) { public ModelAndView referAuth(HttpServletRequest request) {
ModelAndView mav = new ModelAndView();
String uid = getUidFromCookie(request.getCookies()); String uid = getUidFromCookie(request.getCookies());
model.addAttribute("uid", uid); mav.addObject("uid", uid);
return "referAuthLogin"; mav.setViewName("/WEB-INF/template/my/referAuth/referAuthLogin");
return mav;
} }
/** /**
* 地图模式页 * 地图模式页
*/ */
@GetMapping("/map") @GetMapping("/map")
public String map() { public ModelAndView map() {
return "map"; ModelAndView mav = new ModelAndView();
mav.setViewName("/WEB-INF/template/index/map");
return mav;
} }
/** /**
* 诚信页 * 诚信页
*/ */
@GetMapping("/sincerity") @GetMapping("/sincerity")
public String sincerity() { public ModelAndView sincerity() {
return "sincerity"; ModelAndView mav = new ModelAndView();
mav.setViewName("/WEB-INF/template/index/sincerity");
return mav;
} }
/** /**
@ -297,12 +303,14 @@ public class IndexController {
* 最新100条拍购记录页 * 最新100条拍购记录页
*/ */
@GetMapping("/getNewRecord") @GetMapping("/getNewRecord")
public String getNewRecord(Model model) { public ModelAndView getNewRecord() {
ModelAndView mav = new ModelAndView();
Pagination page = spellbuyrecordService.getNowBuyList(0, PAGE_SIZE_XXLARGE); Pagination page = spellbuyrecordService.getNowBuyList(0, PAGE_SIZE_XXLARGE);
List<ProductSpellbuyproductDTO> nowBuyList = (List<ProductSpellbuyproductDTO>) page.getList(); List<SpellbuyrecordDTO> nowBuyList = (List<SpellbuyrecordDTO>) page.getList();
List<ProductJSON> productList = convertToNewRecordProductList(nowBuyList); List<ProductJSON> productList = convertToNewRecordProductList(nowBuyList);
model.addAttribute("productList", productList); mav.addObject("productList", productList);
return "newRecord"; mav.setViewName("/WEB-INF/template/index/newRecord");
return mav;
} }
/** /**
@ -315,7 +323,7 @@ public class IndexController {
if (isCacheExpired(beginDateByNewRecord, nowDateByNewRecord)) { if (isCacheExpired(beginDateByNewRecord, nowDateByNewRecord)) {
beginDateByNewRecord = System.currentTimeMillis(); beginDateByNewRecord = System.currentTimeMillis();
Pagination page = spellbuyrecordService.getNowBuyAjaxList(0, PAGE_SIZE_XXLARGE, Integer.parseInt(id)); Pagination page = spellbuyrecordService.getNowBuyAjaxList(0, PAGE_SIZE_XXLARGE, Integer.parseInt(id));
List<ProductSpellbuyproductDTO> nowBuyList = (List<ProductSpellbuyproductDTO>) page.getList(); List<SpellbuyrecordDTO> nowBuyList = (List<SpellbuyrecordDTO>) page.getList();
newRecordList = convertToNewRecordProductList(nowBuyList); newRecordList = convertToNewRecordProductList(nowBuyList);
} }
return newRecordList; return newRecordList;
@ -325,26 +333,27 @@ public class IndexController {
* 全站拍购记录查询（带时间筛选） * 全站拍购记录查询（带时间筛选）
*/ */
@GetMapping("/getAllBuyRecord") @GetMapping("/getAllBuyRecord")
public String getAllBuyRecord(Model model, public ModelAndView getAllBuyRecord(@RequestParam(required = false) String startDate,
@RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate,
@RequestParam(required = false) String endDate, @RequestParam(defaultValue = "0") int pageNo) {
@RequestParam(defaultValue = "0") int pageNo) { ModelAndView mav = new ModelAndView();
Pagination datePage = spellbuyrecordService.getAllBuyRecord(startDate, endDate, pageNo, PAGE_SIZE_XXLARGE); Pagination datePage = spellbuyrecordService.getAllBuyRecord(startDate, endDate, pageNo, PAGE_SIZE_XXLARGE);
List<ProductSpellbuyproductDTO> dataList = (List<ProductSpellbuyproductDTO>) datePage.getList(); List<SpellbuyrecordDTO> dataList = (List<SpellbuyrecordDTO>) datePage.getList();
List<BuyHistoryJSON> historyList = convertToBuyHistoryList(dataList); List<BuyHistoryJSON> historyList = convertToBuyHistoryList(dataList);
model.addAttribute("buyHistoryJSONList", historyList); mav.addObject("buyHistoryJSONList", historyList);
return "allBuyRecord"; mav.setViewName("/WEB-INF/template/index/allBuyRecord");
return mav;
} }
@GetMapping("/JPData") @GetMapping("/JPData")
public String JPData(@RequestParam String action) { public String JPData(@RequestParam String action) {
return "forward:/group/" + action + ".action"; return "forward:/group/" + action;
} }
/** /**
* 初始化首页新品列表 * 初始化首页新品列表
*/ */
private void initNewProductList(Model model) { private void initNewProductList(ModelAndView mav) {
Pagination page = spellbuyrecordService.indexNewProductList(0, PAGE_SIZE_SMALL); Pagination page = spellbuyrecordService.indexNewProductList(0, PAGE_SIZE_SMALL);
List<ProductSpellbuyproductDTO> newList = (List<ProductSpellbuyproductDTO>) page.getList(); List<ProductSpellbuyproductDTO> newList = (List<ProductSpellbuyproductDTO>) page.getList();
List<ProductJSON> newProductList = new ArrayList<>(); List<ProductJSON> newProductList = new ArrayList<>();
@ -354,18 +363,18 @@ public class IndexController {
newProductList.add(productJSON); newProductList.add(productJSON);
} }
model.addAttribute("newProductList", newProductList); mav.addObject("newProductList", newProductList);
} }
/** /**
* 初始化最新揭晓列表 * 初始化最新揭晓列表
*/ */
private void initLatestLotteryList(Model model) { private void initLatestLotteryList(ModelAndView mav) {
List<Latestlottery> objList = latestlotteryService.indexWinningScroll(); List<Latestlottery> objList = latestlotteryService.indexWinningScroll();
List<Latestlottery> latestlotteryList = new ArrayList<>(); List<Latestlottery> latestlotteryList = new ArrayList<>();
for (Latestlottery lottery : objList) { for (Latestlottery lottery : objList) {
Latestlottery item = new Latestlottery(); Latestlottery item = new Latestlottery();
// 拷贝属性（实际项目建议用BeanUtils） // 拷贝属性
item.setId(lottery.getId()); item.setId(lottery.getId());
item.setSpellbuyProductId(lottery.getSpellbuyProductId()); item.setSpellbuyProductId(lottery.getSpellbuyProductId());
item.setBuyUser(lottery.getBuyUser()); item.setBuyUser(lottery.getBuyUser());
@ -379,46 +388,45 @@ public class IndexController {
item.setBuyUser(userName); item.setBuyUser(userName);
latestlotteryList.add(item); latestlotteryList.add(item);
} }
model.addAttribute("latestlotteryList", latestlotteryList); mav.addObject("latestlotteryList", latestlotteryList);
} }
/** /**
* 初始化每日推荐商品 * 初始化每日推荐商品
*/ */
private void initRecommendProduct(Model model) { private void initRecommendProduct(ModelAndView mav) {
List<Object[]> objectList = recommendService.getRecommend(); List<Object[]> objectList = recommendService.getRecommend();
ProductJSON recommendJSON = null; ProductJSON recommendJSON = null;
if (objectList != null && !objectList.isEmpty()) { if (objectList != null && !objectList.isEmpty()) {
// 推荐服务返回的是Object[]，不是DTO
Product product = (Product) objectList.get(0)[0]; Product product = (Product) objectList.get(0)[0];
Spellbuyproduct spellbuyproduct = (Spellbuyproduct) objectList.get(0)[1]; Spellbuyproduct spellbuyproduct = (Spellbuyproduct) objectList.get(0)[1];
recommendJSON = convertToProductJSON(product, spellbuyproduct, false); recommendJSON = convertToProductJSON(product, spellbuyproduct, false);
} }
model.addAttribute("recommendJSON", recommendJSON); mav.addObject("recommendJSON", recommendJSON);
} }
/** /**
* 初始化新闻列表（缓存） * 初始化新闻列表（缓存）
*/ */
private void initNewsList(Model model) { private void initNewsList(ModelAndView mav) {
if (newsList == null) { if (newsList == null) {
newsList = newsService.indexNews(10, 3); newsList = newsService.indexNews(10, 3);
} }
model.addAttribute("newsList", newsList); mav.addObject("newsList", newsList);
} }
/** /**
* 初始化首页图片列表 * 初始化首页图片列表
*/ */
private void initIndexImgList(Model model) { private void initIndexImgList(ModelAndView mav) {
List<IndexImg> indexImgList = JSONArray.fromObject(ApplicationListenerImpl.indexImgAll); List<IndexImg> indexImgList = JSONArray.fromObject(ApplicationListenerImpl.indexImgAll);
model.addAttribute("indexImgList", indexImgList); mav.addObject("indexImgList", indexImgList);
} }
/** /**
* 初始化即将揭晓商品 * 初始化即将揭晓商品
*/ */
private void initUpcomingProducts(Model model) { private void initUpcomingProducts(ModelAndView mav) {
Pagination page = spellbuyproductService.upcomingAnnounced(0, PAGE_SIZE_MEDIUM); Pagination page = spellbuyproductService.upcomingAnnounced(0, PAGE_SIZE_MEDIUM);
List<ProductSpellbuyproductDTO> upcomingList = (List<ProductSpellbuyproductDTO>) page.getList(); List<ProductSpellbuyproductDTO> upcomingList = (List<ProductSpellbuyproductDTO>) page.getList();
List<ProductJSON> productList = new ArrayList<>(); List<ProductJSON> productList = new ArrayList<>();
@ -428,7 +436,7 @@ public class IndexController {
productList.add(productJSON); productList.add(productJSON);
} }
model.addAttribute("productList", productList); mav.addObject("productList", productList);
} }
/** /**
@ -455,12 +463,12 @@ public class IndexController {
/** /**
* 转换为"正在拍购"商品列表 * 转换为"正在拍购"商品列表
*/ */
private List<ProductJSON> convertToNowBuyProductList(List<ProductSpellbuyproductDTO> dtoList) { private List<ProductJSON> convertToNowBuyProductUserList(List<SpellbuyrecordDTO> dtoList) {
List<ProductJSON> result = new ArrayList<>(); List<ProductJSON> result = new ArrayList<>();
if (dtoList == null) { if (dtoList == null) {
return result; return result;
} }
for (ProductSpellbuyproductDTO dto : dtoList) { for (SpellbuyrecordDTO dto : dtoList) {
ProductJSON json = new ProductJSON(); ProductJSON json = new ProductJSON();
json.setBuyer(UserNameUtil.userName(dto.getUser())); json.setBuyer(UserNameUtil.userName(dto.getUser()));
json.setUserId(String.valueOf(dto.getUser().getUserId())); json.setUserId(String.valueOf(dto.getUser().getUserId()));
@ -476,12 +484,12 @@ public class IndexController {
/** /**
* 转换为最新拍购记录商品列表 * 转换为最新拍购记录商品列表
*/ */
private List<ProductJSON> convertToNewRecordProductList(List<ProductSpellbuyproductDTO> dtoList) { private List<ProductJSON> convertToNewRecordProductList(List<SpellbuyrecordDTO> dtoList) {
List<ProductJSON> result = new ArrayList<>(); List<ProductJSON> result = new ArrayList<>();
if (dtoList == null) { if (dtoList == null) {
return result; return result;
} }
for (ProductSpellbuyproductDTO dto : dtoList) { for (SpellbuyrecordDTO dto : dtoList) {
ProductJSON json = new ProductJSON(); ProductJSON json = new ProductJSON();
json.setBuyer(UserNameUtil.userName(dto.getUser())); json.setBuyer(UserNameUtil.userName(dto.getUser()));
json.setUserId(String.valueOf(dto.getUser().getUserId())); json.setUserId(String.valueOf(dto.getUser().getUserId()));
@ -492,13 +500,10 @@ public class IndexController {
json.setProductName(productName.length() > 35 ? productName.substring(0, 35) + "..." : productName); json.setProductName(productName.length() > 35 ? productName.substring(0, 35) + "..." : productName);
json.setProductPeriod(dto.getSpellbuyproduct().getProductPeriod()); json.setProductPeriod(dto.getSpellbuyproduct().getProductPeriod());
// json.setBuyCount(dto.getSpellbuyrecord().getBuyPrice()); json.setBuyCount(dto.getSpellbuyrecord().getBuyPrice());
json.setBuyCount(1);
json.setProductTitle(dto.getProduct().getProductTitle()); json.setProductTitle(dto.getProduct().getProductTitle());
// json.setBuyDate(dto.getSpellbuyrecord().getBuyDate()); json.setBuyDate(dto.getSpellbuyrecord().getBuyDate());
json.setBuyDate(String.valueOf(new Date())); json.setProductStyle(String.valueOf(dto.getSpellbuyrecord().getSpellbuyRecordId()));
// json.setProductStyle(String.valueOf(dto.getSpellbuyrecord().getSpellbuyRecordId()));
json.setProductStyle(String.valueOf(1));
result.add(json); result.add(json);
} }
return result; return result;
@ -507,18 +512,16 @@ public class IndexController {
/** /**
* 转换为购买历史列表 * 转换为购买历史列表
*/ */
private List<BuyHistoryJSON> convertToBuyHistoryList(List<ProductSpellbuyproductDTO> dtoList) { private List<BuyHistoryJSON> convertToBuyHistoryList(List<SpellbuyrecordDTO> dtoList) {
List<BuyHistoryJSON> result = new ArrayList<>(); List<BuyHistoryJSON> result = new ArrayList<>();
if (dtoList == null) { if (dtoList == null) {
return result; return result;
} }
for (ProductSpellbuyproductDTO dto : dtoList) { for (SpellbuyrecordDTO dto : dtoList) {
BuyHistoryJSON json = new BuyHistoryJSON(); BuyHistoryJSON json = new BuyHistoryJSON();
// json.setBuyCount(Long.parseLong(String.valueOf(dto.getSpellbuyrecord().getBuyPrice()))); json.setBuyCount(Long.parseLong(String.valueOf(dto.getSpellbuyrecord().getBuyPrice())));
json.setBuyCount(Long.parseLong(String.valueOf(1)));
json.setBuyStatus(dto.getSpellbuyproduct().getSpStatus()); json.setBuyStatus(dto.getSpellbuyproduct().getSpStatus());
// json.setHistoryId(dto.getSpellbuyrecord().getSpellbuyRecordId()); json.setHistoryId(dto.getSpellbuyrecord().getSpellbuyRecordId());
json.setHistoryId(1);
json.setProductId(dto.getSpellbuyproduct().getSpellbuyProductId()); json.setProductId(dto.getSpellbuyproduct().getSpellbuyProductId());
json.setProductImg(dto.getProduct().getHeadImage()); json.setProductImg(dto.getProduct().getHeadImage());
json.setProductName(dto.getProduct().getProductName()); json.setProductName(dto.getProduct().getProductName());

9
src/main/java/me/mofun/controller/ListController.java
Unescape Escape View File

@ -255,12 +255,7 @@ public class ListController {
} }
} }
public static List<MenuNode> getTypeSubList() {
return theProductTypeService.getAllProductTypeTree();
}
// 仅保留服务类的getter（如果有外部依赖）
public IProducttypeService getTheProductTypeService() {
return theProductTypeService;
}
} }

41
src/main/java/me/mofun/controller/LoginController.java
Unescape Escape View File

@ -6,7 +6,6 @@ import me.mofun.service.IUserService;
import me.mofun.util.ApplicationListenerImpl; import me.mofun.util.ApplicationListenerImpl;
import me.mofun.util.DateUtil; import me.mofun.util.DateUtil;
import me.mofun.utils.StringUtils; import me.mofun.utils.StringUtils;
import me.mofun.utils.ViewUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -33,21 +32,13 @@ import java.util.Date;
*/ */
@Controller @Controller
@RequestMapping("/login") @RequestMapping("/login")
public class LoginController { public class LoginController {
@Autowired
private ViewUtils viewUtils;
private final String module = "login";
@Autowired @Autowired
private IUserService userService; private IUserService userService;
private static final HTMLFilter htmlFilter = new HTMLFilter(); private static final HTMLFilter htmlFilter = new HTMLFilter();
/** /**
* 登录页面 * 登录页面
*/ */
@ -64,7 +55,7 @@ public class LoginController {
response.setContentType("text/html;charset=UTF-8"); response.setContentType("text/html;charset=UTF-8");
PrintWriter out = response.getWriter(); PrintWriter out = response.getWriter();
out.println("<script>alert('您的浏览器未开启Cookie功能,无法保存购物信息,请先开启Cookie功能后继续购物！');"); out.println("<script>alert('您的浏览器未开启Cookie功能,无法保存购物信息,请先开启Cookie功能后继续购物！');");
out.println("window.location.href='"+ ApplicationListenerImpl.sysConfigureJson.getWwwUrl()+"/help/openCookie.html';</script>"); out.println("window.location.href='" + ApplicationListenerImpl.sysConfigureJson.getWwwUrl() + "/help/openCookie.html';</script>");
out.flush(); out.flush();
return null; return null;
} }
@ -74,14 +65,21 @@ public class LoginController {
if (cookies != null) { if (cookies != null) {
for (Cookie cookie : cookies) { for (Cookie cookie : cookies) {
if ("userId".equals(cookie.getName()) && StringUtils.isNotBlank(cookie.getValue())) { if ("userId".equals(cookie.getName()) && StringUtils.isNotBlank(cookie.getValue())) {
return new ModelAndView("index"); // 已登录，跳转到首页 return new ModelAndView("redirect:/index.html"); // 已登录，跳转到首页
} }
} }
} }
// 添加forward参数到Model
ModelAndView mv = new ModelAndView("WEB-INF/template/login/index");
if (StringUtils.isNotBlank(forward)) {
mv.addObject("forward", forward);
}
return mv;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return new ModelAndView("WEB-INF/template/login/index");
} }
return viewUtils.create(module,"index"); // 未登录，显示登录页
} }
/** /**
@ -167,29 +165,28 @@ public class LoginController {
return "success"; // 登录成功 return "success"; // 登录成功
} }
@GetMapping("/fastLogin") @GetMapping("/fastLogin")
public ModelAndView fastLogin() { public ModelAndView fastLogin() {
return viewUtils.create(module, "fastLogin"); return new ModelAndView("WEB-INF/template/login/fastLogin");
} }
@GetMapping("/buyCartLogin") @GetMapping("/buyCartLogin")
public ModelAndView buyCartLogin() { public ModelAndView buyCartLogin() {
return viewUtils.create(module, "buyCartLogin"); return new ModelAndView("WEB-INF/template/login/buyCartLogin");
} }
@GetMapping("/miniLogin") @GetMapping("/miniLogin")
public ModelAndView miniLogin() { public ModelAndView miniLogin() {
return new ModelAndView("WEB-INF/template/login/miniLogin");
return viewUtils.create(module, "miniLogin");
} }
@GetMapping("/postCommentLogin") @GetMapping("/postCommentLogin")
public ModelAndView postCommentLogin() { public ModelAndView postCommentLogin() {
return new ModelAndView("WEB-INF/template/login/postCommentLogin");
return viewUtils.create(module, "postCommentLogin");
} }
@GetMapping("/popLogin")
public ModelAndView popLogin() {
return new ModelAndView("WEB-INF/template/login/popLogin");
}
} }

2
src/main/java/me/mofun/entity/dto/ProductSpellbuyproductDTO.java
Unescape Escape View File

@ -9,5 +9,5 @@ import me.mofun.entity.User;
public class ProductSpellbuyproductDTO { public class ProductSpellbuyproductDTO {
private Product product; private Product product;
private Spellbuyproduct spellbuyproduct; private Spellbuyproduct spellbuyproduct;
private User user;
} }

18
src/main/resources/mapper/SpellbuyproductMapper.xml
Unescape Escape View File

@ -123,6 +123,12 @@
<association property="user" resultMap="UserResultMap" /> <association property="user" resultMap="UserResultMap" />
</resultMap> </resultMap>
<!-- 用户、拍购商品和记录联合映射 -->
<resultMap id="ProductSpellbuyproductDTOMap" type="me.mofun.entity.dto.ProductSpellbuyproductDTO">
<association property="spellbuyproduct" resultMap="BaseResultMap" />
<association property="product" resultMap="ProductResultMap" />
</resultMap>
<!-- 根据外键产品ID返回最新一个该商品的最新拍购对象 --> <!-- 根据外键产品ID返回最新一个该商品的最新拍购对象 -->
<select id="findByFKProductId" resultMap="BaseResultMap"> <select id="findByFKProductId" resultMap="BaseResultMap">
@ -134,7 +140,7 @@
</select> </select>
<!-- 根据商品的拍购ID，获取拍购商品相关属性 --> <!-- 根据商品的拍购ID，获取拍购商品相关属性 -->
<select id="findBySpellbuyProductId" resultType="me.mofun.entity.dto.ProductSpellbuyproductDTO"> <select id="findBySpellbuyProductId" resultMap="ProductSpellbuyproductDTOMap">
SELECT SELECT
pt.productId as pt_productId, pt.productId as pt_productId,
pt.productName as pt_productName, pt.productName as pt_productName,
@ -179,7 +185,7 @@
</select> </select>
<!-- 根据商品ID，获取拍购商品相关属性 --> <!-- 根据商品ID，获取拍购商品相关属性 -->
<select id="findByFKProductIdList" resultType="me.mofun.entity.dto.ProductSpellbuyproductDTO"> <select id="findByFKProductIdList" resultMap="ProductSpellbuyproductDTOMap">
SELECT SELECT
pt.productId as pt_productId, pt.productId as pt_productId,
pt.productName as pt_productName, pt.productName as pt_productName,
@ -225,7 +231,7 @@
</select> </select>
<!-- 即将揭晓商品 --> <!-- 即将揭晓商品 -->
<select id="upcomingAnnounced" resultType="me.mofun.entity.dto.ProductSpellbuyproductDTO"> <select id="upcomingAnnounced" resultMap="ProductSpellbuyproductDTOMap">
SELECT SELECT
pt.productId as pt_productId, pt.productId as pt_productId,
pt.productName as pt_productName, pt.productName as pt_productName,
@ -273,7 +279,7 @@
</select> </select>
<!-- 人气TOP榜 --> <!-- 人气TOP榜 -->
<select id="upcomingAnnouncedByTop" resultType="me.mofun.entity.dto.ProductSpellbuyproductDTO"> <select id="upcomingAnnouncedByTop" resultMap="ProductSpellbuyproductDTOMap">
SELECT SELECT
pt.productId as pt_productId, pt.productId as pt_productId,
pt.productName as pt_productName, pt.productName as pt_productName,
@ -321,7 +327,7 @@
</select> </select>
<!-- 商品期数列表 --> <!-- 商品期数列表 -->
<select id="productPeriodList" resultType="me.mofun.entity.dto.ProductSpellbuyproductDTO"> <select id="productPeriodList" resultMap="ProductSpellbuyproductDTOMap">
SELECT SELECT
pt.productId as pt_productId, pt.productId as pt_productId,
pt.productName as pt_productName, pt.productName as pt_productName,
@ -384,7 +390,7 @@
</select> </select>
<!-- 已揭晓商品 --> <!-- 已揭晓商品 -->
<select id="announcedProduct" resultType="me.mofun.entity.dto.ProductSpellbuyproductDTO"> <select id="announcedProduct" resultMap="ProductSpellbuyproductDTOMap">
SELECT SELECT
pt.productId as pt_productId, pt.productId as pt_productId,
pt.productName as pt_productName, pt.productName as pt_productName,

Write Preview
Loading…
Cancel
Save