From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java |  296 +++++++++-------------------------------------------------
 1 files changed, 47 insertions(+), 249 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java
index c848ce7..a6b44ad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java
@@ -1,292 +1,90 @@
 package com.yeshi.fanli.service.impl.config;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;
 
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.orm.hibernate4.HibernateCallback;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeshi.fanli.dao.config.SystemClientParamsDao;
-import com.yeshi.fanli.dao.config.SystemHelpListDao;
-import com.yeshi.fanli.dao.config.SystemSecondProblemDao;
 import com.yeshi.fanli.dao.mybatis.SystemClientParamsMapper;
-import com.yeshi.fanli.entity.admin.SystemClientParamsAdmin;
-import com.yeshi.fanli.entity.system.CustomerContent;
-import com.yeshi.fanli.entity.system.CustomerName;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
 import com.yeshi.fanli.entity.system.SystemClientParams;
 import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
-import com.yeshi.fanli.util.Constant;
 
 @Service
 public class SystemClientParamsServiceImpl implements SystemClientParamsService {
 
 	@Resource
-	private SystemClientParamsDao systemClientParamsDao;
-	
-	@Resource
 	private SystemClientParamsMapper systemClientParamsMapper;
 	
-	@Resource
-	private SystemHelpListDao systemHelpListDao;
 	
-	@Resource
-	private SystemSecondProblemDao systemSecondProblemDao;
-	@Cacheable(value = "clientParamCache", key = "#id")
-	public List<SystemClientParams> getSystemClientParamsBySystemId(long id) {
-
-		return systemClientParamsDao.list("from SystemClientParams scp where scp.system.id=?",
-				new Serializable[] { id });
+	@Cacheable(value = "clientParamCache", key = "#systemId+'-'+#version")
+	public List<SystemClientParams> getSystemClientParamsBySystemId(long systemId, int version) {
+		return systemClientParamsMapper.listBySystemId(systemId);
 	}
 
-	public List<SystemClientParamsAdmin> getAdminList(System system, String key) {
-		List<SystemClientParams> list;
-		List<SystemClientParamsAdmin> adminList = new ArrayList<SystemClientParamsAdmin>();
+
+	@Override
+	public SystemClientParams getSystemClientParamsBySystemAndKey(BusinessSystem system, String key) {
 		if (system == null) {
-			list = systemClientParamsDao.list("from SystemClientParams scp where scp.name like ? ",
-					new Serializable[] { "%" + key + "%" });
-		} else {
-			list = systemClientParamsDao.list(
-					"from SystemClientParams scp where scp.system.id = ? and scp.name like ? ",
-					new Serializable[] { system.getId(), "%" + key + "%" });
-			StringBuffer hqlb = new StringBuffer("from SystemClientParams scp ");
-			int ii = 0;
-			if (list.size() > 0) {
-				for (SystemClientParams scp : list) {
-					if (ii == 0) {
-						hqlb.append(" where ( scp.name = '" + scp.getName() + "'  and scp.key = '" + scp.getKey()
-								+ "' and scp.value = '" + scp.getValue() + "' ) ");
-					} else {
-						hqlb.append(" or ( scp.name = '" + scp.getName() + "'  and scp.key = '" + scp.getKey()
-								+ "' and scp.value = '" + scp.getValue() + "' ) ");
-					}
-					ii++;
-				}
-				list = systemClientParamsDao.list(hqlb.toString());
-			}
+			return null;
 		}
-		SystemClientParamsAdmin scpa = null;
-		for (SystemClientParams scp : list) {
-			scpa = new SystemClientParamsAdmin(scp);
-			if (adminList.contains(scpa)) {
-				int indexof = adminList.indexOf(scpa);
-				SystemClientParamsAdmin systemClientParamsAdmin = adminList.get(indexof);
-				systemClientParamsAdmin.getSystemList().add(scp.getSystem());
-			} else {
-				scpa.getSystemList().add(scp.getSystem());
-				adminList.add(scpa);
-			}
-		}
-
-		return adminList;
+		return systemClientParamsMapper.getSystemClientParamsBySystemAndKey(system.getId(), key);
 	}
 
+	
+	
+	@Override
+	public List<SystemClientParams> listQuery(int start, int count, String key, Long systemId) {
+		return systemClientParamsMapper.listQuery(start, count, systemId, key);
+	}
+
+	
+	@Override
+	public long countQuery(String key, Long systemId) {
+		return systemClientParamsMapper.countQuery(systemId, key);
+	}
+	
+	
 	@Transactional
-	public void addSystemClientParamsList(SystemClientParams scp, List<System> list) throws Exception {
+	@Override
+	public void saveAdd(SystemClientParams scp, List<Long> listId) throws Exception {
+		
+		if (listId == null || listId.size() == 0) {
+			return;
+		}
+		
 		SystemClientParams nscp = null;
-		for (System system : list) {
+		for (Long systemId : listId) {
+			BusinessSystem system  = new BusinessSystem(systemId);
 			nscp = new SystemClientParams();
 			nscp.setKey(scp.getKey());
 			nscp.setName(scp.getName());
 			nscp.setValue(scp.getValue());
 			nscp.setSystem(system);
 			nscp.setUpdatetime(java.lang.System.currentTimeMillis());
-			systemClientParamsDao.create(nscp);
+			systemClientParamsMapper.insertSelective(nscp);
 		}
 	}
-
+	
+	@Override
+	public void update(SystemClientParams systemClientParams) {
+		systemClientParamsMapper.updateByPrimaryKeySelective(systemClientParams);
+	}
+	
+	@Override
+	public  SystemClientParams selectByPrimaryKey(long id) {
+		return systemClientParamsMapper.selectByPrimaryKey(id);
+	}
+	
 	@Transactional
-	public void deleteSystemClientParams(final SystemClientParams scp, final System system) {
-		systemClientParamsDao.excute(new HibernateCallback() {
-			public Object doInHibernate(Session session) throws HibernateException {
-				Query query = session.createQuery(
-						"delete from SystemClientParams scp where scp.name = ? and scp.key =? and scp.value = ? and scp.system.id = ?");
-				query.setParameter(0, scp.getName());
-				query.setParameter(1, scp.getKey());
-				query.setParameter(2, scp.getValue());
-				query.setParameter(3, system.getId());
-				return query.executeUpdate();
-			}
-		});
-	}
-
-	public void addSystemClientParams(SystemClientParams scp, System system) {
-		scp.setSystem(system);
-		systemClientParamsDao.create(scp);
-	}
-
-	@Transactional
-	public void deleteSystemClientParams(final SystemClientParams scp) {
-		systemClientParamsDao.excute(new HibernateCallback() {
-
-			public Object doInHibernate(Session session) throws HibernateException {
-				Query query = session.createQuery(
-						"delete from SystemClientParams scp where scp.name=? and scp.key = ?  and scp.value = ? ");
-				query.setParameter(0, scp.getName());
-				query.setParameter(1, scp.getKey());
-				query.setParameter(2, scp.getValue());
-				return query.executeUpdate();
-			}
-		});
-	}
-
-	public SystemClientParamsAdmin getSystemClientParamsAdmin(final SystemClientParams scp) {
-
-		return (SystemClientParamsAdmin) systemClientParamsDao.excute(new HibernateCallback<SystemClientParamsAdmin>() {
-			public SystemClientParamsAdmin doInHibernate(Session session) throws HibernateException {
-				Query query = session
-						.createQuery("from SystemClientParams s where s.key = ?");
-				query.setParameter(0, scp.getKey());
-				List<SystemClientParams> list = query.list();
-				SystemClientParamsAdmin scpa = new SystemClientParamsAdmin(scp);
-				for (SystemClientParams fscp : list) {
-					System system = fscp.getSystem();
-					if (scpa.getSystemList().contains(system)) {
-						continue;
-					}
-					scpa.getSystemList().add(fscp.getSystem());
-					scpa.setSystemClientParams(fscp);
-				}
-				return scpa;
-			}
-		});
-
-	}
-
-	@Transactional
-	public void update(final SystemClientParams oscp, final SystemClientParams nscp) {
-		systemClientParamsDao.excute(new HibernateCallback() {
-			public Object doInHibernate(Session session) throws HibernateException {
-				Query query = session.createQuery(
-						"update SystemClientParams s set s.name=? , s.key=? , s.value=? where s.name=? and s.key = ? ");
-				query.setParameter(0, nscp.getName());
-				query.setParameter(1, nscp.getKey());
-				query.setParameter(2, nscp.getValue());
-				query.setParameter(3, oscp.getName());
-				query.setParameter(4, oscp.getKey());
-				return query.executeUpdate();
-			}
-		});
-	}
-
 	@Override
-	public SystemClientParams getSystemClientParamsBySystemAndKey(System system, String key) {
-		List<SystemClientParams> list = systemClientParamsDao.list(
-				"from SystemClientParams scp where scp.system.id=? and scp.key=?",
-				new Serializable[] { system.getId(), key });
-		if (list == null || list.size() == 0)
-			return null;
-		else
-			return list.get(0);
-	}
-
-	@Override
-	public Integer getCount(int type) {
-		return systemClientParamsMapper.getCount(type);
-	}
-	
-	@Override
-	public List<CustomerName> customerNameList(int page, String key, int type) {
-		int start = page * Constant.PAGE_SIZE;
-		return systemHelpListDao.list(
-
-			"from CustomerName cn where cn.type = ? and cn.name like ? order by cn.createTime asc", start,
-			Constant.PAGE_SIZE, new Serializable[] {type, "%"+key+"%"});
-	}
-
-	@Override
-	public void deleteHelp(long id) {
-		systemHelpListDao.excute(new HibernateCallback() {
-			public Object doInHibernate(Session session) 
-								throws HibernateException {
-				Query query = session.createQuery("delete from CustomerName cn where cn.id = ?");
-				query.setParameter(0, id);
-				query.executeUpdate();
-				return null;
-			}
-		});
-	}
-	
-
-	@Override
-	public CustomerName getHelpCenter(int type) {
-		return systemClientParamsMapper.getHelpCenter(type);
-	}
-
-	@Override
-	public Integer getProblemCount(long id) {
-		return systemClientParamsMapper.getProblemCount(id);
-	}
-
-	@Override
-	public List<CustomerContent> getSecondProblemList(int index, String key, long id) {
-		int start = index * Constant.PAGE_SIZE;
-		return systemSecondProblemDao.list(
-				"from CustomerContent cc where cc.cnId = ? and cc.title like ? order by cc.createTime asc", start,
-				Constant.PAGE_SIZE, new Serializable[] {id, "%"+key+"%"});
-	}
-	
-	
-	@Override
-	public void deleteSecondProblem(long id) {
-		systemSecondProblemDao.excute(new HibernateCallback() {
-			public Object doInHibernate(Session session) 
-								throws HibernateException {
-				Query query = session.createQuery("delete from CustomerContent cc where cc.id = ?");
-				query.setParameter(0, id);
-				query.executeUpdate();
-				return null;
-			}
-		});
-	}
-
-	@Override
-	public CustomerContent getCustomerContent(long id) {
-		return systemSecondProblemDao.find(CustomerContent.class, id);
-	}
-
-	@Override
-	public void updateAnswerDetail(CustomerContent customerContent) {
-		CustomerContent find = systemSecondProblemDao.find(CustomerContent.class, customerContent.getId());
-		if(find == null ){
-			return;
+	public void deleteBatchByPrimaryKey(List<Long> ids) {
+		for (Long id: ids) {
+			systemClientParamsMapper.deleteByPrimaryKey(id);
 		}
-		find.setTitle(customerContent.getTitle());
-		find.setContent(customerContent.getContent());
-		systemSecondProblemDao.update(find);
 	}
-
-	@Override
-	public void addFirstMenu(CustomerName customerName, int type) {
-		customerName.setName(customerName.getName());
-		customerName.setCreateTime(new Date());
-		customerName.setType(type);
-		systemHelpListDao.save(customerName);
-	}
-
-	@Override
-	public void addSecondMenu(CustomerContent customerContent, long cnId) {
-		customerContent.setCnId(cnId);
-		customerContent.setTitle(customerContent.getTitle());
-		customerContent.setContent(customerContent.getContent());
-		customerContent.setCreateTime(new Date());
-		systemSecondProblemDao.save(customerContent);
-	}
-
-	@Override
-	public List<CustomerContent> contactCustomerService(String title) {
-		return systemClientParamsMapper.contactCustomerService(title);
-	}
-
-
 
 }

--
Gitblit v1.8.0