Update

徐烜
1 parent 4a0cb023
Showing 10 changed files with 50 additions and 114 deletions
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
src/main/java/com/bsth/entity/schedule/GuideboardInfo.java
src/main/java/com/bsth/service/schedule/GuideboardInfoService.java
src/main/java/com/bsth/service/schedule/impl/GuideboardInfoServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/service.js
@@ -48,8 +48,8 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
         return guideboardInfoRepository.findLpName(ttid);
     }
-    @RequestMapping(value = "/validate1", method = RequestMethod.GET)
-    public Map<String, Object> validate1(@RequestParam Map<String, Object> param) {
+    @RequestMapping(value = "/validate_lpno", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpno(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
             // 路牌编号验证
@@ -59,7 +59,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
                     param.get("lpNo_eq"),
                     null
             );
-            guideboardInfoService.validate(guideboardInfo);
+            guideboardInfoService.validate_lpno(guideboardInfo);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -68,8 +68,8 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
         return rtn;
     }
-    @RequestMapping(value = "/validate2", method = RequestMethod.GET)
-    public Map<String, Object> validate2(@RequestParam Map<String, Object> param) {
+    @RequestMapping(value = "/validate_lpname", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpname(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
             // 路牌名称验证
@@ -79,7 +79,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
                     null,
                     param.get("lpName_eq")
             );
-            guideboardInfoService.validate(guideboardInfo);
+            guideboardInfoService.validate_lpname(guideboardInfo);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
             rtn.put("status", ResponseCode.ERROR);
 package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
-import java.util.Date;
 /**
  * 路牌信息。
@@ -18,7 +16,7 @@ import java.util.Date;
         })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class GuideboardInfo {
+public class GuideboardInfo extends BEntity {
     /** 主键Id */
     @Id
@@ -43,21 +41,6 @@ public class GuideboardInfo {
     @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 GuideboardInfo() {}
     public GuideboardInfo(Object id, Object xlid, Object lpNo, Object lpName) {
@@ -126,38 +109,6 @@ public class GuideboardInfo {
         this.lpType = lpType;
     }
-    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;
     }
@@ -6,6 +6,8 @@ import com.bsth.entity.schedule.GuideboardInfo;
  * Created by xu on 16/5/11.
  */
 public interface GuideboardInfoService extends BService<GuideboardInfo, Long> {
-    public void validate(GuideboardInfo guideboardInfo) throws ScheduleException;
+    public void validate_lpno(GuideboardInfo guideboardInfo) throws ScheduleException;
+    public void validate_lpname(GuideboardInfo guideboardInfo) throws ScheduleException;
     public void toggleCancel(Long id) throws ScheduleException;
+
 }
@@ -22,52 +22,44 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
-    // 验证方法
-    @Transactional
-    public void validate(GuideboardInfo guideboardInfo) throws ScheduleException {
+    @Override
+    public void validate_lpno(GuideboardInfo guideboardInfo) throws ScheduleException {
         // 查询条件
         Map<String, Object> param = new HashMap<>();
-        if (guideboardInfo.getId() != null)
+        if (guideboardInfo.getId() != null) {
             param.put("id_ne", guideboardInfo.getId());
+        }
         if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
             throw new ScheduleException("线路未选择");
         } else {
+            param.put("isCancel_eq", false); // 作废的也算入判定区
             param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("lpNo_eq", guideboardInfo.getLpNo());
+            if (!CollectionUtils.isEmpty(list(param))) {
+                throw new ScheduleException("路牌编号重复");
+            }
+        }
+    }
-//            param.put("isCancel_eq", false); // 作废的也算入判定区
-            if (guideboardInfo.getLpNo() != null) {
-                if (guideboardInfo.getLpName() != null) {
-                    // 如果两个都写了，分开查询
-                    param.put("lpNo_eq", guideboardInfo.getLpNo());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌编号重复");
-                    }
-                    param.remove("lpNo_eq");
-                    param.put("lpName_eq", guideboardInfo.getLpName());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌名称重复");
-                    }
+    @Override
+    public void validate_lpname(GuideboardInfo guideboardInfo) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (guideboardInfo.getId() != null) {
+            param.put("id_ne", guideboardInfo.getId());
+        }
-                } else {
-                    param.put("lpNo_eq", guideboardInfo.getLpNo());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌编号重复");
-                    }
-                }
-            } else {
-                if (guideboardInfo.getLpName() != null) {
-                    param.put("lpName_eq", guideboardInfo.getLpName());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌名字重复");
-                    }
-                } else {
-                    // 都为空
-                    throw new ScheduleException("路牌编号名字都为空");
-                }
+        if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
+            throw new ScheduleException("线路未选择");
+        } else {
+            param.put("isCancel_eq", false); // 作废的也算入判定区
+            param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("lpName_eq", guideboardInfo.getLpName());
+            if (!CollectionUtils.isEmpty(list(param))) {
+                throw new ScheduleException("路牌名字重复");
             }
         }
-
     }
     @Transactional
@@ -83,7 +75,8 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
         GuideboardInfo guideboardInfo = findById(id);
         Map<String, Object> param = new HashMap<>();
         if (guideboardInfo.getIsCancel()) {
-            validate(guideboardInfo);
+            validate_lpno(guideboardInfo);
+            validate_lpname(guideboardInfo);
             guideboardInfo.setIsCancel(false);
         } else {
             param.clear();
@@ -96,7 +89,7 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
             } else {
                 throw new ScheduleException("在时刻表" +
                         ttInfoDetailList.get(0).getTtinfo().getName() +
-                        "已使用，无法删除！");
+                        "已使用，无法作废！");
             }
         }
     }
@@ -263,7 +263,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             gbv1: { // 路牌序号验证
                 template: {'xl.id_eq': -1, 'lpNo_eq': 'ddd'},
                 remote: $resource(
-                    '/gic/validate1',
+                    '/gic/validate_lpno',
                     {},
                     {
                         do: {
@@ -275,7 +275,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             gbv2: { // 路牌名称验证
                 template: {'xl.id_eq': -1, 'lpName_eq': 'ddd'},
                 remote: $resource(
-                    '/gic/validate2',
+                    '/gic/validate_lpname',
                     {},
                     {
                         do: {
@@ -295,7 +295,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
     return {
         rest: $resource(
             '/gic/:id',
-            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id_route'},
+            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -817,7 +817,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             gbv1: { // 路牌序号验证
                 template: {'xl.id_eq': -1, 'lpNo_eq': 'ddd'},
                 remote: $resource(
-                    '/gic/validate1',
+                    '/gic/validate_lpno',
                     {},
                     {
                         do: {
@@ -829,7 +829,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             gbv2: { // 路牌名称验证
                 template: {'xl.id_eq': -1, 'lpName_eq': 'ddd'},
                 remote: $resource(
-                    '/gic/validate2',
+                    '/gic/validate_lpname',
                     {},
                     {
                         do: {
@@ -63,7 +63,7 @@
                                name="lpNo" placeholder="请输入路牌编号..." min="1" required
                                remote-Validation
                                remotevtype="gbv1"
-                               remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}"
+                               remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}"
                                 />
                     </div>
@@ -85,7 +85,7 @@
                                name="lpName" placeholder="请输入路牌名字..." required
                                remote-Validation
                                remotevtype="gbv2"
-                               remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}"
+                               remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}"
                                />
                     </div>
@@ -77,8 +77,8 @@
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="guideboardManage_detail({id : info.id})" class="btn btn-info btn-sm"> 详细 </a>
                     <a ui-sref="guideboardManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
-                    <a ng-click="ctrl.toggleCancel(info.id)" class="btn btn-danger btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
-                    <a ng-click="ctrl.toggleCancel(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
+                    <a ng-click="ctrl.toggleGuideboard(info.id)" class="btn btn-danger btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
+                    <a ng-click="ctrl.toggleGuideboard(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
                 </td>
             </tr>
             </tbody>
@@ -180,18 +180,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     service.getPage(result);
                 });
             };
-            self.toggleTtinfo = function(id) {
-                Gb.delete({id: id}, function(result) {
-                    if (result.message) { // 暂时这样做，之后全局拦截
-                        alert("失败：" + result.message);
-                    } else {
-                        self.doPage();
-                    }
-                });
-            };
-
             // 作废切换
-            self.toggleCancel = function(id) {
+            self.toggleGuideboard = function(id) {
                 Gb.delete({id: id}, function(result) {
                     if (result.status == "ERROR") { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
@@ -3,7 +3,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
     return {
         rest: $resource(
             '/gic/:id',
-            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id_route'},
+            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',