Update

徐烜
1 parent 878dd614
Showing 8 changed files with 53 additions and 146 deletions
src/main/java/com/bsth/controller/schedule/RerunController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/core/RerunController.java
src/main/java/com/bsth/entity/schedule/rule/RerunRule.java
src/main/java/com/bsth/service/schedule/RerunService.java
src/main/java/com/bsth/service/schedule/RerunServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/RerunServiceImpl.java
src/main/resources/application-dev.properties
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.repository.schedule.RerunRuleRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/10/20.
- */
-@RestController
-@RequestMapping("rms")
-public class RerunController extends BaseController<RerunRule, Long> {
-
-    @Autowired
-    private RerunRuleRepository rerunRuleRepository;
-
-    @Override
-    public RerunRule findById(@PathVariable("id") Long aLong) {
-        return rerunRuleRepository.findOneExtend(aLong);
-    }
-
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody RerunRule t){
-        return baseService.save(t);
-    }
-
-
-}
@@ -113,6 +113,9 @@ public class TTInfoDetailController extends BaseController2&lt;TTInfoDetail, Long&gt; 
                                 p1.put("stationName_eq", cell_con.trim());
                                 p1.put("stationMark_eq", "B");
  
+
+                                // TODO：这里要修改（起点站有启用撤销的标志的）
+
                                 List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
                                 if (CollectionUtils.isEmpty(stationRouteList)) {
                                     rtn.put("status", ResponseCode.ERROR);
+package com.bsth.controller.schedule.core;
+
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.rule.RerunRule;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/10/20.
+ */
+@RestController
+@RequestMapping("rms")
+public class RerunController extends BController<RerunRule, Long> {
+
+
+}
 package com.bsth.entity.schedule.rule;
  
 import com.bsth.entity.Line;
-import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.entity.schedule.EmployeeConfigInfo;
-import com.bsth.entity.schedule.GuideboardInfo;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.*;
  
 import javax.persistence.*;
-import java.util.Date;
  
 /**
  * 套跑规则。
@@ -41,7 +36,7 @@ import java.util.Date;
 })
  
  
-public class RerunRule {
+public class RerunRule extends BEntity {
     /** 主键Id */
     @Id
     @GeneratedValue
@@ -84,19 +79,6 @@ public class RerunRule {
     @Column(nullable = false)
     private Boolean isCancel = false;
  
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -177,34 +159,6 @@ public class RerunRule {
         this.useEmployeeConfig = useEmployeeConfig;
     }
  
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -213,7 +167,4 @@ public class RerunRule {
         this.isCancel = isCancel;
     }
  
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.service.BaseService;
  
 /**
  * Created by xu on 16/10/20.
  */
-public interface RerunService extends BaseService<RerunRule, Long> {
+public interface RerunService extends BService<RerunRule, Long> {
 }
-package com.bsth.service.schedule;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.repository.schedule.RerunRuleRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by xu on 16/10/20.
- */
-@Service
-public class RerunServiceImpl extends BaseServiceImpl<RerunRule, Long> implements RerunService {
-
-    @Autowired
-    private RerunRuleRepository rerunRuleRepository;
-
-    @Override
-    @Transactional
-    public Map<String, Object> delete(Long aLong) {
-        // 获取带作废的数据
-        RerunRule rerunRule = rerunRuleRepository.findOne(aLong);
-
-        toogleIsCancel(rerunRule);
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("status", ResponseCode.SUCCESS);
-
-        return map;
-
-    }
-
-    /**
-     * 撤销/作废切换。
-     * @param rerunRule
-     */
-    private void toogleIsCancel(RerunRule rerunRule) {
-        boolean isCancel = rerunRule.getIsCancel();
-        if (isCancel) {
-            rerunRule.setIsCancel(false);
-        } else {
-            rerunRule.setIsCancel(true);
-        }
-    }
-}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.schedule.rule.RerunRule;
+import com.bsth.service.schedule.RerunService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by xu on 16/10/20.
+ */
+@Service
+public class RerunServiceImpl extends BServiceImpl<RerunRule, Long> implements RerunService {
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    private void toggleCancel(Long id) throws ScheduleException {
+        RerunRule rerunRule = findById(id);
+        if (rerunRule.getIsCancel()) {
+            rerunRule.setIsCancel(false);
+        } else {
+            rerunRule.setIsCancel(true);
+        }
+    }
+}
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root