update

徐烜
1 parent 0732ca21
Showing 7 changed files with 44 additions and 9 deletions
src/main/java/com/bsth/controller/schedule/TTInfoController.java
src/main/java/com/bsth/entity/schedule/TTInfo.java
src/main/java/com/bsth/service/schedule/TTInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/strategy/IStrategyImpl.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableManage.js
@@ -7,6 +7,7 @@ import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import java.util.Map;
@@ -59,4 +60,13 @@ public class TTInfoController extends BaseController&lt;TTInfo, Long&gt; {
         // 一般比较自编号是否重复
         return baseService.validateEquale(map);
     }
+
+    @Override
+    public Page<TTInfo> list(@RequestParam Map<String, Object> map, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "id") String order, @RequestParam(defaultValue = "DESC") String direction) {
+        // 如果有isCancel键值，将其值变成boolean
+        if (map.get("isCancel_eq") != null)
+            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
+
+        return super.list(map, page, size, order, direction);
+    }
 }
@@ -41,6 +41,9 @@ public class TTInfo {
     /** 是否启用调度模版 */
     @Column(nullable = false)
     private Boolean isEnableDisTemplate;
+    /** 是否删除（标记） */
+    @Column(nullable = false)
+    private Boolean isCancel = false;
     /** 模版类型（TODO：时刻表，间隔式，这个以后用枚举还是字典再议，现在先用文字） */
     private String templateType;
@@ -193,4 +196,11 @@ public class TTInfo {
         this.updateDate = updateDate;
     }
+    public Boolean getIsCancel() {
+        return isCancel;
+    }
+
+    public void setIsCancel(Boolean isCancel) {
+        this.isCancel = isCancel;
+    }
 }
 package com.bsth.service.schedule;
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
+import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import javax.transaction.Transactional;
+import java.util.HashMap;
 import java.util.Map;
 /**
@@ -16,11 +19,21 @@ import java.util.Map;
 @Transactional
 public class TTInfoServiceImpl extends BaseServiceImpl<TTInfo, Long> implements TTInfoService {
     @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
+    private TTInfoRepository ttInfoRepository;
     @Override
     public Map<String, Object> delete(Long aLong) {
-        ttInfoDetailRepository.deleteByTtinfoId(aLong);
-        return super.delete(aLong);
+        TTInfo ttInfo = ttInfoRepository.findOne(aLong);
+        ttInfo.setIsCancel(true);
+
+        Map<String, Object> map = new HashMap<>();
+        try{
+            ttInfoRepository.save(ttInfo);
+            map.put("status", ResponseCode.SUCCESS);
+        }catch(DataIntegrityViolationException de){
+            map.put("status", ResponseCode.ERROR);
+            map.put("msg", "“完整性约束”校验失败，请检查要删除的对象是否存在外键约束");
+        }
+        return map;
     }
 }
@@ -37,6 +37,7 @@ public class IStrategyImpl implements IStrategy {
         // 查询参数
         Map<String, Object> param = new HashMap<>();
         param.put("xl.id_eq", xlId); // 线路id
+        param.put("isCancel_eq", false); // 没有作废
         param.put("isEnableDisTemplate_eq", true); // 是否启用
         Iterable<TTInfo> ttInfoIterable = ttInfoService.list(param);
         Iterator<TTInfo> ttInfoIterator = ttInfoIterable.iterator();
@@ -201,7 +201,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;TimeTableManageService_g&#39;, [&#39;$resource&#39;, 
                 list: {
                     method: 'GET',
                     params: {
-                        page: 0
+                        page: 0,
+                        isCancel_eq: 'false'
                     }
                 },
                 get: {
@@ -70,14 +70,14 @@
                        class="btn default blue-stripe btn-sm"> 编辑 </a>
                     <a ng-click="ctrl.importData($index)" class="btn default blue-stripe btn-sm"> 导入 </a>
                     <a href="javascript:" class="btn default blue-stripe btn-sm"> 导出 </a>
-                    <a href="javascript:" class="btn default blue-stripe btn-sm"> 模版 </a>
+                    <a href="javascript:" class="btn default blue-stripe btn-sm"> 清空 </a>
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="timeTableManage_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
                     <a ui-sref="timeTableManage_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
-                    <a ng-click="ctrl.deleteTTinfo(info.id)" class="btn default blue-stripe btn-sm"> 删除 </a>
+                    <a ng-click="ctrl.deleteTTinfo(info.id)" class="btn default blue-stripe btn-sm"> 作废 </a>
                 </td>
             </tr>
             </tbody>
@@ -195,14 +195,14 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableManageListCtrl&#39;, [&#39;TimeTableM
         // TODO:
         timeTableManageService.deleteDetail(id).then(
             function(result) {
-                alert("删除成功！");
+                alert("作废成功！");
                 timeTableManageService.getPage().then(
                     function(result) {
                         self.pageInfo.totalItems = result.totalElements;
                         self.pageInfo.currentPage = result.number + 1;
                         self.pageInfo.infos = result.content;
-                        schedulePlanManageService.setCurrentPageNo(result.number + 1);
+                        timeTableManageService.setCurrentPageNo(result.number + 1);
                     },
                     function(result) {
                         alert("出错啦！");