Update

徐烜
1 parent 22c4d88d
Showing 11 changed files with 355 additions and 9 deletions
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/entity/schedule/TTInfo.java
src/main/java/com/bsth/entity/schedule/TTInfoBackup.java
src/main/java/com/bsth/entity/schedule/TTInfoDetail.java
src/main/java/com/bsth/repository/schedule/TTInfoBackupRepository.java
src/main/java/com/bsth/service/schedule/TTInfoService.java
src/main/java/com/bsth/service/schedule/impl/TTInfoServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/service.js
@@ -6,10 +6,7 @@ import com.bsth.entity.schedule.TTInfo;
 import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
  
 import java.util.HashMap;
 import java.util.Map;
@@ -87,4 +84,18 @@ public class TTInfoController extends BController&lt;TTInfo, Long&gt; {
         return rtn;
     }
  
+    @RequestMapping(value = "/backup/{ttinfo}", method = RequestMethod.GET)
+    public Map<String, Object> backup(@PathVariable(value = "ttinfo") Long ttInfoId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 备份时刻表
+            this.ttInfoService.backUp(ttInfoId);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
 }
 \ No newline at end of file
 package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
+import com.bsth.service.schedule.utils.TimeTableProto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.persistence.*;
@@ -63,6 +64,9 @@ public class TTInfo extends BEntity {
     /** 特殊有效日期（格式：2001-01-01，多个用逗号隔开） */
     private String special_days;
  
+    /** 最近备份日期 */
+    private Date lastBackUpDate;
+
     public TTInfo() {}
     public TTInfo(Object id, Object xlid, Object name, Object nds, Object sds) {
         if (id != null) {
@@ -83,6 +87,32 @@ public class TTInfo extends BEntity {
         }
     }
  
+    /**
+     * 输出proto生成的builder
+     * @return
+     */
+    public TimeTableProto.TTInfo.Builder toProtoBuilder() {
+        // 注意部份空值处理，必须覆默认值，否则报nullexceptio
+        return TimeTableProto.TTInfo.newBuilder()
+                .setId(id)
+                .setName(name)
+                .setXl(xl.getId())
+                .setXlName(xl.getName())
+                .setXlDir(xlDir)
+                .setQyrq(qyrq.getTime())
+                .setIsEnableDisTemplate(isEnableDisTemplate)
+                .setIsCancel(isCancel)
+                .setRuleDays(rule_days)
+                .setSpecialDays(special_days)
+                .setCreateUser(getCreateBy() == null ? 0 : getCreateBy().getId())
+                .setCreateUserName(getCreateBy() == null ? "" : getCreateBy().getUserName())
+                .setUpdateUser(getUpdateBy() == null ? 0 : getUpdateBy().getId())
+                .setUpdateUserName(getUpdateBy() == null ? "" : getUpdateBy().getUserName())
+                .setCreateDate(getCreateDate() == null ? 0l : getCreateDate().getTime())
+                .setUpdateDate(getUpdateDate() == null ? 0l : getUpdateDate().getTime());
+
+    }
+
     public Long getId() {
         return id;
     }
@@ -178,4 +208,12 @@ public class TTInfo extends BEntity {
     public void setIsCancel(Boolean isCancel) {
         this.isCancel = isCancel;
     }
+
+    public Date getLastBackUpDate() {
+        return lastBackUpDate;
+    }
+
+    public void setLastBackUpDate(Date lastBackUpDate) {
+        this.lastBackUpDate = lastBackUpDate;
+    }
 }
+package com.bsth.entity.schedule;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 时刻表信息备份。
+ * --不做关联信息，保存相应的关联id
+ */
+@Entity
+@Table(name="bsth_c_s_ttinfo_bak")
+public class TTInfoBackup {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 关联 bsth_c_line 主键，不做mapping */
+    @Column(nullable = false)
+    private Integer xl;
+    /** 线路名称 */
+    @Column(nullable = false)
+    private String xlName;
+
+    /** 关联 bsth_c_s_ttinfo 主键，不做mapping */
+    @Column(nullable = false)
+    private Long ttInfo;
+    /** 关联的时刻表名字 */
+    private String ttInfoName;
+
+    /** 备份日期 */
+    @Column(nullable = false)
+    private Date backUpDate;
+    /** 备份的二进制内容（google protobuf格式） */
+    @Lob
+    private byte[] backUpInfo;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getXl() {
+        return xl;
+    }
+
+    public void setXl(Integer xl) {
+        this.xl = xl;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public Long getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(Long ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
+
+    public Date getBackUpDate() {
+        return backUpDate;
+    }
+
+    public void setBackUpDate(Date backUpDate) {
+        this.backUpDate = backUpDate;
+    }
+
+    public byte[] getBackUpInfo() {
+        return backUpInfo;
+    }
+
+    public void setBackUpInfo(byte[] backUpInfo) {
+        this.backUpInfo = backUpInfo;
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
+import com.bsth.service.schedule.utils.TimeTableProto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.persistence.*;
@@ -99,6 +100,35 @@ public class TTInfoDetail extends BEntity {
     /** 备注 */
     private String remark;
  
+    /**
+     * 输出proto生成的builder
+     * @return
+     */
+    public TimeTableProto.TTInfoDetail.Builder toProtoBuilder() {
+        // 注意部份空值处理，必须覆默认值，否则报nullexception
+        return TimeTableProto.TTInfoDetail.newBuilder()
+                .setId(id)
+                .setXl(xl.getId())
+                .setXlName(xl.getName())
+                .setLp(lp.getId())
+                .setLpName(lp.getLpName())
+                .setFcno(fcno)
+                .setXlDir(xlDir)
+                .setQdzCode(qdzCode)
+                .setQdzName(qdzName)
+                .setZdzCode(zdzCode)
+                .setZdzName(zdzName)
+                .setFcsj(fcsj)
+                .setBcs(bcs)
+                .setJhlc(jhlc)
+                .setBcsj(bcsj)
+                .setBcType(bcType)
+                .setIsFB(isFB == null ? false : isFB)
+                .setIsTS(isTS == null ? false : isTS)
+                .setRemark(remark == null ? "" : remark)
+                ;
+    }
+
     public Long getId() {
         return id;
     }
+package com.bsth.repository.schedule;
+
+import com.bsth.entity.schedule.TTInfoBackup;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 17/7/13.
+ */
+@Repository
+public interface TTInfoBackupRepository extends BaseRepository<TTInfoBackup, Long> {
+}
@@ -12,4 +12,6 @@ public interface TTInfoService extends BService&lt;TTInfo, Long&gt; {
     void validate_s_d(TTInfo ttInfo) throws ScheduleException;
     void toggleCancel(Long id) throws ScheduleException;
  
+    void backUp(Long ttInfoId) throws ScheduleException;
+
 }
 package com.bsth.service.schedule.impl;
  
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.entity.schedule.TTInfoBackup;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.repository.schedule.TTInfoBackupRepository;
+import com.bsth.repository.schedule.TTInfoDetailRepository;
+import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.service.schedule.TTInfoService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.TimeTableProto;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +31,15 @@ import java.util.Map;
  */
 @Service
 public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTInfoService {
+    /** 日志记录器 */
+    private static final Logger LOG = LoggerFactory.getLogger(TTInfoServiceImpl.class);
+
+    @Autowired
+    private TTInfoRepository ttInfoRepository;
+    @Autowired
+    private TTInfoDetailRepository ttInfoDetailRepository;
+    @Autowired
+    private TTInfoBackupRepository ttInfoBackupRepository;
  
     @Override
     public void validate_name(TTInfo ttInfo) throws ScheduleException {
@@ -112,4 +135,60 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
             ttInfo.setIsCancel(true);
         }
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    public void backUp(Long ttInfoId) throws ScheduleException {
+        LOG.info(">>>>>>开始备份时刻表<<<<<<");
+
+        try {
+            // 获取原始数据
+            TTInfo ttInfo = ttInfoRepository.findOne(ttInfoId);
+            List<TTInfoDetail> ttInfoDetails = ttInfoDetailRepository.findByTtinfoId(ttInfoId);
+
+            // protobuf序列化成二进制数据
+            TimeTableProto.TTInfo.Builder tb = ttInfo.toProtoBuilder();
+            for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
+                tb.addBcInfo(ttInfoDetail.toProtoBuilder());
+            }
+            byte[] backupbytes = tb.build().toByteArray();
+            LOG.info("......时刻表={}", ttInfo.getName());
+            LOG.info("......时刻表protoBuf字节数={}", backupbytes.length);
+
+            // 更新备份日期
+            Date backupdate = new Date();
+            ttInfo.setLastBackUpDate(backupdate);
+
+            // 保存备份数据
+            TTInfoBackup ttInfoBackup = new TTInfoBackup();
+            ttInfoBackup.setXl(ttInfo.getXl().getId());
+            ttInfoBackup.setXlName(ttInfo.getXl().getName());
+            ttInfoBackup.setTtInfo(ttInfoId);
+            ttInfoBackup.setTtInfoName(ttInfo.getName());
+            ttInfoBackup.setBackUpDate(backupdate);
+            ttInfoBackup.setBackUpInfo(backupbytes);
+
+            ttInfoBackupRepository.save(ttInfoBackup);
+//        System.out.println(backupbytes.length);
+//        try {
+//
+//            TimeTableProto.TTInfo tt1 = TimeTableProto.TTInfo.parseFrom(backupbytes);
+//            System.out.println(tt1.getName());
+//            System.out.println(tt1.getBcInfoCount());
+//        } catch (Exception exp) {
+//            exp.printStackTrace();
+//        }
+
+            LOG.info(">>>>>>备份时刻表success<<<<<<");
+        } catch (Exception exp) {
+            StringWriter stringWriter = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(stringWriter);
+            exp.printStackTrace(printWriter);
+            LOG.info("......异常stack->{}", stringWriter.toString());
+            LOG.info(">>>>>>备份时刻表failed<<<<<<");
+            throw new ScheduleException(exp);
+        }
+
+
+    }
 }
@@ -699,7 +699,25 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                     return dst;
                                 }
                             }
-                        },
+                        }
+                    }
+                ),
+
+                backup: $resource(
+                    '/tic_ec/backup/:ttinfoid',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
                     }
                 )
             };
@@ -9,7 +9,7 @@
                 <th style="width: 180px;">时刻表名称</th>
                 <th style="width: 80px">上下行</th>
                 <th style="width: 50px;">启用</th>
-                <th style="width: 120px">启用日期</th>
+                <th style="width: 120px">启用/备份日期</th>
                 <th style="width: 80px">状态</th>
                 <th style="width: 60%">时刻表明细</th>
                 <th style="width: 40%">操作</th>
@@ -76,7 +76,24 @@
                     <span ng-bind="info.isEnableDisTemplate | dict:'truefalseType':'未知' "></span>
                 </td>
                 <td>
-                    <span ng-bind="info.qyrq | date: 'yyyy-MM-dd'"></span>
+                    <div>
+                        <a href="#">
+                            <span ng-bind="info.qyrq | date: 'yyyy-MM-dd'"></span>
+                        </a>
+                    </div>
+                    <div>
+                        <a href="#"
+                           tooltip-animation="false"
+                           tooltip-placement="top"
+                           uib-tooltip="备份时间：{{info.lastBackUpDate | date: 'yyyy-MM-dd HH:mm:ss' }}"
+                           tooltip-class="headClass">
+
+                            <i class="fa fa-hdd-o" aria-hidden="true"></i>
+                            <span ng-bind="info.lastBackUpDate | date: 'yyyy-MM-dd'"></span>
+                        </a>
+
+                    </div>
+
                 </td>
                 <td>
                     <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
@@ -94,6 +111,10 @@
                     <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a>
                     <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a>
+                    <a sweetalert
+                       sweet-options="{title: '是否备份时刻表？',text: '时刻表名称：' + info.name + '</br>TODO：已备份信息！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
+                       sweet-on-confirm="ctrl.backupinfo(info.id)"
+                       class="btn btn-danger btn-sm">备份</a>
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
@@ -60,6 +60,16 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     param.type = 'exportFile';
                     param.ttinfoid = ttinfoid;
                     return dservice.dataTools.dataExport(param).$promise;
+                },
+
+                /**
+                 * 备份。
+                 * @returns {*|Function|promise|n}
+                 */
+                backupinfo: function(ttinfoid) {
+                    var param = {};
+                    param.ttinfoid = ttinfoid;
+                    return service.backup.do(param).$promise;
                 }
  
  
@@ -136,6 +146,19 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 );
             };
  
+            // 备份信息
+            self.backupinfo = function(ttinfoid) {
+                service.backupinfo(ttinfoid).then(
+                    function(result) {
+                        self.doPage();
+                        console.log("备份成功！");
+                    },
+                    function(result) {
+                        console.log("备份失败：" + result);
+                    }
+                );
+            };
+
             self.doPage();
  
             // 自动生成时刻表
@@ -33,7 +33,25 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                     return dst;
                                 }
                             }
-                        },
+                        }
+                    }
+                ),
+
+                backup: $resource(
+                    '/tic_ec/backup/:ttinfoid',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
                     }
                 )
             };