线路档案整改内容

yiming
1 parent f188b8f4
Showing 14 changed files with 110 additions and 25 deletions
bsthLineProfiles/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
bsthLineProfiles/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthSite.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLineKFK.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthSiteMapper.xml
bsthLineProfiles/src/main/resources/templates/include.html
bsthLineProfiles/src/main/resources/templates/system/historyReport/historyReport.html
bsthLineProfiles/src/main/resources/templates/system/line/map.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
@@ -263,6 +263,9 @@ public class ShiroConfig
         // filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll());
         //线路全量数据接口
         filterChainDefinitionMap.put("/system/line/getLineList", "anon,captchaValidate");
+        filterChainDefinitionMap.put("/system/line/map2", "anon,captchaValidate");
+        filterChainDefinitionMap.put("/system/line/getStation", "anon,captchaValidate");
+
         Map<String, Filter> filters = new LinkedHashMap<String, Filter>();
         filters.put("onlineSession", onlineSessionFilter());
         filters.put("syncOnlineSession", syncOnlineSessionFilter());
@@ -111,4 +111,14 @@ public class BaseEntity implements Serializable
     {
         this.params = params;
     }
+
+    public String getParamsStringVal(String key)
+    {
+        if (params.get(key)==null){
+            return null;
+        }else {
+            String[] arr= (String[]) params.get(key);
+            return arr[0];
+        }
+    }
 }
@@ -9,9 +9,11 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
+import com.ruoyi.project.system.line.domain.BsthSite;
 import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.domain.Company;
 import com.ruoyi.project.system.line.service.IBsthTLineService;
+import com.ruoyi.project.system.line.service.IBsthTSiteService;
 import com.ruoyi.project.system.user.domain.User;
 import com.ruoyi.project.system.user.service.IUserService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -49,6 +51,9 @@ public class BsthTLineAddController extends BaseController
     @Autowired
     IDictDataService dictDataService;
+
+    @Autowired
+    IBsthTSiteService iBsthTSiteService;
     @Autowired
@@ -86,7 +91,9 @@ public class BsthTLineAddController extends BaseController
     {
         ModelAndView mv=new ModelAndView(prefix + "/add");
         List<Company> companyList=bsthTLineService.selectCompany(new Company());
+        List<BsthSite> siteList=iBsthTSiteService.selectBsthSite();
         mv.addObject("companyList",companyList);
+        mv.addObject("siteList",siteList);
         return mv;
     }
@@ -132,8 +139,10 @@ public class BsthTLineAddController extends BaseController
     {
         BsthTLine bsthTLine = bsthTLineService.selectBsthTLineExamineById(id);
         List<Company> companyList=bsthTLineService.selectCompany(new Company());
+        List<BsthSite> siteList=iBsthTSiteService.selectBsthSite();
         mmap.put("companyList",companyList);
         mmap.put("bsthTLine", bsthTLine);
+        mmap.put("siteList",siteList);
         return prefix + "/edit";
     }
@@ -159,9 +159,9 @@ public class BsthTLineController extends BaseController
                 if(dictMap.get(type) != null) {
-                    name = name.substring(0,1).toUpperCase() + name.substring(1);
-
-
+                    if(name!="fCompany"){
+                        name = name.substring(0,1).toUpperCase() + name.substring(1);
+                    }
                     try {
                         Method param = line.getClass().getMethod("get"+name);
@@ -320,5 +320,9 @@ public class BsthTLineController extends BaseController
     {
         return AjaxResult.success(bsthTLineService.selectBsthStationListByLoc(lng,lat,dis));
     }
-
+    @GetMapping("/map2")
+    public String map2()
+    {
+        return prefix + "/map2";
+    }
 }
@@ -4,7 +4,9 @@ package com.ruoyi.project.system.line.controller;
 import java.util.List;
 import java.util.Map;
+import com.ruoyi.project.system.line.domain.BsthSite;
 import com.ruoyi.project.system.line.domain.Company;
+import com.ruoyi.project.system.line.service.IBsthTSiteService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -48,7 +50,9 @@ public class BsthTLineHistoryController extends BaseController
     @Autowired
     private IUserService userService;
-    
+
+    @Autowired
+    IBsthTSiteService iBsthTSiteService;
     @RequiresPermissions("system:lineHistory:view")
     @GetMapping()
@@ -89,9 +93,12 @@ public class BsthTLineHistoryController extends BaseController
         bsthTLine.setUpdateStatus("1");
         boolean flag=bsthTLineService.selectHistoryByLineNameAndUpdateStatus(bsthTLine)!=null?true:false;
         mmap.put("flag",flag);
+        bsthTLine.setRemark(null);
         mmap.put("bsthTLine", bsthTLine);
         List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mmap.put("companyList",companyList);
+        List<BsthSite> siteList=iBsthTSiteService.selectBsthSite();
+        mmap.put("siteList",siteList);
         return prefix + "/edit";
     }
@@ -74,7 +74,10 @@ public class BsthTLineHistoryReportController extends BaseController
     @PostMapping("/export")
     @ResponseBody
     public AjaxResult export(BsthTLine bsthTLine) throws NoSuchFieldException {
-
+        bsthTLine.setCreateTimeStr(bsthTLine.getParamsStringVal("createTimeStr"));
+        bsthTLine.setCreateTimeEnd(bsthTLine.getParamsStringVal("createTimeEnd"));
+        bsthTLine.setLineName(bsthTLine.getParamsStringVal("lineName"));
+        bsthTLine.setLineUpdateType(bsthTLine.getParamsStringVal("updateType"));
         //查询变更记录
         List<LineHistoryReport> list =bsthTLineService.getLineHistoryReport(bsthTLine);
@@ -14,6 +14,8 @@ public class BsthSite
     private String name;
+    private String user;
+
     public long getId() {
         return id;
     }
@@ -38,25 +40,34 @@ public class BsthSite
         this.name = name;
     }
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         BsthSite bsthSite = (BsthSite) o;
-        return Objects.equals(id, bsthSite.id) && Objects.equals(ddname, bsthSite.ddname) && Objects.equals(name, bsthSite.name);
+        return id == bsthSite.id && Objects.equals(ddname, bsthSite.ddname) && Objects.equals(name, bsthSite.name) && Objects.equals(user, bsthSite.user);
     }
     @Override
     public int hashCode() {
-        return Objects.hash(id, ddname, name);
+        return Objects.hash(id, ddname, name, user);
     }
     @Override
     public String toString() {
         return "BsthSite{" +
-                "id='" + id + '\'' +
+                "id=" + id +
                 ", ddname='" + ddname + '\'' +
                 ", name='" + name + '\'' +
+                ", user='" + user + '\'' +
                 '}';
     }
 }
@@ -193,6 +193,8 @@ public class BsthTLineKFK
     /** 线路编码 */
     private String lineCode;
+    private String serviceState;
+
     public BsthTLineKFK(){
@@ -212,11 +214,12 @@ public class BsthTLineKFK
             }
             this.fCompany=bsthTLine.getfCompany();
             for (Company company : companyList) {
+                String c=company.getCompany();
                 String fc=company.getfCompany();
                 String id=company.getCompanyID();
-                if (fc.equals(this.company+"本部")){
+                if (fc==null&&this.company.equals(c)){
                     this.companyID=id;
-                }if(fc.equals(this.fCompany)){
+                }else if(this.fCompany.equals(fc)){
                     this.fCompanyID=id;
                 }
             }
@@ -681,4 +684,12 @@ public class BsthTLineKFK
     public void setLineCode(String lineCode) {
         this.lineCode = lineCode;
     }
+
+    public String getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(String serviceState) {
+        this.serviceState = serviceState;
+    }
 }
@@ -5,7 +5,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 <mapper namespace="com.ruoyi.project.system.line.mapper.BsthSiteMapper">
 	<select id="selectBsthSite" resultType="com.ruoyi.project.system.line.domain.BsthSite">
-		select id,ddname,name from bsth_t_site
+		select id,ddname,name,user from bsth_t_site
 	</select>
 	<update id="updateBsthSite" parameterType="com.ruoyi.project.system.line.domain.BsthSite">
@@ -13,6 +13,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<trim prefix="SET" suffixOverrides=",">
 			<if test="ddname != null">ddname = #{ddname},</if>
 			<if test="name != null">name = #{name},</if>
+			<if test="user != null">user = #{user},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -23,11 +24,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="id != null and id != ''">id,</if>
 			<if test="ddname != null and ddname != ''">ddname,</if>
 			<if test="name != null and name != ''">name,</if>
+			<if test="user != null and user != ''">user,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="id != null and id != ''">#{id},</if>
 			<if test="ddname != null and ddname != ''">#{ddname},</if>
 			<if test="name != null and name != ''">#{name},</if>
+			<if test="user != null and user != ''">#{user},</if>
 		</trim>
 	</insert>
@@ -56,11 +56,12 @@
 	<script th:src="@{/ajax/libs/layui/layui.js}"></script>
 	<script th:src="@{/ruoyi/js/common.js?v=4.6.0}"></script>
 	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.6.0}"></script>
-	
+
 <link rel="stylesheet"
 	href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 <!-- import Vue before Element -->
-<script src="https://unpkg.com/vue/dist/vue.js"></script>
+<!--<script src="https://unpkg.com/vue/dist/vue.js"></script>-->
+<script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <!-- import JavaScript -->
 <script src="https://unpkg.com/element-ui/lib/index.js"></script>
@@ -29,9 +29,9 @@
                             </li>
                             <li ><label>审批日期：</label>
                             <li class="select-time">
-                                <input type="text" class="time-input" id="createTimeStr" placeholder="开始时间" name="params[beginTime]" lay-key="1">
+                                <input type="text" class="time-input" id="createTimeStr" placeholder="开始时间" name="params[createTimeStr]" lay-key="1">
                                 <span>-</span>
-                                <input type="text" class="time-input" id="createTimeEnd" placeholder="结束时间" name="params[endTime]" lay-key="2">
+                                <input type="text" class="time-input" id="createTimeEnd" placeholder="结束时间" name="params[createTimeStr]" lay-key="2">
                             </li>
                             </li>
                             <li>
@@ -96,7 +96,7 @@ body, html, #container {
 					<button type="button" class="el-button el-button--primary el-button--mini" onclick="searchStation()"><!----><i class="el-icon-search"></i><span>搜索</span></button>
 				</div>
 				<div class="col-sm-4">
-				<button type="button" class="el-button el-button--default el-button--mini" onclick="$.form.reset();"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
+				<button type="button" class="el-button el-button--default el-button--mini" onclick="clearAll()"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
 				</div>
 			</div>
 		</form>
@@ -116,7 +116,7 @@ body, html, #container {
 					<button type="button" class="el-button el-button--primary el-button--mini" onclick="searchRoad();"><!----><i class="el-icon-search"></i><span>搜索</span></button>
 				</div>
 				<div class="col-sm-4">
-					<button type="button" class="el-button el-button--default el-button--mini" onclick="reset();"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
+					<button type="button" class="el-button el-button--default el-button--mini" onclick="clearAll()"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
 				</div>
 			</div>
 		</form>
@@ -159,7 +159,7 @@ body, html, #container {
 					<button type="button" class="el-button el-button--primary el-button--mini" onclick="searchArea()"><!----><i class="el-icon-search"></i><span>搜索</span></button>
 				</div>
 				<div class="col-sm-4">
-					<button type="button" class="el-button el-button--default el-button--mini" onclick="$.form.reset();"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
+					<button type="button" class="el-button el-button--default el-button--mini" onclick="clearAll()"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
 				</div>
 			</div>
 		</form>
@@ -488,6 +488,12 @@ body, html, #container {
 			}
 		}
+
+		function clearAll(){
+			$.form.reset();
+			$('#distance2').val('');
+			clearline();
+		}
 	</script>
@@ -609,9 +609,17 @@
         }
         return parent;
     }
-
     $("#form-line-edit").validate({
-        focusCleanup: true
+        rules: {
+            remark: {
+                required: true,
+            },
+        },
+        messages: {
+            remark: {
+                required: "请写入备注",
+            }
+        }, focusCleanup: true
     });
     function submitHandler() {
@@ -34,8 +34,7 @@
                         :type="line.timeLineType"
                         size="large"
                         :timestamp="line.createTime" @click.native="change(index);">
-                    {{line.lineUpdateType}}(
-                    {{line.remark}})
+                    {{line.lineUpdateType}}  <a @click="showRemark(index)">详情</a>
                 </el-timeline-item>
             </el-timeline>
         </el-col>
@@ -635,7 +634,7 @@
     });
-
+    var remark;
     function getData(data) {
         for (var index in data) {
             var obj = data[index];
@@ -743,7 +742,15 @@
                 this.lines[index].timeLineType = "success";
             },
-
+            showRemark(index){
+                remark=this.lines[index].remark;
+                layer.open({
+                    type: 0,
+                    title:'备注',
+                    content:remark,
+                    closeBtn: 1
+                });
+            }
         }
     })
     var dicts = [[${@dict.getType('')}]];
@@ -765,6 +772,8 @@
         dicts = allDicts;
     });
+
+
 </script>
 <style>