Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -34,6 +34,11 @@ public class DateUtils {
     private static final SimpleDateFormat shortDateNew = new SimpleDateFormat("yyyy/M/d");
 
     /**
+     * 获取时分秒
+     */
+    private static final SimpleDateFormat timeSdf = new SimpleDateFormat("HH:mm:ss");
+
+    /**
      * 获取当前时间
      *
      * @return 当前日期时间
@@ -687,4 +692,19 @@ public class DateUtils {
         int age = birth.until(now).getYears();
         return age;
     }
+
+
+    /**
+     * 根据两个日期返回相差的时分秒
+     * @param newTime 靠后时间
+     * @param oldTime 靠前时间
+     * @return
+     */
+    public static String getTimestr(Date newTime, Date oldTime) {
+        Long newTimes = newTime.getTime();
+        Long oldTimes = oldTime.getTime();
+        // 不改时间会多加八个小时
+        timeSdf.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
+        return timeSdf.format(newTimes-oldTimes);
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RequestData.java

@@ -36,4 +36,7 @@ public class RequestData {
 
     @ApiModelProperty(value = "灾情状态")
     private int status =0;
+
+    @ApiModelProperty(value = "灾情ID")
+    private Long alertId ;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -139,7 +139,17 @@ public interface EquipFeignClient {
      * @param
      * @return
      */
-    @RequestMapping(value = "//building/video/page", method = RequestMethod.GET)
+    @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
     ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam Page page, @RequestParam Long buildingId);
 
+    /**
+     *
+     *获取视频列表
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/video/pageVideo", method = RequestMethod.GET)
+    ResponseModel<Page<Map<String, Object>>> pageVideo( @RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam Double longitude,@RequestParam Double latitude,@RequestParam Double distance);
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/core/common/response/CalendarStatusCountRespone.java

@@ -6,7 +6,7 @@ public class CalendarStatusCountRespone {
 	/**
 	 * 个数
 	 */
-	private double count;
+	private Double count;
 	/**
 	 * 状态
 	 */

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/VoiceRecordFileDto.java

@@ -48,4 +48,7 @@ public class VoiceRecordFileDto  extends BaseDto {
     @ApiModelProperty(value = "警情阶段code")
     private String alertStageCode;
 
+    @ApiModelProperty(value = "通话时长")
+    private String telTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/DispatchPaperEnums.java

@@ -52,7 +52,10 @@ public  enum DispatchPaperEnums {
 	repairUnit("950","repairUnit","维保单位"),
 	levelOneUnit("951","levelOneUnit","一级响应"),
 	levelTwoUnit("952","levelTwoUnit","二级响应"),
-	levelThreeUnit("953","levelThreeUnit","三级响应");
+	levelThreeUnit("953","levelThreeUnit","三级响应"),
+
+	hasDispatched("956","hasDispatched","已派遣"),
+	notDispatched("957","notDispatched","未派遣");
 
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -235,6 +235,29 @@ public class CommandController extends BaseController {
 
 
 
+
+    /**
+     * 水源列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "video/list")
+    @ApiOperation(httpMethod = "GET", value = " 视频分页查询88", notes = "视频分页查询88")
+    public ResponseModel<Object> getVideo(Integer pageNum, Integer pageSize, RequestData par) {
+
+      if(par.getAlertId()!=null){
+          AlertCalled alertCalled=   iAlertCalledService.getAlertCalledById(par.getAlertId());
+          par.setLatitude(alertCalled.getCoordinateX());
+          par.setLongitude(alertCalled.getCoordinateY());
+      }
+        ResponseModel<Page<Map<String, Object>>> data=  equipFeignClient.pageVideo(pageNum,pageSize,par.getLongitude(),par.getLatitude(),par.getDistance());
+        return ResponseHelper.buildResponse(data!=null?data.getResult():null);
+    }
+
+
+
+
     /**
      * 水源列表分页查询
      *

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

@@ -534,10 +534,10 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			if(buttonValueString.endsWith(PROCESS_NAME[0])) { //提交维修单
 				flag=1;
 			}else if(buttonValueString.endsWith(PROCESS_NAME[1])) {  //审核
+				flag=2;
 				if(buttonValueString.startsWith(PROCESS_NAME[2])) {
 					flag=3;
 				}
-				flag=2;
 			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {//维修
 				flag=4;
 			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//验收

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -299,24 +299,19 @@ public class CheckController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "获取巡检日历数据<font color='blue'>手机app</font>", notes = "获取巡检日历数据<font color='blue'>手机app</font>")
-    @PostMapping(value = "/checkCalendar", produces = "application/json;charset=UTF-8")
+    @ApiOperation(value = "获取巡检日历数据-mobile", notes = "获取巡检日历数据-mobile")
+    @GetMapping(value = "/{date}/checkCalendar", produces = "application/json;charset=UTF-8")
     public CommonResponse checkCalendar(
-            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
-        try {
-            ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getOrgCode(reginParams);
-            String roleTypeName = getRoleTypeName(reginParams);
-            List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName);
-
-
-            Map<String, Object> map = checkService.checkCalendar(CheckParamUtil.checkCalendar(daoCriterias));
-            return CommonResponseUtil.success(map);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResponseUtil.failure(e.getMessage());
-        }
-
+            @ApiParam(value = "date,格式YYYY-MM-DD",required = true)@PathVariable String date) {
+        HashMap<String, Object> params = new HashMap<>();
+        ReginParams reginParams = getSelectedOrgInfo();
+        String loginOrgCode = getOrgCode(reginParams);
+        Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
+        params.putAll(authMap);
+        params.put("checkTime", date);
+        params.put("orgCode", loginOrgCode);
+        Map<String, Object> map = checkService.checkCalendar(params);
+        return CommonResponseUtil.success(map);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -347,13 +342,8 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "获取巡检记录详情信息<font color='blue'>手机app</font>", notes = "获取巡检记录详情信息<font color='blue'>手机app</font>")
     @RequestMapping(value = "/queryCheckDetail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryRecordById(@RequestParam(required = true) int checkId) {
-        try {
-            Map<String, Object> map = checkService.queryRecordById(checkId);
-            return CommonResponseUtil.success(map);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResponseUtil.failure(e.getMessage());
-        }
+        Map<String, Object> map = checkService.queryRecordById(checkId);
+        return CommonResponseUtil.success(map);
     }
 
     /**
@@ -498,6 +488,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "结束时间") @RequestParam(value = "endTime", required = false) String endTime,
             @ApiParam(value = "维保人员") @RequestParam(value = "personId", required = false) String person,
             @ApiParam(value = "业主单位") @RequestParam(value = "teamId", required = false) String teamId,
+            @ApiParam(value = "设施Id") @RequestParam(value = "equipId", required = false) String equipId,
             @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
             @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception{
         HashMap<String, Object> params = new HashMap<>();
@@ -513,6 +504,7 @@ public class CheckController extends AbstractBaseController {
         params.put("endTime", endTime);
         params.put("person", person);
         params.put("teamId", teamId);
+        params.put("equipId", equipId);
         params.put("orgCode", loginOrgCode);
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         return CommonResponseUtil.success(checkService.getCheckPage(params, pageable));

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/CheckMapper.java

@@ -45,14 +45,14 @@ public interface CheckMapper extends BaseMapper {
 	 * @param param
 	 * @return
 	 */
-	Map<String,Object> pieChartData(CheckRecordParam param);
+	Map<String,Object> pieChartData(Map<String,Object> param);
 
 	/**
 	 * 巡检日历日历数据
 	 * @param param
 	 * @return
 	 */
-	List<Map<String,Object>> calendarData(CheckRecordParam param);
+	List<Map<String,Object>> calendarData(Map<String,Object> param);
 
 	List<Map<String, Object>> queryRecordByPointId(HashMap<String, Object> req);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -624,26 +624,16 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public Map<String, Object> checkCalendar(CheckRecordParam recordParam) {
-        Map<String, Object> charData = checkMapper.pieChartData(recordParam);
-        List<Map<String, Object>> calendarData = checkMapper.calendarData(recordParam);
+    public Map<String, Object> checkCalendar(Map<String, Object> param) {
+        Map<String, Object> charData = checkMapper.pieChartData(param);
+        List<Map<String, Object>> calendarData = checkMapper.calendarData(param);
         Map<String, Object> result = new HashMap<>();
-        Map<String, List<CalendarStatusCountRespone>> calendarMap = new HashMap<>();
-        if (!calendarData.isEmpty()) {
-            calendarData.forEach(action -> {
-                List<CalendarStatusCountRespone> statusCountList = new ArrayList<>();
-                CalendarStatusCountRespone statusCount = new CalendarStatusCountRespone();
-                statusCount.setCount(Double.valueOf(action.get("count").toString()));
-                statusCount.setStatus(action.get("status").toString());
-                if (calendarMap.containsKey(action.get("time"))) {
-                    statusCountList = calendarMap.get(action.get("time"));
-                    statusCountList.add(statusCount);
-                } else {
-                    statusCountList.add(statusCount);
-                    calendarMap.put(action.get("time").toString(), statusCountList);
-                }
-            });
-        }
+        Map<String,List<CalendarStatusCountRespone>> calendarMap = calendarData.stream().collect(Collectors.groupingBy(map -> map.get("time").toString(),Collectors.mapping(c->{
+            CalendarStatusCountRespone countRespone = new CalendarStatusCountRespone();
+            countRespone.setCount(Long.parseLong(c.get("count").toString()));
+            countRespone.setStatus(c.get("status").toString());
+            return countRespone;
+        },Collectors.toList())));
         result.put("charData", charData);
         result.put("calendarData", calendarMap);
         return result;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PointServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.maintenance.business.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -35,6 +36,7 @@ import org.springframework.data.domain.*;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -228,26 +230,19 @@ public class PointServiceImpl implements IPointService {
         if (!pointInputItems.isEmpty()) {
             iPointInputItemDao.saveAll(pointInputItems);
         }
-        //TODO 2.分类暂时不需要 维保
     }
 
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public List<Long> delPointById(Long[] ids) {
         List<Long> idList = new ArrayList<Long>();
-        for (long pointId : ids) {
-            idList.add(pointId);
-        }
-        iPointClassifyDao.deleteByPointId(idList); // 物理删除点的分类
+        idList.addAll(Arrays.asList(ids));
         List<PointInputItem> pointInputItem = iPointInputItemDao.findAllById(idList);
         List<Long> pointInputItemIds = Lists.transform(pointInputItem, PointInputItem::getId);
-        if (pointInputItemIds.size() > 0)
-            iPointInputItemDao.deleteFmeaRelationByPointInputItemIds(pointInputItemIds);//物理删除fmea关联巡检点项
-        iPointInputItemDao.deleteByPointId(idList); // 物理删除p_point_inputitem表对应行
-        iPointPhotoDao.deleteByPointId(idList); // 物理删除点的图片信息
-        // iRoutePointDao.delRoutePointByPointId(idList); //
-        // 物理删除p_route_point中相关行
+        // 物理删除p_point_inputitem表对应行
+        iPointInputItemDao.deleteByPointId(idList);
+        // 物理删除p_route_point、p_route_point_item中相关行
         List<BigInteger> routePointIdList = iRoutePointDao.queryRoutePointByPointId(idList);
         for (BigInteger routePointId : routePointIdList) {
             iRoutePointItemDao.delRoutePointItem(routePointId.longValue());
@@ -270,18 +265,19 @@ public class PointServiceImpl implements IPointService {
                 }
             }
         }
-
-        iPlanTaskDetailDao.deletePlanTaskDetailByPointId(idList); // 删除p_plan_task_detail相关行
+        // 删除p_plan_task_detail相关行
+        iPlanTaskDetailDao.deletePlanTaskDetailByPointId(idList);
+        // 删除p_point相关行
         iPointDao.delPointById(idList);
         return idList;
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Point updatePoint(PointParam pointParam) {
         //1.更新点
         long pointId = pointParam.getPoint().getId();
-        Point newPoint = iPointDao.findById(pointId).get();
+        Point newPoint = iPointDao.findById(pointId).orElseThrow(()->new RuntimeException("找不到原始数据"));
         Bean.copyExistPropertis(pointParam.getPoint(), newPoint);
         newPoint.setLastUpdateTime(new Date());
         iPointDao.save(newPoint);
@@ -346,9 +342,9 @@ public class PointServiceImpl implements IPointService {
     public Page<PointVo> queryPointInfo(List<DaoCriteria> criterias, CommonPageable commonPageable, String loginOrgCode) {
         BaseQuerySpecification<Point> spec = new BaseQuerySpecification<>(criterias);
         Order idOrder = new Order(Direction.DESC, "id");
-    	List<Order> orders = new ArrayList<Order>();
-    	orders.add(idOrder);
-    	Sort sort = Sort.by(orders);
+        List<Order> orders = new ArrayList<Order>();
+        orders.add(idOrder);
+        Sort sort = Sort.by(orders);
         commonPageable.setSort(sort);
         Page<Point> pointPage = iPointDao.findAll(spec, commonPageable);
         List<PointInputItem> pointInputItems = iPointInputItemDao.findAll();
@@ -367,9 +363,9 @@ public class PointServiceImpl implements IPointService {
     public List<PointVo> queryAllPoint(List<DaoCriteria> criterias) {
         BaseQuerySpecification<Point> spec = new BaseQuerySpecification<>(criterias);
         Order idOrder = new Order(Direction.DESC, "id");
-    	List<Order> orders = new ArrayList<Order>();
-    	orders.add(idOrder);
-    	Sort sort = Sort.by(orders);
+        List<Order> orders = new ArrayList<Order>();
+        orders.add(idOrder);
+        Sort sort = Sort.by(orders);
         List<PointVo> returnList = new ArrayList<>();
         List<Point> list = iPointDao.findAll(spec, sort);
         if (!CollectionUtils.isEmpty(list)) {
@@ -381,6 +377,7 @@ public class PointServiceImpl implements IPointService {
         }
         return returnList;
     }
+
     @Override
     public List<PointInputItemVo> queryPointInputItem(Long pointId) {
         return pointMapper.getPointInputItemById1(pointId, null);
@@ -1089,11 +1086,27 @@ public class PointServiceImpl implements IPointService {
         return equipFeign.getRegionTress();
     }
 
+
     @Override
+    @Async
     public void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId) {
         List<Point> points = new ArrayList<>();
         List<PointInputItem> inputItems = new ArrayList<>();
-        List<Long> ids = new ArrayList<Long>();
+        List<Long> ids = new ArrayList<>();
+        //1.删除已有数据
+        for (MaintenanceResourceData x : list) {
+            String pointNo = x.getFireFacilityCode();
+            String originalId = String.valueOf(x.getFireFacilityId());
+            Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, originalId);
+            if (null != id) {
+                ids.add(id);
+            }
+        }
+        if (!ids.isEmpty()) {
+            Long[] idsArray = ids.toArray(new Long[0]);
+            delPointById(idsArray);
+        }
+        //2.创建
         for (MaintenanceResourceData x : list) {
             Point point = new Point();
             String pointNo = StringUtil.isNotEmpty(x.getFireFacilityCode()) ? x.getFireFacilityCode() : String.valueOf(sequence.nextId());
@@ -1107,16 +1120,13 @@ public class PointServiceImpl implements IPointService {
             point.setBelongSystemName(x.getFireFightSysName());
             point.setOwnerId(String.valueOf(x.getOwnerUnitId()));
             point.setOwnerName(x.getOwnerUnitName());
-            point.setAddress(x.getLocation());
+            point.setBuildingId(x.getBuildingId() != null ? x.getBuildingId().toString() : "");
+            point.setBuildingName(x.getBuildingName());
+            point.setAddress(x.getArea());
             point.setLevel("");
             point.setCreatorId(userId);
             point.setOrgCode(orgCode);
             points.add(point);
-            Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, originalId);
-            if (null != id) {
-                ids.add(id);
-                iPointDao.delPointBIds(id);
-            }
             iPointDao.save(point);
             List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(x.getClassifyName(), orgCode);
             if (0 < inputItemVos.size()) {
@@ -1129,9 +1139,6 @@ public class PointServiceImpl implements IPointService {
                 });
             }
         }
-        if (0 < ids.size()) {
-            iPointInputItemDao.deleteByPointId(ids);
-        }
         iPointInputItemDao.saveAll(inputItems);
     }
 
@@ -1139,9 +1146,9 @@ public class PointServiceImpl implements IPointService {
     public Page<PointDto> queryPointInfoWithItem(List<DaoCriteria> criterias, CommonPageable cPageable, Long ownerId) {
         BaseQuerySpecification<Point> spec = new BaseQuerySpecification<>(criterias);
         Order idOrder = new Order(Direction.DESC, "id");
-    	List<Order> orders = new ArrayList<Order>();
-    	orders.add(idOrder);
-    	Sort sort = Sort.by(orders);
+        List<Order> orders = new ArrayList<Order>();
+        orders.add(idOrder);
+        Sort sort = Sort.by(orders);
         cPageable.setSort(sort);
         Page<Point> pointPage = iPointDao.findAll(spec, cPageable);
         List<PointInputItem> pointInputItems = iPointInputItemDao.findAll();

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java

@@ -66,7 +66,7 @@ public interface ICheckService {
      * @param requestParam
      * @return
      */
-    Map<String, Object> checkCalendar(CheckRecordParam requestParam);
+    Map<String, Object> checkCalendar(Map<String, Object> requestParam);
 
     /**
      * 根据点ID查询点巡检记录 手机APP

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/IPointService.java

@@ -297,7 +297,7 @@ public interface IPointService {
 
     List queryItemList4RoutePoint(Long pointId, Long equipId);
 
-    LinkedHashMap<String,Object> getRegionTress ();
+    LinkedHashMap<String,Object> getRegionTress();
 
     void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId);
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/vo/MaintenanceResourceData.java

 package com.yeejoin.amos.maintenance.business.vo;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -53,7 +52,6 @@ public class MaintenanceResourceData {
     /**
      * 业主单位名称
      */
-    @Excel(name = "所属单位", width = 30, orderNum = "7")
     private String ownerUnitName;
 
     /**
@@ -69,7 +67,6 @@ public class MaintenanceResourceData {
     /**
      * 消防系统名称
      */
-    @Excel(name = "所属消防系统", width = 30, orderNum = "4")
     private String fireFightSysName;
 
     /**
@@ -85,7 +82,6 @@ public class MaintenanceResourceData {
     /**
      * 分类名称
      */
-    @Excel(name = "设施类型", width = 30, orderNum = "3")
     private String classifyName;
 
     /**
@@ -101,13 +97,11 @@ public class MaintenanceResourceData {
     /**
      * 消防设施编码
      */
-    @Excel(name = "设施编码", width = 30, orderNum = "6")
     private String fireFacilityCode;
 
     /**
      * 消防设施名称
      */
-    @Excel(name = "设施名称", width = 30, orderNum = "1")
     private String fireFacilityName;
 
     /**
@@ -116,29 +110,10 @@ public class MaintenanceResourceData {
     private String fireFacilityType;
 
     /**
-     * 维保到期时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "到期维保时间", exportFormat = "yyyy-MM-dd HH:mm:ss", importFormat = "yyyy-MM-dd HH:mm:ss", width = 30, orderNum = "5")
-    private Date maintenanceExpirationTime;
-
-    /**
      * 位置
      */
-    @Excel(name = "安装或设置位置", width = 50, orderNum = "2")
     private String location;
 
-    /**
-     * 建筑层级IDS
-     */
-    private String buildTierIds;
-
-    /**
-     * 新增和更新执行
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "添加时间", exportFormat = "yyyy-MM-dd HH:mm:ss", importFormat = "yyyy-MM-dd HH:mm:ss", width = 30, orderNum = "8")
-    private Date createDate;
 
     /**
      * 建筑ID
@@ -150,17 +125,12 @@ public class MaintenanceResourceData {
      */
     private String buildingName;
 
-    /**
-     * 是否已关联
-     */
-    private List<Long> buildingIds;
 
     /**
-     * 是否已关联
+     * 详情位置
      */
-    private Boolean isRelation;
+    private String area;
+
+
 
-//    public void setRelation(Boolean relation) {
-//        isRelation = relation == null ? null : false;
-//    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.SystemClock;
@@ -325,12 +327,12 @@ public class AlertCalledController extends BaseController {
 	}
 
 	void getResponseLevel(Long alertId, AlertCalledDto alertCalledDto, ESAlertCalledDto esAlertCalledDto) {
-		QueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new QueryWrapper<>();
-		dispatchPaperQueryWrapper.eq("alert_id",alertId);
+		LambdaQueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new LambdaQueryWrapper<>();
+		dispatchPaperQueryWrapper.eq(DispatchPaper::getAlertId,alertId);
 		DispatchPaper dispatchPaper = dispatchPaperServiceImpl.getOne(dispatchPaperQueryWrapper);
 		if(null != dispatchPaper) {
-			QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("alert_called_id", dispatchPaper.getSequenceNbr()).eq("alert_type_code", DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
+			LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(AlertFormValue::getAlertCalledId, dispatchPaper.getSequenceNbr()).eq(AlertFormValue::getAlertTypeCode, DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
 			// 派遣单动态表单数据
 			List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
 			// map 存取数据
@@ -385,10 +387,10 @@ public class AlertCalledController extends BaseController {
 				|| ValidationUtil.isEmpty(forzenResult)){
 			throw new BadRequest("参数校验失败.");
 		}
-		UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
-		updateWrapper.set("forzen_result",forzenResult);
-		updateWrapper.set("alert_status",1);
-		updateWrapper.eq("sequence_nbr",alertId);
+		LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
+		updateWrapper.set(AlertCalled::getForzenResult,forzenResult);
+		updateWrapper.set(AlertCalled::getAlertStage,1);
+		updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
 		return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
 	}
 
@@ -406,10 +408,10 @@ public class AlertCalledController extends BaseController {
 				|| ValidationUtil.isEmpty(alertId)){
 			throw new BadRequest("参数校验失败.");
 		}
-		UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
-		updateWrapper.set("final_reason",finalReason);
-		updateWrapper.set("alert_status",1);
-		updateWrapper.eq("sequence_nbr",alertId);
+		LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
+		updateWrapper.set(AlertCalled::getFinalReason,finalReason);
+		updateWrapper.set(AlertCalled::getAlertStage,1);
+		updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
 		return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -78,8 +79,8 @@ public class DispatchTaskController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据警情id 查找力量调派信息",   notes = "根据警情id 查找力量调派信息")
 	@GetMapping(value = "/list/alert/{alertId}")
 	public ResponseModel<List<DispatchTask>> selectForListByAlertId(@PathVariable Long alertId) {
-		QueryWrapper<DispatchTask> queryWrapper = new QueryWrapper<DispatchTask>();
-		queryWrapper.eq("alert_id", alertId);
+		LambdaQueryWrapper<DispatchTask> queryWrapper = new LambdaQueryWrapper<DispatchTask>();
+		queryWrapper.eq(DispatchTask::getAlertId, alertId);
 		List<DispatchTask> list = dispatchTaskServiceImpl.list(queryWrapper);
 	    return ResponseHelper.buildResponse(list);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RepairConsultController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -62,8 +63,8 @@ public class RepairConsultController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据警情id 查找处置过程日志",   notes = "根据警情id 查找处置过程日志")
 	@GetMapping(value = "/list/alert/{alertId}")
 	public ResponseModel<List<RepairConsult>> selectForListByAlertId(@PathVariable Long alertId) {
-		QueryWrapper<RepairConsult> queryWrapper = new QueryWrapper<RepairConsult>();
-		queryWrapper.eq("parent_id", alertId).orderByDesc("rec_date");
+		LambdaQueryWrapper<RepairConsult> queryWrapper = new LambdaQueryWrapper<RepairConsult>();
+		queryWrapper.eq(RepairConsult::getParentId, alertId).orderByDesc(RepairConsult::getRecDate);
 		List<RepairConsult> list = repairConsultServiceImpl.list(queryWrapper);
 		return ResponseHelper.buildResponse(list);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/VoiceRecordFileController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordFileDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.VoiceRecordFile;
@@ -9,6 +11,7 @@ import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.VoiceRecordFileServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,6 +26,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.UUID;
@@ -83,10 +87,21 @@ public class VoiceRecordFileController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "根据警情id 查找通话记录信息",   notes = "根据警情id 查找通话记录信息")
 	@GetMapping(value = "/list/alert/{alertId}")
-	public ResponseModel<List<VoiceRecordFile>> selectForListByAlertId(@PathVariable Long alertId) {
-		QueryWrapper<VoiceRecordFile> queryWrapper = new QueryWrapper<VoiceRecordFile>();
-		queryWrapper.eq("alert_id", alertId).orderByDesc("rec_date");
+	public ResponseModel<List<VoiceRecordFileDto>> selectForListByAlertId(@PathVariable Long alertId) {
+		LambdaQueryWrapper<VoiceRecordFile> queryWrapper = new LambdaQueryWrapper<VoiceRecordFile>();
+		queryWrapper.eq(VoiceRecordFile::getAlertId, alertId).orderByDesc(VoiceRecordFile::getRecDate);
 		List<VoiceRecordFile> list = voiceRecordFileServiceImpl.list(queryWrapper);
-		return ResponseHelper.buildResponse(list);
+		List<VoiceRecordFileDto> dtoList = new ArrayList<VoiceRecordFileDto>(list.size());
+		list.stream().forEach(voiceRecord -> {
+			// 创建新的对象实例
+			VoiceRecordFileDto target = new VoiceRecordFileDto();
+			// 把原对象数据拷贝到新对象
+			BeanUtils.copyProperties(voiceRecord, target);
+			if(voiceRecord.getTelStartTime() != null && voiceRecord.getTelEndTime() != null) {
+				target.setTelTime(DateUtils.getTimestr( voiceRecord.getTelEndTime(),voiceRecord.getTelStartTime()));
+			}
+			dtoList.add(target);
+		});
+		return ResponseHelper.buildResponse(dtoList);
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,8 +82,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         }else{
             // 警情基本信息
             AlertCalled alertCalled = this.getById(id);
-            QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("alert_called_id", id);
+            LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AlertFormValue::getAlertCalledId, id);
             // 警情动态表单数据
             List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
             List<FormValue> formValue = new ArrayList<FormValue>();
@@ -92,9 +94,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 }
             }
             AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
-            QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
-            elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
-            elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
+            LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
+            elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
+            elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
             Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
             if(null !=  elevator) {
                 alertCalledDto.setAddress(elevator.getAddress());
@@ -117,8 +119,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     public AlertCalledFormDto selectAlertCalledByIdNoCache(Long id) {
         // 警情基本信息
         AlertCalled alertCalled = this.getById(id);
-        QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("alert_called_id", id);
+        LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlertFormValue::getAlertCalledId, id);
         // 警情动态表单数据
         List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
         List<FormValue> formValue = new ArrayList<FormValue>();
@@ -129,9 +131,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             }
         }
         AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
-        QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
-        elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
-        elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
+        LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
+        elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
+        elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
         Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
         if(null !=  elevator) {
             alertCalledDto.setAddress(elevator.getAddress());
@@ -155,11 +157,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
     @Override
     public Boolean updateAlertStageByAlertId(Long alertId, String alertStage) {
-        UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("sequence_nbr",alertId);
+        LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
         AlertStageEnums stage = AlertStageEnums.getEnumByCode(alertStage);
-        updateWrapper.set("alert_stage_code",stage.getId());
-        updateWrapper.set("alert_stage",stage.getValue());
+        updateWrapper.set(AlertCalled::getAlertStageCode,stage.getId());
+        updateWrapper.set(AlertCalled::getAlertStage,stage.getValue());
         return this.update(updateWrapper);
     }
 
@@ -232,7 +234,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 alertCalledObjsDto.setAlertCalledDto(BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class));
                 alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
                 //保存处置记录-接警
-                repairConsultServiceImpl.saveRepairConsultByAlertIdType(alertCalled.getSequenceNbr(),"JJ",null, user); //保存接警日志
+                repairConsultServiceImpl.saveRepairConsultByAlertIdType(alertCalled.getSequenceNbr(),AlertStageEnums.JJ.getCode(),null, user); //保存接警日志
             }
 
             /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -17,6 +18,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
 import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
+import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchTaskMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
@@ -99,9 +101,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         dispatchTaskDto.setAlertId(alertId);
         dispatchTaskDto.setAlertCode(alertCalledDto.getAlarmTypeCode());
         // 获取模板 拼接json
-        QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Template> templateQueryWrapper = new LambdaQueryWrapper<>();
         String alertTypeCode =   AlertStageEnums.getEnumById(alertCalledDto.getAlarmTypeCode()).getCode()  ;
-        templateQueryWrapper.eq("type_code","TASK-" + alertTypeCode);
+        templateQueryWrapper.eq(Template::getTypeCode,"TASK-" + alertTypeCode);
         Template template = templateServiceImpl.getOne(templateQueryWrapper);
         String content = template.getContent();
         // 替换模板内容
@@ -127,8 +129,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             typeCode  = AlertStageEnums.TSZX.getId();
         }
         // 警情信息动态数据
-        QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("alert_called_id", alertId).eq("alert_type_code",typeCode);
+        LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlertFormValue::getAlertCalledId, alertId).eq(AlertFormValue::getAlertTypeCode,typeCode);
         // 派遣单动态表单数据
         List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
         // map 存取数据
@@ -182,13 +184,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         dispatchTaskDto.setDispatchTime(new Date());
         DispatchTask dispatchTask = BeanDtoVoUtils.convert(dispatchTaskDto, DispatchTask.class);
         dispatchTask.setPaperId(dispatchPaperDto.getDispatchPaper().getSequenceNbr());
-        if(dispatchPaper.getRepairOrgTaskId() != null && (dispatchTask.getOrgTypeCode().equals("levelOneUnit") || dispatchTask.getOrgTypeCode().equals("levelTwoUnit"))) {
+        if(dispatchPaper.getRepairOrgTaskId() != null && (dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.levelOneUnit.getCode()) || dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.levelTwoUnit.getCode()))) {
             throw new BadRequest("已经派遣过其他力量调派");
         }
-        if(dispatchPaper.getUseOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals("useUnit")) {
+        if(dispatchPaper.getUseOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.useUnit.getCode())) {
             throw new BadRequest("已经派遣过使用单位");
         }
-        if(dispatchPaper.getRepairOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals("repairUnit") ) {
+        if(dispatchPaper.getRepairOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.repairUnit.getCode()) ) {
             throw new BadRequest("已经派遣过维修单位调派");
         }
 
@@ -201,11 +203,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     UseUnit useUnit = iUseUnitService.getById(dispatchTask.getResponseOrgId());
                     dispatchPaper.setUseOrgId(useUnit.getSequenceNbr());
                     dispatchPaper.setUseOrgTaskId(dispatchTask.getSequenceNbr());
-                    if(AlertStageEnums.getEnumById(dispatchPaper.getAlertCode()).getCode().equals("KRJY")) {
+                    if(AlertStageEnums.getEnumById(dispatchPaper.getAlertCode()).getCode().equals(AlertStageEnums.KRJY.getCode())) {
                         dynamicFormAlert.stream().forEach(alertFormValue -> {
                             if(alertFormValue.getFieldCode().equals("dispatch_status")) {
-                                alertFormValue.setFieldValue("已派遣");
-                                alertFormValue.setFieldValueCode("hasDispatched");
+                                alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
+                                alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
                             }
                         });
                     }
@@ -223,11 +225,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     // 修改动态字段
                     dynamicFormAlert.stream().forEach(alertFormValue -> {
                         if(alertFormValue.getFieldCode().equals("dispatch_status")) {
-                            alertFormValue.setFieldValue("已派遣");
-                            alertFormValue.setFieldValueCode("hasDispatched");
+                            alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
+                            alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
                         } else if(alertFormValue.getFieldCode().equals("response_level")) {
-                            alertFormValue.setFieldValue("一级响应");
-                            alertFormValue.setFieldValueCode("levelOneUnit");
+                            alertFormValue.setFieldValue(DispatchPaperEnums.levelOneUnit.getValue());
+                            alertFormValue.setFieldValueCode(DispatchPaperEnums.levelOneUnit.getId());
                         } else if(alertFormValue.getFieldCode().equals("save_credit_code")) {
                             alertFormValue.setFieldValue(socialCreditCode);
                         }
@@ -240,11 +242,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     // 修改动态字段
                     dynamicFormAlert.stream().forEach(alertFormValue -> {
                         if(alertFormValue.getFieldCode().equals("dispatch_status")) {
-                            alertFormValue.setFieldValue("已派遣");
-                            alertFormValue.setFieldValueCode("hasDispatched");
+                            alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
+                            alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
                         } else if(alertFormValue.getFieldCode().equals("response_level")) {
-                            alertFormValue.setFieldValue("二级响应");
-                            alertFormValue.setFieldValueCode("levelTwoUnit");
+                            alertFormValue.setFieldValue(DispatchPaperEnums.levelTwoUnit.getValue());
+                            alertFormValue.setFieldValueCode(DispatchPaperEnums.levelTwoUnit.getId());
                         }
                     });
                     break;
@@ -254,9 +256,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             // 保存动态表单数据
             iAlertFormValueService.updateBatchById(dynamicFormAlert);
             // 记录日志
-            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(),"PQ", dispatchTask.getSequenceNbr(),sendUser);
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(), TzsCommonParam.PQ, dispatchTask.getSequenceNbr(),sendUser);
             // 派遣后如果困人救援更新派遣过程表
-            if("960".equals(dispatchPaper.getAlertCode())) {
+            if(AlertStageEnums.KRJY.getId().equals(dispatchPaper.getAlertCode())) {
                 RescueProcessDto rescueProcessDto = rescueProcessServiceImpl.getProcessByAlertId(dispatchTaskDto.getAlertId());
                 if(rescueProcessDto.getDispatchStatus() == null && rescueProcessDto.getDispatchTime() == null) {
                     rescueProcessDto.setDispatchStatus(true);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorServiceImpl.java

@@ -102,8 +102,8 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
         String equipmentClassificationCode = alertCalledDto.getEquipmentClassificationCode();
         String deviceId = alertCalledDto.getDeviceId();
         // 目前只有电梯类型
-        QueryWrapper<Elevator> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("rescue_code", deviceId);
+        LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Elevator::getRescueCode, deviceId);
         Elevator elevator = this.getOne(queryWrapper);
         if (ValidationUtil.isEmpty(elevator))
             throw new BadRequest("设备未找到");

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RepairConsultServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
@@ -22,12 +21,10 @@ import com.yeejoin.amos.boot.module.tzs.api.service.IRepairConsultService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,12 +37,6 @@ import java.util.Map;
  */
 @Service
 public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,RepairConsult,RepairConsultMapper> implements IRepairConsultService {
-    /**
-     * 分页查询
-     */
-    public Page<RepairConsultDto> queryForRepairConsultPage(Page<RepairConsultDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
 
     @Autowired
     TemplateServiceImpl templateServiceImpl;
@@ -65,13 +56,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
     @Autowired
     RescueProcessServiceImpl rescueProcessServiceImpl;
 
-    /**
-     * 列表查询 示例
-     */
-    public List<RepairConsultDto> queryForRepairConsultList()   {
-        return this.queryForList("" , false);
-    }
-
+    @Transactional
     @Override
     public Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId,AgencyUserModel user) {
         Boolean flag = false;
@@ -83,17 +68,16 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
         }
         AlertCalledDto alertCalledVo  = alertCallFrom.getAlertCalledDto();
         // 获取模板 拼接json
-        QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Template> templateQueryWrapper = new LambdaQueryWrapper<>();
         if(TzsCommonParam.WXFK_TS.equals(type)) {
-            templateQueryWrapper.eq("type_code","RECORD-WXFK");
+            templateQueryWrapper.eq(Template::getTypeCode,"RECORD-" + TzsCommonParam.WXFK);
         } else {
-            templateQueryWrapper.eq("type_code","RECORD-" + type);
+            templateQueryWrapper.eq(Template::getTypeCode,"RECORD-" + type);
         }
         Template template = templateServiceImpl.getOne(templateQueryWrapper);
         String content = template.getContent();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String createTime = sdf.format(new Date());
-        if("JJ".equals(type)) {
+        String createTime = DateUtils.getDateNowString();
+        if(AlertStageEnums.JJ.getCode().equals(type)) {
             String createUser = user.getUserName();
             String emergency_call = alertCalledVo.getEmergencyCall();
             String area = alertCalledVo.getAddress();
@@ -121,11 +105,11 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
                 phone = "";
             }
             String taskType = "";
-            if("960".equals( alertCalledVo.getAlarmTypeCode())) {
+            if(AlertStageEnums.KRJY.getId().equals( alertCalledVo.getAlarmTypeCode())) {
                 taskType = "救援任务单";
-            } else if("961".equals( alertCalledVo.getAlarmTypeCode())) {
+            } else if(AlertStageEnums.GZWX.getId().equals( alertCalledVo.getAlarmTypeCode())) {
                 taskType = "故障维修单";
-            } else if("962".equals( alertCalledVo.getAlarmTypeCode())) {
+            } else if(AlertStageEnums.TSZX.getId().equals( alertCalledVo.getAlarmTypeCode())) {
                 taskType = "投诉处理单";
             }
             content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$unit",unit);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RescueProcessServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
@@ -95,8 +96,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
         Date rescueTime = rescueProcessDto.getRescueTime();
         if(arriveTime != null && dispatchTime != null) {
                 Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
-                SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");//这里想要只保留分秒可以写成"mm:ss"
-                String hms = formatter.format(arriveTimes);
+                String hms = DateUtils.getTimestr(arriveTime,dispatchTime);
                 rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
                 rescueProcessDto.setArriveUseTime(hms);
         }

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -286,13 +286,22 @@
         COUNT(id) count
         FROM
         p_check
-        WHERE
-        DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
-        <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, user_id)>0</if>
-        <if test="routeId!=null and routeId!=0">AND route_id = #{routeId}</if>
-        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>
+        <include refid="calendar-where"/>
     </select>
 
+    <sql id="calendar-where">
+        <where>
+            DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
+            <choose>
+                <when test="identityType==1">
+                    And (org_code LIKE CONCAT( #{orgCode}, '-%' ) or org_code= #{orgCode} )
+                </when>
+                <when test="identityType==2">
+                    And owner_id = #{companyId}
+                </when>
+            </choose>
+        </where>
+    </sql>
     <select id="calendarData" resultType="Map">
         SELECT
         sum(is_ok) AS count,
@@ -300,11 +309,7 @@
         is_ok status
         FROM
         p_check
-        WHERE
-        DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
-        <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, user_id)>0</if>
-        <if test="routeId!=null and routeId!=0">AND route_id = #{routeId}</if>
-        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>
+        <include refid="calendar-where"/>
         GROUP BY is_ok,time
         ORDER BY time
     </select>
@@ -1907,6 +1912,7 @@
                 pp.belong_system_id systemId,
                 pp.belong_system_name systemName,
                 pp.address address,
+                pp.original_id equipId,
                 CONCAT(pp.address, pp.building_name) buildingName
             FROM p_check pc
             LEFT JOIN p_point pp ON pp.id = pc.point_id
@@ -1937,6 +1943,7 @@
                 <include refid="mobile-check-time-last-month"></include>
             </if>
             <if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
+            <if test="equipId != null and equipId != '' "> and a.equipId = #{equipId}</if>
             <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''  ">
                 AND (
                 (