From fb6de01aa4d7b20c7f1c12af898e44b7e1a5469e Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 14 Jun 2017 15:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=A2=9E=E5=8A=A0=E6=B5=81?=
 =?UTF-8?q?=E4=BA=A7=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/biz/service/BasicConfigService.java   |  9 +++------
 .../src/main/java/com/lyms/platform/pojo/BasicConfig.java   | 11 +++++++++++
 .../platform/operate/web/request/BasicConfigAddRequest.java | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java
index 5430f55..fdf1d78 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.biz.service;
 
-import com.google.common.cache.*;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.lyms.platform.biz.dal.IBasicConfigDao;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.dao.operator.MongoCondition;
@@ -11,19 +12,16 @@ import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.utils.AddressUtil;
 import com.lyms.platform.common.utils.CacheHelper;
-import com.lyms.platform.common.utils.ExceptionUtils;
 import com.lyms.platform.pojo.BasicConfig;
 import com.lyms.platform.query.BasicConfigQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 @Service("basicConfigService")
 public class BasicConfigService implements InitializingBean {
@@ -48,8 +46,7 @@ public class BasicConfigService implements InitializingBean {
             basicConfigQuery.mysqlBuild(basicConfigDao.queryBasicConfigCount(basicConfigQuery.convertToQuery()));
             query.start(basicConfigQuery.getOffset()).end(basicConfigQuery.getLimit());
         }
-
-        return basicConfigDao.queryBasicConfig(query.addOrder(Direction.ASC, "createDate"));
+        return basicConfigDao.queryBasicConfig(query.addOrder(Direction.DESC, "createDate,weight"));
     }
 
 
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
index 471380c..f1f9c53 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
@@ -27,6 +27,9 @@ public class BasicConfig extends BaseModel {
 
     private String typeId;
 
+    //权重
+    private Integer weight;
+
     private String publishName;
     private String publishId;
     private Long createDate;
@@ -36,6 +39,14 @@ public class BasicConfig extends BaseModel {
     private String describe;
     private String color;
 
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Integer weight) {
+        this.weight = weight;
+    }
+
     public String getColor() {
         return color;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java
index 5ba44c1..c64aac1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java
@@ -14,14 +14,24 @@ public class BasicConfigAddRequest implements IBasicRequestConvert<BasicConfig>{
     private String parentId;
     @FormParam
     private String name;
-
     @FormParam
     private String code;
+    //权重
+    @FormParam
+    private Integer weight;
 
     private String typeId;
     private Integer score;
     private String describe;
 
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Integer weight) {
+        this.weight = weight;
+    }
+
     public String getTypeId() {
         return typeId;
     }
@@ -82,6 +92,7 @@ public class BasicConfigAddRequest implements IBasicRequestConvert<BasicConfig>{
         if(StringUtils.isEmpty(parentId)){
             return null;
         }
+        basicConfig.setWeight(weight);
         basicConfig.setTypeId(typeId);
         basicConfig.setDescribe(describe);
         basicConfig.setScore(score);
-- 
1.8.3.1