Update

徐烜
1 parent 404e0e2f
Showing 11 changed files with 154 additions and 144 deletions
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/entity/schedule/BEntity.java
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/service/schedule/impl/EmployeeConfigInfoServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
 package com.bsth.controller.schedule;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
+import com.bsth.entity.schedule.BEntity;
+import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.BService;
 import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.sys.SysUserService;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpSession;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * 基础控制器。
@@ -21,12 +23,24 @@ import java.util.Map;
 public class BController<T, ID extends Serializable> {
     @Autowired
     protected BService<T, ID> bService;
+    @Autowired
+    private SysUserService sysUserService;
     // CRUD 操作
     // Create操作
     @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody T t) {
-        T t_saved = bService.save(t);
+    public Map<String, Object> save(@RequestBody T t, HttpSession httpSession) {
+        // 判定T是否是BEntity的子类，增加新的字段
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        BEntity t_b = null;
+        if (t instanceof BEntity) {
+            t_b = (BEntity) t;
+            t_b.setCreateBy(sysUser);
+            t_b.setCreateDate(new Date());
+        }
+
+        T t_saved = bService.save((T) t_b);
         Map<String, Object> rtn = new HashMap<>();
         rtn.put("status", ResponseCode.SUCCESS);
         rtn.put("data", t_saved);
@@ -34,8 +48,21 @@ public class BController&lt;T, ID extends Serializable&gt; {
     }
     // Update操作
     @RequestMapping(value="/{id}", method = RequestMethod.POST)
-    public Map<String, Object> update(@RequestBody T t) {
-        return save(t);
+    public Map<String, Object> update(@RequestBody T t, HttpSession httpSession) {
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        BEntity t_b = null;
+        if (t instanceof BEntity) {
+            t_b = (BEntity) t;
+            t_b.setUpdateBy(sysUser);
+            t_b.setUpdateDate(new Date());
+        }
+
+        T t_updated = bService.save((T) t_b);
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", t_updated);
+        return rtn;
     }
     // Research操作
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@@ -97,9 +124,10 @@ public class BController&lt;T, ID extends Serializable&gt; {
     // Delete操作
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public Map<String, Object> delete(@PathVariable("id") ID id) {
+    public Map<String, Object> delete(@PathVariable("id") ID id, HttpSession httpSession) {
         Map<String, Object> rtn = new HashMap<>();
         try {
+            // 由于种种原因，这里不保存用户和操作时间了
             bService.delete(id);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * Created by xu on 16/12/14.
+ */
+@MappedSuperclass
+public class BEntity {
+
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser updateBy;
+
+    /** 创建日期 */
+    @Column(updatable = false, name = "create_date")
+    private Date createDate;
+    /** 修改日期 */
+    @Column(name = "update_date")
+    private Date updateDate;
+
+    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 void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
@@ -2,7 +2,6 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
@@ -21,7 +20,7 @@ import java.util.Date;
         })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class CarConfigInfo implements Serializable {
+public class CarConfigInfo extends BEntity implements Serializable {
     /** 主健Id */
     @Id
@@ -59,20 +58,6 @@ public class CarConfigInfo implements Serializable {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    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 CarConfigInfo() {}
     public CarConfigInfo(Object id, Object xlid, Object xlname, Object clid) {
         if (id != null) {
@@ -164,38 +149,6 @@ public class CarConfigInfo implements Serializable {
         this.isSwitch = isSwitch;
     }
-    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 void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -3,13 +3,12 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.hibernate.annotations.Formula;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
+import java.io.Serializable;
 /**
  * 人员配置信息。
@@ -24,7 +23,7 @@ import java.util.Date;
     })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class EmployeeConfigInfo {
+public class EmployeeConfigInfo extends BEntity implements Serializable {
     /** 主键Id */
     @Id
@@ -55,20 +54,6 @@ public class EmployeeConfigInfo {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    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 EmployeeConfigInfo() {}
     public EmployeeConfigInfo(Object id, Object xlid, Object xlname, Object jsyid, Object spyid) {
@@ -156,36 +141,4 @@ public class EmployeeConfigInfo {
     public void setIsCancel(Boolean isCancel) {
         this.isCancel = isCancel;
     }
-
-    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 void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
 package com.bsth.entity.sys;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import javax.persistence.*;
 import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-
 @Entity
 @Table(name = "bsth_c_sys_user")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class SysUser {
 	@Id
@@ -83,7 +83,9 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
         Map<String, Object> param = new HashMap<>();
         if (employeeConfigInfo.getIsCancel()) {
             validate_jsy(employeeConfigInfo);
-            validate_spy(employeeConfigInfo);
+            if (employeeConfigInfo.getSpy() != null) {
+                validate_spy(employeeConfigInfo);
+            }
             employeeConfigInfo.setIsCancel(false);
         } else {
             param.clear();
@@ -17,15 +17,18 @@
                 <td></td>
                 <td>
                     <div>
-                        <sa-Select3 model="ctrl.searchCondition()"
-                                    name="xl"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.searchCondition()['xl.lineCode_eq']}}"
+                        <sa-Select5 name="xl"
+                                    model="ctrl.searchCondition()"
+                                    cmaps="{'xl.lineCode_eq' : 'lineCode'}"
                                     dcname="xl.lineCode_eq"
                                     icname="lineCode"
-                                    icnames="name"
-                                    datatype="xl">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
+                                    required >
+                        </sa-Select5>
                     </div>
                 </td>
                 <td>
@@ -169,8 +169,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             self.toggleBusConfig = function(id) {
                 BusConfig.delete({id: id}, function(result) {
-                    if (result.message) { // 暂时这样做，之后全局拦截
-                        alert("失败：" + result.message);
+                    if (result.msg) { // 暂时这样做，之后全局拦截
+                        alert("失败：" + result.msg);
                     } else {
                         self.doPage();
                     }
@@ -222,9 +222,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 提交方法
             self.submit = function() {
-                self.busConfigForSave.$save(function() {
-                    $state.go("busConfig");
-                });
+                if (id) {
+                    // 更新
+                    self.busConfigForSave.$save({id: id}, function() {
+                        $state.go("busConfig");
+                    });
+                } else {
+                    // 保存
+                    self.busConfigForSave.$save(function() {
+                        $state.go("busConfig");
+                    });
+                }
             };
 }]);
@@ -121,8 +121,8 @@
                         </sa-Select5>
                         <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
                                remote-Validation
-                               remotevtype="ec_jsy"
-                               remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
+                               remotevtype="ec_spy"
+                               remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
                                 />
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -18,17 +18,18 @@
                 <td></td>
                 <td>
                     <div>
-                        <sa-Select3 model="ctrl.searchCondition()"
-                                    name="xl"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.searchCondition()['xl.lineCode_eq']}}"
+                        <sa-Select5 name="xl"
+                                    model="ctrl.searchCondition()"
+                                    cmaps="{'xl.lineCode_eq' : 'lineCode'}"
                                     dcname="xl.lineCode_eq"
                                     icname="lineCode"
-                                    dcname2="xl.company_eq"
-                                    icname2="company"
-                                    icnames="name"
-                                    datatype="xl">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
+                                    required >
+                        </sa-Select5>
                     </div>
                 </td>
                 <td></td>
@@ -170,8 +170,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.toggleEmpConfig = function(id) {
                 EmpConfig.delete({id: id}, function(result) {
-                    if (result.message) { // 暂时这样做，之后全局拦截
-                        alert("失败：" + result.message);
+                    if (result.msg) { // 暂时这样做，之后全局拦截
+                        alert("失败：" + result.msg);
                     } else {
                         self.doPage();
                     }
@@ -220,9 +220,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     self.employeeConfigForSave.spy = null;
                 }
-                self.employeeConfigForSave.$save(function() {
-                    $state.go("employeeConfig");
-                });
+                if (id) {
+                    // 更新
+                    self.employeeConfigForSave.$save({id: id}, function() {
+                        $state.go("employeeConfig");
+                    });
+                } else {
+                    // 保存
+                    self.employeeConfigForSave.$save(function() {
+                        $state.go("employeeConfig");
+                    });
+                }
             };
 }]);