提交开发车辆和微型消防站排班的月视图借口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DutyPersonShiftMapper.java

@@ -72,4 +72,60 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
             @Param("beginDate") String beginDate,
             @Param("endDate") String endDate
     );
+    /**
+     * 获取指定日期下的当前排班的人员列表
+     * eg : {"name":"夜班","value":"李某某、张作霖、张作相"}
+     * @param dutyDate
+     * @param groupCode
+     * @param targetFiled
+     * @return
+     */
+    List<Map<String, Object>> getSpecifyDateList(String dutyDate,String groupCode,String[] instanceIds,String params);
+    
+    /**
+     * 获取指定日期下的装备ID、eg:车辆、微型消防站
+     * @param dutyDate
+     * @param groupCode
+     * @param targetFiled
+     * @return
+     */
+    List<Map<String, Object>> getEquipmentForSpecifyDate(String dutyDate,String groupCode,String equipmentId,String equipmentName,String teamName,String groupByName);
+    
+    
+    /**
+     * 通过装备ID查询指定如期下的该装备所包含的InstanceId
+     * @param dutyDate
+     * @param groupCode
+     * @param targetId eg: carId
+     * @return
+     */
+    Map<String, Object>  getInstanceIdForSpecifyDateAndEquipment(String dutyDate,String groupCode,String targetId);
+    
+    /**
+     * 获取指定日期装备的操作人员，例如车辆的驾驶员
+     * @param dutyDate
+     * @param groupCode
+     * @param instanceIds
+     * @param operator
+     * @return
+     */
+    Map<String, Object>  getEquipmentOperator(String dutyDate,String groupCode,String[] instanceIds,String operator,String duty);
+    
+    
+    /**
+     * 获取指定日期下的排班人员与岗位等信息
+     * @param dutyDate
+     * @param groupCode
+     * @param instanceIds
+     * @return
+     */
+    List<Map<String, Object>> getPositionStaffDutyForSpecifyDate(String dutyDate,String groupCode,String[] instanceIds,String duty);
+    
+    
+    /**
+     * 获取指定日期下的班次信息
+     * @param duty
+     * @return
+     */
+    List<Map<String, Object>>  getDutyForSpecifyDate(String duty);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCarService.java

@@ -29,4 +29,6 @@ public interface IDutyCarService extends IDutyCommonService {
      * @return
      */
     JSONObject isFireCarDriver();
+    
+    public Object getSchedulingDutyForSpecifyDate(String dutyDay, Long shiftId, String postType);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyFireFightingService.java

@@ -17,4 +17,6 @@ public interface IDutyFireFightingService extends IDutyCommonService {
      * @return List<DutyCarDto>
      */
 	DutyFireFightingDto update(Long instanceId, DutyFireFightingDto dto);
+	
+	public Object getSchedulingDutyForSpecifyDate(String dutyDay, Long shiftId, String postType);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyCarController.java

@@ -152,7 +152,7 @@ public class DutyCarController extends BaseController {
     public ResponseModel listDutyPerson(@ApiParam(value = "值班日期",required = true) @PathVariable String dutyDay,
                                         @ApiParam(value = "班次id") @RequestParam(required = false) Long shiftId,
                                         @ApiParam(value = "岗位") @RequestParam(required = false) String postType){
-        return ResponseHelper.buildResponse(iDutyCarService.dayDutyPersonList(dutyDay,shiftId,postType));
+        return ResponseHelper.buildResponse(iDutyCarService.getSchedulingDutyForSpecifyDate(dutyDay,shiftId,postType));
     }
 
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyFireFightingController.java

@@ -155,6 +155,6 @@ public class DutyFireFightingController extends BaseController{
 	    public ResponseModel listDutyPerson(@ApiParam(value = "值班日期",required = true) @PathVariable String dutyDay,
 	                                        @ApiParam(value = "班次id") @RequestParam(required = false) Long shiftId,
 	                                        @ApiParam(value = "岗位") @RequestParam(required = false) String postType){
-	        return ResponseHelper.buildResponse(iDutyFireFightingService.dayDutyPersonList(dutyDay,shiftId,postType));
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.getSchedulingDutyForSpecifyDate(dutyDay,shiftId,postType));
 	    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyFireFightingServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -9,13 +13,22 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyFireFightingService;
+
 @Service
 public class DutyFireFightingServiceImpl extends DutyCommonServiceImpl implements IDutyFireFightingService {
 
 	@Autowired
 	FireStationServiceImpl fireStationServiceImpl;
-
+	
+	@Autowired
+	DutyPersonShiftMapper dutyPersonShiftMapper;
+	
+	public String getGroupCode() {
+		return "dutyFireFighting";
+	}
+	
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public DutyFireFightingDto save(DutyFireFightingDto dto) {
@@ -32,13 +45,61 @@ public class DutyFireFightingServiceImpl extends DutyCommonServiceImpl implement
 
 	@Override
 	public DutyFireFightingDto update(Long instanceId, DutyFireFightingDto dto) {
-        updateDynamicFormInstance(this.getGroupCode(),instanceId,Bean.BeantoMap(dto));
-        insertPersonShift(instanceId, dto.getDutyShift());
+		updateDynamicFormInstance(this.getGroupCode(), instanceId, Bean.BeantoMap(dto));
+		insertPersonShift(instanceId, dto.getDutyShift());
 		return dto;
 	}
-
-	public String getGroupCode() {
-		return "dutyFireFighting";
+	public Object getSchedulingDutyForSpecifyDate(String dutyDay, Long shiftId, String postType) {
+		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(dutyDay,
+				this.getGroupCode(), "fireFightingId", "fireFighting", "teamName","result.fireFightingId");
+		if(equipmentList==null || equipmentList.size()<1 || equipmentList.get(0)==null) {
+			return null;
+		}
+		List<Object>	detailList = new ArrayList<Object>();
+		for (Map<String, Object> map : equipmentList) {
+			List<Map<String, Object>>	resultList = new ArrayList<Map<String, Object>>();
+			LinkedHashMap<String, Object> titleMap_1 =new LinkedHashMap<String, Object>();
+			titleMap_1.put("微型消防站", map.get("fireFighting").toString());
+			resultList.add(titleMap_1);
+			LinkedHashMap<String, Object> titleMap_2 =new LinkedHashMap<String, Object>();
+			titleMap_2.put("单位/部门", map.get("teamName").toString());
+			resultList.add(titleMap_2);
+			String carId =map.get("fireFightingId").toString();
+			Map<String, Object> instanceMap = dutyPersonShiftMapper.getInstanceIdForSpecifyDateAndEquipment(dutyDay,
+					this.getGroupCode(), carId);
+			if(instanceMap==null) {
+				continue;
+			}
+			String instanceId = instanceMap.get("instanceIds").toString();
+			if (StringUtils.isNotBlank(instanceId)) {
+				String[] instanceIds = instanceId.split(",");
+				
+				List<Map<String, Object>>  dutyList = dutyPersonShiftMapper.getDutyForSpecifyDate(dutyDay);
+				if(dutyList!=null && dutyList.size()>0) {
+					for (Map<String, Object> dutyDetail : dutyList) {
+						if(!dutyDetail.containsKey("name")) {
+							continue;
+						}
+						// 获取当前装备ID下的排版数据
+						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,
+								this.getGroupCode(), instanceIds,dutyDetail.get("name").toString());
+						if(specifyDateList==null || specifyDateList.size() < 1 || specifyDateList.get(0)==null) {
+							continue;
+						}
+						LinkedHashMap<String, Object> infoMap_1 =new LinkedHashMap<String, Object>();
+						infoMap_1.put(dutyDetail.get("name").toString(), "");
+						resultList.add(infoMap_1);
+						for (Map<String, Object> specify : specifyDateList) {
+							LinkedHashMap<String, Object> infoMap_2 =new LinkedHashMap<String, Object>();
+							infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
+							resultList.add(infoMap_2);
+						}
+					}
+				}
+			}
+			detailList.add(resultList);
+		}
+		return detailList;
 	}
-
+	
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyPersonServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
-import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
-import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
-import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
-import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
-import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
-import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,13 +19,15 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
 
 /**
  * @author DELL
@@ -36,6 +37,7 @@ public class DutyPersonServiceImpl extends DutyCommonServiceImpl implements IDut
 
     @Autowired
     EquipFeignClient equipFeign;
+    
 
     @Override
     public String getGroupCode(){
@@ -234,4 +236,98 @@ public class DutyPersonServiceImpl extends DutyCommonServiceImpl implements IDut
                 });
         return temp;
     }
+    
+    
+    
+    
+public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType) {
+		
+		List<Map<String, Object>> list = dayDutyPersonList(dutyDay, shiftId, postType);
+		list.stream().forEach(i->{
+			List<Object> fieldsList= new ArrayList<Object>();
+			List<Object>infoList= new ArrayList<Object>();
+			LinkedHashMap<String, String> map = new LinkedHashMap<String, String>();
+			map.put("name", "微型消防站");
+			map.put("value",i.get("deptName").toString());
+			map.put("id","1");
+			fieldsList.add(map);
+			map.clear();
+			map.put("name", "微型消防站");
+			map.put("value",i.get("deptName").toString());
+			
+		});
+		
+	
+		
+		return postType;
+	}
+    
+    public static void main(String[] args) {
+		String ssString="[{\"teamName\":\"发士大夫大师傅\",\"shiftId\":\"1437585222345547778\",\"carName\":\"特种消防车(46586458)\",\"postType\":\"\",\"dutyArea\":\"测试控制室\",\"dutyAreaId\":\"1382166994773610497\",\"postTypeName\":\"\",\"userName\":\"故障报修\",\"userId\":\"1428653787706347522\",\"dutyDate\":\"2021-10-12 00:00:00\",\"carId\":\"1432590747256770562\",\"shiftName\":\"晚班\",\"instanceId\":\"1447490875843239937\",\"teamId\":\"1404995716634050561\",\"groupCode\":\"dutyCar\"},{\"teamName\":\"发士大夫大师傅\",\"shiftId\":\"1432883228491972609\",\"carName\":\"特种消防车(46586458)\",\"postType\":\"\",\"dutyArea\":\"消防小室-shg\",\"dutyAreaId\":\"1382530839199387650\",\"postTypeName\":\"\",\"userName\":\"78678676\",\"userId\":\"1435886728803000322\",\"dutyDate\":\"2021-10-12 00:00:00\",\"carId\":\"1432590747256770562\",\"shiftName\":\"夜班\",\"instanceId\":\"1447490812534415361\",\"teamId\":\"1404995716634050561\",\"groupCode\":\"dutyCar\"},{\"teamName\":\"发士大夫大师傅\",\"shiftId\":\"1432883228491972609\",\"carName\":\"特种消防车(46586458)\",\"postType\":\"1\",\"dutyArea\":\"建构住-shg\",\"dutyAreaId\":\"1382157469081407490\",\"postTypeName\":\"指挥员\",\"userName\":\"张小四6\",\"userId\":\"1435072204550225922\",\"dutyDate\":\"2021-10-12 00:00:00\",\"carId\":\"1432590747256770562\",\"shiftName\":\"夜班\",\"instanceId\":\"1447490699435008001\",\"teamId\":\"1404995716634050561\",\"groupCode\":\"dutyCar\"}]\r\n"
+				+ "";
+	List<Map>	jjList= JSONArray.parseArray(ssString, Map.class);
+	Map< String, String> map20 = new HashMap<String, String>();
+	jjList.forEach(i->{
+		List<Object> fieldsList= new ArrayList<Object>();
+		List<Object>infoList= new ArrayList<Object>();
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("name", "微型消防站");
+		map.put("value",i.get("carName").toString());
+		map.put("id","1");
+		fieldsList.add(map);
+		Map<String, String> map1 = new HashMap<String, String>();
+		map1.put("name", "微型消防站");
+		map1.put("value",i.get("teamName").toString());
+		map1.put("id","2");
+		fieldsList.add(map1);
+	 if(!map20.containsKey(i.get("shiftName").toString())) {
+		 map20.put(ssString, ssString);
+	 }
+		
+		
+		
+		
+		System.out.println("ssssssssss");
+	});
+		
+		
+		
+		
+		
+		
+		
+		
+	}
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyShiftServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
 import com.yeejoin.amos.boot.module.common.api.mapper.DutyShiftMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyShiftService;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
 
 /**
  * 值班班次服务实现类
@@ -35,4 +36,5 @@ public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, D
     public List<DutyShiftDto> queryForDutyShiftList(Boolean isDelete) {
         return this.queryForList("", false, isDelete);
     }
+    
 }