Skip to content

zhangtai / zzhnc

转到一个项目
Commit b24b0ab4 由 zxt@theyeasy.com
选项

update

1 个父辈 0d3b0fb3
内嵌 并排
正在显示 23 个修改的文件 包含 283 行增加 和 226 行删除
WebContent/WEB-INF/classes/mapper/CalllogDao.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.w1hd.zzhnc.dao.CalllogDao">
<select id="getCalllogList" resultType="com.w1hd.zzhnc.vo.Calllog_Vo">
select a.*,b.nickname,b.logo,c.name as salename from calllog a
left join fans b on a.fansid=b.id
LEFT JOIN sales c on a.salesid=c.id
<where>
<if test="keyword !=null and keyword!='' ">
and (b.nickname like CONCAT(CONCAT('%',#{keyword}),'%')
or
c.name like CONCAT(CONCAT('%',#{keyword}),'%'))
</if>
</where>
order by a.createdtime desc
limit #{0},#{1}
</select>
<select id="getCalllogCount" resultType="java.lang.Integer">
select count(a.id) from calllog a
left join fans b on a.fansid=b.id
LEFT JOIN sales c on a.salesid=c.id
<where>
<if test="keyword !=null and keyword!='' ">
and (b.nickname like CONCAT(CONCAT('%',#{keyword}),'%')
or
c.name like CONCAT(CONCAT('%',#{keyword}),'%'))
</if>
</where>
</select>
</mapper>
\ No newline at end of file
WebContent/WEB-INF/classes/mapper/RemarksDao.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.w1hd.zzhnc.dao.RemarksDao">
<select id="getRemarksList" resultType="com.w1hd.zzhnc.vo.Remarks_Vo">
select a.*,b.nickname,b.logo from remarks a
left join fans b on
a.fansid=b.id
<where>
a.deleted=0
<if test="estateid != null and estateid>0">
and a.estateid=#{estateid}
</if>
<choose>
<when test="fansId != null and fansId > 0">
and (a.fansid= #{fansId} or (a.fansid!= #{fansId}
and status = #{status}))
</when>
<otherwise>
<if test="status != null">
and status = #{status}
</if>
</otherwise>
</choose>
</where>
ORDER BY createdtime desc limit #{0},#{1}
</select>
<select id="getRemarksCount" resultType="java.lang.Integer">
select count(a.id)
from remarks a
left join fans b on a.fansid=b.id
<where>
a.deleted=0
<if test="estateid != null and estateid>0">
and a.estateid=#{estateid}
</if>
<choose>
<when test="fansId != null and fansId > 0">
and (a.fansid= #{fansId} or (a.fansid!= #{fansId}
and status = #{status}))
</when>
<otherwise>
<if test="status != null">
and status = #{status}
</if>
</otherwise>
</choose>
</where>
</select>
</mapper>
\ No newline at end of file
src/com/w1hd/zzhnc/controller/pc/BannerController.java 0 → 100644
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<String, Object> 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));
}
}
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";
}
}
src/com/w1hd/zzhnc/dao/BannerDao.java 0 → 100644
package com.w1hd.zzhnc.dao;
import com.w1hd.zzhnc.model.Banner;
import com.w1hd.zzhnc.util.MyMapper;
public interface BannerDao extends MyMapper<Banner>{
}
src/com/w1hd/zzhnc/dao/CalllogDao.java deleted 100644 → 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<Calllog> {
List<Calllog_Vo> getCalllogList(int page,int pagesize,@Param("keyword")String keyword);
int getCalllogCount(@Param("keyword")String keyword);
}
src/com/w1hd/zzhnc/dao/GoodsDao.java 0 → 100644
package com.w1hd.zzhnc.dao;
import com.w1hd.zzhnc.model.Goods;
import com.w1hd.zzhnc.util.MyMapper;
public interface GoodsDao extends MyMapper<Goods> {
}
src/com/w1hd/zzhnc/dao/PrizeDao.java 0 → 100644
package com.w1hd.zzhnc.dao;
import com.w1hd.zzhnc.model.Prize;
import com.w1hd.zzhnc.util.MyMapper;
public interface PrizeDao extends MyMapper<Prize>{
}
src/com/w1hd/zzhnc/dao/SallerDao.java 0 → 100644
package com.w1hd.zzhnc.dao;
import com.w1hd.zzhnc.model.Saller;
import com.w1hd.zzhnc.util.MyMapper;
public interface SallerDao extends MyMapper<Saller>{
}
src/com/w1hd/zzhnc/model/Banner.java 0 → 100644
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;
}
}
src/com/w1hd/zzhnc/model/Calllog.java deleted 100644 → 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;
}
}
src/com/w1hd/zzhnc/model/Prize.java 0 → 100644
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
src/com/w1hd/zzhnc/service/BannerService.java 0 → 100644
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<Banner> getAll() {
return bannerDao.selectAll();
}
}
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<Fans_Vo> 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<Calllog_Vo> getCalllogList(int page, String keyword) {
List<Calllog_Vo> list = callLogDao.getCalllogList((page - 1) * 10, 10, keyword);
int total = callLogDao.getCalllogCount(keyword);
PageResults<Calllog_Vo> pageresult = new PageResults<>();
pageresult.setPage(page);
pageresult.setRows(list);
pageresult.setPageSize(10);
pageresult.setTotal(total);
return pageresult;
}
public Fans addFans(String miniOpenid) {
......
src/com/w1hd/zzhnc/service/GoodsService.java 0 → 100644
package com.w1hd.zzhnc.service;
import org.springframework.stereotype.Service;
@Service
public class GoodsService {
}
src/com/w1hd/zzhnc/service/PrizeService.java 0 → 100644
package com.w1hd.zzhnc.service;
import org.springframework.stereotype.Service;
@Service
public class PrizeService {
}
src/com/w1hd/zzhnc/service/SallerService.java 0 → 100644
package com.w1hd.zzhnc.service;
import org.springframework.stereotype.Service;
@Service
public class SallerService {
}
src/com/w1hd/zzhnc/vo/Calllog_Vo.java deleted 100644 → 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;
}
}
Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
请先完成此消息的编辑！