From b24b0ab46e9e6d038c876224b80a5617cd8a5015 Mon Sep 17 00:00:00 2001 From: zxt@theyeasy.com Date: Tue, 26 Dec 2017 16:17:54 +0800 Subject: [PATCH] update --- WebContent/WEB-INF/classes/mapper/CalllogDao.xml | 31 ------------------------------- WebContent/WEB-INF/classes/mapper/RemarksDao.xml | 50 -------------------------------------------------- build/classes/com/w1hd/zzhnc/controller/wx/WxMiniController.class | Bin 8279 -> 0 bytes build/classes/com/w1hd/zzhnc/dao/CalllogDao.class | Bin 591 -> 0 bytes build/classes/com/w1hd/zzhnc/model/Calllog.class | Bin 1515 -> 0 bytes build/classes/com/w1hd/zzhnc/service/FansService.class | Bin 7326 -> 0 bytes build/classes/com/w1hd/zzhnc/vo/Calllog_Vo.class | Bin 941 -> 0 bytes src/com/w1hd/zzhnc/controller/pc/BannerController.java | 42 ++++++++++++++++++++++++++++++++++++++++++ src/com/w1hd/zzhnc/controller/wx/WxMiniController.java | 13 ++----------- src/com/w1hd/zzhnc/dao/BannerDao.java | 8 ++++++++ src/com/w1hd/zzhnc/dao/CalllogDao.java | 15 --------------- src/com/w1hd/zzhnc/dao/GoodsDao.java | 8 ++++++++ src/com/w1hd/zzhnc/dao/PrizeDao.java | 8 ++++++++ src/com/w1hd/zzhnc/dao/SallerDao.java | 8 ++++++++ src/com/w1hd/zzhnc/model/Banner.java | 32 ++++++++++++++++++++++++++++++++ src/com/w1hd/zzhnc/model/Calllog.java | 61 ------------------------------------------------------------- src/com/w1hd/zzhnc/model/Prize.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/com/w1hd/zzhnc/service/BannerService.java | 32 ++++++++++++++++++++++++++++++++ src/com/w1hd/zzhnc/service/FansService.java | 25 ------------------------- src/com/w1hd/zzhnc/service/GoodsService.java | 8 ++++++++ src/com/w1hd/zzhnc/service/PrizeService.java | 8 ++++++++ src/com/w1hd/zzhnc/service/SallerService.java | 8 ++++++++ src/com/w1hd/zzhnc/vo/Calllog_Vo.java | 33 --------------------------------- 23 files changed, 283 insertions(+), 226 deletions(-) delete mode 100644 WebContent/WEB-INF/classes/mapper/CalllogDao.xml delete mode 100644 WebContent/WEB-INF/classes/mapper/RemarksDao.xml delete mode 100644 build/classes/com/w1hd/zzhnc/dao/CalllogDao.class delete mode 100644 build/classes/com/w1hd/zzhnc/model/Calllog.class delete mode 100644 build/classes/com/w1hd/zzhnc/vo/Calllog_Vo.class create mode 100644 src/com/w1hd/zzhnc/controller/pc/BannerController.java create mode 100644 src/com/w1hd/zzhnc/dao/BannerDao.java delete mode 100644 src/com/w1hd/zzhnc/dao/CalllogDao.java create mode 100644 src/com/w1hd/zzhnc/dao/GoodsDao.java create mode 100644 src/com/w1hd/zzhnc/dao/PrizeDao.java create mode 100644 src/com/w1hd/zzhnc/dao/SallerDao.java create mode 100644 src/com/w1hd/zzhnc/model/Banner.java delete mode 100644 src/com/w1hd/zzhnc/model/Calllog.java create mode 100644 src/com/w1hd/zzhnc/model/Prize.java create mode 100644 src/com/w1hd/zzhnc/service/BannerService.java create mode 100644 src/com/w1hd/zzhnc/service/GoodsService.java create mode 100644 src/com/w1hd/zzhnc/service/PrizeService.java create mode 100644 src/com/w1hd/zzhnc/service/SallerService.java delete mode 100644 src/com/w1hd/zzhnc/vo/Calllog_Vo.java diff --git a/WebContent/WEB-INF/classes/mapper/CalllogDao.xml b/WebContent/WEB-INF/classes/mapper/CalllogDao.xml deleted file mode 100644 index f32a051..0000000 --- a/WebContent/WEB-INF/classes/mapper/CalllogDao.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/mapper/RemarksDao.xml b/WebContent/WEB-INF/classes/mapper/RemarksDao.xml deleted file mode 100644 index 32f616c..0000000 --- a/WebContent/WEB-INF/classes/mapper/RemarksDao.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/build/classes/com/w1hd/zzhnc/controller/wx/WxMiniController.class b/build/classes/com/w1hd/zzhnc/controller/wx/WxMiniController.class index ef0e7b2..36f5e58 100644 Binary files a/build/classes/com/w1hd/zzhnc/controller/wx/WxMiniController.class and b/build/classes/com/w1hd/zzhnc/controller/wx/WxMiniController.class differ diff --git a/build/classes/com/w1hd/zzhnc/dao/CalllogDao.class b/build/classes/com/w1hd/zzhnc/dao/CalllogDao.class deleted file mode 100644 index f8fe9ad..0000000 Binary files a/build/classes/com/w1hd/zzhnc/dao/CalllogDao.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/model/Calllog.class b/build/classes/com/w1hd/zzhnc/model/Calllog.class deleted file mode 100644 index 9bfc50b..0000000 Binary files a/build/classes/com/w1hd/zzhnc/model/Calllog.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/service/FansService.class b/build/classes/com/w1hd/zzhnc/service/FansService.class index 119d1cc..988a7ba 100644 Binary files a/build/classes/com/w1hd/zzhnc/service/FansService.class and b/build/classes/com/w1hd/zzhnc/service/FansService.class differ diff --git a/build/classes/com/w1hd/zzhnc/vo/Calllog_Vo.class b/build/classes/com/w1hd/zzhnc/vo/Calllog_Vo.class deleted file mode 100644 index e4bb1ef..0000000 Binary files a/build/classes/com/w1hd/zzhnc/vo/Calllog_Vo.class and /dev/null differ diff --git a/src/com/w1hd/zzhnc/controller/pc/BannerController.java b/src/com/w1hd/zzhnc/controller/pc/BannerController.java new file mode 100644 index 0000000..f7d2a9d --- /dev/null +++ b/src/com/w1hd/zzhnc/controller/pc/BannerController.java @@ -0,0 +1,42 @@ +package com.w1hd.zzhnc.controller.pc; + +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import com.w1hd.zzhnc.service.BannerService; +import com.w1hd.zzhnc.vo.Vo_msg; + +@Controller +@RequestMapping("/banner") +public class BannerController { + + @Autowired + BannerService bannerService; + + @RequestMapping("/bannerList") + public ModelAndView autoreplyIndex(Map map) { + map.put("list", bannerService.getAll()); + ModelAndView mv = new ModelAndView("/pc/banner/bannerList", map); + return mv; + } + + @ResponseBody + @RequestMapping(value = "/add", method = RequestMethod.POST) + public Object addBanner(@RequestParam("url") String url) { + return new Vo_msg(0, bannerService.addBanner(url)); + } + + @ResponseBody + @RequestMapping(value = "/{id}/delete", method = RequestMethod.GET) + public Object delete(@PathVariable("id") Integer id) { + return new Vo_msg(0, bannerService.deleteBanner(id)); + } +} diff --git a/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java b/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java index cb7602b..b2b7300 100644 --- a/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java +++ b/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java @@ -147,17 +147,6 @@ public class WxMiniController extends BaseController { return WxMiniUtil.refreshToken(); } - // 增加电话记录 - @RequestMapping(value = "/addCallLog", method = { RequestMethod.POST, RequestMethod.GET}) - public @ResponseBody Vo_msg addCallLog(Integer fansid, Integer saleid, String projectname) { - String result = fansService.addCallLog(fansid, saleid, projectname); - if (result.equals("ok")) { - return new Vo_msg(0, "保存成功"); - } else { - return new Vo_msg(-1, result); - } - } - // 文章列表 @RequestMapping(value = "/getArticlesList") @@ -249,4 +238,6 @@ public class WxMiniController extends BaseController { RedisUtil.remove("zzhnc_leave_program_thumb_url"); return "ok"; } + + } diff --git a/src/com/w1hd/zzhnc/dao/BannerDao.java b/src/com/w1hd/zzhnc/dao/BannerDao.java new file mode 100644 index 0000000..d24b316 --- /dev/null +++ b/src/com/w1hd/zzhnc/dao/BannerDao.java @@ -0,0 +1,8 @@ +package com.w1hd.zzhnc.dao; + +import com.w1hd.zzhnc.model.Banner; +import com.w1hd.zzhnc.util.MyMapper; + +public interface BannerDao extends MyMapper{ + +} diff --git a/src/com/w1hd/zzhnc/dao/CalllogDao.java b/src/com/w1hd/zzhnc/dao/CalllogDao.java deleted file mode 100644 index 3dfe89f..0000000 --- a/src/com/w1hd/zzhnc/dao/CalllogDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.w1hd.zzhnc.dao; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - -import com.w1hd.zzhnc.model.Calllog; -import com.w1hd.zzhnc.util.MyMapper; -import com.w1hd.zzhnc.vo.Calllog_Vo; - -public interface CalllogDao extends MyMapper { - - List getCalllogList(int page,int pagesize,@Param("keyword")String keyword); - - int getCalllogCount(@Param("keyword")String keyword); -} diff --git a/src/com/w1hd/zzhnc/dao/GoodsDao.java b/src/com/w1hd/zzhnc/dao/GoodsDao.java new file mode 100644 index 0000000..ce96ad8 --- /dev/null +++ b/src/com/w1hd/zzhnc/dao/GoodsDao.java @@ -0,0 +1,8 @@ +package com.w1hd.zzhnc.dao; + +import com.w1hd.zzhnc.model.Goods; +import com.w1hd.zzhnc.util.MyMapper; + +public interface GoodsDao extends MyMapper { + +} diff --git a/src/com/w1hd/zzhnc/dao/PrizeDao.java b/src/com/w1hd/zzhnc/dao/PrizeDao.java new file mode 100644 index 0000000..37cd5c8 --- /dev/null +++ b/src/com/w1hd/zzhnc/dao/PrizeDao.java @@ -0,0 +1,8 @@ +package com.w1hd.zzhnc.dao; + +import com.w1hd.zzhnc.model.Prize; +import com.w1hd.zzhnc.util.MyMapper; + +public interface PrizeDao extends MyMapper{ + +} diff --git a/src/com/w1hd/zzhnc/dao/SallerDao.java b/src/com/w1hd/zzhnc/dao/SallerDao.java new file mode 100644 index 0000000..76dc785 --- /dev/null +++ b/src/com/w1hd/zzhnc/dao/SallerDao.java @@ -0,0 +1,8 @@ +package com.w1hd.zzhnc.dao; + +import com.w1hd.zzhnc.model.Saller; +import com.w1hd.zzhnc.util.MyMapper; + +public interface SallerDao extends MyMapper{ + +} diff --git a/src/com/w1hd/zzhnc/model/Banner.java b/src/com/w1hd/zzhnc/model/Banner.java new file mode 100644 index 0000000..6d0b1b0 --- /dev/null +++ b/src/com/w1hd/zzhnc/model/Banner.java @@ -0,0 +1,32 @@ +package com.w1hd.zzhnc.model; + +import javax.persistence.Id; + +public class Banner { + + @Id + private Integer id; + private String imageUrl; + + public Banner(String imageUrl) { + super(); + this.imageUrl = imageUrl; + } + public Banner() { + super(); + } + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } + public String getImageUrl() { + return imageUrl; + } + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + +} diff --git a/src/com/w1hd/zzhnc/model/Calllog.java b/src/com/w1hd/zzhnc/model/Calllog.java deleted file mode 100644 index e9b2ce5..0000000 --- a/src/com/w1hd/zzhnc/model/Calllog.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.w1hd.zzhnc.model; - -import java.util.Date; - -import javax.persistence.Id; - -public class Calllog { - - @Id - private Integer id; - - private Integer fansid; - - private Integer salesid; - - private Date createdtime; - - private String projectname; - - - public String getProjectname() { - return projectname; - } - - - public void setProjectname(String projectname) { - this.projectname = projectname; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getFansid() { - return fansid; - } - - public void setFansid(Integer fansid) { - this.fansid = fansid; - } - - public Integer getSalesid() { - return salesid; - } - - public void setSalesid(Integer salesid) { - this.salesid = salesid; - } - - public Date getCreatedtime() { - return createdtime; - } - - public void setCreatedtime(Date createdtime) { - this.createdtime = createdtime; - } -} diff --git a/src/com/w1hd/zzhnc/model/Prize.java b/src/com/w1hd/zzhnc/model/Prize.java new file mode 100644 index 0000000..29f3cba --- /dev/null +++ b/src/com/w1hd/zzhnc/model/Prize.java @@ -0,0 +1,119 @@ +package com.w1hd.zzhnc.model; + +import java.util.Date; + +import javax.persistence.Id; + +public class Prize { + + @Id + private Integer id; + + private String name; + private Integer num; + private Date createtime; + private Boolean deleted; + + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column prize.name + * + * @return the value of prize.name + * + * @mbggenerated Tue Dec 26 15:46:25 CST 2017 + */ + public String getName() { + return name; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column prize.name + * + * @param name the value for prize.name + * + * @mbggenerated Tue Dec 26 15:46:25 CST 2017 + */ + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column prize.num + * + * @return the value of prize.num + * + * @mbggenerated Tue Dec 26 15:46:25 CST 2017 + */ + public Integer getNum() { + return num; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column prize.num + * + * @param num the value for prize.num + * + * @mbggenerated Tue Dec 26 15:46:25 CST 2017 + */ + public void setNum(Integer num) { + this.num = num; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column prize.createtime + * + * @return the value of prize.createtime + * + * @mbggenerated Tue Dec 26 15:46:25 CST 2017 + */ + public Date getCreatetime() { + return createtime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column prize.createtime + * + * @param createtime the value for prize.createtime + * + * @mbggenerated Tue Dec 26 15:46:25 CST 2017 + */ + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column prize.deleted + * + * @return the value of prize.deleted + * + * @mbggenerated Tue Dec 26 15:46:25 CST 2017 + */ + public Boolean getDeleted() { + return deleted; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column prize.deleted + * + * @param deleted the value for prize.deleted + * + * @mbggenerated Tue Dec 26 15:46:25 CST 2017 + */ + public void setDeleted(Boolean deleted) { + this.deleted = deleted; + } +} \ No newline at end of file diff --git a/src/com/w1hd/zzhnc/service/BannerService.java b/src/com/w1hd/zzhnc/service/BannerService.java new file mode 100644 index 0000000..678c989 --- /dev/null +++ b/src/com/w1hd/zzhnc/service/BannerService.java @@ -0,0 +1,32 @@ +package com.w1hd.zzhnc.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.google.common.base.Strings; +import com.w1hd.zzhnc.dao.BannerDao; +import com.w1hd.zzhnc.model.Banner; + +@Service +public class BannerService { + + @Autowired + BannerDao bannerDao; + + public boolean addBanner(String url) { + if (Strings.isNullOrEmpty(url)) { + return false; + } + return bannerDao.insert(new Banner(url)) > 0; + } + + public boolean deleteBanner(Integer id) { + return bannerDao.deleteByPrimaryKey(id) > 0; + } + + public List getAll() { + return bannerDao.selectAll(); + } +} diff --git a/src/com/w1hd/zzhnc/service/FansService.java b/src/com/w1hd/zzhnc/service/FansService.java index 3e9c3e3..6c2f286 100644 --- a/src/com/w1hd/zzhnc/service/FansService.java +++ b/src/com/w1hd/zzhnc/service/FansService.java @@ -38,14 +38,11 @@ import org.theyeasy.weixin.util.CusAccessObjectUtil2; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import com.w1hd.zzhnc.dao.CalllogDao; import com.w1hd.zzhnc.dao.FansDao; -import com.w1hd.zzhnc.model.Calllog; import com.w1hd.zzhnc.model.Fans; import com.w1hd.zzhnc.util.CommonUtil; import com.w1hd.zzhnc.util.PageResults; import com.w1hd.zzhnc.util.StringUtil; -import com.w1hd.zzhnc.vo.Calllog_Vo; import com.w1hd.zzhnc.vo.Fans_Vo; import tk.mybatis.mapper.entity.Example; @@ -63,8 +60,6 @@ public class FansService { @Autowired FansDao fansDao; - @Autowired - CalllogDao callLogDao; public PageResults getFansList(Integer page, String keyword) { @@ -94,28 +89,8 @@ public class FansService { return fansDao.selectByPrimaryKey(id); } - - public String addCallLog(Integer fansid, Integer saleid, String projectname) { - Calllog log = new Calllog(); - log.setFansid(fansid); - log.setSalesid(saleid); - log.setCreatedtime(CommonUtil.getTime()); - log.setProjectname(projectname); - int row = callLogDao.insertSelective(log); - return row > 0 ? "ok" : "添加失败，数据异常"; - } - public PageResults getCalllogList(int page, String keyword) { - List list = callLogDao.getCalllogList((page - 1) * 10, 10, keyword); - int total = callLogDao.getCalllogCount(keyword); - PageResults pageresult = new PageResults<>(); - pageresult.setPage(page); - pageresult.setRows(list); - pageresult.setPageSize(10); - pageresult.setTotal(total); - return pageresult; - } public Fans addFans(String miniOpenid) { diff --git a/src/com/w1hd/zzhnc/service/GoodsService.java b/src/com/w1hd/zzhnc/service/GoodsService.java new file mode 100644 index 0000000..984bf34 --- /dev/null +++ b/src/com/w1hd/zzhnc/service/GoodsService.java @@ -0,0 +1,8 @@ +package com.w1hd.zzhnc.service; + +import org.springframework.stereotype.Service; + +@Service +public class GoodsService { + +} diff --git a/src/com/w1hd/zzhnc/service/PrizeService.java b/src/com/w1hd/zzhnc/service/PrizeService.java new file mode 100644 index 0000000..d9ca3ed --- /dev/null +++ b/src/com/w1hd/zzhnc/service/PrizeService.java @@ -0,0 +1,8 @@ +package com.w1hd.zzhnc.service; + +import org.springframework.stereotype.Service; + +@Service +public class PrizeService { + +} diff --git a/src/com/w1hd/zzhnc/service/SallerService.java b/src/com/w1hd/zzhnc/service/SallerService.java new file mode 100644 index 0000000..99ac74f --- /dev/null +++ b/src/com/w1hd/zzhnc/service/SallerService.java @@ -0,0 +1,8 @@ +package com.w1hd.zzhnc.service; + +import org.springframework.stereotype.Service; + +@Service +public class SallerService { + +} diff --git a/src/com/w1hd/zzhnc/vo/Calllog_Vo.java b/src/com/w1hd/zzhnc/vo/Calllog_Vo.java deleted file mode 100644 index 490bedf..0000000 --- a/src/com/w1hd/zzhnc/vo/Calllog_Vo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.w1hd.zzhnc.vo; - -import com.w1hd.zzhnc.model.Calllog; - -public class Calllog_Vo extends Calllog{ - private String nickname; - private String logo; - private String salename; - - public String getNickname() { - return nickname; - } - - public void setNickname(String nickname) { - this.nickname = nickname; - } - - public String getLogo() { - return logo; - } - - public void setLogo(String logo) { - this.logo = logo; - } - - public String getSalename() { - return salename; - } - - public void setSalename(String salename) { - this.salename = salename; - } -} -- libgit2 0.24.0