fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
@@ -174,7 +174,7 @@ List<TaoBaoOrder> orderList = null ; try { orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream()); out.print(JsonUtil.loadTrueResult("上传文件成功")); out.print(JsonUtil.loadTrueResult("上传成功,系统正在处理中...")); } catch (IOException e) { out.print(JsonUtil.loadFalseResult("上传文件失败")); e.printStackTrace(); @@ -228,15 +228,72 @@ String contentType = file.getContentType(); String type = contentType.substring(contentType.indexOf("/") + 1); // 上传文件相对位置 String fileUrl=UUID.randomUUID().toString().replace("-", "") + "." + type; String fileUrl="/img/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type; String uploadPath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl(); out.print(JsonUtil.loadTrueResult(uploadPath)); JSONObject data = new JSONObject(); data.put("original", file.getOriginalFilename()); data.put("name", file.getOriginalFilename()); data.put("url", uploadPath); data.put("size", file.getSize() + ""); data.put("type", "." + type); data.put("state", "SUCCESS"); out.print(JsonUtil.loadTrueResult(data)); } catch (IOException e) { out.print(JsonUtil.loadFalseResult("上传图片失败")); e.printStackTrace(); } } /** * * 方法说明: 上传Apk安装包 * * @param file * @param out */ @RequestMapping(value = "installPackage") public void installPackage(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletResponse response, PrintWriter out) { response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Methods", "*"); AdminUser admin = adminUserService.selectByPrimaryKey(uid); if (admin == null) { out.print(JsonUtil.loadFalseResult("当前账户验证失败")); return; } if (file == null) { out.print(JsonUtil.loadFalseResult("上传文件为空")); return; } try { InputStream inputStream = file.getInputStream(); String contentType = file.getContentType(); String type = contentType.substring(contentType.indexOf("/") + 1); // 上传文件相对位置 String fileUrl="/img/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk"; String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl(); JSONObject data = new JSONObject(); data.put("original", file.getOriginalFilename()); data.put("name", file.getOriginalFilename()); data.put("url", uploadFilePath); data.put("size", file.getSize() + ""); data.put("type", "." + type); data.put("state", "SUCCESS"); out.print(JsonUtil.loadTrueResult(data)); } catch (Exception e) { out.print(JsonUtil.loadFalseResult("上传失败")); e.printStackTrace(); } } } fanli/src/main/java/com/yeshi/fanli/controller/admin/config/JumpDetailAdminController.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/controller/admin/JumpDetailAdminController.java @@ -1,4 +1,4 @@ package com.yeshi.fanli.controller.admin; package com.yeshi.fanli.controller.admin.config; import java.io.PrintWriter; import java.util.ArrayList; fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemAdminController.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/controller/admin/SystemAdminController.java @@ -1,4 +1,4 @@ package com.yeshi.fanli.controller.admin; package com.yeshi.fanli.controller.admin.config; import java.io.PrintWriter; import java.util.List; fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/controller/admin/SystemClientParamsAdminController.java @@ -1,7 +1,8 @@ package com.yeshi.fanli.controller.admin; package com.yeshi.fanli.controller.admin.config; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -13,7 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.yeshi.fanli.entity.admin.SystemClientParamsAdmin; import com.yeshi.fanli.entity.bus.help.AppPageNotification; import com.yeshi.fanli.entity.bus.help.AppPageNotification.AppPageNotificationTypeEnum; import com.yeshi.fanli.entity.system.CustomerContent; import com.yeshi.fanli.entity.system.CustomerName; import com.yeshi.fanli.entity.system.System; @@ -23,7 +28,9 @@ import com.yeshi.fanli.tag.PageEntity; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.GsonUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.Utils; import org.yeshi.utils.JsonUtil; import net.sf.json.JSONObject; @@ -302,5 +309,167 @@ out.print(JsonUtil.loadTrueResult("添加成功")); } /** * 后端查询-新后台 * @param callback * @param pageIndex * @param pageSize * @param key * @param systemId * @param out */ @RequestMapping(value="query") public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long systemId, PrintWriter out) { if (pageIndex == null || pageIndex < 1) { pageIndex = 1; } if (pageSize == null || pageSize < 1) { pageSize = Constant.PAGE_SIZE; } try { List<SystemClientParams> list = systemClientParamsService.listQuery((pageIndex - 1) * pageSize, pageSize, key, systemId); if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据")); return; } long count = systemClientParamsService.countQuery(key, systemId); int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); JSONObject data = new JSONObject(); data.put("pe", pe); data.put("result_list", list); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常")); e.printStackTrace(); } } /** * 新增 * @param callback * @param special * @param out */ @RequestMapping(value = "saveAdd") public void saveAdd(String callback, SystemClientParams systemClientParams, String idArray, PrintWriter out) { String key = systemClientParams.getKey(); String name = systemClientParams.getName(); String value = systemClientParams.getValue(); if (StringUtil.isNullOrEmpty(key) || StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(value) || StringUtil.isNullOrEmpty(idArray)) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("名称、key、value、系统不能为空")); return; } Gson gson = new Gson(); List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType()); if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("系统不能为空")); return; } try { systemClientParamsService.addSystemClientParams(systemClientParams, null); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("添加成功")); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常")); e.printStackTrace(); } } /** * 修改 * @param callback * @param special * @param out */ @RequestMapping(value = "saveModify") public void saveModify(String callback, SystemClientParams systemClientParams, PrintWriter out) { String key = systemClientParams.getKey(); String name = systemClientParams.getName(); String value = systemClientParams.getValue(); if (StringUtil.isNullOrEmpty(key) || StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(value)) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("名称、key、value不能为空")); return; } try { List<SystemClientParams> list = systemClientParamsService.getSystemClientParamsBySystemId(systemClientParams.getId()); if (list == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作数据已不存在")); return; } SystemClientParams resultObject = list.get(0); systemClientParams.setSystem(resultObject.getSystem()); systemClientParams.setUpdatetime(java.lang.System.currentTimeMillis()); systemClientParamsService.update(systemClientParams); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("修改成功")); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常")); e.printStackTrace(); } } /** * 删除 * @param callback * @param idArray * @param out */ @RequestMapping(value = "delete") public void delete(String callback, String idArray, PrintWriter out) { try { if (StringUtil.isNullOrEmpty(idArray)) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请选择操作的数据")); return; } Gson gson = new Gson(); List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType()); if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未检测到删除的数据")); return; } systemClientParamsService.deleteBatchByPrimaryKey(list); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("删除成功")); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败")); e.printStackTrace(); } } } fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemConfigAdminController.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/controller/admin/SystemConfigAdminController.java @@ -1,4 +1,4 @@ package com.yeshi.fanli.controller.admin; package com.yeshi.fanli.controller.admin.config; import java.io.PrintWriter; import java.util.HashMap; fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java
@@ -7,6 +7,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.Transient; import org.yeshi.utils.mybatis.Column; @@ -72,6 +73,14 @@ @Expose private Integer resultCode;// 第三方平台订单爬取结果 @Transient private Integer total; @Transient private Integer totalPass; @Transient private Integer totalReject; public Integer getResultCode() { return resultCode; } @@ -160,4 +169,28 @@ this.order = order; } public Integer getTotal() { return total; } public void setTotal(Integer total) { this.total = total; } public Integer getTotalPass() { return totalPass; } public void setTotalPass(Integer totalPass) { this.totalPass = totalPass; } public Integer getTotalReject() { return totalReject; } public void setTotalReject(Integer totalReject) { this.totalReject = totalReject; } } fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java
@@ -7,6 +7,7 @@ import javax.annotation.Resource; import org.apache.commons.beanutils.PropertyUtils; import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; @@ -25,7 +26,9 @@ import com.yeshi.fanli.entity.system.System; import com.yeshi.fanli.entity.system.SystemClientParams; import com.yeshi.fanli.service.inter.config.SystemClientParamsService; import com.yeshi.fanli.service.inter.config.SystemService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; @Service public class SystemClientParamsServiceImpl implements SystemClientParamsService { @@ -38,6 +41,9 @@ @Resource private SystemHelpListDao systemHelpListDao; @Resource private SystemService systemService; @Resource private SystemSecondProblemDao systemSecondProblemDao; @@ -74,6 +80,7 @@ list = systemClientParamsDao.list(hqlb.toString()); } } SystemClientParamsAdmin scpa = null; for (SystemClientParams scp : list) { scpa = new SystemClientParamsAdmin(scp); @@ -287,6 +294,108 @@ return systemClientParamsMapper.contactCustomerService(title); } @Override public List<SystemClientParams> listQuery(int start, int count, String key, Long systemId) { List<SystemClientParams> list = null; if (systemId == null) { if (StringUtil.isNullOrEmpty(key)) { list = systemClientParamsDao.list("from SystemClientParams scp", start, count, null); } else { list = systemClientParamsDao.list("from SystemClientParams scp where (scp.name like ? or scp.key like ?) ", start, count, new Serializable[] { "%" + key + "%" ,"%" + key + "%"}); } } else { if (StringUtil.isNullOrEmpty(key)) { list = systemClientParamsDao.list("from SystemClientParams scp where scp.system.id = ? ", new Serializable[] {systemId}); } else { list = systemClientParamsDao.list( "from SystemClientParams scp where scp.system.id = ? and (scp.name like ? or scp.key like ?)", new Serializable[] {systemId, "%" + key + "%" ,"%" + key + "%"}); } } return list; } @Override public long countQuery(String key, Long systemId) { if (systemId == null) { if (StringUtil.isNullOrEmpty(key)) { return systemClientParamsDao.getCount("from SystemClientParams scp"); } else { return systemClientParamsDao.getCount("from SystemClientParams scp where (scp.name like ? or scp.key like ?) ", new Serializable[] { "%" + key + "%" ,"%" + key + "%"}); } } else { if (StringUtil.isNullOrEmpty(key)) { return systemClientParamsDao.getCount("from SystemClientParams scp where scp.system.id = ? ", new Serializable[] {systemId}); } else { return systemClientParamsDao.getCount( "from SystemClientParams scp where scp.system.id = ? and (scp.name like ? or scp.key like ?)", new Serializable[] {systemId, "%" + key + "%" ,"%" + key + "%"}); } } } @Transactional public void saveAdd(SystemClientParams scp, List<Long> listId) throws Exception { if (listId == null || listId.size() == 0) { return; } SystemClientParams nscp = null; for (Long systemId : listId) { System system = new System(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); } } @Override public void update(SystemClientParams systemClientParams) { systemClientParamsDao.update(systemClientParams); } @Override public List<SystemClientParams> getById(long id) { return systemClientParamsDao.list("from SystemClientParams scp where scp.id=?", new Serializable[] { id }); } @Transactional @Override public void deleteBatchByPrimaryKey(List<Long> ids) { for (Long id: ids) { systemClientParamsDao.excute(new HibernateCallback() { public Object doInHibernate(Session session) throws HibernateException { Query query = session.createQuery("delete from SystemClientParams scp where scp.id= ?"); query.setParameter(0, id); return query.executeUpdate(); } }); } } } fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemClientParamsService.java
@@ -2,8 +2,6 @@ import java.util.List; import org.springframework.cache.annotation.Cacheable; import com.yeshi.fanli.entity.admin.SystemClientParamsAdmin; import com.yeshi.fanli.entity.system.CustomerContent; import com.yeshi.fanli.entity.system.CustomerName; @@ -61,4 +59,35 @@ public List<CustomerContent> contactCustomerService(String title); /** * 新版后台查询 * @param start * @param count * @param key * @param systemId * @return */ public List<SystemClientParams> listQuery(int start, int count, String key, Long systemId); public long countQuery(String key, Long systemId); /** * 更新 * @param systemClientParams */ public void update(SystemClientParams systemClientParams); /** * 根据id获取 * @param id * @return */ public List<SystemClientParams> getById(long id); /** * 根据id批量删除 * @param ids */ public void deleteBatchByPrimaryKey(List<Long> ids); }
