tzs 更新

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 值班坐席dto 类
+ */
+@Data
+@ApiModel(value="DutySeatDto", description="值班坐席dto类")
+public class DutySeatDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "坐席id")
+    private String userId;
+
+    @ApiModelProperty(value = "坐席姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "坐席角色")
+    private String userRole;
+
+    @ApiModelProperty(value = "坐席编号")
+    private String seatCode;
+
+    @ApiModelProperty(value = "服务评分")
+    private String serviceSocre;
+
+    @ApiModelProperty(value = "坐席状态")
+    private String userStatus;
+
+    @ApiModelProperty(value = "今日处理数量")
+    private int todayDeal;
+
+
+
+}

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

@@ -113,6 +113,9 @@ public class ElevatorDto extends BaseDto {
     @ApiModelProperty(value = "电梯使用状态")
     private Integer useStatus;
 
+    @ApiModelProperty(value = "电梯使用状态Str")
+    private String useStatusStr;
+
     @ApiModelProperty(value = "使用单位")
     private String useUnit;
 

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 装备分类
+ *
+ * @author system_generator
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value="EquipmentCategoryDto", description="装备分类")
+public class EquipmentCategoryDto   {
+
+   private static final long serialVersionUID = 1L;
+
+
+    private Long id;
+
+    private String parentId;
+
+    @ApiModelProperty(value = "装备分类编码")
+    private String code;
+
+    @ApiModelProperty(value = "装备分类名称")
+    private String name;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private Date createDate;
+
+    @ApiModelProperty(value = "行业编码")
+    private String industryCode;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/EquipmentCategory.java

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 装备分类
+ *
+ * @author system_generator
+ * @date 2021-10-20
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tz_equipment_category")
+public class EquipmentCategory  {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("id")
+    private Long id;
+
+    /**
+     * 
+     */
+	@TableField("parent_id")
+    private String parentId;
+
+    /**
+     * 装备分类编码
+     */
+	@TableField("code")
+    private String code;
+
+    /**
+     * 装备分类名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 描述
+     */
+	@TableField("description")
+    private String description;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 行业编码
+     */
+	@TableField("industry_code")
+    private String industryCode;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/EquipmentCategoryMapper.java

+package com.yeejoin.amos.boot.module.tzs.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 装备分类 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-10-20
+ */
+public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IAlertCalledService.java

@@ -8,6 +8,8 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledRecordDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DutyPersonDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DutySeatDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
@@ -91,4 +93,10 @@ public interface IAlertCalledService {
      * @return
      */
     List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart,String callTimeEnd, String type, String alertSource, String alarmType);
+
+    /**
+     * 获取坐席信息
+     * @return
+     */
+    List<DutySeatDto> getSeatInfos();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IEquipmentCategoryService.java

+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+
+/**
+ * 装备分类接口类
+ *
+ * @author system_generator
+ * @date 2021-10-20
+ */
+public interface IEquipmentCategoryService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper">
+
+</mapper>

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

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledRecordDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertPaperInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DutySeatDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledRequestDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
@@ -640,4 +641,16 @@ public class AlertCalledController extends BaseController {
 	public ResponseModel<Object> getCalledInfo() {
 		return ResponseHelper.buildResponse(iAlertCalledService.getCalledInfo());
 	}
+
+
+	/**
+	 *  获取坐席情况
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getSeatInfos")
+	@ApiOperation(httpMethod = "GET", value = "获取坐席情况", notes = "获取坐席情况")
+	public ResponseModel<List<DutySeatDto>> getSeatInfos() {
+		return ResponseHelper.buildResponse(iAlertCalledService.getSeatInfos());
+	}
+
 }

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

+package com.yeejoin.amos.boot.module.tzs.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.EquipmentCategoryServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 装备分类
+ *
+ * @author system_generator
+ * @date 2021-10-20
+ */
+@RestController
+@Api(tags = "装备分类Api")
+@RequestMapping(value = "/equipment-category")
+public class EquipmentCategoryController extends BaseController {
+
+    @Autowired
+    EquipmentCategoryServiceImpl equipmentCategoryServiceImpl;
+
+    /**
+     * 新增装备分类
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增装备分类", notes = "新增装备分类")
+	public ResponseModel<EquipmentCategoryDto> save(@RequestBody EquipmentCategoryDto model) {
+	    model = equipmentCategoryServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除装备分类", notes = "根据sequenceNbr删除装备分类")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个装备分类",  notes = "根据sequenceNbr查询单个装备分类")
+	public ResponseModel<EquipmentCategoryDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "装备分类分页查询",  notes = "装备分类分页查询")
+	public ResponseModel<Page<EquipmentCategoryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<EquipmentCategoryDto> page = new Page<EquipmentCategoryDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryForEquipmentCategoryPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "装备分类列表全部数据查询",   notes = "装备分类列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<EquipmentCategoryDto>> selectForList() {
+	    return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryForEquipmentCategoryList());
+	}
+}

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

@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledRecordDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertPaperInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DutySeatDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
@@ -34,6 +35,8 @@ import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -42,12 +45,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -363,6 +365,46 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         return list;
     }
 
+    @Override
+    public List<DutySeatDto> getSeatInfos() {
+        // 获取人员信息
+        FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.list(null);
+        List<AgencyUserModel> userList = userListResult.getResult();
+        List<DutySeatDto> dutyList = new ArrayList<>();
+        userList.stream().forEach(u -> {
+            // 排除非系统中人员
+            if(!u.getRealName().equals(u.getMobile())) { // 公众号创建
+                DutySeatDto temp = new DutySeatDto();
+                temp.setUserId(u.getUserId());
+                temp.setUserName(u.getRealName());
+                temp.setUserRole("管理员");
+                temp.setSeatCode("1001");
+                temp.setUserStatus("1");
+                // 获取当日警情处理件数
+                Calendar c = Calendar.getInstance();
+                c.set(Calendar.SECOND,0);
+                c.set(Calendar.HOUR_OF_DAY,0);
+                c.set(Calendar.MINUTE,0);
+                String beginDate = DateUtils.date2LongStr(c.getTime());
+                c.set(Calendar.SECOND,59);
+                c.set(Calendar.HOUR_OF_DAY,23);
+                c.set(Calendar.MINUTE,59);
+                String endDate = DateUtils.date2LongStr(c.getTime());
+                List<AlertCalled> dealAlert = this.list(new LambdaQueryWrapper<AlertCalled>().eq(AlertCalled::getIsDelete,false).eq(AlertCalled::getRecUserId,u.getUserId())
+                        .gt(AlertCalled::getCallTime,beginDate).lt(AlertCalled::getCallTime,endDate).eq(AlertCalled::getAlertStatus, true));
+                int count = 0;
+                if(dealAlert != null && dealAlert.size() > 0) {
+                    count = dealAlert.size();
+                }
+                temp.setTodayDeal(count);
+                temp.setServiceSocre("95");
+                dutyList.add(temp);
+            }
+
+        });
+        return dutyList;
+    }
+
     private void dataInit(AlertHandlerInfoDto alertHandlerInfoDto, String process,String answerThePolice, String report, String notice, String arrive, String complete,String returnVisit) {
         alertHandlerInfoDto.setAbProcess(process);
         alertHandlerInfoDto.setAcAnswerThePolice(answerThePolice);

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

@@ -2,8 +2,11 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 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.google.common.collect.Lists;
+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.QRCodeUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
@@ -11,6 +14,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorWlInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
+import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -51,6 +55,12 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
     @Autowired
     ElevatorMapper elevatorMapper;
 
+    @Autowired
+    EquipmentCategoryServiceImpl equipmentCategoryServiceImpl;
+
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
 
     /**
      * 保存电梯信息
@@ -115,7 +125,20 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
             // 获取附件
             elevatorDto.setAttachments(attachment);
         }
-
+        // 封装设备类别 使用场所 和 使用状态
+        EquipmentCategory equipmentCategory = equipmentCategoryServiceImpl.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode,elevatorDto.getCategory()));
+        elevatorDto.setCategoryName(equipmentCategory.getName());
+
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", "USE_SITE_CATEGORY").eq("code", elevatorDto.getUseSiteCategory());
+        DataDictionary useSiteCategory = iDataDictionaryService.getOne(queryWrapper);
+        elevatorDto.setUseSiteCategoryName(useSiteCategory.getName());
+
+        if(elevatorDto.getUseStatus() == 1) {
+            elevatorDto.setUseStatusStr("在用");
+        } else {
+            elevatorDto.setUseStatusStr("停用");
+        }
         return elevatorDto;
     }
 

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

+package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
+import com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IEquipmentCategoryService;
+import com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 装备分类服务实现类
+ *
+ * @author system_generator
+ * @date 2021-10-20
+ */
+@Service
+public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryDto,EquipmentCategory,EquipmentCategoryMapper> implements IEquipmentCategoryService {
+    /**
+     * 分页查询
+     */
+    public Page<EquipmentCategoryDto> queryForEquipmentCategoryPage(Page<EquipmentCategoryDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<EquipmentCategoryDto> queryForEquipmentCategoryList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file