m

youxiw2000
1 parent 982959cf
Showing 24 changed files with 529 additions and 439 deletions
trash-admin/src/main/resources/application-dev.yml
trash-ui/dist.zip
trash-ui/src/api/truck_active.js
trash-ui/src/api/warningInfo.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index55.vue → trash-ui/src/layout/index3.vue
trash-ui/src/views/business/truckActivate/index.vue
trash-ui/src/views/h5/truckActivate/index.vue
trash-ui/vue.config.js
trash-workFlow/src/main/java/com/trash/business/controller/CompanyCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/DriverCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionSpecialController.java
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/controller/ThreestepHistoryController.java
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
trash-workFlow/src/main/java/com/trash/business/controller/TruckCreditController.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
@@ -16,10 +16,10 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    #remotePath: http://175.6.47.84:8008
-    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
-    remotePath: http://183.66.242.6:14601
-    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    remotePath: http://175.6.47.84:8008
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    #remotePath: http://183.66.242.6:14601
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
@@ -176,8 +176,22 @@ export default {
         this.openActivateTime = true;
         this.queryParams.status = "1";
       }
-      this.loading = true;
-      listTruckActivate(this.queryParams).then(response => {
+      this.loading = true;
+
+      if(this.queryParams.createTime){
+        this.queryParams.startTime = this.queryParams.createTime[0];
+        this.queryParams.endTime = this.queryParams.createTime[1];
+      }
+
+      const query = {};
+
+      for(var i in this.queryParams){
+        query[i] = this.queryParams[i];
+      }
+
+      query.createTime = null;
+
+      listTruckActivate(query).then(response => {
         this.truckActivateList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -426,14 +440,26 @@ export default {
       })
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
+    handleExport() {
+      if(this.queryParams.createTime){
+        this.queryParams.startTime = this.queryParams.createTime[0];
+        this.queryParams.endTime = this.queryParams.createTime[1];
+      }
+      
+      const query = {};
+      
+      for(var i in this.queryParams){
+        query[i] = this.queryParams[i];
+      }
+      
+      query.createTime = null;
+      
       this.$confirm('是否确认导出所有车辆激活数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return exportTruckActivate(queryParams);
+        return exportTruckActivate(query);
       }).then(response => {
         this.download(response.message);
       })
@@ -163,6 +163,10 @@ export default {
         {
           code: 14,
           name: "失信车辆作业"
+        },
+        {
+          code: 14,
+          name: "卫星定位异常"
         }
       ],
       projectNameList: {},
@@ -276,16 +280,16 @@ export default {
         this.queryParams.startTime = this.queryParams.createTime[0];
         this.queryParams.endTime = this.queryParams.createTime[1];
       }
-      
+
       let query = {};
-      
+
       for(var i in this.queryParams){
         query[i] = this.queryParams[i];
       }
-      
+
       query.createTime = null;
-      
-      
+
+
       listViolationWarningInformation(query).then(response => {
         this.violationWarningInformationList = response.rows;
         this.total = response.total;
@@ -440,20 +444,20 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      
+
       if(this.queryParams.createTime){
         this.queryParams.startTime = this.queryParams.createTime[0];
         this.queryParams.endTime = this.queryParams.createTime[1];
       }
-      
+
       const query = {};
-      
+
       for(var i in this.queryParams){
         query[i] = this.queryParams[i];
       }
-      
+
       query.createTime = null;
-      
+
       this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
 <template>
-      <app-main />
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container"/>
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+      <tags-view v-if="needTagsView"/>
+      <app-main/>
+
+    </div>
+  </div>
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 export default {
   name: 'Layout',
@@ -38,52 +45,63 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
-  .fixed-header {
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
   }
+}
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px)
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
+
+.preview figure {
+  float: left;
+  width: 30%;
+  height:calc(30vw - 0px);
+  margin: 1.5%;
+}
+
+.preview figure img {
+  width: 400px;
+}
 </style>
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container"/>
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <tags-view v-if="needTagsView"/>
-      <app-main/>
-
-    </div>
-  </div>
+      <app-main />
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
-import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -45,63 +38,52 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-@import "~@/assets/styles/mixin.scss";
-@import "~@/assets/styles/variables.scss";
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
   }
-}
-.drawer-bg {
-  background: #000;
-  opacity: 0.3;
-  width: 100%;
-  top: 0;
-  height: 100%;
-  position: absolute;
-  z-index: 999;
-}
-
-.fixed-header {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 9;
-  width: calc(100% - #{$sideBarWidth});
-  transition: width 0.28s;
-}
-
-.hideSidebar .fixed-header {
-  width: calc(100% - 54px)
-}
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
-.mobile .fixed-header {
-  width: 100%;
-}
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
-.preview figure {
-  float: left;
-  width: 30%;
-  height:calc(30vw - 0px);
-  margin: 1.5%;
-}
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
-.preview figure img {
-  width: 400px;
-}
+  .mobile .fixed-header {
+    width: 100%;
+  }
 </style>
@@ -34,13 +34,11 @@
           <el-option label="已激活" value="1"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="激活时间" prop="activateDate" v-if="openActivateTime">
-        <el-date-picker  size="small" style="width: 200px"
-          v-model="queryParams.activateDate"
-          type="datetime"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择激活时间">
+      <el-form-item label="激活时间" prop="createTime" v-if="openActivateTime">
+        <el-date-picker v-model="queryParams.createTime" type="datetimerange"
+           start-placeholder="开始日期"
+           value-format="yyyy-MM-dd HH:mm:ss"
+           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -33,13 +33,11 @@
          <el-option label="已激活" value="1"/>
        </el-select>
      </el-form-item>
-     <el-form-item label="激活时间" prop="activateDate" v-if="openActivateTime">
-       <el-date-picker  size="small" style="width: 200px"
-         v-model="queryParams.activateDate"
-         type="datetime"
-         format="yyyy-MM-dd HH:mm:ss"
-         value-format="yyyy-MM-dd HH:mm:ss"
-         placeholder="选择激活时间">
+     <el-form-item label="激活时间" prop="createTime" v-if="openActivateTime">
+        <el-date-picker v-model="queryParams.createTime" type="datetimerange"
+           start-placeholder="开始日期"
+           value-format="yyyy-MM-dd HH:mm:ss"
+           end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
      <el-form-item>
@@ -41,13 +41,13 @@ module.exports = {
         }
       },
         ['/api']: {
-          target: `http://183.66.242.6:14601`,
-          // target: `http://175.6.47.84:8008`,
+          // target: `http://183.66.242.6:14601`,
+          target: `http://175.6.47.84:8008`,
           changeOrigin: true,
         },
         ['^/remotedown']: {
-           target: `http://183.66.242.6:14601/upload_files`,
-           // target: `http://175.6.47.84:8008/upload_files`,
+           // target: `http://183.66.242.6:14601/upload_files`,
+           target: `http://175.6.47.84:8008/upload_files`,
            changeOrigin: true,
         },
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
@@ -110,6 +111,7 @@ public class CompanyCreditController extends BaseController {
 	 */
 	@Log(title = "企业失信", businessType = BusinessType.INSERT)
 	@PostMapping
+    @RepeatSubmit
 	public AjaxResult add(@RequestBody CompanyCredit companyCredit) {
 		try {
@@ -21,6 +21,7 @@ import com.trash.business.domain.CompanyCredit;
 import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.service.IConstructionCreditService;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.page.TableDataInfo;
@@ -103,6 +104,7 @@ public class ConstructionCreditController extends BaseController
      */
     @Log(title = "工地失信", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody ConstructionCredit constructionCredit)
     {	
     	constructionCredit.setTime(new Date());
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
@@ -114,6 +115,7 @@ public class DriverCreditController extends BaseController {
 	 */
 	@Log(title = "驾驶员失信", businessType = BusinessType.INSERT)
 	@PostMapping
+    @RepeatSubmit
 	public AjaxResult add(@RequestBody DriverCredit driverCredit) {
 		driverCredit.setCreateBy(SecurityUtils.getUsername());
 		driverCredit.setTime(new Date());
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
@@ -96,6 +97,7 @@ public class EarthsitesCreditController extends BaseController
      */
     @Log(title = "处理场所失信", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody EarthsitesCredit earthsitesCredit)
     {    	earthsitesCredit.setCreateBy(SecurityUtils.getUsername());
     earthsitesCredit.setTime(new Date());
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
@@ -74,6 +75,7 @@ public class SupervisionSpecialController extends BaseController
      */
     @Log(title = "专项督察", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody SupervisionSpecial supervisionSpecial)
     {
         return toAjax(supervisionSpecialService.insertSupervisionSpecial(supervisionSpecial));
@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.config.trashConfig;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
@@ -308,6 +309,7 @@ public class SupervisionThreestepController extends BaseController
      */
     @Log(title = "三查机制", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody SupervisionThreestep supervisionThreestep)
     {
@@ -17,6 +17,7 @@ import com.trash.business.domain.ThreestepHistory;
 import com.trash.business.domain.TruckActivate;
 import com.trash.business.service.IThreestepHistoryService;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.page.TableDataInfo;
@@ -83,6 +84,7 @@ public class ThreestepHistoryController extends BaseController
     @PreAuthorize("@ss.hasPermi('threehistory:threeHistory:add')")
     @Log(title = "开停工", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody ThreestepHistory threestepHistory)
     {
         return toAjax(threestepHistoryService.insertThreestepHistory(threestepHistory));
@@ -115,15 +115,13 @@ public class TruckActivateController extends BaseController
         	info.setConstruction(turck.getConstruction());
         	info.setCompany(turck.getCompany());
-        	JSONObject object = RemoteServerUtils.getConstructionLicenseById(turck.getConstructionId());
-        	
-        	info.setAddress(object.getString("address"));
-        	info.setEarthName(object.getString("earthName"));
-        	info.setRouteName(object.getString("routeName"));
-        	info.setTransportEndTime(object.getString("transportEndTime"));
-        	info.setTransportStartTime(object.getString("transportStartTime"));
-        	info.setEffectiveFrom(object.getString("effectiveFrom"));
-        	info.setEffectiveEnd(object.getString("effectiveEnd"));
+        	info.setAddress(turck.getAddress());
+        	info.setEarthName(turck.getEarthName());
+        	info.setRouteName(turck.getRouteName());
+        	info.setTransportEndTime(turck.getTransportStartTime());
+        	info.setTransportStartTime(turck.getTransportStartTime());
+        	info.setEffectiveFrom(turck.getEffectiveFrom());
+        	info.setEffectiveEnd(turck.getEffectiveEnd());
         	outList.add(info);
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
@@ -114,6 +115,7 @@ public class TruckCreditController extends BaseController
      */
     @Log(title = "车辆失信", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody TruckCredit truckCredit)
     {
         truckCredit.setCreateBy(SecurityUtils.getUsername());
@@ -73,12 +73,18 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 			truckActivate.setActivateDate(DateFormatUtils.format(truckActivate.getActivateTime(), "yyyy-MM-dd"));
 		}
+		
 		List<TruckActivate> list = new ArrayList<>();
 				List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
 				List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
 				List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+
+				JSONArray dArea = redis.getCacheObject("areaList");
+				if(areas.size() == (dArea.size()+1)){
+					return truckActivateMapper.selectTruckActivateList(truckActivate);
+				}
 				if(areas.size() > 0) {
 					JSONArray array = redis.getCacheObject("companyList");
@@ -138,7 +138,7 @@ public class ViolationWarningInformationController extends BaseController
     String[] caseType = {"工地预警-未报开工作业", "工地预警-视频设备离线超时报警", "工地预警-三无车辆进入工地", "工地预警-未按时间作业",
             "处理场所预警-未报开工作业", "处理场所预警-视频设备离线超时报警", "处理场所预警-三无车辆进入处理场所", "处理场所预警-未到指定的处理场所作业",
             "离线运输报警(工)", "离线运输报警(消)", "未激活车辆作业", "未核准作业车辆作业", "未按线路行驶",
-            "闯禁行驶", "失信车辆作业"};
+            "闯禁行驶", "失信车辆作业", "卫星定位异常"};
     @GetMapping(value = "/caseTable")
     public AjaxResult getTable(String owningRegion,String startDate,String endDate){
@@ -319,7 +319,6 @@ public class Consumer {
                     break;
                 case "44030032"://未按线路行驶
                     violationWarningInformation.setViolationObjectType("0");
-                    violationWarningInformation.setViolationGrade("重点类");
                     violationWarningInformation.setSendObject("区管理部门");
                     describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
                             + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
@@ -348,7 +347,7 @@ public class Consumer {
                     break;
                 case "44030034"://失信车辆作业
-                case "44030035"://失信车辆作业
+                case "44030035"://卫星
                 	violationWarningInformation.setViolationObjectType("2");
                     violationWarningInformation.setSendObject("运输企业");
                     describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
@@ -88,6 +88,9 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
     		List<String> names = new ArrayList<>();
+    		
+    		
+    		
     		List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
     		List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
     		List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
@@ -95,6 +98,18 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
     		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
     		JSONArray construList = redisCache.getCacheObject("constructionList");
+			JSONArray companyList = redisCache.getCacheObject("companyList");
+
+    		List<String> companyAreas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+    		List<String> companyIds = SecurityUtils.getLoginUser().getUser().getCompanyIds();
+    				for(Object obj:companyList) {
+    					JSONObject jsonObject = (JSONObject)obj;
+    					if(companyIds.indexOf(jsonObject.getString("id")) > -1 || companyAreas.indexOf(jsonObject.getString("areaCode"))> -1){
+    	    				names.add(jsonObject.getString("name"));
+    	    			}
+    				}
+    			
+    		
     		for(Object obj:earthList){
     			JSONObject jsonObject = (JSONObject) obj;
@@ -147,6 +162,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
                 JSONObject jo = (JSONObject) o;
                 if (violationCaseFile.getCompanyName().equals(jo.getString("name"))) {
                     violationCaseFile.setAbbreviation(jo.getString("abbreviation"));
+                    break;
                 }
             }
         }
@@ -41,317 +41,347 @@ import org.springframework.web.multipart.MultipartFile;
  * @date 2023-05-09
  */
 @Service
-public class ViolationWarningInformationServiceImpl implements IViolationWarningInformationService
-{
-    private static final Logger log = LoggerFactory.getLogger(ViolationWarningInformationServiceImpl.class);
-    @Autowired
-    private ViolationWarningInformationMapper violationWarningInformationMapper;
-    @Autowired
-    private UploadFileMapper uploadFileMapper;
-    @Autowired
-    IWorkflowService WorkflowService;
-    @Autowired
-    RedisCache redisCache;
-    /**
-     * 查询违规预警信息
-     * 
-     * @param id 违规预警信息ID
-     * @return 违规预警信息
-     */
-    @Override
-    public ViolationWarningInformationVo selectViolationWarningInformationById(Long id) {
-        ViolationWarningInformationVo violationWarningInformationVo = new ViolationWarningInformationVo();
-        violationWarningInformationVo.setViolationWarningInformation(violationWarningInformationMapper.selectViolationWarningInformationById(id));
-        if(violationWarningInformationVo.getViolationWarningInformation()!=null){
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("violation_warning_information");
-            uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            violationWarningInformationVo.setUploadFiles(list);
-        }
-        return violationWarningInformationVo;
-    }
-
-    /**
-     * 查询违规预警信息列表
-     * 
-     * @param violationWarningInformation 违规预警信息
-     * @return 违规预警信息
-     */
-    @Override
-    public List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation)
-    {	
-
-        List<ViolationWarningInformation> list = new ArrayList<>();
-    	JSONArray areas = redisCache.getCacheObject("areas");
-    	       
-    	 List<String> names = new ArrayList<>();
-			
-			List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
-			List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
-			List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
-			List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
-			
-			JSONArray earthList = redisCache.getCacheObject("earthSitesList");
-			JSONArray construList = redisCache.getCacheObject("constructionList");
-			
-			for(Object obj:earthList){
-				JSONObject jsonObject = (JSONObject) obj;
-				if(eLish.indexOf(jsonObject.getString("id")) > -1 || eArea.indexOf(jsonObject.getString("areaCode"))> -1){
-					names.add(jsonObject.getString("name"));
-				}
+public class ViolationWarningInformationServiceImpl implements IViolationWarningInformationService {
+	private static final Logger log = LoggerFactory.getLogger(ViolationWarningInformationServiceImpl.class);
+	@Autowired
+	private ViolationWarningInformationMapper violationWarningInformationMapper;
+	@Autowired
+	private UploadFileMapper uploadFileMapper;
+	@Autowired
+	IWorkflowService WorkflowService;
+	@Autowired
+	RedisCache redisCache;
+
+	/**
+	 * 查询违规预警信息
+	 * 
+	 * @param id
+	 *            违规预警信息ID
+	 * @return 违规预警信息
+	 */
+	@Override
+	public ViolationWarningInformationVo selectViolationWarningInformationById(Long id) {
+		ViolationWarningInformationVo violationWarningInformationVo = new ViolationWarningInformationVo();
+		violationWarningInformationVo.setViolationWarningInformation(
+				violationWarningInformationMapper.selectViolationWarningInformationById(id));
+		if (violationWarningInformationVo.getViolationWarningInformation() != null) {
+			UploadFile uploadFile = new UploadFile();
+			uploadFile.setTableName("violation_warning_information");
+			uploadFile
+					.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
+			List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
+			violationWarningInformationVo.setUploadFiles(list);
+		}
+		return violationWarningInformationVo;
+	}
+
+	/**
+	 * 查询违规预警信息列表
+	 * 
+	 * @param violationWarningInformation
+	 *            违规预警信息
+	 * @return 违规预警信息
+	 */
+	@Override
+	public List<ViolationWarningInformation> selectViolationWarningInformationList(
+			ViolationWarningInformation violationWarningInformation) {
+
+		List<ViolationWarningInformation> list = new ArrayList<>();
+		JSONArray areas = redisCache.getCacheObject("areas");
+
+		List<String> names = new ArrayList<>();
+
+		List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
+		List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
+		List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
+		List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
+
+		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
+		JSONArray construList = redisCache.getCacheObject("constructionList");
+
+		JSONArray companyList = redisCache.getCacheObject("companyList");
+
+		List<String> companyAreas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+		List<String> companyIds = SecurityUtils.getLoginUser().getUser().getCompanyIds();
+		for (Object obj : companyList) {
+			JSONObject jsonObject = (JSONObject) obj;
+			if (companyIds.indexOf(jsonObject.getString("id")) > -1
+					|| companyAreas.indexOf(jsonObject.getString("areaCode")) > -1) {
+				names.add(jsonObject.getString("name"));
 			}
-			for(Object obj:construList){
-				JSONObject jsonObject = (JSONObject) obj;
-				if(cLish.indexOf(jsonObject.getString("id")) > -1 || cArea.indexOf(jsonObject.getString("areaCode"))> -1){
-					names.add(jsonObject.getString("name"));
+		}
+
+		for (Object obj : earthList) {
+			JSONObject jsonObject = (JSONObject) obj;
+			if (eLish.indexOf(jsonObject.getString("id")) > -1
+					|| eArea.indexOf(jsonObject.getString("areaCode")) > -1) {
+				names.add(jsonObject.getString("name"));
+			}
+		}
+		for (Object obj : construList) {
+			JSONObject jsonObject = (JSONObject) obj;
+			if (cLish.indexOf(jsonObject.getString("id")) > -1
+					|| cArea.indexOf(jsonObject.getString("areaCode")) > -1) {
+				names.add(jsonObject.getString("name"));
+			}
+		}
+
+		if (names.size() == 0) {
+			return list;
+		} else {
+			violationWarningInformation.setNames(names);
+		}
+
+		return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
+	}
+
+	@Override
+	public List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,
+			String startDate, String endDate) {
+		return violationWarningInformationMapper.selectViolationWarningInformationListByTable(owningRegion, startDate,
+				endDate);
+	}
+
+	/**
+	 * 新增违规预警信息
+	 * 
+	 * @param violationWarningInformation
+	 *            违规预警信息
+	 * @return 结果
+	 */
+
+	String innerArea = "湘江新区,芙蓉区,天心区,开福区,雨花区";
+	String warnString = "处理场所预警-未报开工作业、处理场所预警-视频设备离线超时报警、处理场所预警-三无车辆进入处理场所、处理场所预警-未到指定的处理场所作业";
+
+	@Override
+	@Transactional
+	public int insertViolationWarningInformation(MultipartFile[] files,
+			ViolationWarningInformation violationWarningInformation) throws IOException {
+
+		if (!innerArea.contains(violationWarningInformation.getOwningRegion())
+				&& warnString.contains(violationWarningInformation.getViolationType())
+				&& violationWarningInformation.getViolationObjectType() == "1") {
+
+			log.info("不记录预警信息" + violationWarningInformation.getOwningRegion() + " "
+					+ violationWarningInformation.getViolationType());
+
+			return 1;
+
+		}
+
+		if (violationWarningInformation.getCreateTime() == null) {
+			violationWarningInformation.setCreateTime(DateUtils.getNowDate());
+		}
+		if (StringUtils.isEmpty(violationWarningInformation.getCreateBy())) {
+			violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
+		}
+		// 判断公司是否为空，如果不为空则查询公司简称
+		if (StringUtils.isNotEmpty(violationWarningInformation.getCompanyName())) {
+			JSONArray companyList = redisCache.getCacheObject("companyList");
+			for (Object o : companyList) {
+				JSONObject jo = (JSONObject) o;
+				if (violationWarningInformation.getCompanyName().equals(jo.getString("name"))) {
+					violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
+					break;
 				}
 			}
-			
-			if(names.size() == 0){
-				return list;
-			}else{
-				violationWarningInformation.setNames(names);
+		}
+		violationWarningInformation.setStatus(0);
+
+		if (violationWarningInformation.getViolationObjectType().equals("2")) {
+			violationWarningInformation.setProjectName(violationWarningInformation.getCompanyName());
+		}
+
+		log.info("违规预警信息新增");
+		Integer result = violationWarningInformationMapper
+				.insertViolationWarningInformation(violationWarningInformation);
+		log.info("违规预警信息新增成功,resultSize:" + result);
+		if (StringUtils.isNotEmpty(files)) {
+			// 文件上传
+			for (MultipartFile file : files) {
+				UploadFile uploadFile = new UploadFile();
+				uploadFile.setTableName("violation_warning_information");
+				uploadFile.setTableNumber(violationWarningInformation.getId().toString());
+				uploadFile.setFileName(file.getOriginalFilename());
+				uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
+				uploadFileMapper.insertUploadFile(uploadFile);
+			}
+		}
+		int i = 0;
+		// 根据发送对象判断流程
+		if (violationWarningInformation.getSendObject().equals("区管理部门")) {
+
+			if (violationWarningInformation.getViolationGrade().equals("一般类")) {
+				i = 1;
+			} else {
+				i = 2;
+			}
+		}
+
+		try {
+
+			Map map = null;
+			try {
+				map = redisCache.getCacheMap("warningParam");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			if (map == null || map.size() == 0) {
+				map = getTypeToRedis();
+			}
+
+			if (map != null && map.get(violationWarningInformation.getViolationType()) != null
+					&& map.get(violationWarningInformation.getViolationType()).equals("0")) {
+				System.out.println(violationWarningInformation.getViolationType() + " "
+						+ map.get(violationWarningInformation.getViolationType()));
+				return result;
 			}
-     
-        
-        
-        return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
-    }
-
-    @Override
-    public List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,String startDate,String endDate)
-    {
-        return violationWarningInformationMapper.selectViolationWarningInformationListByTable(owningRegion,startDate,endDate);
-    }
-
-    /**
-     * 新增违规预警信息
-     * 
-     * @param violationWarningInformation 违规预警信息
-     * @return 结果
-     */
-    
-    String innerArea = "湘江新区,芙蓉区,天心区,开福区,雨花区";
-    String warnString = "处理场所预警-未报开工作业、处理场所预警-视频设备离线超时报警、处理场所预警-三无车辆进入处理场所、处理场所预警-未到指定的处理场所作业";
-    
-    @Override
-    @Transactional
-    public int insertViolationWarningInformation(MultipartFile[] files,ViolationWarningInformation violationWarningInformation) throws IOException {
-    	
-    	
-    	if(!innerArea.contains(violationWarningInformation.getOwningRegion()) && warnString.contains(violationWarningInformation.getViolationType()) 
-    			&& violationWarningInformation.getViolationObjectType() == "1") {
-    		
-    		log.info("不记录预警信息"  + violationWarningInformation.getOwningRegion() + " " + violationWarningInformation.getViolationType());
-    		
-    		return 1;
-    		
-    	}
-    	
-    	
-        if(violationWarningInformation.getCreateTime()==null){
-            violationWarningInformation.setCreateTime(DateUtils.getNowDate());
-        }
-        if(StringUtils.isEmpty(violationWarningInformation.getCreateBy())){
-            violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
-        }
-        //判断公司是否为空，如果不为空则查询公司简称
-        if(StringUtils.isNotEmpty(violationWarningInformation.getCompanyName())){
-            JSONArray companyList = redisCache.getCacheObject("companyList");
-            for(Object o:companyList){
-                JSONObject jo = (JSONObject) o;
-                if(violationWarningInformation.getCompanyName().equals(jo.getString("name"))){
-                    violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
-                }
-            }
-        }
-        violationWarningInformation.setStatus(0);
-        
-        if(violationWarningInformation.getViolationObjectType().equals("2")) {
-        	violationWarningInformation.setProjectName(violationWarningInformation.getCompanyName());
-        }
-        
-        log.info("违规预警信息新增");
-        Integer result = violationWarningInformationMapper.insertViolationWarningInformation(violationWarningInformation);
-        log.info("违规预警信息新增成功,resultSize:"+result);
-        if(StringUtils.isNotEmpty(files)){
-            //文件上传
-            for (MultipartFile file : files) {
-                UploadFile uploadFile = new UploadFile();
-                uploadFile.setTableName("violation_warning_information");
-                uploadFile.setTableNumber(violationWarningInformation.getId().toString());
-                uploadFile.setFileName(file.getOriginalFilename());
-                uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
-                uploadFileMapper.insertUploadFile(uploadFile);
-            }
-        }
-        int i = 0;
-        //根据发送对象判断流程
-        if(violationWarningInformation.getSendObject().equals("区管理部门")){
-
-            if(violationWarningInformation.getViolationGrade().equals("一般类")){
-                i = 1;
-            }else{
-                i = 2;
-            }
-        }
-        
-        Map map = null;
-        try {
-        	map = redisCache.getCacheMap("warningParam");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-        
-        
-        if(map == null || map.size() == 0){
-        	map = getTypeToRedis();
-        }
-        
-        if(map!= null && map.get(violationWarningInformation.getViolationType()) != null &&
-        		map.get(violationWarningInformation.getViolationType()).equals("0")){
-        	System.out.println(violationWarningInformation.getViolationType() + " " + map.get(violationWarningInformation.getViolationType()));
-        	return result;
-        }
-//        
-        
-        if(violationWarningInformation.getCreateBy().equals("长沙市建筑垃圾智慧监管平台")){
-            WorkflowService.createCaseFile1(violationWarningInformation,i,1);
-        }else{
-            WorkflowService.createCaseFile1(violationWarningInformation,i,0);
-        }
-
-        return result;
-    }
-    
-    
-    public Map getTypeToRedis(){
-    	
-    	
-    	File file = new File("d:/warningParam.txt");
-    	
-    	Map map = null;
-    	
-    	try {
+
+		if (violationWarningInformation.getCreateBy().equals("长沙市建筑垃圾智慧监管平台")) {
+			WorkflowService.createCaseFile1(violationWarningInformation, i, 1);
+		} else {
+			WorkflowService.createCaseFile1(violationWarningInformation, i, 0);
+		}
+
+		return result;
+	}
+
+	public Map getTypeToRedis() {
+
+		File file = new File("d:/warningParam.txt");
+
+		Map map = null;
+
+		try {
 			BufferedReader fReader = new BufferedReader(new FileReader(file));
-			
+
 			String result = null;
 			map = new HashMap<>();
-			while(true){
+			while (true) {
 				try {
 					result = fReader.readLine();
-					
-					if(result == null){
+
+					if (result == null) {
 						break;
 					}
-					
+
 					map.put(result.split(" ")[0], result.split(" ")[1]);
-					
-					System.out.println(result.split(" ")[0] +"," +  result.split(" ")[1]);
-					
+
+					System.out.println(result.split(" ")[0] + "," + result.split(" ")[1]);
+
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-				
+
 			}
-			
-			redisCache.setCacheObject("warningParam", map,15,TimeUnit.MINUTES);
-			
+
+			redisCache.setCacheObject("warningParam", map, 15, TimeUnit.MINUTES);
+
 			return map;
 		} catch (FileNotFoundException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-    	return null;
-    }
-
-    /**
-     * 修改违规预警信息
-     * 
-     * @param violationWarningInformationVo 违规预警信息
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateViolationWarningInformation(MultipartFile[] files,ViolationWarningInformationVo violationWarningInformationVo) throws IOException {
-        violationWarningInformationVo.getViolationWarningInformation().setUpdateBy(SecurityUtils.getUsername());
-        //查询该合同下的文件上传数据然后删除数据库中的数据和文件
-        UploadFile uploadFile = new UploadFile();
-        uploadFile.setTableName("violation_warning_information");
-        uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
-        List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile);
-        //判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件
-        if (violationWarningInformationVo.getUploadFiles().size() != 0) {
-            //获取两个list的交集
-            List<UploadFile> distinctList = uploadFileList.stream().filter(item -> violationWarningInformationVo.getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId()))).collect(Collectors.toList());
-            //去掉交集得到需要删除的数据
-            uploadFileList.removeAll(distinctList);
-
-            for (UploadFile distinctFile : uploadFileList) {
-                uploadFileMapper.deleteUploadFileById(distinctFile.getId());
-                //删除文件
-                FileUploadUtils.deleteFile(distinctFile.getFilePath());
-            }
-        } else {
-            for (UploadFile uploadFile1 : uploadFileList) {
-                //删除数据库数据
-                uploadFileMapper.deleteUploadFileById(uploadFile1.getId());
-                //删除文件
-                FileUploadUtils.deleteFile(uploadFile1.getFilePath());
-            }
-        }
-
-        //添加新的文件
-        for (MultipartFile file : files) {
-            UploadFile newUploadFile = new UploadFile();
-            newUploadFile.setTableName("violation_warning_information");
-            newUploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
-            newUploadFile.setFileName(file.getOriginalFilename());
-            newUploadFile.setFilePath(FileUploadUtils.uploadFile(file));
-            uploadFileMapper.insertUploadFile(newUploadFile);
-        }
-        return violationWarningInformationMapper.updateViolationWarningInformation(violationWarningInformationVo.getViolationWarningInformation());
-    }
-
-    /**
-     * 批量删除违规预警信息
-     * 
-     * @param ids 需要删除的违规预警信息ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int deleteViolationWarningInformationByIds(Long[] ids)
-    {
-        for (Long id : ids) {
-            ViolationWarningInformation violationWarningInformation = violationWarningInformationMapper.selectViolationWarningInformationById(id);
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("violation_warning_information");
-            uploadFile.setTableNumber(violationWarningInformation.getId().toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //遍历删除文件
-            for (UploadFile file : list) {
-                uploadFileMapper.deleteUploadFileById(file.getId());
-                FileUploadUtils.deleteFile(file.getFilePath());
-            }
-        }
-        return violationWarningInformationMapper.deleteViolationWarningInformationByIds(ids);
-    }
-
-    /**
-     * 删除违规预警信息信息
-     * 
-     * @param id 违规预警信息ID
-     * @return 结果
-     */
-    @Override
-    public int deleteViolationWarningInformationById(Long id)
-    {
-        return violationWarningInformationMapper.deleteViolationWarningInformationById(id);
-    }
-
-    public void updateViolationCaseFile(ViolationWarningInformation violationWarningInformation){
-        violationWarningInformationMapper.updateViolationWarningInformation(violationWarningInformation);
-    }
+		return null;
+	}
+
+	/**
+	 * 修改违规预警信息
+	 * 
+	 * @param violationWarningInformationVo
+	 *            违规预警信息
+	 * @return 结果
+	 */
+	@Override
+	@Transactional
+	public int updateViolationWarningInformation(MultipartFile[] files,
+			ViolationWarningInformationVo violationWarningInformationVo) throws IOException {
+		violationWarningInformationVo.getViolationWarningInformation().setUpdateBy(SecurityUtils.getUsername());
+		// 查询该合同下的文件上传数据然后删除数据库中的数据和文件
+		UploadFile uploadFile = new UploadFile();
+		uploadFile.setTableName("violation_warning_information");
+		uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
+		List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile);
+		// 判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件
+		if (violationWarningInformationVo.getUploadFiles().size() != 0) {
+			// 获取两个list的交集
+			List<UploadFile> distinctList = uploadFileList.stream().filter(item -> violationWarningInformationVo
+					.getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId())))
+					.collect(Collectors.toList());
+			// 去掉交集得到需要删除的数据
+			uploadFileList.removeAll(distinctList);
+
+			for (UploadFile distinctFile : uploadFileList) {
+				uploadFileMapper.deleteUploadFileById(distinctFile.getId());
+				// 删除文件
+				FileUploadUtils.deleteFile(distinctFile.getFilePath());
+			}
+		} else {
+			for (UploadFile uploadFile1 : uploadFileList) {
+				// 删除数据库数据
+				uploadFileMapper.deleteUploadFileById(uploadFile1.getId());
+				// 删除文件
+				FileUploadUtils.deleteFile(uploadFile1.getFilePath());
+			}
+		}
+
+		// 添加新的文件
+		for (MultipartFile file : files) {
+			UploadFile newUploadFile = new UploadFile();
+			newUploadFile.setTableName("violation_warning_information");
+			newUploadFile
+					.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
+			newUploadFile.setFileName(file.getOriginalFilename());
+			newUploadFile.setFilePath(FileUploadUtils.uploadFile(file));
+			uploadFileMapper.insertUploadFile(newUploadFile);
+		}
+		return violationWarningInformationMapper
+				.updateViolationWarningInformation(violationWarningInformationVo.getViolationWarningInformation());
+	}
+
+	/**
+	 * 批量删除违规预警信息
+	 * 
+	 * @param ids
+	 *            需要删除的违规预警信息ID
+	 * @return 结果
+	 */
+	@Override
+	@Transactional
+	public int deleteViolationWarningInformationByIds(Long[] ids) {
+		for (Long id : ids) {
+			ViolationWarningInformation violationWarningInformation = violationWarningInformationMapper
+					.selectViolationWarningInformationById(id);
+			UploadFile uploadFile = new UploadFile();
+			uploadFile.setTableName("violation_warning_information");
+			uploadFile.setTableNumber(violationWarningInformation.getId().toString());
+			List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
+			// 遍历删除文件
+			for (UploadFile file : list) {
+				uploadFileMapper.deleteUploadFileById(file.getId());
+				FileUploadUtils.deleteFile(file.getFilePath());
+			}
+		}
+		return violationWarningInformationMapper.deleteViolationWarningInformationByIds(ids);
+	}
+
+	/**
+	 * 删除违规预警信息信息
+	 * 
+	 * @param id
+	 *            违规预警信息ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteViolationWarningInformationById(Long id) {
+		return violationWarningInformationMapper.deleteViolationWarningInformationById(id);
+	}
+
+	public void updateViolationCaseFile(ViolationWarningInformation violationWarningInformation) {
+		violationWarningInformationMapper.updateViolationWarningInformation(violationWarningInformation);
+	}
 }
@@ -29,17 +29,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="routeInfo"    column="route_info"    />
         <result property="earthList"    column="earth_list"    />
         <result property="coord"    column="coord"    />
-        
-        
     </resultMap>
     <sql id="selectTruckActivateVo">
-        select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, 
-        		create_by, create_type, activate_time, create_time,create_count,address,effective_from,effective_end,
-        		transport_start_time,transport_end_time,route_name,earth_name,route_info,earth_list,coord
+        select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, create_by, create_type, activate_time, create_time,create_count
+        ,address,effective_from,effective_end,transport_start_time,transport_end_time,route_name,earth_name
          from truck_activate
     </sql>
-
+    
+ 
     <select id="selectTruckActivateList" parameterType="TruckActivate" resultMap="TruckActivateResult">
         <include refid="selectTruckActivateVo"/>
         <where>  
@@ -65,6 +63,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 				        </foreach>
 	        </if>
         </where>
+        ORDER BY create_time desc
     </select>
         <select id="selectTruckActivateListByConstructions" parameterType="TruckActivate" resultMap="TruckActivateResult">
@@ -230,7 +229,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </select>
    <select id="getTruckHistoryListByObjects" parameterType="TruckActivate" resultMap="TruckActivateResult">
-        <include refid="selectTruckActivateVo"/>
+   		 from truck_activate
         <where>
             <if test="startTime != null "> and activate_time BETWEEN #{startTime} and #{endTime}</if>
         	and object_id in