Skip to content

W
wulian_weChat-market
Commit 27c248f3 authored by dongshize's avatar dongshize
Browse files
Options

优化

parent a379d7bd
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 180 deletions
src/main/java/com/weChatmarket/controller/FileUploadController.java
View file @ 27c248f3
......@@ -3,6 +3,8 @@ package com.weChatmarket.controller;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -35,7 +37,7 @@ public class FileUploadController {
private static Logger logger = LoggerFactory.getLogger(FileUploadController.class);
@Value("${uploadFile.resourceHandler}")
private String resourceHandler; // 请求 url 中的资源映射，不推荐写死在代码中，最好提供可配置，如 /uploadFiles/**
private String resourceHandler; // 请求 url 中的资源映射，不推荐写死在代码中，最好提供可配置，如 /image/**
@Value("${uploadFile.location}")
private String location; // 上传文件保存的本地目录，使用@Value获取全局配置文件中配置的属性值，如 D:/wx/uploadFiles/
......@@ -44,9 +46,9 @@ public class FileUploadController {
private String userLogin; // 用户名
@Resource
private WxShopInforService wxShopInforService;
@Resource
private WxShopItemService wxShopItemService;
private final static long MAX_FILE_BYTES = 1024 * 1024 * 10L;
@RequestMapping(value = "/upload", method = { RequestMethod.POST })
......@@ -108,6 +110,11 @@ public class FileUploadController {
fs.flush();
fs.close();
stream.close();
// 记录上传的照片
Date date = new Date();
String strDateFormat = "yyyy-MM-dd HH:mm:ss";
SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
logger.info(sdf.format(date) + "上传照片：" + multipartFile.getName());
} catch (Exception e) {
e.printStackTrace();
try {
......
src/main/java/com/weChatmarket/controller/WxShopInforController.java
View file @ 27c248f3
......@@ -58,7 +58,7 @@ public class WxShopInforController {
return result;
}
@RequestMapping(value = "/wxFindById", method = { RequestMethod.POST})
@RequestMapping(value = "/wxFindById", method = { RequestMethod.POST })
@ApiOperation(value = "微信端获取单个商城", notes = "微信端获取单个商城", response = String.class)
public BaseResult<Object> wxFindById(@ApiParam(value = "主键") @RequestParam(required = true) Long id) {
BaseResult<Object> result = new BaseResult<>();
......@@ -91,10 +91,10 @@ public class WxShopInforController {
if (exist) {
// 存在就不允许创建，并返回错误信息
result.setCode(ResultCodeEnum.HTTP_PARAMS_ERROR.getCode());
result.setMsg("内容已经存在");
result.setMsg("内容已经存在或者店铺号重复");
} else {
wxShopInforService.addOrUpdateWxShopInfor(id, name, code, typeId, labelIds, telephone, introduce, wechat,
shopMap,shopMapName, top);
shopMap, shopMapName, top);
}
return result;
}
......
src/main/java/com/weChatmarket/controller/WxShopItemController.java
View file @ 27c248f3
......@@ -31,7 +31,7 @@ public class WxShopItemController {
@RequestMapping(value = "/pageList", method = { RequestMethod.POST })
@ApiOperation(value = "web端商铺商品详情查询", notes = "web端商铺商品详情查询", response = String.class)
public BaseResult<BasePage<WxShopItem>> pageList(
@ApiParam(value = "页码") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
@ApiParam(value = " ") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
@ApiParam(value = "每页数量") @RequestParam(required = false, defaultValue = "20") Integer pageSize,
@ApiParam(value = "商场主键ID") @RequestParam(required = false) Long pId) {
BaseResult<BasePage<WxShopItem>> result = new BaseResult<>();
......@@ -61,8 +61,8 @@ public class WxShopItemController {
@RequestMapping(value = "/addOrUpdate", method = { RequestMethod.POST })
@ApiOperation(value = "商铺商品详情维护", notes = "商铺商品详情维护", response = String.class)
public BaseResult<Object> addOrUpdate(HttpServletRequest request,
@ApiParam(value = "主键ID") @RequestParam(required = false) Long id,
@ApiParam(value = "商铺主键id") @RequestParam(required = false) Long pId,
@ApiParam(value = "主键ID") @RequestParam(required = true) Long id,
@ApiParam(value = "商铺主键id") @RequestParam(required = true) Long pId,
@ApiParam(value = "商品标题") @RequestParam(required = true) String title,
@ApiParam(value = "商品内容") @RequestParam(required = true) String content,
@ApiParam(value = "商品照片") @RequestParam(required = true) String photoId,
......@@ -74,7 +74,7 @@ public class WxShopItemController {
result.setMsg("请先登入后，在进行操作");
return result;
}
wxShopItemService.addOrUpdateWxShopItem(id, pId, title,content,photoId,photoName);
wxShopItemService.addOrUpdateWxShopItem(id, pId, title, content, photoId, photoName);
return result;
}
......
src/main/java/com/weChatmarket/dao/WxShopInforDao.java
View file @ 27c248f3
......@@ -18,8 +18,4 @@ public interface WxShopInforDao extends BaseDao<WxShopInfor> {
public void cleanTypeAndLabelByTypeId(@Param("typeId") Long typeId);
public void updateShopMapById(@Param("id") Long id);
public void updateShopImageById(@Param("id") Long id, @Param("shopImage") String shopImage);
}
\ No newline at end of file
src/main/java/com/weChatmarket/dao/WxShopItemDao.java
View file @ 27c248f3
package com.weChatmarket.dao;
import java.util.List;
import org.apache.ibatis.annotations.Param;
......@@ -14,4 +13,6 @@ public interface WxShopItemDao extends BaseDao<WxShopItem> {
public List<WxShopItem> findPage(@Param("pId") Long pId);
public void updateStatusByPId(@Param("pId") Long pId);
}
\ No newline at end of file
src/main/java/com/weChatmarket/domain/WxShopInfor.java
View file @ 27c248f3
package com.weChatmarket.domain;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
/**
* 微信商场店铺信息表
* 微信商场店铺信息表
*
* @author create by dongshize
* @author create by dongshize
*/
public class WxShopInfor implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;// 主键
private String name;// 商铺名称
private String code;// 门牌号
private Long typeId;// 种类ID
private String label;// 标签ID
private String telephone;// 电话号码
private String introduce;// 店铺介绍
private String wechat;// 微信联系方式
private String shopMap;// 店铺主图
private String shopMapName;// 主图名字
private Integer status;// 店铺状态| 1，有效；2，无效
private Integer top;// 置顶| 1置顶，0默认顺序
public void setId(Long id) {
private static final long serialVersionUID = 1L;
private Long id;// 主键
private String name;// 商铺名称
private String code;// 门牌号
private Long typeId;// 种类ID
private String label;// 标签ID
private String telephone;// 电话号码
private String introduce;// 店铺介绍
private String wechat;// 微信联系方式
private String shopMap;// 店铺主图
private String shopMapName;// 主图名字
private Integer status;// 店铺状态| 1，有效；2，无效
private Integer top;// 置顶| 1置顶，0默认顺序
public void setId(Long id) {
this.id = id;
}
public Long getId() {
}
public Long getId() {
return this.id;
}
public void setName(String name) {
}
public void setName(String name) {
this.name = name;
}
public String getName() {
}
public String getName() {
return this.name;
}
public void setCode(String code) {
}
public void setCode(String code) {
this.code = code;
}
public String getCode() {
}
public String getCode() {
return this.code;
}
public void setTypeId(Long typeId) {
}
public void setTypeId(Long typeId) {
this.typeId = typeId;
}
public Long getTypeId() {
}
public Long getTypeId() {
return this.typeId;
}
public void setLabel(String label) {
}
public void setLabel(String label) {
this.label = label;
}
public String getLabel() {
}
public String getLabel() {
return this.label;
}
public void setTelephone(String telephone) {
}
public void setTelephone(String telephone) {
this.telephone = telephone;
}
public String getTelephone() {
}
public String getTelephone() {
return this.telephone;
}
public void setIntroduce(String introduce) {
}
public void setIntroduce(String introduce) {
this.introduce = introduce;
}
public String getIntroduce() {
}
public String getIntroduce() {
return this.introduce;
}
public void setWechat(String wechat) {
}
public void setWechat(String wechat) {
this.wechat = wechat;
}
public String getWechat() {
}
public String getWechat() {
return this.wechat;
}
public void setShopMap(String shopMap) {
}
public void setShopMap(String shopMap) {
this.shopMap = shopMap;
}
public String getShopMap() {
}
public String getShopMap() {
return this.shopMap;
}
public void setShopMapName(String shopMapName) {
}
public void setShopMapName(String shopMapName) {
this.shopMapName = shopMapName;
}
public String getShopMapName() {
}
public String getShopMapName() {
return this.shopMapName;
}
public void setStatus(Integer status) {
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getStatus() {
}
public Integer getStatus() {
return this.status;
}
public void setTop(Integer top) {
}
public void setTop(Integer top) {
this.top = top;
}
public Integer getTop() {
}
public Integer getTop() {
return this.top;
}
}
}
src/main/java/com/weChatmarket/page/PageTableRequest.java
View file @ 27c248f3
package com.weChatmarket.page;
import java.io.Serializable;
import java.util.Map;
......@@ -14,9 +12,9 @@ import java.util.Map;
public class PageTableRequest implements Serializable {
private static final long serialVersionUID = 7328071045193618467L;
//后添加的用这个
// 后添加的用这个
private Integer offset;
//原系统用
// 原系统用
private Integer sysOffset;
private Integer limit;
private Map<String, Object> params;
......@@ -29,15 +27,13 @@ public class PageTableRequest implements Serializable {
this.sysOffset = sysOffset;
}
public Integer getOffset() {
return offset/this.limit+1;
return offset / this.limit + 1;
}
public void setOffset(Integer offset) {
this.offset =offset ;
this.offset = offset;
}
public Integer getLimit() {
......
src/main/java/com/weChatmarket/service/WxShopItemService.java
View file @ 27c248f3
......@@ -8,12 +8,16 @@ import com.weChatmarket.page.BasePage;
*/
public interface WxShopItemService extends BaseService<WxShopItem> {
public void addOrUpdateWxShopItem(Long id, Long pId, String title,String content,String photoId,String photoName);
public WxShopItem makeWxShopItem (Long id, Long pId, String title,String content,String photoId ,String photoName,Integer status);
public void addOrUpdateWxShopItem(Long id, Long pId, String title, String content, String photoId,
String photoName);
public WxShopItem makeWxShopItem(Long id, Long pId, String title, String content, String photoId, String photoName,
Integer status);
public void updateStatusById(Long id);
public BasePage<WxShopItem> findPage(Integer pageNum, Integer pageSize, Long pId);
public void updateStatusByPId(Long pId);
}
src/main/java/com/weChatmarket/service/impl/WxShopInforServiceImpl.java
View file @ 27c248f3
......@@ -129,7 +129,7 @@ public class WxShopInforServiceImpl extends BaseServiceImpl<WxShopInfor> impleme
@Override
public boolean checkWxShopInfor(Long id, String code) {
boolean result = true;
WxShopInfor wxShopInfor = this.makeWxShopInfor(id, null, code, Long.valueOf(0), null, null, null,
WxShopInfor wxShopInfor = this.makeWxShopInfor(Long.valueOf(0), null, code, Long.valueOf(0), null, null, null,
null, null, null, 0, 1);
WxShopInfor wxShopInforExist = wxShopInforDao.findByNamedParam(wxShopInfor);
if (null == wxShopInforExist) {
......@@ -174,7 +174,7 @@ public class WxShopInforServiceImpl extends BaseServiceImpl<WxShopInfor> impleme
*/
@Override
public void addOrUpdateWxShopInfor(Long id, String name, String code, Long typeId, List<String> labelIds,
String telephone, String introduce, String wechat, String shopMap, String shopMapName,Integer top) {
String telephone, String introduce, String wechat, String shopMap, String shopMapName, Integer top) {
WxShopInfor wxShopInfor = this.makeWxShopInfor(id, name, code, typeId, labelIds, telephone, introduce, wechat,
shopMap, shopMapName, top, 0);
if (id == 0) {
......@@ -218,8 +218,8 @@ public class WxShopInforServiceImpl extends BaseServiceImpl<WxShopInfor> impleme
*/
@Override
public WxShopInfor makeWxShopInfor(Long id, String name, String code, Long typeId, List<String> labelIds,
String telephone, String introduce, String wechat, String shopMap, String shopMapName,
Integer top, Integer status) {
String telephone, String introduce, String wechat, String shopMap, String shopMapName, Integer top,
Integer status) {
WxShopInfor wxShopInfor = new WxShopInfor();
if (id > 0) { // 主键ID
wxShopInfor.setId(id);
......@@ -253,10 +253,10 @@ public class WxShopInforServiceImpl extends BaseServiceImpl<WxShopInfor> impleme
wxShopInfor.setShopMapName(shopMapName);
}
if (null != top && Integer.valueOf(top) > 0) {
wxShopInfor.setTop(top);
wxShopInfor.setTop(Integer.valueOf(top));
}
if (null != status && Integer.valueOf(status) > 0) {
wxShopInfor.setStatus(status);
if (null != status && status > 0) {
wxShopInfor.setStatus(Integer.valueOf(status));
}
return wxShopInfor;
}
......@@ -269,9 +269,11 @@ public class WxShopInforServiceImpl extends BaseServiceImpl<WxShopInfor> impleme
*/
@Override
public void updateStatusById(Long id) {
WxShopInfor wxShopInfor = this.makeWxShopInfor(id, null, null, Long.valueOf(0), null, null, null,
null, null, null, 0, 2);
WxShopInfor wxShopInfor = this.makeWxShopInfor(id, null, null, Long.valueOf(0), null, null, null, null, null,
null, 0, 2);
wxShopInforDao.update(wxShopInfor);
// 删除店铺中对应的商品
wxShopItemService.updateStatusByPId(id);
}
/**
......
src/main/java/com/weChatmarket/service/impl/WxShopItemServiceImpl.java
View file @ 27c248f3
......@@ -30,15 +30,21 @@ public class WxShopItemServiceImpl extends BaseServiceImpl<WxShopItem> implement
/**
* 商品信息的新增或更新
*
* @param id 商品主键
* @param pId 商铺的主鍵
* @param title 商品的标题
* @param content 商品的内容
* @param photoId 商品的图片
* @param id
* 商品主键
* @param pId
* 商铺的主鍵
* @param title
* 商品的标题
* @param content
* 商品的内容
* @param photoId
* 商品的图片
*/
@Override
public void addOrUpdateWxShopItem(Long id, Long pId, String title, String content, String photoId,String photoName) {
WxShopItem wxShopItem = this.makeWxShopItem(id, pId, title, content, photoId,photoName, 0);
public void addOrUpdateWxShopItem(Long id, Long pId, String title, String content, String photoId,
String photoName) {
WxShopItem wxShopItem = this.makeWxShopItem(id, pId, title, content, photoId, photoName, 0);
if (id == 0) {
wxShopItemDao.create(wxShopItem);
} else {
......@@ -49,15 +55,22 @@ public class WxShopItemServiceImpl extends BaseServiceImpl<WxShopItem> implement
/**
* 商品信息的编辑
*
* @param id 商品主键
* @param pId 商铺的主鍵
* @param title 商品的标题
* @param content 商品的内容
* @param photoId 商品的图片
* @param status 商品的状态
* @param id
* 商品主键
* @param pId
* 商铺的主鍵
* @param title
* 商品的标题
* @param content
* 商品的内容
* @param photoId
* 商品的图片
* @param status
* 商品的状态
*/
@Override
public WxShopItem makeWxShopItem(Long id, Long pId, String title, String content, String photoId,String photoName, Integer status) {
public WxShopItem makeWxShopItem(Long id, Long pId, String title, String content, String photoId, String photoName,
Integer status) {
WxShopItem wxShopItem = new WxShopItem();
if (null != id && id > 0) { // 主键ID
wxShopItem.setId(id);
......@@ -86,23 +99,30 @@ public class WxShopItemServiceImpl extends BaseServiceImpl<WxShopItem> implement
/**
* 商品的状态变更
*
* @param id 商品主键
* @param id
* 商品主键
*/
@Override
public void updateStatusById(Long id) {
WxShopItem wxShopItem = this.makeWxShopItem(id, Long.valueOf(0), null, null, null,null, 2);
WxShopItem wxShopItem = this.makeWxShopItem(id, Long.valueOf(0), null, null, null, null, 2);
wxShopItemDao.update(wxShopItem);
}
/**
* 商品信息的编辑
*
* @param id 商品主键
* @param pId 商铺的主鍵
* @param title 商品的标题
* @param content 商品的内容
* @param photoId 商品的图片
* @param status 商品的状态
* @param id
* 商品主键
* @param pId
* 商铺的主鍵
* @param title
* 商品的标题
* @param content
* 商品的内容
* @param photoId
* 商品的图片
* @param status
* 商品的状态
*/
@Override
public BasePage<WxShopItem> findPage(Integer pageNum, Integer pageSize, Long pId) {
......@@ -110,4 +130,15 @@ public class WxShopItemServiceImpl extends BaseServiceImpl<WxShopItem> implement
List<WxShopItem> list = wxShopItemDao.findPage(pId);
return new BasePage<WxShopItem>(list);
}
/**
* 商品信息的删除
*
* @param pId
* 商铺的主鍵
*/
@Override
public void updateStatusByPId(Long pId) {
wxShopItemDao.updateStatusByPId(pId);
}
}
src/main/resources/META-INF/mappers/adapter/WxShopItemMapper.xml
View file @ 27c248f3
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.weChatmarket.dao.WxShopItemDao">
<resultMap id="ResultMap" type="com.weChatmarket.domain.WxShopItem">
<result column="id" property="id" jdbcType="BIGINT"/>
<result column="p_id" property="pId" jdbcType="BIGINT"/>
<result column="photo_id" property="photoId" jdbcType="VARCHAR"/>
<result column="title" property="title" jdbcType="VARCHAR"/>
<result column="content" property="content" jdbcType="VARCHAR"/>
<result column="status" property="status" jdbcType="TINYINT"/>
</resultMap>
<sql id="Column_List">
id,p_id,photo_id,photoName,title,content,status
</sql>
<!--多条件条件查询列表 -->
<select id="findPage" resultMap="ResultMap">
select
<include refid="Column_List" />
from t_wx_shop_item
<trim prefix="where" prefixOverrides="and |or ">
<if test="pId != null and pId != ''">and p_id = #{pId}</if>
and status = 1
</trim>
order by id desc
</select>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.weChatmarket.dao.WxShopItemDao">
<resultMap id="ResultMap" type="com.weChatmarket.domain.WxShopItem">
<result column="id" property="id" jdbcType="BIGINT"/>
<result column="p_id" property="pId" jdbcType="BIGINT"/>
<result column="photo_id" property="photoId" jdbcType="VARCHAR"/>
<result column="title" property="title" jdbcType="VARCHAR"/>
<result column="content" property="content" jdbcType="VARCHAR"/>
<result column="status" property="status" jdbcType="TINYINT"/>
</resultMap>
<sql id="Column_List">
id,p_id,photo_id,photoName,title,content,status
</sql>
<!--多条件条件查询列表 -->
<select id="findPage" resultMap="ResultMap">
select
<include refid="Column_List" />
from t_wx_shop_item
<trim prefix="where" prefixOverrides="and |or ">
<if test="pId != null and pId != ''">and p_id = #{pId}</if>
and status = 1
</trim>
order by id desc
</select>
<!--更新一条-->
<update id="updateStatusByPId">
update t_wx_shop_item
set status = 2
where p_id = #{pId}
</update>
</mapper>
\ No newline at end of file
src/main/resources/application.yml
View file @ 27c248f3
......@@ -10,7 +10,7 @@ spring:
uploadFile:
resourceHandler: /image/** #请求 url 中的资源映射
location: D:/WX/uploadFiles/ #自定义上传文件本地保存路径
location: E:/WX/uploadFiles/ #自定义上传文件本地保存路径
userLogin: admin
......
src/main/resources/config.properties
View file @ 27c248f3
#数据库配置
#ds_master_0.url=jdbc:mysql://123.57.2.50:3333/db_freight_platform?useUnicode=true&amp;characterEncoding=utf-8&amp;allowMultiQueries=true&amp;tinyInt1isBit=false&amp;useSSL=false
ds_master_0.url=jdbc:mysql://192.168.1.147:3306/wx_market?characterEncoding=utf8&amp;allowMultiQueries=true&amp;tinyInt1isBit=false&amp;useSSL=false
ds_master_0.url=jdbc:mysql://123.57.2.50:3333/db_freight_platform?useUnicode=true&amp;characterEncoding=utf-8&amp;allowMultiQueries=true&amp;tinyInt1isBit=false&amp;useSSL=false
#ds_master_0.url=jdbc:mysql://192.168.1.147:3306/wx_market?characterEncoding=utf8&amp;allowMultiQueries=true&amp;tinyInt1isBit=false&amp;useSSL=false
ds_master_0.username=root
ds_master_0.password=123456
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