server/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
@@ -6,11 +6,12 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.Category; import com.doumee.service.business.CategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -87,4 +88,15 @@ public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(categoryService.findById(id)); } @ApiOperation("根据ID查询") @GetMapping("/findListByStatus") @RequiresPermissions("business:category:query") public ApiResponse<List<Category>> findListByStatus(@RequestParam("type") Integer type){ Category category = new Category(); category.setIsdeleted(Constants.ZERO); category.setStatus(Constants.ZERO); category.setType(type); return ApiResponse.success(categoryService.findList(category)); } } server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
@@ -72,16 +72,8 @@ @ExcelColumn(name="事件类型") private String eventType; @ApiModelProperty(value = "事件状态,0-瞬时 1-开始 2-停止 4-事件联动结果更新 5-事件图片异步上传", example = "1") @ExcelColumn(name="事件状态,0-瞬时 1-开始 2-停止 4-事件联动结果更新 5-事件图片异步上传") @ApiModelProperty(value = "事件状态,0-瞬时 1-开始2-停止4-事件联动结果更新5-事件图片异步上传", example = "1") @ExcelColumn(name="事件状态,0-瞬时 1-开始2-停止4-事件联动结果更新5-事件图片异步上传") private Integer status; @ApiModelProperty(value = "脉冲超时时间") @@ -108,18 +100,8 @@ @ExcelColumn(name="卡号") private String cardNo; @ApiModelProperty(value = "事件号,1:压线事件 2:上传图片 3:入场 4:出场 5:车牌矫正 6:图片重传", example = "1") @ExcelColumn(name="事件号,1:压线事件 2:上传图片 3:入场 4:出场 5:车牌矫正 6:图片重传") @ApiModelProperty(value = "事件号,1:压线事件2:上传图片3:入场4:出场5:车牌矫正6:图片重传", example = "1") @ExcelColumn(name="事件号,1:压线事件2:上传图片3:入场4:出场5:车牌矫正6:图片重传") private Integer eventCmd; @ApiModelProperty(value = "事件编号") server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -67,26 +67,16 @@ @ExcelColumn(name="事件发生时间(设备时间") private String happenTime; @ApiModelProperty(value = "门禁点唯一接入编码 ") @ExcelColumn(name="门禁点唯一接入编码 ") @ApiModelProperty(value = "门禁点唯一接入编码") @ExcelColumn(name="门禁点唯一接入编码") private String srcIndex; @ApiModelProperty(value = "门禁名称") @ExcelColumn(name="门禁名称") private String srcName; @ApiModelProperty(value = "事件状态,0-瞬时 1-开始 2-停止 4-事件联动结果更新 5-事件图片异步上传", example = "1") @ExcelColumn(name="事件状态,0-瞬时 1-开始 2-停止 4-事件联动结果更新 5-事件图片异步上传") @ApiModelProperty(value = "事件状态,0-瞬时1-开始2-停止4-事件联动结果更新5-事件图片异步上传", example = "1") @ExcelColumn(name="事件状态,0-瞬时1-开始2-停止4-事件联动结果更新5-事件图片异步上传") private Integer status; @ApiModelProperty(value = "脉冲超时时间,单位:秒,瞬时事件此字段填0", example = "1") @@ -141,16 +131,8 @@ @ExcelColumn(name="人员编号") private String extEventPersonNo; @ApiModelProperty(value = "读卡器类别0-无效 1-IC读卡器 2-身份证读卡器 3-二维码读卡器 4-指纹头", example = "1") @ExcelColumn(name="读卡器类别0-无效 1-IC读卡器 2-身份证读卡器 3-二维码读卡器 4-指纹头") @ApiModelProperty(value = "读卡器类别0-无效1-IC读卡器2-身份证读卡器3-二维码读卡器4-指纹头", example = "1") @ExcelColumn(name="读卡器类别0-无效1-IC读卡器2-身份证读卡器3-二维码读卡器4-指纹头") private Integer extEventReaderKind; @ApiModelProperty(value = "读卡器id", example = "1") @@ -165,14 +147,8 @@ @ExcelColumn(name="图片存储服务器唯一标识") private String svrIndexCode; @ApiModelProperty(value = "报告上传通道,1-布防int上传 2-中心组1上传 3-中心组2上传 0-无效", example = "1") @ExcelColumn(name="报告上传通道,1-布防int上传 2-中心组1上传 3-中心组2上传 0-无效") @ApiModelProperty(value = "报告上传通道,1-布防int上传2-中心组1上传3-中心组2上传0-无效", example = "1") @ExcelColumn(name="报告上传通道,1-布防int上传2-中心组1上传3-中心组2上传0-无效") private Integer extEventReportChannel; @ApiModelProperty(value = "群组编号", example = "1") server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -71,16 +71,8 @@ @ExcelColumn(name="事件类型") private String eventType; @ApiModelProperty(value = "事件状态,0-瞬时 1-开始 2-停止 4-事件联动结果更新 5-事件图片异步上传", example = "1") @ExcelColumn(name="事件状态,0-瞬时 1-开始 2-停止 4-事件联动结果更新 5-事件图片异步上传") @ApiModelProperty(value = "事件状态,0-瞬时1-开始2-停止4-事件联动结果更新5-事件图片异步上传", example = "1") @ExcelColumn(name="事件状态,0-瞬时1-开始2-停止4-事件联动结果更新5-事件图片异步上传") private Integer status; @ApiModelProperty(value = "脉冲超时时间") @@ -95,10 +87,8 @@ @ExcelColumn(name="事件发生的事件源父设备") private String srcParentIndex; @ApiModelProperty(value = "访客Is,,对应访客来访记录中的orderId字段 ") @ExcelColumn(name="访客Is,,对应访客来访记录中的orderId字段 ") @ApiModelProperty(value = "访客Is,,对应访客来访记录中的orderId字段") @ExcelColumn(name="访客Is,,对应访客来访记录中的orderId字段") private String visitorId; @ApiModelProperty(value = "姓名") server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -1,7 +1,11 @@ package com.doumee.service.business.impl; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.CategoryMapper; import com.doumee.dao.business.model.Category; @@ -10,10 +14,12 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.Date; import java.util.List; /** @@ -29,8 +35,23 @@ @Override public Integer create(Category category) { categoryMapper.insert(category); return category.getId(); checkUnique(category); LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); Category insert = new Category(); insert.setCreator(loginUserInfo.getId()); insert.setCreateDate(new Date()); insert.setEditor(loginUserInfo.getId()); insert.setEditDate(new Date()); insert.setIsdeleted(Constants.ZERO); insert.setName(category.getName()); insert.setRemark(category.getRemark()); insert.setStatus(Constants.ZERO); insert.setSortnum(category.getSortnum()); insert.setImgurl(category.getImgurl()); insert.setType(Constants.ZERO); insert.setParentId(category.getParentId()); categoryMapper.insert(insert); return insert.getId(); } @Override @@ -54,6 +75,7 @@ @Override public void updateById(Category category) { checkUnique(category); categoryMapper.updateById(category); } @@ -83,7 +105,7 @@ QueryWrapper<Category> wrapper = new QueryWrapper<>(category); return categoryMapper.selectList(wrapper); } @Override public PageData<Category> findPage(PageWrap<Category> pageWrap) { IPage<Category> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); @@ -145,4 +167,18 @@ QueryWrapper<Category> wrapper = new QueryWrapper<>(category); return categoryMapper.selectCount(wrapper); } private void checkUnique(Category category){ QueryWrapper<Category> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(Category::getIsdeleted,Constants.ZERO) .eq(Category::getType,category.getType()) .eq(Category::getName,category.getName()); List<Category> categories = categoryMapper.selectList(wrapper); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(categories)){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"分类信息已存在"); } } }