Browse Source

1、实现动态配置
2、实现订单的分页查询

binguoc 4 years ago
parent
commit
7f805d6188

+ 19 - 0
src/main/java/com/chuanghai/repair/service/ServiceImpl/CacheManagerImpl.java

@@ -19,18 +19,22 @@ public class CacheManagerImpl implements ICacheManager {
 
     /**
      * 存入缓存
+     *
      * @param key
      * @param cache
      */
+    @Override
     public void putCache(String key, EntityCache cache) {
         caches.put(key, cache);
     }
 
     /**
      * 存入缓存
+     *
      * @param key
      * @param
      */
+    @Override
     public void putCache(String key, Object datas, long timeOut) {
         timeOut = timeOut > 0 ? timeOut : 0L;
         putCache(key, new EntityCache(datas, timeOut, System.currentTimeMillis()));
@@ -38,9 +42,11 @@ public class CacheManagerImpl implements ICacheManager {
 
     /**
      * 获取对应缓存
+     *
      * @param key
      * @return
      */
+    @Override
     public EntityCache getCacheByKey(String key) {
         if (this.isContains(key)) {
             return caches.get(key);
@@ -50,9 +56,11 @@ public class CacheManagerImpl implements ICacheManager {
 
     /**
      * 获取对应缓存
+     *
      * @param key
      * @return
      */
+    @Override
     public Object getCacheDataByKey(String key) {
         if (this.isContains(key)) {
             return caches.get(key).getDatas();
@@ -62,18 +70,22 @@ public class CacheManagerImpl implements ICacheManager {
 
     /**
      * 获取所有缓存
+     *
      * @param
      * @return
      */
+    @Override
     public Map<String, EntityCache> getCacheAll() {
         return caches;
     }
 
     /**
      * 判断是否在缓存中
+     *
      * @param key
      * @return
      */
+    @Override
     public boolean isContains(String key) {
         return caches.containsKey(key);
     }
@@ -81,14 +93,17 @@ public class CacheManagerImpl implements ICacheManager {
     /**
      * 清除所有缓存
      */
+    @Override
     public void clearAll() {
         caches.clear();
     }
 
     /**
      * 清除对应缓存
+     *
      * @param key
      */
+    @Override
     public void clearByKey(String key) {
         if (this.isContains(key)) {
             caches.remove(key);
@@ -97,9 +112,11 @@ public class CacheManagerImpl implements ICacheManager {
 
     /**
      * 缓存是否超时失效
+     *
      * @param key
      * @return
      */
+    @Override
     public boolean isTimeOut(String key) {
         if (!caches.containsKey(key)) {
             return true;
@@ -115,8 +132,10 @@ public class CacheManagerImpl implements ICacheManager {
 
     /**
      * 获取所有key
+     *
      * @return
      */
+    @Override
     public Set<String> getAllKeys() {
         return caches.keySet();
     }

+ 37 - 21
src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsOrderServiceImpl.java

@@ -27,13 +27,14 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
 
     /**
      * 通过学生ID查询订单
+     *
      * @param
      * @return
      * @throws Exception
      */
     @Override
     public PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, String tody, String tomorrow, String status) throws Exception {
-        pageNum = pageNum==null ? 1 : pageNum;
+        pageNum = pageNum == null ? 1 : pageNum;
         Integer pageSize = 5;
         PageHelper.startPage(pageNum, pageSize);//分页插件,专门用于myBatis分页
         List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByDate(tody, tomorrow, status);
@@ -43,6 +44,7 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
 
     /**
      * 通过订单ID修改订单评价
+     *
      * @param orderId
      * @param orderAdvice
      * @return
@@ -65,6 +67,7 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
 
     /**
      * 管理员手动派单 通过OrderId  修改order_status   work_id
+     *
      * @param orderList
      * @return
      */
@@ -75,86 +78,99 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
 
     /**
      * 订单填报
+     *
      * @param repairsOrder
      */
     @Override
-     public void insertOrder(RepairsOrder repairsOrder) throws Exception{
+    public void insertOrder(RepairsOrder repairsOrder) throws Exception {
         repairsOrderMapper.insertOrder(repairsOrder);
     }
 
 
-
     /**
      * 查询各个校区、类型的订单  木工  水电工  空调工
+     *
      * @param orderType
      * @return
      * @throws Exception
      */
     @Override
-    public List<String> queryOrderByType(String orderType,String campus) throws Exception {
-        return repairsOrderMapper.queryOrderByType(orderType,campus);
+    public List<String> queryOrderByType(String orderType, String campus) throws Exception {
+        return repairsOrderMapper.queryOrderByType(orderType, campus);
     }
 
     /**
      * 系统自动派单  修改对应的订单
+     *
      * @param orderMap
      */
-    public void updateOrderWorkId(HashMap<String,String> orderMap)throws Exception{
+    @Override
+    public void updateOrderWorkId(HashMap<String, String> orderMap) throws Exception {
         repairsOrderMapper.updateOrderWorkId(orderMap);
     }
 
 
     /**
      * 通过ID查询订单
+     *
      * @param studentId
      * @param workId
      * @param campus
      * @return
      */
-   public List<RepairsOrder> queryAllOrderById(String studentId,String workId,String campus) throws Exception{
-        return repairsOrderMapper.queryAllOrderById(studentId,workId,campus);
+    @Override
+    public List<RepairsOrder> queryAllOrderById(String studentId, String workId, String campus) throws Exception {
+        return repairsOrderMapper.queryAllOrderById(studentId, workId, campus);
     }
 
 
     /**
      * 订单修改状态   已完成 退单状态+退单理由
+     *
      * @param
      * @param
      */
-   public void updateOrderStatus(List<RepairsOrder> orderList)throws Exception{
+    @Override
+    public void updateOrderStatus(List<RepairsOrder> orderList) throws Exception {
         repairsOrderMapper.updateOrderStatus(orderList);
     }
 
 
     /**
      * 查询与系统时间相差半小时的订单编号
+     *
      * @param systemTime
      * @param changeTime
      * @return
      */
-   public List<RepairsOrder> queryByTime(String systemTime,String changeTime)throws Exception {
-       return repairsOrderMapper.queryByTime(systemTime,changeTime);
-   }
+    @Override
+    public List<RepairsOrder> queryByTime(String systemTime, String changeTime) throws Exception {
+        return repairsOrderMapper.queryByTime(systemTime, changeTime);
+    }
 
 
     /**
      * 查询所有评价的订单信息
+     *
      * @return
      */
-   public PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum)throws Exception {
-       pageNum = pageNum==null ? 1 : pageNum;
-       Integer pageSize = 5;
-       PageHelper.startPage(pageNum, pageSize);//分页插件,专门用于myBatis分页
-       List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByAdvice();
-       PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
-       return pageInfo;
+    @Override
+    public PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum) throws Exception {
+        pageNum = pageNum == null ? 1 : pageNum;
+        Integer pageSize = 5;
+        PageHelper.startPage(pageNum, pageSize);//分页插件,专门用于myBatis分页
+        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByAdvice();
+        PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
+        return pageInfo;
     }
 
     /**
      * 移动端查询所有用户评价的订单信息
+     *
      * @return
      */
-   public List<RepairsOrder> queryAllOrderUserAdvice()throws Exception {
-       return repairsOrderMapper.queryAllOrderByAdvice();
+    @Override
+    public List<RepairsOrder> queryAllOrderUserAdvice() throws Exception {
+        return repairsOrderMapper.queryAllOrderByAdvice();
     }
 }

+ 7 - 3
src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsStudentServiceImpl.java

@@ -23,6 +23,7 @@ public class RepairsStudentServiceImpl implements RepairsStudentService {
 
     /**
      * 新增学生信息
+     *
      * @param repairsStudent
      * @throws Exception
      */
@@ -33,16 +34,19 @@ public class RepairsStudentServiceImpl implements RepairsStudentService {
 
     /**
      * 查询指定学号的学生
+     *
      * @param studentId
      * @return
-             */
-    public RepairsStudent queryByStudentId(String studentId)throws Exception{
+     */
+    @Override
+    public RepairsStudent queryByStudentId(String studentId) throws Exception {
         return repairsStudentMapper.queryByStudentId(studentId);
     }
 
 
     /**
-     *  更新学生信息
+     * 更新学生信息
+     *
      * @param
      * @param
      * @throws Exception

+ 10 - 6
src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsWorkServiceImpl.java

@@ -21,25 +21,27 @@ import java.util.List;
  * @version: 1.0
  */
 @Service("repairsWorkService")
-public class RepairsWorkServiceImpl implements RepairsWorkService  {
+public class RepairsWorkServiceImpl implements RepairsWorkService {
 
     @Resource
     private RepairsWorkMapper repairsWorkMapper;
 
     /**
      * 维修工登录
+     *
      * @param phone
      * @param password
      * @return
      */
 
     @Override
-    public RepairsWork loginWork(String phone, String password) throws Exception{
-        return repairsWorkMapper.loginWork(phone,password);
+    public RepairsWork loginWork(String phone, String password) throws Exception {
+        return repairsWorkMapper.loginWork(phone, password);
     }
 
     /**
      * 维修工注册
+     *
      * @param repairsWork
      * @return
      * @throws Exception
@@ -51,6 +53,7 @@ public class RepairsWorkServiceImpl implements RepairsWorkService  {
 
     /**
      * 查找同名同电话的人判断维修工是否存在
+     *
      * @param workName
      * @return
      * @throws Exception
@@ -62,6 +65,7 @@ public class RepairsWorkServiceImpl implements RepairsWorkService  {
 
     /**
      * 逻辑删除维修工
+     *
      * @param workId
      * @return
      * @throws Exception
@@ -72,11 +76,11 @@ public class RepairsWorkServiceImpl implements RepairsWorkService  {
     }
 
     /**
-     *
      * @return
      * @throws Exception
      */
-   public List<String> queryAllWork(String workType) throws Exception{
+    @Override
+    public List<String> queryAllWork(String workType) throws Exception {
         return repairsWorkMapper.queryAllWork(workType);
     }
 
@@ -94,7 +98,7 @@ public class RepairsWorkServiceImpl implements RepairsWorkService  {
 
     @Override
     public PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum) throws Exception {
-        pageNum = pageNum==null ? 1 : pageNum;
+        pageNum = pageNum == null ? 1 : pageNum;
         Integer pageSize = 5;
         PageHelper.startPage(pageNum, pageSize);//分页插件,专门用于myBatis分页
         List<RepairsWork> repairsWorkList = repairsWorkMapper.queryAllWorkStatus();