m

youxiw2000
1 parent 315e50eb
Showing 20 changed files with 140 additions and 70 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
trash-daily/src/main/java/com/trash/information_sharing/controller/InformationSharingController.java
trash-daily/src/main/java/com/trash/report/controller/WorkReportController.java
trash-daily/src/main/java/com/trash/situation/controller/DailySituationController.java
trash-daily/src/main/java/com/trash/toollist/controller/DailyToolListController.java
trash-ui/dist.rar
trash-ui/src/api/taskmethod.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/layout/index3.vue → trash-ui/src/layout/index44.vue
trash-ui/src/views/h5/task/handleInfo.vue
trash-ui/src/views/office/handle/handleInfo.vue
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
trash-workFlow/src/main/java/com/trash/business/mapper/TruckActivateMapper.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/casefile/controller/ViolationCaseFileController.java
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
@@ -339,7 +339,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 			Set<String> idString = new HashSet<String>();
 			for (ProcessInstance pi : processInstanceList) {
-				idString.add(pi.getBusinessKey());
+				idString.add(pi.getId());
 			}
 			List<Map<String, Object>> maps = actMapper.selectWorkByIds(idString);
@@ -42,19 +42,13 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     @Override
     public List<ActWorkflowFormData> historyDataShow(String businessKey) {
         List<ActWorkflowFormData> returnHistoryFromDataDTOS=new ArrayList<>();
+        List<ActWorkflowFormData> actWorkflowFormData=new ArrayList<>();
         List<Task> tasks = null;
-        
-        if(businessKey.contains("constructsite")){
-        	String id = businessKey.split(":")[1];
-            tasks =taskService.createTaskQuery().processInstanceBusinessKey("workflow_constructsite_edit:" + id).list();
-            tasks.addAll(taskService.createTaskQuery().processInstanceBusinessKey("workflow_constructsite:" + id).list());
-        }else{
-            tasks =taskService.createTaskQuery().processInstanceBusinessKey(businessKey).list();
-        }
-        
+
+        tasks =taskService.createTaskQuery().processInstanceBusinessKey(businessKey).list();
 		if(tasks.size() > 0){
@@ -71,7 +65,21 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
 			returnHistoryFromDataDTOS.add(afw);
 		}
-        List<ActWorkflowFormData> actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
+        
+        if(businessKey.contains("constructsite")){
+        	String id = businessKey.split(":")[1];
+
+            actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_constructsite:" + id));
+           
+            actWorkflowFormData  = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_constructsite_edit:" + id);
+            
+            
+        }else{
+
+            actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
+        }
+		
+		
         for(int i =0;i<actWorkflowFormData.size();i++){
         	if(i == actWorkflowFormData.size()-1){
@@ -108,9 +116,8 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
 //                    returnHistoryFromDataDTOS.add(returnHistoryFromDataDTO);
 //                }
 //        );
-//        returnHistoryFromDataDTOS = returnHistoryFromDataDTOS.stream().sorted((x, y) -> x.getCreateTime().compareTo(y.getCreateTime())).collect(Collectors.toList());
-		
+        returnHistoryFromDataDTOS = returnHistoryFromDataDTOS.stream().sorted((y,x) -> x.getCreateTime().compareTo(y.getCreateTime())).collect(Collectors.toList());
         return returnHistoryFromDataDTOS;
@@ -36,7 +36,7 @@ public class InformationSharingController extends BaseController
     public TableDataInfo list(InformationSharing informationSharing)
     {
         startPage();
-        informationSharing.setCreateBy(SecurityUtils.getUsername());
+//        informationSharing.setCreateBy(SecurityUtils.getUsername());
         List<InformationSharing> list = informationSharingService.selectInformationSharingList(informationSharing);
         return getDataTable(list);
     }
@@ -37,7 +37,7 @@ public class WorkReportController extends BaseController
     public TableDataInfo list(WorkReport workReport)
     {
         startPage();
-    	workReport.setCreateBy(SecurityUtils.getUsername());
+//    	workReport.setCreateBy(SecurityUtils.getUsername());
         List<WorkReport> list = workReportService.selectWorkReportList(workReport);
         return getDataTable(list);
     }
@@ -37,7 +37,7 @@ public class DailySituationController extends BaseController
     public TableDataInfo list(DailySituation dailySituation)
     {
         startPage();
-        dailySituation.setCreateBy(SecurityUtils.getUsername());
+//        dailySituation.setCreateBy(SecurityUtils.getUsername());
         List<DailySituation> list = dailySituationService.selectDailySituationList(dailySituation);
         return getDataTable(list);
     }
@@ -37,7 +37,7 @@ public class DailyToolListController extends BaseController
     public TableDataInfo list(DailyToolList dailyToolList)
     {
         startPage();
-        dailyToolList.setCreateBy(SecurityUtils.getUsername());
+//        dailyToolList.setCreateBy(SecurityUtils.getUsername());
         List<DailyToolList> list = dailyToolListService.selectDailyToolListList(dailyToolList);
         return getDataTable(list);
     }
@@ -369,13 +369,13 @@ export default {
                 }
               }
-            if (this.taskName == "勘察科员") {
+            if (this.taskName.indexOf("科员") > -1) {
               query.idx = 0;
               query.sign1Text = text;
-            } else if (this.taskName == "堪察部长") {
+            } else if (this.taskName.indexOf("部长") > -1) {
               query.idx = 1;
               query.sign2Text = text;
-            } else if (this.taskName == "堪察分管领导") {
+            } else if (this.taskName.indexOf("分管领导") > -1) {
               query.idx = 2;
               query.sign3Text = text
             } else if (this.taskName == "中心负责人") {
@@ -103,7 +103,7 @@ export default {
         {code: 22, name: "未按线路行驶"},
         {code: 23, name: "闯禁行驶"},
         {code: 24, name: "失信车辆作业"},
-        {code: 25, name: "其他1"},
+        {code: 25, name: "卫星定位异常"},
         {code: 26, name: "其他2"},
         {code: 27, name: "其他3"},
         {code: 28, name: "其他4"},
@@ -137,7 +137,7 @@ export default {
       depts:[
         {
           "code": 1,
-          "name": "勘察部"
+          "name": "勘查部"
         },
         {
           "code": 2,
@@ -145,7 +145,7 @@ export default {
       depts:[
         {
           "code": 1,
-          "name": "勘察部"
+          "name": "勘查部"
         },
         {
           "code": 2,
@@ -140,8 +140,20 @@ public class SupervisionThreestep extends BaseEntity
 	private String his;
+	
+	private String[] ids;
+	
+	
+	public String[] getIds() {
+		return ids;
+	}
+
+	public void setIds(String[] ids) {
+		this.ids = ids;
+	}
+
 	public String getHis() {
 	return his;
 }
@@ -65,11 +65,13 @@ public interface TruckActivateMapper
 	public void endAllTurckUnActive();
-	public TruckActivate selectTodayTruckActivateByObjId(String objId);
+	public List<TruckActivate> selectTodayTruckActivateByObjId(String objId);
 	public TruckActivate selectTodayTruckByObjId(String objId);
-	public Map<String,String> getConractByObjectId(TruckActivate turck);
+	public TruckActivate getConractByObjectId(TruckActivate turck);
 	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
+
+	public List<TruckActivate> selectTodayTruckByObjIds(String[] objs);
 }
@@ -55,10 +55,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	TruckActivateMapper truckActivateMapper;
-	
-	SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
-	SimpleDateFormat timeFomat = new SimpleDateFormat("HH:mm:SS");
-	
 	/**
 	 * 查询三查机制
 	 * 
@@ -83,6 +79,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		if (supervisionThreestep.getWorkStartTime() == null && supervisionThreestep.getStatus() == null) {
 			String start, end;
+			SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
 			Date date = new Date();
 			if (new Date().getHours() < 8) {
@@ -132,6 +129,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		if (supervisionThreestep.getWorkStartTime() == null && supervisionThreestep.getStatus() == null) {
 			String start, end;
+			
+			
+			SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
 			Date date = new Date();
 			if (new Date().getHours() < 8) {
@@ -185,9 +185,13 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<Map<String,String>> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
-		if (supervisionThreestep.getWorkStartTime() == null) {
+		
+			SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+			if (supervisionThreestep.getWorkStartTime() == null) {
 			String start, end;
+			
+			
 			Date date = new Date();
 			if (new Date().getHours() < 8) {
@@ -513,6 +517,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	@Override
 	public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep) {
+		
+		
+		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
 			String start, end;
 			Date date = new Date();
@@ -557,15 +564,12 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				}
 			}
-			 List<String> idStrings = new ArrayList<String>();
-			 if(m.get("company_trucks") != null){
-				 for(String objId :  m.get("company_trucks").toString().split(",")){
-					 TruckActivate truck = truckActivateMapper.selectTodayTruckActivateByObjId(objId);
-					 if(truck != null){
-						 idStrings.add(objId);
-					 }
-				 }
-			 }
+			List<String> idStrings = new ArrayList<String>();
+			List<TruckActivate> trucks = truckActivateMapper.selectTodayTruckActivateByObjId(m.get("id").toString());
+			for(TruckActivate truck:trucks){
+					idStrings.add(truck.getObjectId());
+			}
+				 
 			 m.put("vehicleIdList", idStrings);
 			 list.add(m);
@@ -581,6 +585,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	public List<SupervisionThreestep> selectTodayDataList(SupervisionThreestep supervisionThreestep){
+		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
 		if(supervisionThreestep.getWorkStartTime() == null){
 			String start, end;
@@ -623,6 +628,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	@Transactional
 	public int insertSupervisionThreestep(SupervisionThreestep supervisionThreestep) {
+		
+		
+		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
 		if (supervisionThreestep.getId() != null) {
 			supervisionThreestepMapper.deleteSupervisionThreestepById(supervisionThreestep.getId());
 		}
@@ -696,6 +704,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		int j = supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
+		
+		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		
 		supervisionThreestep = supervisionThreestepMapper.selectSupervisionThreestepById(supervisionThreestep.getId());
@@ -916,6 +927,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	public void updateTodayData(String token){
+		
+		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		
 		SupervisionThreestep supervisionThreestep = new SupervisionThreestep();
 			String start, end;
@@ -110,6 +110,10 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 		String[] objs = truckActivate.getObjectId().split(",");
 		String[] nos = truckActivate.getLicensePlate().split(",");
+
+		List<TruckActivate> oldDates = truckActivateMapper.selectTodayTruckByObjIds(objs);
+		
+		
 		for(int i =0 ;i<objs.length;i++){
 			TruckActivate active = new TruckActivate();
@@ -124,8 +128,14 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 			active.setCreateTime(DateUtils.getNowDate());
-	    	TruckActivate oldDate = truckActivateMapper.selectTodayTruckByObjId(active.getObjectId());
-	    	
+			
+			TruckActivate oldDate = null;
+			
+	    	for(int j =0;j<oldDates.size();j++){
+	    		if(objs[i].equals( oldDates.get(j).getObjectId())){
+	    			oldDate = oldDates.get(j);
+	    		}
+	    	}
 	    	if(oldDate != null){
@@ -336,13 +346,14 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 			}
 		}
-		Map<String,String> m = truckActivateMapper.getConractByObjectId(turck);
+		TruckActivate truck = truckActivateMapper.getConractByObjectId(turck);
+
+		if(truck == null)return null;
 		Map param = new HashMap<>();
 		List<String> ids =new ArrayList<>();
-		if(m == null)return null;
 		JSONArray contracts = redis.getCacheObject("contractList");
@@ -359,31 +370,43 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 		for(Object obj :contracts){
 			JSONObject jsonObject = (JSONObject)obj;
-			if(m.get("object_id").equals(jsonObject.getString("constructionSiteID"))){
+			if(truck.getConstructionId().equals(jsonObject.getString("constructionSiteID"))){
 				array.add(obj);
 			}
 		}
-		if(array == null || m.size() == 0){
+		if(array.size() == 0){
 			return null;
 		}
+		String eids = "";
+		
 		for(Object object:array){
-			
+
 			JSONObject jsonObject = (JSONObject) object;
-			
-			threestep.setObjectId(jsonObject.getString("earthSiteID"));
-			threestep.setType(1L);
-			threestep.setStatus(1L);
-			List<SupervisionThreestep> list = threestepMapper.selectSupervisionThreestepList(threestep);
-			
-			
-			
-			if(list.size() == 1){
-				conractIds += jsonObject.getString("id") + ",";
+
+			eids += jsonObject.getString("earthSiteID") + ",";
+		}
+		
+		threestep.setIds(eids.split(","));
+		threestep.setType(1L);
+		threestep.setStatus(1L);
+		
+		List<SupervisionThreestep> list = threestepMapper.selectSupervisionThreestepList(threestep);
+
+		for(SupervisionThreestep three:list){
+			for(Object object:array){
+				JSONObject jsonObject = (JSONObject) object;
+				if(jsonObject.getString("earthSiteID").equals((three.getObjectId()))){
+					conractIds += jsonObject.getString("id") + ",";
+					break;
+				}
 			}
+			
 		}
+		
+		
 		if(conractIds.length() == 0){
 			return conractIds;
 		}
@@ -126,7 +126,7 @@ public class ViolationCaseFileController extends BaseController
     String[] caseType = {"进入非专用车辆","无许可手续（工）","无许可手续（消）","黄土覆盖情况","出入口路面污染","出入口道路硬化","车辆冲洗是否到位",
     	"雾炮机是否正常开启","使用费专用车运输","监控点位未对准","未报开工作业","视频设备离线超时报警","三无车辆进入工地","未按时间作业",
     	"未报开工作业","视频设备离线超时报警","三无车辆进入消纳场","未到指定的消纳场作业","离线运输报警（工）","离线运输报警（消）","未激活车辆作业",
-    		"未核准作业车辆作业","未按线路行驶","闯禁行驶","失信车辆作业","其他1","其他2","其他3","其他4","其他5"};
+    		"未核准作业车辆作业","未按线路行驶","闯禁行驶","失信车辆作业","卫星定位异常","其他2","其他3","其他4","其他5"};
     @GetMapping(value = "/caseTable")
     public AjaxResult getTable(String owningRegion,String startDate,String endDate){
@@ -63,6 +63,8 @@ public class Consumer {
                 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
                 "44030033=闯禁行驶", "44030034=失信车辆作业"};
+        //卫星定位异常
+        
         JSONObject jsonObject = JSONObject.parseObject(data);
         //报警时间
         Date alarmTime = new Date(jsonObject.getLong("alarmTime")*1000L);
@@ -135,6 +135,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
 			<if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
 				#{workEndTime}</if>
+				
+			<if test="ids != null">
+				and object_id in
+				<foreach item="id" collection="ids" open="(" separator=","
+					close=")">
+					#{id}
+				</foreach>
+			</if>
 		</where>
 		ORDER BY create_time desc
 	</select>
@@ -66,21 +66,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </where>
     </select>
-	<select id="getConractByObjectId" parameterType="TruckActivate" resultType="java.util.HashMap">
-        select three.* from(
-			select id, company, license_plate, time, construction, status, 
+	<select id="getConractByObjectId" parameterType="TruckActivate" resultMap="TruckActivateResult">
+       select id, company,construction_id, license_plate, time, construction, status, 
 			earthsite, object_id, create_by, create_type, activate_time, create_time 
 			from truck_activate
 			where 
 			object_id = #{objectId} and
-			activate_time between #{startTime} and #{endTime}) truck
-			LEFT JOIN (select * from supervision_threestep WHERE company_trucks LIKE CONCAT("%",#{objectId},"%")
-			and
-			check_time between #{startTime} and #{endTime}
-			) three 
-			on 
-			truck.construction = three.name
+			activate_time between #{startTime} and #{endTime}
     </select>
+                        
+
+            
      <select id="selectTodayTruckByObjId" parameterType="String" resultMap="TruckActivateResult">
         <include refid="selectTruckActivateVo"/>
@@ -95,7 +91,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
      <select id="selectTodayTruckActivateByObjId" parameterType="String" resultMap="TruckActivateResult">
         <include refid="selectTruckActivateVo"/>
-        where object_id = #{objId} and activate_time is not null and status = 0
+        where construction_id = #{objId} and activate_time is not null and status = 0
     </select>
@@ -173,9 +169,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <delete id="deleteTruckActivateByIds" parameterType="String">
         delete from truck_activate where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
+       
+    </delete>
+    
+    <select id="selectTodayTruckByObjIds" parameterType="String" resultMap="TruckActivateResult">
+        <include refid="selectTruckActivateVo"/>
+        where status = 0 and object_id in 
+         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </select>
 </mapper>
 \ No newline at end of file