返回格式统一调整，代码规范调整

src/main/java/com/uas/platform/b2b/manage/controller/AccountController.java

@@ -6,7 +6,6 @@ import com.uas.platform.b2b.manage.model.Constant;
 import com.uas.platform.b2b.manage.model.UseType;
 import com.uas.platform.b2b.manage.model.User;
 import com.uas.platform.b2b.manage.page.exception.IllegalOperatorException;
-import com.uas.platform.b2b.manage.service.UseLogService;
 import com.uas.platform.b2b.manage.service.UserService;
 import com.uas.platform.b2b.manage.support.MyException;
 import com.uas.platform.b2b.manage.support.SecurityConstant;
@@ -16,12 +15,10 @@ import com.uas.platform.core.util.encry.Md5Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.support.SessionStatus;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
@@ -37,9 +34,6 @@ public class AccountController extends BaseController {
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private UseLogService useLogService;
-
 	/**
 	 * 账户信息
 	 * 

src/main/java/com/uas/platform/b2b/manage/controller/InviteController.java

@@ -1,10 +1,10 @@
 package com.uas.platform.b2b.manage.controller;
 
+import com.uas.platform.b2b.manage.controller.support.PageResultBean;
 import com.uas.platform.b2b.manage.core.support.SystemSession;
 import com.uas.platform.b2b.manage.model.Invite;
 import com.uas.platform.b2b.manage.model.UseType;
 import com.uas.platform.b2b.manage.service.InviteService;
-import com.uas.platform.b2b.manage.service.UseLogService;
 import com.uas.platform.b2b.manage.support.DateFormatUtils;
 import com.uas.platform.b2b.manage.support.JxlsExcelView;
 import com.uas.platform.b2b.manage.support.MyException;
@@ -13,7 +13,6 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
@@ -49,7 +48,7 @@ public class InviteController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Page<Invite> findByPageInfo(PageParams params, String keyword, HttpServletRequest request, String fromDate, String endDate) throws ParseException {
+    public PageResultBean<Invite> findByPageInfo(PageParams params, String keyword, HttpServletRequest request, String fromDate, String endDate) throws ParseException {
         PageInfo info = new PageInfo(params);
         Sort sort = new Sort(Sort.Direction.DESC, "enDate");
         info.setSort(sort);
@@ -57,7 +56,7 @@ public class InviteController extends BaseController {
             keyword = keyword.trim();
         }
         useLogService.appendLog(UseType.UAS_INVITE_SEARCH.code(), keyword, AgentUtils.getIp(request));
-        return inviteService.findInviteByPageInfo(info, keyword, fromDate, endDate);
+        return new PageResultBean<>(inviteService.findInviteByPageInfo(info, keyword, fromDate, endDate));
     }
 
     /**
@@ -73,12 +72,12 @@ public class InviteController extends BaseController {
         params.setPage(1);
         params.setCount(JxlsExcelView.MAX_SIZE);
         ModelAndView modelAndView = new ModelAndView();
-        Page<Invite> invites = findByPageInfo(params, keyword, request, fromDate, endDate);
+        PageResultBean<Invite> invites = findByPageInfo(params, keyword, request, fromDate, endDate);
         modelAndView.addObject("time", DateFormatUtils.EXPORT_FORMAT.format(new Date(System.currentTimeMillis())));
         modelAndView.addObject("user", SystemSession.getUser().getFullName());
         modelAndView.addObject("count",
                 invites.getTotalElements() > JxlsExcelView.MAX_SIZE ? JxlsExcelView.MAX_SIZE : invites.getTotalElements());
-        modelAndView.addObject("data", invites.getContent());
+        modelAndView.addObject("data", invites.getData());
         modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
         modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/Invite", "邀请注册记录"));
         useLogService.appendLog(UseType.EXPROT_INVITE_DATA.code(), keyword, AgentUtils.getIp(request));

src/main/java/com/uas/platform/b2b/manage/controller/ListenController.java

@@ -14,8 +14,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * 监控数据查询接口
  * @Author: huj
@@ -41,7 +39,6 @@ public class ListenController extends BaseController {
             keyword = keyword.trim();
         }
         useLogService.appendLog(UseType.MONITORING_SEARCH.code(), keyword, AgentUtils.getIp(request));
-        PageResultBean resultBean = new PageResultBean(listenService.findAll(info, keyword));
-        return resultBean;
+        return new PageResultBean<>(listenService.findAll(info, keyword));
     }
 }

src/main/java/com/uas/platform/b2b/manage/controller/LogsController.java

@@ -1,15 +1,14 @@
 package com.uas.platform.b2b.manage.controller;
 
+import com.uas.platform.b2b.manage.controller.support.PageResultBean;
 import com.uas.platform.b2b.manage.model.ErrorLog;
 import com.uas.platform.b2b.manage.model.UseType;
 import com.uas.platform.b2b.manage.service.ErrorLogService;
-import com.uas.platform.b2b.manage.service.UseLogService;
 import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
@@ -42,7 +41,7 @@ public class LogsController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/errPage", method = RequestMethod.GET)
-    public Page<ErrorLog> findByPageInfo(PageParams params, String keyword, HttpServletRequest request, Long fromDate, Long endDate) {
+    public PageResultBean<ErrorLog> findByPageInfo(PageParams params, String keyword, HttpServletRequest request, Long fromDate, Long endDate) {
         PageInfo info = new PageInfo(params);
         Sort sort = new Sort(Sort.Direction.DESC, "id");
         info.setSort(sort);
@@ -50,7 +49,7 @@ public class LogsController extends BaseController {
             keyword = keyword.trim();
         }
         useLogService.appendLog(UseType.LOGS_SEARCH.code(), keyword, AgentUtils.getIp(request));
-        return logService.findErrLogsByPageInfo(info, keyword, fromDate, endDate);
+        return new PageResultBean<>(logService.findErrLogsByPageInfo(info, keyword, fromDate, endDate));
     }
 
     /**

src/main/java/com/uas/platform/b2b/manage/controller/SaleNoticeController.java

@@ -1,16 +1,15 @@
 package com.uas.platform.b2b.manage.controller;
 
+import com.uas.platform.b2b.manage.controller.support.PageResultBean;
 import com.uas.platform.b2b.manage.model.UseType;
 import com.uas.platform.b2b.manage.page.PageInfo;
 import com.uas.platform.b2b.manage.page.PageParams;
 import com.uas.platform.b2b.manage.service.NoticeRecordService;
 import com.uas.platform.b2b.manage.model.NoticeRecordInfo;
-import com.uas.platform.b2b.manage.service.UseLogService;
 import com.uas.platform.b2b.manage.utils.SearchUtils;
 import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
@@ -40,7 +39,7 @@ public class SaleNoticeController extends BaseController {
      * @return Page<NoticeRecordInfo>
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Page<NoticeRecordInfo> findByPageInfo(PageParams params, String keyword,
+    public PageResultBean<NoticeRecordInfo> findByPageInfo(PageParams params, String keyword,
                                                  @RequestParam(value = "method", defaultValue = SearchUtils.SEARCH_ALL, required = false) String method) throws ParseException {
         PageInfo pageInfo = new PageInfo(params);
         Sort sort = new Sort(Sort.Direction.DESC, "id");
@@ -49,7 +48,7 @@ public class SaleNoticeController extends BaseController {
             keyword = keyword.trim();
         }
         useLogService.appendLog(UseType.SALE_NOTICE_SEARCH.code(), keyword, AgentUtils.getIp(request));
-        return recordService.findRecordByPageInfo(pageInfo, keyword, method);
+        return new PageResultBean<>(recordService.findRecordByPageInfo(pageInfo, keyword, method));
     }
 
     /**

src/main/java/com/uas/platform/b2b/manage/controller/UasSchedularController.java

@@ -6,7 +6,6 @@ import com.uas.platform.b2b.manage.model.UseType;
 import com.uas.platform.b2b.manage.page.PageInfo;
 import com.uas.platform.b2b.manage.page.PageParams;
 import com.uas.platform.b2b.manage.service.UasSchedularService;
-import com.uas.platform.b2b.manage.service.UseLogService;
 import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,9 +32,6 @@ public class UasSchedularController extends BaseController {
     @Autowired
     private UasSchedularService schedularService;
 
-    @Autowired
-    private UseLogService useLogService;
-
     /**
      * 设置轮询地址
      *

src/main/java/com/uas/platform/b2b/manage/core/support/SystemSession.java

@@ -14,8 +14,6 @@ public class SystemSession {
 
 	private static ThreadLocal<User> local = new ThreadLocal<>();
 
-	private static User user;
-
 	private static ThreadLocal<HttpSession> localSession = new ThreadLocal<>();
 
 	public static void setUser(User session) {

src/main/java/com/uas/platform/b2b/manage/service/impl/EnterpriseBaseInfoServiceImpl.java

@@ -10,18 +10,18 @@ import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.manage.page.criteria.LogicalExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 /**
  * 企业基本信息操作实现
  *
- * Created by hejq on 2018-04-20.
+ *
+ * @author hejq
+ * @date 2018-04-20
  */
 @Service
 public class EnterpriseBaseInfoServiceImpl extends BaseService implements EnterpriseBaseInfoService {
@@ -53,12 +53,7 @@ public class EnterpriseBaseInfoServiceImpl extends BaseService implements Enterp
                 info.expression(logical);
             }
         }
-        return baseInfoDao.findAll(new Specification<EnterpriseBaseInfo>() {
-            @Override
-            public Predicate toPredicate(Root<EnterpriseBaseInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                query.where(info.getPredicates(root, query, builder));
-                return null;
-            }
-        }, info);
+        return baseInfoDao.findAll((Root<EnterpriseBaseInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder)
+                -> query.where(info.getPredicates(root, query, builder)).getRestriction(), info);
     }
 }

src/main/java/com/uas/platform/b2b/manage/service/impl/InviteServiceImpl.java

@@ -10,10 +10,7 @@ import com.uas.platform.b2b.manage.support.CollectionUtil;
 import com.uas.platform.b2b.manage.support.MyException;
 import com.uas.platform.b2b.manage.core.util.StringUtils;
 import com.uas.platform.b2b.manage.dao.EnterpriseBaseInfoDao;
-import com.uas.platform.b2b.manage.support.MyThread;
 import com.uas.platform.b2b.manage.support.MyThreadPoolExecutor;
-import com.uas.platform.b2b.manage.model.*;
-import com.uas.platform.b2b.manage.support.*;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
@@ -22,21 +19,18 @@ import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.*;
 
 
 /**
@@ -77,13 +71,13 @@ public class InviteServiceImpl extends BaseService implements InviteService {
     public Page<Invite> findInviteByPageInfo(final PageInfo info, String keyword, String fromDate, String endDate) throws ParseException {
         if (!StringUtils.isEmpty(keyword)) {
             SimpleExpression name = new SimpleExpression("enName", keyword, CriterionExpression.Operator.LIKE, true);
-            SimpleExpression enBussinessCode = new SimpleExpression("enBussinessCode", keyword, CriterionExpression.Operator.LIKE, true);
+            SimpleExpression enBusinessCode = new SimpleExpression("enBussinessCode", keyword, CriterionExpression.Operator.LIKE, true);
             SimpleExpression inviteEnName = new SimpleExpression("inviteEnName", keyword, CriterionExpression.Operator.LIKE, true);
             SimpleExpression inviteUserName = new SimpleExpression("inviteUserName", keyword, CriterionExpression.Operator.LIKE, true);
             SimpleExpression adminUserName = new SimpleExpression("adminName", keyword, CriterionExpression.Operator.LIKE, true);
             List<SimpleExpression> expressionList = new ArrayList<>();
             expressionList.add(name);
-            expressionList.add(enBussinessCode);
+            expressionList.add(enBusinessCode);
             expressionList.add(inviteEnName);
             expressionList.add(inviteUserName);
             expressionList.add(adminUserName);
@@ -101,13 +95,8 @@ public class InviteServiceImpl extends BaseService implements InviteService {
         if (!StringUtils.isEmpty(endDate)) {
             info.expression(PredicateUtils.lte("enDate", SIMPLE_DATE_FORMAT.parse(endDate), false));
         }
-        Page<Invite> invites = inviteDao.findAll(new Specification<Invite>() {
-            @Override
-            public Predicate toPredicate(Root<Invite> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                query.where(info.getPredicates(root, query, builder));
-                return null;
-            }
-        }, info);
+        Page<Invite> invites = inviteDao.findAll((Root<Invite> root, CriteriaQuery<?> query, CriteriaBuilder builder)
+                -> query.where(info.getPredicates(root, query, builder)).getRestriction(), info);
         Map<Long, InviteProdInfo> map = productService.findByEnUUList(CollectionUtil.getKeyCollection(invites.getContent()));
         for (Invite invite : invites) {
             if (null != invite.getUu()) {
@@ -152,13 +141,7 @@ public class InviteServiceImpl extends BaseService implements InviteService {
         String sql = "update sec$enterprises set en_inviteuu = " + inviteUU +
                 ", en_inviteuseruu = " + inviteUserUU + " where en_uu = " + enUU;
         jdbcTemplate.execute(sql);
-        MyThreadPoolExecutor.executor.execute(new Runnable() {
-            @Override
-            public void run() {
-                // 更新邀请记录
-                updateInvitation(inviteUserUU, enUU, inviteUU);
-            }
-        });
+        MyThreadPoolExecutor.executor.execute(() ->  updateInvitation(inviteUserUU, enUU, inviteUU));
         return new ModelMap("content", inviteDao.findOne(enUU));
     }
 
@@ -296,21 +279,4 @@ public class InviteServiceImpl extends BaseService implements InviteService {
         jdbcTemplate.execute(sql);
     }
 
-    public static void main(String[] args) {
-        ThreadPoolExecutor executor = new ThreadPoolExecutor(
-                5,
-                10,
-                60,
-                TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(),
-                new MyThread(),
-                new ThreadPoolExecutor.AbortPolicy());
-        executor.execute(new Runnable() {
-            @Override
-            public void run() {
-                System.out.println("Tread start");
-            }
-        });
-    }
-
-
 }

src/main/java/com/uas/platform/b2b/manage/service/impl/ListenServiceImpl.java

@@ -10,12 +10,10 @@ import com.uas.platform.b2b.manage.page.criteria.SimpleExpression;
 import com.uas.platform.b2b.manage.service.ListenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 /**
@@ -39,12 +37,7 @@ public class ListenServiceImpl implements ListenService {
             SimpleExpression name = new SimpleExpression("name", keyword, CriterionExpression.Operator.LIKE, true);
             info.expression(name);
         }
-        return listenDao.findAll(new Specification<Listen>() {
-            @Override
-            public Predicate toPredicate(Root<Listen> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                query.where(info.getPredicates(root, query, builder));
-                return null;
-            }
-        }, info);
+        return listenDao.findAll((Root<Listen> root, CriteriaQuery<?> query, CriteriaBuilder builder)
+                -> query.where(info.getPredicates(root, query, builder)).getRestriction(), info);
     }
 }

src/main/java/com/uas/platform/b2b/manage/service/impl/UasSchedularServiceImpl.java

@@ -11,12 +11,10 @@ import com.uas.platform.b2b.manage.page.criteria.LogicalExpression;
 import com.uas.platform.b2b.manage.service.UasSchedularService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.Date;
 
@@ -73,12 +71,7 @@ public class UasSchedularServiceImpl implements UasSchedularService {
             LogicalExpression logical = new LogicalExpression(expressions, CriterionExpression.Operator.OR);
             info.expression(logical);
         }
-        return schedularDao.findAll(new Specification<UasSchedular>() {
-            @Override
-            public Predicate toPredicate(Root<UasSchedular> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                query.where(info.getPredicates(root, query, builder));
-                return null;
-            }
-        }, info);
+        return schedularDao.findAll((Root<UasSchedular> root, CriteriaQuery<?> query, CriteriaBuilder builder) ->
+                query.where(info.getPredicates(root, query, builder)).getRestriction(), info);
     }
 }

src/main/webapp/resources/js/common/invite.js

@@ -30,8 +30,9 @@ function getinviteList(count, page, keyword) {
         endDate: $('#endDate').val()
     }, function (data) {
         $('#loadingDiv').hide();
-        inviteList = data.content;
+        inviteList = data.data;
         var pageNumber = data.number;
+        var pageNumber = data.page;
         var pageSize = data.size;
         var total = data.totalElements;
         var totalPage = data.totalPages;

src/main/webapp/resources/js/common/log.js

@@ -30,8 +30,8 @@ function getLogList(count, page, keyword, fromDate, endDate) {
         endDate: endDate
     }, function (data) {
         $('#loadingDiv').hide();
-        logList = data.content;
-        var pageNumber = data.number;
+        logList = data.data;
+        var pageNumber = data.page;
         var pageSize = data.size;
         var total = data.totalElements;
         var totalPage = data.totalPages;

src/main/webapp/resources/js/common/notice.js

@@ -33,8 +33,8 @@ function getNoticeList(count, page, keyword, method) {
         method: method
     }, function (data) {
         $('#loadingDiv').hide();
-        noticeList = data.content;
-        var pageNumber = data.number;
+        noticeList = data.data;
+        var pageNumber = data.page;
         var pageSize = data.size;
         var total = data.totalElements;
         var totalPage = data.totalPages;