恢复上个版本

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7610 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/dao/EnterTogsDao.java

@@ -0,0 +1,38 @@
+package com.uas.platform.b2b.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.EnterpriseTogs;
+
+@Repository
+public interface EnterTogsDao extends JpaRepository<EnterpriseTogs, Long>, JpaSpecificationExecutor<EnterpriseTogs> {
+
+	/**
+	 * 通过businessCode查询该企业所有的标签
+	 * 
+	 * @param businessCode
+	 * @return
+	 */
+	public List<EnterpriseTogs> findByEnbusinesscode(String businessCode);
+
+	/**
+	 * 通过营业执照和标签名称查询信息
+	 * 
+	 * @param businessCode
+	 * @param name
+	 * @return
+	 */
+	public EnterpriseTogs findByEnbusinesscodeAndName(String businessCode, String name);
+
+	/**
+	 * 查询默认标签
+	 * 
+	 * @param isdefault
+	 * @return
+	 */
+	public List<EnterpriseTogs> findByIsdefault(Short isdefault);
+}

src/main/java/com/uas/platform/b2b/dao/EnterpriseNewsDao.java

@@ -0,0 +1,21 @@
+package com.uas.platform.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.EnterpriseNews;
+import com.uas.search.b2b.model.SPage;
+
+@Repository
+public interface EnterpriseNewsDao
+		extends JpaRepository<EnterpriseNews, Long>, JpaSpecificationExecutor<EnterpriseNewsDao> {
+
+	/**
+	 * 通过BusinessCode查询所有动态
+	 * 
+	 * @param businessCode
+	 * @return
+	 */
+	SPage<EnterpriseNews> findByBusinessCode(String businessCode);
+}

src/main/java/com/uas/platform/b2b/dao/TipReprintedLogDao.java

@@ -0,0 +1,29 @@
+package com.uas.platform.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.TipReprintedLog;
+import com.uas.search.b2b.model.SPage;
+
+@Repository
+public interface TipReprintedLogDao
+		extends JpaRepository<TipReprintedLog, Long>, JpaSpecificationExecutor<TipReprintedLog> {
+
+	/**
+	 * 通过转载人uu查询转载记录
+	 * 
+	 * @param useruu
+	 * @return
+	 */
+	public SPage<TipReprintedLog> findByUseruu(Long useruu);
+
+	/**
+	 * 通过被转载人uu查询被转载记录
+	 * 
+	 * @param originaluu
+	 * @return
+	 */
+	public SPage<TipReprintedLog> findByOriginaluu(Long originaluu);
+}

src/main/java/com/uas/platform/b2b/model/EnterpriseNews.java

@@ -0,0 +1,183 @@
+package com.uas.platform.b2b.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.validation.constraints.Max;
+
+/**
+ * 企业发布动态
+ * 
+ * @author hejq
+ * @time 创建时间：2017年2月13日
+ */
+@Entity
+@Table(name = "sec$enternews")
+public class EnterpriseNews implements Serializable {
+
+	/**
+	 * 序号
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$enternews_gen")
+	@SequenceGenerator(name = "sec$enternews_gen", sequenceName = "sec$enternews_seq", allocationSize = 1)
+	@Column(name = "news_id")
+	private Long id;
+	
+	/**
+	 * 发布人
+	 */
+	@Column(name = "news_creater")
+	private String creater;
+	
+	/**
+	 * 发布人uu
+	 */
+	@Column(name = "news_createruu")
+	private Long createruu;
+
+	/**
+	 * 发布时间
+	 */
+	@Column(name = "news_date")
+	private Date date;
+
+	/**
+	 * 动态内容
+	 */
+	@Column(name = "news_content")
+	@Max(value = 4000)
+	private String content;
+	
+	/**
+	 * 企业
+	 */
+	@Column(name = "news_enname")
+	private String enname;
+	
+	/**
+	 * 企业uu
+	 */
+	@Column(name = "news_enuu")
+	private Long enuu;
+	
+	/**
+	 * 企业营业执照
+	 */
+	@Column(name = "news_businesscode")
+	private String businessCode;
+
+	/**
+	 * 转载来源
+	 */
+	@Column(name = "news_source")
+	private String source;
+
+	/**
+	 * 是否原创 <br>
+	 * 1. 是 <br>
+	 * 2. 否 <br>
+	 */
+	@Column(name = "news_isdeafult")
+	private Short isdefault;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getCreater() {
+		return creater;
+	}
+
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
+
+	public Long getCreateruu() {
+		return createruu;
+	}
+
+	public void setCreateruu(Long createruu) {
+		this.createruu = createruu;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public String getEnname() {
+		return enname;
+	}
+
+	public void setEnname(String enname) {
+		this.enname = enname;
+	}
+
+	public Long getEnuu() {
+		return enuu;
+	}
+
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
+	}
+
+	public String getBusinessCode() {
+		return businessCode;
+	}
+
+	public void setBusinessCode(String businessCode) {
+		this.businessCode = businessCode;
+	}
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	public Short getIsdefault() {
+		return isdefault;
+	}
+
+	public void setIsdefault(Short isdefault) {
+		this.isdefault = isdefault;
+	}
+
+	@Override
+	public String toString() {
+		return "EnterpriseNews [id=" + id + ", creater=" + creater + ", createruu=" + createruu + ", date=" + date
+				+ ", content=" + content + ", enname=" + enname + ", enuu=" + enuu + ", businessCode=" + businessCode
+				+ ", source=" + source + ", isdefault=" + isdefault + "]";
+	}
+
+}

src/main/java/com/uas/platform/b2b/model/EnterpriseTogs.java

@@ -0,0 +1,109 @@
+package com.uas.platform.b2b.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+/**
+ * 企业标签
+ * 
+ * @author hejq
+ * @time 创建时间：2017年2月13日
+ */
+@Entity
+@Table(name = "sec$entogs")
+public class EnterpriseTogs implements Serializable {
+
+	/**
+	 * 序号
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$entertog_gen")
+	@SequenceGenerator(name = "sec$entertog_gen", sequenceName = "sec$entertog_seq", allocationSize = 1)
+	@Column(name = "tog_id")
+	private Long id;
+
+	/**
+	 * 标签名字
+	 */
+	@Column(name = "tog_name")
+	private String name;
+
+	/**
+	 * 简介
+	 */
+	@Column(name = "tog_paraphrase")
+	private String paraphrase;
+
+	/**
+	 * 关联的企业营业执照号
+	 */
+	@Column(name = "tog_enbusinesscode")
+	private String enbusinesscode;
+
+	/**
+	 * 是否系统默认<br>
+	 * 1. 默认,不可删除 <br>
+	 * 0. 用户自定义，可删除
+	 */
+	@Column(name = "tog_isdefault")
+	private Short isdefault;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getParaphrase() {
+		return paraphrase;
+	}
+
+	public void setParaphrase(String paraphrase) {
+		this.paraphrase = paraphrase;
+	}
+
+	public String getEnbusinesscode() {
+		return enbusinesscode;
+	}
+
+	public void setEnbusinesscode(String enbusinesscode) {
+		this.enbusinesscode = enbusinesscode;
+	}
+
+	public Short getIsdefault() {
+		return isdefault;
+	}
+
+	public void setIsdefault(Short isdefault) {
+		this.isdefault = isdefault;
+	}
+
+	@Override
+	public String toString() {
+		return "EnterpriseTogs [id=" + id + ", name=" + name + ", paraphrase=" + paraphrase + ", enbusinesscode="
+				+ enbusinesscode + ", isdefault=" + isdefault + "]";
+	}
+
+}

src/main/java/com/uas/platform/b2b/model/TipReprintedLog.java

@@ -0,0 +1,179 @@
+package com.uas.platform.b2b.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+/**
+ * 日志转载记录
+ * 
+ * @author hejq
+ * @time 创建时间：2017年2月13日
+ */
+@Entity
+@Table(name = "sec$tipreprintedlogs")
+public class TipReprintedLog implements Serializable {
+
+	/**
+	 * 序号
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$tipreprintedlogs_gen")
+	@SequenceGenerator(name = "sec$tipreprintedlogs_gen", sequenceName = "sec$tipreprintedlogs_seq", allocationSize = 1)
+	@Column(name = "tlog_id")
+	private Long id;
+
+	/**
+	 * 转载人uu
+	 */
+	@Column(name = "tlog_useruu")
+	private Long useruu;
+	
+	/**
+	 * 转载人姓名
+	 */
+	@Column(name = "tlog_username")
+	private String username;
+
+	/**
+	 * （ 转载）企业uu
+	 */
+	@Column(name = "tlog_enuu")
+	private Long enuu;
+
+	/**
+	 * （转载）企业名称
+	 */
+	@Column(name = "tlog_enname")
+	private String enname;
+
+	/**
+	 * 转载时间
+	 */
+	@Column(name = "tlog_date")
+	private Date date;
+	
+	/**
+	 * 原创人uu
+	 */
+	@Column(name = "tlog_originaluu")
+	private Long originaluu;
+
+	/**
+	 * 原创姓名
+	 */
+	@Column(name = "tlog_originalname")
+	private String originalname;
+	
+	/**
+	 * 原创企业uu
+	 */
+	@Column(name = "tlog_originalenuu")
+	private Long originalenuu;
+
+	/**
+	 * 原创企业名称
+	 */
+	@Column(name = "tlog_originalenname")
+	private String originalenname;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getUseruu() {
+		return useruu;
+	}
+
+	public void setUseruu(Long useruu) {
+		this.useruu = useruu;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public Long getEnuu() {
+		return enuu;
+	}
+
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
+	}
+
+	public String getEnname() {
+		return enname;
+	}
+
+	public void setEnname(String enname) {
+		this.enname = enname;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public Long getOriginaluu() {
+		return originaluu;
+	}
+
+	public void setOriginaluu(Long originaluu) {
+		this.originaluu = originaluu;
+	}
+
+	public String getOriginalname() {
+		return originalname;
+	}
+
+	public void setOriginalname(String originalname) {
+		this.originalname = originalname;
+	}
+
+	public Long getOriginalenuu() {
+		return originalenuu;
+	}
+
+	public void setOriginalenuu(Long originalenuu) {
+		this.originalenuu = originalenuu;
+	}
+
+	public String getOriginalenname() {
+		return originalenname;
+	}
+
+	public void setOriginalenname(String originalenname) {
+		this.originalenname = originalenname;
+	}
+
+	@Override
+	public String toString() {
+		return "TipReprintedLog [id=" + id + ", useruu=" + useruu + ", username=" + username + ", enuu=" + enuu
+				+ ", enname=" + enname + ", date=" + date + ", originaluu=" + originaluu + ", originalname="
+				+ originalname + ", originalenuu=" + originalenuu + ", originalenname=" + originalenname + "]";
+	}
+
+}

src/main/java/com/uas/platform/b2b/service/EnterTogsService.java

@@ -0,0 +1,57 @@
+package com.uas.platform.b2b.service;
+
+import java.util.List;
+
+import com.uas.platform.b2b.model.EnterpriseTogs;
+
+public interface EnterTogsService {
+
+	/**
+	 * 通过标签名称和企业营业执照查询标签
+	 * 
+	 * @param name
+	 * @param businessCode
+	 * @return
+	 */
+	public EnterpriseTogs findByTogsnameAndBusCode(String name, String businessCode);
+
+	/**
+	 * 通过营业执照查询该企业的标签
+	 * 
+	 * @param businessCode
+	 * @return
+	 */
+	public List<EnterpriseTogs> findByBusCode(String businessCode);
+
+	/**
+	 * 查询默认的所有标签
+	 * 
+	 * @return
+	 */
+	public List<EnterpriseTogs> getAllDefalutTogs();
+
+	/**
+	 * 通过id查找
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public EnterpriseTogs findById(Long id);
+
+	/**
+	 * 通过id删除
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public void deleteById(Long id);
+
+	/**
+	 * 通过name，paraphrase保存新的标签
+	 * 
+	 * @param name
+	 * @param paraphrase
+	 * @return
+	 */
+	public EnterpriseTogs createNewTogByNameAndParaphrase(String name, String paraphrase);
+}

src/main/java/com/uas/platform/b2b/service/EnterpriseNewsService.java

@@ -0,0 +1,33 @@
+package com.uas.platform.b2b.service;
+
+import com.uas.platform.b2b.model.EnterpriseNews;
+import com.uas.search.b2b.model.SPage;
+
+public interface EnterpriseNewsService {
+
+	/**
+	 * 新增一条动态
+	 * 
+	 * @param news
+	 * @return
+	 */
+	public EnterpriseNews save(EnterpriseNews news);
+
+	/**
+	 * 通过businessCode查询企业所有动态<br>
+	 * 采用businessCode是方便做成接口形式
+	 * 
+	 * @param businessCode
+	 * @return
+	 */
+	public SPage<EnterpriseNews> findByBusinessCode(String businessCode);
+
+	/**
+	 * 转载日志
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public EnterpriseNews reprintedTip(Long id);
+
+}

src/main/java/com/uas/platform/b2b/service/TipReprintedLogService.java

@@ -0,0 +1,32 @@
+package com.uas.platform.b2b.service;
+
+import com.uas.platform.b2b.model.TipReprintedLog;
+import com.uas.search.b2b.model.SPage;
+
+public interface TipReprintedLogService {
+
+	/**
+	 * 通过个人uu查询转载记录
+	 * 
+	 * @param useruu
+	 * @return
+	 */
+	public SPage<TipReprintedLog> getReprintedRecords(Long useruu);
+
+	/**
+	 * 通过个人uu查询被转载记录
+	 * 
+	 * @param originaluu
+	 * @return
+	 */
+	public SPage<TipReprintedLog> getBeReprintedRecords(Long originaluu);
+
+	/**
+	 * 新增一条转载记录
+	 * 
+	 * @param originaluu
+	 * @param originalenuu
+	 * @return
+	 */
+	public TipReprintedLog newLog(Long originaluu, Long originalenuu);
+}

src/main/java/com/uas/platform/b2b/service/impl/EnterTogsServiceImpl.java

@@ -0,0 +1,55 @@
+package com.uas.platform.b2b.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.dao.EnterTogsDao;
+import com.uas.platform.b2b.model.EnterpriseTogs;
+import com.uas.platform.b2b.service.EnterTogsService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Constant;
+
+@Service
+public class EnterTogsServiceImpl implements EnterTogsService {
+
+	@Autowired
+	private EnterTogsDao enterTogsDao;
+
+	@Override
+	public EnterpriseTogs findByTogsnameAndBusCode(String name, String businessCode) {
+		return enterTogsDao.findByEnbusinesscodeAndName(businessCode, name);
+	}
+
+	@Override
+	public List<EnterpriseTogs> findByBusCode(String businessCode) {
+		return enterTogsDao.findByEnbusinesscode(businessCode);
+	}
+
+	@Override
+	public List<EnterpriseTogs> getAllDefalutTogs() {
+		return enterTogsDao.findByIsdefault(Constant.YES);
+	}
+
+	@Override
+	public EnterpriseTogs findById(Long id) {
+		return enterTogsDao.findOne(id);
+	}
+
+	@Override
+	public void deleteById(Long id) {
+		enterTogsDao.delete(id);
+	}
+
+	@Override
+	public EnterpriseTogs createNewTogByNameAndParaphrase(String name, String paraphrase) {
+		EnterpriseTogs enterTog = new EnterpriseTogs();
+		enterTog.setEnbusinesscode(SystemSession.getUser().getEnterprise().getEnBussinessCode());
+		enterTog.setIsdefault(Constant.NO);
+		enterTog.setName(name);
+		enterTog.setParaphrase(paraphrase);
+		return enterTogsDao.save(enterTog);
+	}
+
+}

src/main/java/com/uas/platform/b2b/service/impl/EnterpriseNewsServiceImpl.java

@@ -0,0 +1,54 @@
+package com.uas.platform.b2b.service.impl;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.dao.EnterpriseNewsDao;
+import com.uas.platform.b2b.model.EnterpriseNews;
+import com.uas.platform.b2b.service.EnterpriseNewsService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Constant;
+import com.uas.search.b2b.model.SPage;
+
+@Service
+public class EnterpriseNewsServiceImpl implements EnterpriseNewsService {
+
+	@Autowired
+	private EnterpriseNewsDao enterpriseNewsDao;
+
+	@Override
+	public EnterpriseNews save(EnterpriseNews news) {
+		news.setIsdefault(Constant.YES);
+		return enterpriseNewsDao.save(news);
+	}
+
+	@Override
+	public SPage<EnterpriseNews> findByBusinessCode(String businessCode) {
+		return enterpriseNewsDao.findByBusinessCode(businessCode);
+	}
+
+	@Override
+	public EnterpriseNews reprintedTip(Long id) {
+		EnterpriseNews oldNews = enterpriseNewsDao.findOne(id);
+		EnterpriseNews news = new EnterpriseNews();
+		news.setContent(oldNews.getContent());
+		if (oldNews.getIsdefault() != null) {
+			if (oldNews.getIsdefault().equals(Constant.YES)) {
+				news.setSource(oldNews.getCreater());
+			}
+			if (oldNews.getIsdefault().equals(Constant.NO)) {
+				news.setSource(oldNews.getSource());
+			}
+		}
+		news.setCreater(SystemSession.getUser().getUserName());
+		news.setCreateruu(SystemSession.getUser().getUserUU());
+		news.setDate(new Date());
+		news.setEnname(SystemSession.getUser().getEnterprise().getEnName());
+		news.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		news.setIsdefault(Constant.NO);
+		news.setBusinessCode(SystemSession.getUser().getEnterprise().getEnBussinessCode());
+		return enterpriseNewsDao.save(news);
+	}
+}

src/main/java/com/uas/platform/b2b/service/impl/TipReprintedLogServiceImpl.java

@@ -0,0 +1,54 @@
+package com.uas.platform.b2b.service.impl;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.dao.TipReprintedLogDao;
+import com.uas.platform.b2b.model.TipReprintedLog;
+import com.uas.platform.b2b.service.EnterpriseService;
+import com.uas.platform.b2b.service.TipReprintedLogService;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.search.b2b.model.SPage;
+
+@SuppressWarnings("deprecation")
+@Service
+public class TipReprintedLogServiceImpl implements TipReprintedLogService {
+
+	@Autowired
+	private TipReprintedLogDao tipReprintedLogDao;
+
+	@Autowired
+	private EnterpriseService enterpriseService;
+
+	@Autowired
+	private UserService userService;
+
+	@Override
+	public SPage<TipReprintedLog> getReprintedRecords(Long useruu) {
+		return tipReprintedLogDao.findByUseruu(useruu);
+	}
+
+	@Override
+	public SPage<TipReprintedLog> getBeReprintedRecords(Long originaluu) {
+		return tipReprintedLogDao.findByOriginaluu(originaluu);
+	}
+
+	@Override
+	public TipReprintedLog newLog(Long originaluu, Long originalenuu) {
+		TipReprintedLog tipLog = new TipReprintedLog();
+		tipLog.setDate(new Date());
+		tipLog.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		tipLog.setEnname(SystemSession.getUser().getEnterprise().getEnName());
+		tipLog.setOriginaluu(originaluu);
+		tipLog.setOriginalenuu(originalenuu);
+		tipLog.setUseruu(SystemSession.getUser().getUserUU());
+		tipLog.setUsername(SystemSession.getUser().getUserName());
+		tipLog.setOriginalenname(enterpriseService.findByEnUU(originalenuu).getEnName());
+		tipLog.setOriginalname(userService.findUserByUserUU(originaluu).getUserName());
+		return tipReprintedLogDao.save(tipLog);
+	}
+
+}