m

youxiw2000
1 parent 0808b760
Showing 9 changed files with 56 additions and 29 deletions
trash-ui/src/api/truck_active.js
trash-ui/src/api/vio_casefile.js
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/java/com/trash/caseOffline/service/impl/CaseOfflineServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
@@ -408,7 +408,7 @@ export default {
           }
           addTruckActivate(data).then(response => {
-            this.msgSuccess(response.message);
+            this.msgSuccess("操作成功," + response.message);
             this.open = false;
             this.getList();
           });
@@ -93,10 +93,10 @@ export default {
         {code: 11, name: "工地预警-视频设备离线超时报警"},
         {code: 12, name: "工地预警-三无车辆进入工地"},
         {code: 13, name: "工地预警-未按时间作业"},
-        {code: 14, name: "处理场所预警-未报开工作业"},
-        {code: 15, name: "处理场所预警-视频设备离线超时报警"},
-        {code: 16, name: "处理场所预警-三无车辆进入处理场所"},
-        {code: 17, name: "处理场所预警-未到指定的处理场所作业"},
+        {code: 14, name: "未报开工作业"},
+        {code: 15, name: "视频设备离线超时报警"},
+        {code: 16, name: "三无车辆进入处理场所"},
+        {code: 17, name: "未到指定的处理场所作业"},
         {code: 18, name: "离线运输报警（工）"},
         {code: 19, name: "离线运输报警（消）"},
         {code: 20, name: "未激活车辆作业"},
@@ -16,6 +16,7 @@ import com.trash.business.domain.DriverCredit;
 import com.trash.business.domain.EarthsitesCredit;
 import com.trash.business.service.IDriverCreditService;
 import com.trash.common.config.trashConfig;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -53,6 +54,9 @@ public class DriverCreditServiceImpl implements IDriverCreditService
      */
     @Autowired
     private trashConfig trashConfig;
+
+    @Autowired
+    RedisCache redis;
     @Override
     public List<DriverCredit> selectDriverCreditList(DriverCredit driverCredit)
@@ -61,7 +65,20 @@ public class DriverCreditServiceImpl implements IDriverCreditService
     	List<DriverCredit> list = new ArrayList<>();
 			List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
-
+List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+			
+			
+			if(areas.size() > 0) {
+				JSONArray array = redis.getCacheObject("companyList");
+				if(array != null) {
+					for(Object obj:array) {
+						JSONObject json = (JSONObject)obj;
+						if(areas.indexOf(json.getString("areaCode")) > -1) {
+							companys.add(json.getString("id"));
+						}
+					}
+				}
+			}
 			if (companys.size() > 0) {
@@ -849,8 +849,13 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		TruckActivate truckActivate = new TruckActivate();
 		truckActivate.setStatus(0L);
 		truckActivate.setActivateStatus("0");
-
-		List<TruckActivate> taList = truckActivateMapper.selectTruckActivateList(truckActivate);
+		List<TruckActivate> taList = null;
+		try{
+			taList = truckActivateMapper.selectTruckActivateList(truckActivate);
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
 		for (TruckActivate ta : taList) {
 			unActiveTruck += ta.getObjectId() + ",";
@@ -193,7 +193,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		String[] objs = truckActivate.getObjectId().split(",");
 		String[] nos = truckActivate.getLicensePlate().split(",");
-		List<TruckActivate> oldDates = truckActivateMapper.selectTodayTruckByObjIds(objs);
+		List<TruckActivate> oldDatas = truckActivateMapper.selectTodayTruckByObjIds(objs);
 		JSONObject construction = RemoteServerUtils.getConstructionLicenseById(truckActivate.getConstructionId());
@@ -222,25 +222,30 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 			active.setCreateTime(DateUtils.getNowDate());
-			TruckActivate oldDate = null;
+			TruckActivate oldData = null;
-			for (int j = 0; j < oldDates.size(); j++) {
-				if (objs[i].equals(oldDates.get(j).getObjectId())) {
-					oldDate = oldDates.get(j);
+			for (int j = 0; j < oldDatas.size(); j++) {
+				if (objs[i].equals(oldDatas.get(j).getObjectId())) {
+					oldData = oldDatas.get(j);
+					break;
 				}
 			}
-			if (oldDate != null) {
+			if (oldData != null) {
+				
+				if(oldData.getConstructionId().equals(truckActivate.getConstructionId())){
+					continue;
+				}
-				if (oldDate.getCreateCount() > 1) {
+				if (oldData.getCreateCount() > 1) {
 					errorMessage += nos[i] + " ";
 					continue;
 				}
 				SupervisionThreestep threestep = new SupervisionThreestep();
-				threestep.setName(oldDate.getConstruction());
-				threestep.setObjectId(oldDate.getConstructionId());
+				threestep.setName(oldData.getConstruction());
+				threestep.setObjectId(oldData.getConstructionId());
 				try {
 					threestep.setWorkStartTime(DateUtils.parseDate(start));
@@ -291,7 +296,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 					threestep.setId(threeId);
-					trucks = trucks.replace(oldDate.getObjectId(), "").replace(",,", ",");
+					trucks = trucks.replace(oldData.getObjectId(), "").replace(",,", ",");
 					if (trucks.length() == 1) {
 						trucks = "";
@@ -303,8 +308,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 					threestepMapper.updateSupervisionThreestep(threestep);
 				}
-				active.setId(oldDate.getId());// 更新已有车辆激活数据
-				active.setCreateCount(oldDate.getCreateCount() + 1);
+				active.setId(oldData.getId());// 更新已有车辆激活数据
+				active.setCreateCount(oldData.getCreateCount() + 1);
 				successMessage += nos[i] + " ";
 				truckActivateMapper.updateTruckActivate(active);
 				continue;
@@ -90,13 +90,13 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
 		for(Object obj:earthList){
 			JSONObject jsonObject = (JSONObject) obj;
-			if(eLish.indexOf(jsonObject.getString("id")) > 0 || eArea.indexOf(jsonObject.getString("areaCode"))> 0){
+			if(eLish.indexOf(jsonObject.getString("id")) > -1 || eArea.indexOf(jsonObject.getString("areaCode"))> -10){
 				names.add(jsonObject.getString("name"));
 			}
 		}
 		for(Object obj:construList){
 			JSONObject jsonObject = (JSONObject) obj;
-			if(cLish.indexOf(jsonObject.getString("id")) > 0 || cArea.indexOf(jsonObject.getString("areaCode"))> 0){
+			if(cLish.indexOf(jsonObject.getString("id")) > -1 || cArea.indexOf(jsonObject.getString("areaCode"))> -1){
 				names.add(jsonObject.getString("name"));
 			}
 		}
@@ -98,13 +98,13 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
     		for(Object obj:earthList){
     			JSONObject jsonObject = (JSONObject) obj;
-    			if(eLish.indexOf(jsonObject.getString("id")) > 0 || eArea.indexOf(jsonObject.getString("areaCode"))> 0){
+    			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")) > 0 || cArea.indexOf(jsonObject.getString("areaCode"))> 0){
+    			if(cLish.indexOf(jsonObject.getString("id")) > -1 || cArea.indexOf(jsonObject.getString("areaCode"))> -1){
     				names.add(jsonObject.getString("name"));
     			}
     		}
@@ -97,13 +97,13 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 			for(Object obj:earthList){
 				JSONObject jsonObject = (JSONObject) obj;
-				if(eLish.indexOf(jsonObject.getString("id")) > 0 || eArea.indexOf(jsonObject.getString("areaCode"))> 0){
+				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")) > 0 || cArea.indexOf(jsonObject.getString("areaCode"))> 0){
+				if(cLish.indexOf(jsonObject.getString("id")) > -1 || cArea.indexOf(jsonObject.getString("areaCode"))> -1){
 					names.add(jsonObject.getString("name"));
 				}
 			}
@@ -58,7 +58,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="activateStatus == 1 "> and activate_time is not null</if>
             <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
-              <if test="cIds.size() > 0 and ids.size() > 0">and (
+              <if test="cIds != null and ids != null and cIds.size() > 0 and ids.size() > 0">and (
 	              		construction_id in 
 				        <foreach item="id" collection="cIds" open="(" separator="," close=")">
 				            #{id}
@@ -70,13 +70,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			        )
 	        </if>
-	        <if test="cIds.size() > 0 and ids.size() == 0">
+	        <if test="cIds != null and ids != null and cIds.size() > 0 and ids.size() == 0">
 	              		and construction_id in 
 				        <foreach item="id" collection="cIds" open="(" separator="," close=")">
 				            #{id}
 				        </foreach>
 	        </if>
-	        <if test="cIds.size() == 0 and ids.size() > 0">
+	        <if test="cIds != null and ids != null and cIds.size() == 0 and ids.size() > 0">
 	              		and object_id in 
 				        <foreach item="id" collection="ids" open="(" separator="," close=")">
 				            #{id}