diff --git a/src/main/java/com/biutag/supervision/controller/baseData/BusinessDepartController.java b/src/main/java/com/biutag/supervision/controller/baseData/BusinessDepartController.java new file mode 100644 index 0000000..b76bc44 --- /dev/null +++ b/src/main/java/com/biutag/supervision/controller/baseData/BusinessDepartController.java @@ -0,0 +1,23 @@ +package com.biutag.supervision.controller.baseData; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.model.BusinessPoliceModel; +import com.biutag.supervision.pojo.param.BusinessQueryParam; +import com.biutag.supervision.service.BusinessDepartService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequiredArgsConstructor +@RequestMapping("baseData/depart") +@RestController +public class BusinessDepartController { + private final BusinessDepartService businessDepartService; + + @GetMapping("page") + public Result> page(BusinessQueryParam businessQueryParam) { + return Result.success(businessDepartService.page(businessQueryParam)); + } +} diff --git a/src/main/java/com/biutag/supervision/controller/baseData/BusinessPoliceController.java b/src/main/java/com/biutag/supervision/controller/baseData/BusinessPoliceController.java new file mode 100644 index 0000000..b2be0a0 --- /dev/null +++ b/src/main/java/com/biutag/supervision/controller/baseData/BusinessPoliceController.java @@ -0,0 +1,24 @@ +package com.biutag.supervision.controller.baseData; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.model.BusinessPoliceModel; +import com.biutag.supervision.pojo.param.BusinessQueryParam; +import com.biutag.supervision.service.BusinessPoliceService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequiredArgsConstructor +@RequestMapping("baseData/police") +@RestController +public class BusinessPoliceController { + + private final BusinessPoliceService businessPoliceService; + + @GetMapping("page") + public Result> page(BusinessQueryParam businessQueryParam) { + return Result.success(businessPoliceService.page(businessQueryParam)); + } +} diff --git a/src/main/java/com/biutag/supervision/mapper/BusinessDepartMapper.java b/src/main/java/com/biutag/supervision/mapper/BusinessDepartMapper.java index a07e594..d0ac758 100644 --- a/src/main/java/com/biutag/supervision/mapper/BusinessDepartMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/BusinessDepartMapper.java @@ -1,8 +1,14 @@ package com.biutag.supervision.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.pojo.entity.BusinessDepart; +import com.biutag.supervision.pojo.model.BusinessPoliceModel; +import org.apache.ibatis.annotations.Param; public interface BusinessDepartMapper extends BaseMapper { + Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/mapper/BusinessPoliceMapper.java b/src/main/java/com/biutag/supervision/mapper/BusinessPoliceMapper.java index 608bfc0..18aff6a 100644 --- a/src/main/java/com/biutag/supervision/mapper/BusinessPoliceMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/BusinessPoliceMapper.java @@ -1,8 +1,13 @@ package com.biutag.supervision.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.pojo.entity.BusinessPolice; +import com.biutag.supervision.pojo.model.BusinessPoliceModel; +import org.apache.ibatis.annotations.Param; public interface BusinessPoliceMapper extends BaseMapper { - + Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/entity/BusinessDepart.java b/src/main/java/com/biutag/supervision/pojo/entity/BusinessDepart.java index 95d3f02..899e66c 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/BusinessDepart.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/BusinessDepart.java @@ -17,7 +17,7 @@ public class BusinessDepart { // 日期(天) @TableField("date") - private String date; + private LocalDateTime date; // 单位ID @TableField("depart_id") diff --git a/src/main/java/com/biutag/supervision/pojo/entity/BusinessPolice.java b/src/main/java/com/biutag/supervision/pojo/entity/BusinessPolice.java index ff705ea..a815209 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/BusinessPolice.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/BusinessPolice.java @@ -48,16 +48,16 @@ public class BusinessPolice { private String groupName; // 业务类别 - @TableField("bussiness_type") - private String bussinessType; + @TableField("business_type") + private String businessType; // 业务量 @TableField("number") private Integer number; // 业务类型名称 - @TableField("bussiness_type_name") - private String bussinessTypeName; + @TableField("business_type_name") + private String businessTypeName; // 创建时间 @TableField("create_time") diff --git a/src/main/java/com/biutag/supervision/pojo/model/BusinessPoliceModel.java b/src/main/java/com/biutag/supervision/pojo/model/BusinessPoliceModel.java new file mode 100644 index 0000000..4c8f14e --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/model/BusinessPoliceModel.java @@ -0,0 +1,44 @@ +package com.biutag.supervision.pojo.model; + +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class BusinessPoliceModel { + // 警员姓名 + private String policeName; + + // 警号 + private Integer empNo; + + // 单位名称 + private String departName; + + // 单位类型 + private String groupName; + + // 110接处警 + private Integer jiechujing110; + + // 122接处警 + private Integer jiechujing122; + + // 身份证业务 + private Integer shenfenzhengyewu; + + // 执法办案 + private Integer zhifabanan; + + // 户口业务 + private Integer hukouyewu; + + // 出入境业务 + private Integer churujingyewu; + + // 车辆上牌 + private Integer cheliangshangpai; + + // 驾驶人考试 + private Integer jiashirenkaoshi; +} diff --git a/src/main/java/com/biutag/supervision/pojo/param/BusinessQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/BusinessQueryParam.java new file mode 100644 index 0000000..ea13eda --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/param/BusinessQueryParam.java @@ -0,0 +1,30 @@ +package com.biutag.supervision.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Setter +@Getter +public class BusinessQueryParam { + private long current = 1; + private long size = 10; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private List happenTime = new ArrayList<>(); + // 姓名 + private String policeName; + // 警号 + private String empNo; + // 单位名称 + private String departName; + // 单位类型 + private String groupName; + // 排序字段 + private String sortField; + // 排序顺序(ASC 或 DESC) + private String sortOrder; +} diff --git a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java index 6e1dd82..db63df0 100644 --- a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java +++ b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java @@ -1,11 +1,27 @@ package com.biutag.supervision.service; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.biutag.supervision.pojo.entity.BusinessDepart; import com.biutag.supervision.mapper.BusinessDepartMapper; +import com.biutag.supervision.pojo.model.BusinessPoliceModel; +import com.biutag.supervision.pojo.param.BusinessQueryParam; import org.springframework.stereotype.Service; @Service public class BusinessDepartService extends ServiceImpl { - + public Page page(BusinessQueryParam businessQueryParam) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(businessQueryParam.getDepartName()), "depart_name", businessQueryParam.getDepartName()) + .eq(StrUtil.isNotBlank(businessQueryParam.getGroupName()), "group_name", businessQueryParam.getGroupName()) + .groupBy("depart_name") + .orderBy(StrUtil.isNotBlank(businessQueryParam.getSortField()), businessQueryParam.getSortOrder().equals("ASC"), businessQueryParam.getSortField()); + if (businessQueryParam.getHappenTime().size() == 2) { + queryWrapper.between("date", businessQueryParam.getHappenTime().get(0), businessQueryParam.getHappenTime().get(1)); + } + return baseMapper.queryPage(Page.of(businessQueryParam.getCurrent(), businessQueryParam.getSize()), queryWrapper); + } } diff --git a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java index e842de8..214230a 100644 --- a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java +++ b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java @@ -1,11 +1,32 @@ package com.biutag.supervision.service; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.biutag.supervision.pojo.entity.BusinessPolice; import com.biutag.supervision.mapper.BusinessPoliceMapper; +import com.biutag.supervision.pojo.entity.BusinessPolice; +import com.biutag.supervision.pojo.model.BusinessPoliceModel; +import com.biutag.supervision.pojo.param.BusinessQueryParam; import org.springframework.stereotype.Service; @Service public class BusinessPoliceService extends ServiceImpl { - + public Page page(BusinessQueryParam businessQueryParam) { + String empNo = ""; + if (businessQueryParam.getEmpNo() != null && !businessQueryParam.getEmpNo().isEmpty()) { + empNo = String.valueOf(Integer.parseInt(businessQueryParam.getEmpNo())); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StrUtil.isNotBlank(businessQueryParam.getPoliceName()), "police_name", businessQueryParam.getPoliceName()) + .like(StrUtil.isNotBlank(empNo), "emp_no", empNo) + .like(StrUtil.isNotBlank(businessQueryParam.getDepartName()), "depart_name", businessQueryParam.getDepartName()) + .eq(StrUtil.isNotBlank(businessQueryParam.getGroupName()), "group_name", businessQueryParam.getGroupName()) + .groupBy("police_name") + .orderBy(StrUtil.isNotBlank(businessQueryParam.getSortField()), businessQueryParam.getSortOrder().equals("ASC"), businessQueryParam.getSortField()); + if (businessQueryParam.getHappenTime().size() == 2) { + queryWrapper.between("date", businessQueryParam.getHappenTime().get(0), businessQueryParam.getHappenTime().get(1)); + } + return baseMapper.queryPage(Page.of(businessQueryParam.getCurrent(), businessQueryParam.getSize()), queryWrapper); + } } diff --git a/src/main/resources/mapper/BusinessDepartMapper.xml b/src/main/resources/mapper/BusinessDepartMapper.xml new file mode 100644 index 0000000..4ce0b84 --- /dev/null +++ b/src/main/resources/mapper/BusinessDepartMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/BusinessPoliceMapper.xml b/src/main/resources/mapper/BusinessPoliceMapper.xml new file mode 100644 index 0000000..6712805 --- /dev/null +++ b/src/main/resources/mapper/BusinessPoliceMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file