diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
new file mode 100644
index 0000000..5d3670c
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.controller.meter;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+import com.casic.missiles.model.MeterStaff;
+import com.casic.missiles.model.MeterStandardApply;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.service.meter.MeterStandardApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ **
+ * * 设备管理点检查列表
+ * *
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+@Api(tags = "设备管理点检查相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/check")
+public class MeterCheckInfoController extends ExportController {
+
+ @Resource
+ private MeterCheckInfoService meterCheckInfoService;
+
+ /**
+ * 设备管理点检查列表
+ */
+ @ApiOperation("设备管理点检查列表")
+ @PostMapping("/checkInfoList")
+ @ResponseBody
+ public ReturnDTO> checkInfoList(@RequestBody MeterCheckInfoRequest request) throws Exception{
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(meterCheckInfoService.checkInfoList(page, request)));
+ }
+
+ /**
+ * 设备管理点检查列表删除
+ */
+ @ApiOperation("设备管理点检查列表删除")
+ @PostMapping("/deleteCheckInfo")
+ @ResponseBody
+ public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+ return meterCheckInfoService.deleteCheckInfo(idDto);
+ }
+
+
+ /**
+ * 设备管理点检查详细信息
+ */
+ @ApiOperation("设备管理点检查详细信息")
+ @PostMapping("/selectCheckInfo")
+ @ResponseBody
+ public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+ return ReturnUtil.success(meterCheckInfoService.selectCheckInfo(idDto));
+ }
+
+ /**
+ * 设备管理点检查新建
+ */
+ @ApiOperation("备管理点检查新建")
+ @PostMapping("/addCheckInfo")
+ @ResponseBody
+ public ReturnDTO addCheckInfo(@RequestBody @Valid MeterCheckInfo meterCheckInfo) throws Exception{
+ return meterCheckInfoService.addCheckInfo(meterCheckInfo);
+ }
+
+ /**
+ * 设备管理点检查列表导出
+ */
+ @ApiOperation("设备管理点检查列表导出")
+ @PostMapping("/exportCheckInfoList")
+ @ResponseBody
+ public void exportCheckInfoList(@RequestBody MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ try {
+ meterCheckInfoService.exportCheckInfoList(request,response);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
new file mode 100644
index 0000000..5d3670c
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.controller.meter;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+import com.casic.missiles.model.MeterStaff;
+import com.casic.missiles.model.MeterStandardApply;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.service.meter.MeterStandardApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ **
+ * * 设备管理点检查列表
+ * *
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+@Api(tags = "设备管理点检查相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/check")
+public class MeterCheckInfoController extends ExportController {
+
+ @Resource
+ private MeterCheckInfoService meterCheckInfoService;
+
+ /**
+ * 设备管理点检查列表
+ */
+ @ApiOperation("设备管理点检查列表")
+ @PostMapping("/checkInfoList")
+ @ResponseBody
+ public ReturnDTO> checkInfoList(@RequestBody MeterCheckInfoRequest request) throws Exception{
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(meterCheckInfoService.checkInfoList(page, request)));
+ }
+
+ /**
+ * 设备管理点检查列表删除
+ */
+ @ApiOperation("设备管理点检查列表删除")
+ @PostMapping("/deleteCheckInfo")
+ @ResponseBody
+ public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+ return meterCheckInfoService.deleteCheckInfo(idDto);
+ }
+
+
+ /**
+ * 设备管理点检查详细信息
+ */
+ @ApiOperation("设备管理点检查详细信息")
+ @PostMapping("/selectCheckInfo")
+ @ResponseBody
+ public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+ return ReturnUtil.success(meterCheckInfoService.selectCheckInfo(idDto));
+ }
+
+ /**
+ * 设备管理点检查新建
+ */
+ @ApiOperation("备管理点检查新建")
+ @PostMapping("/addCheckInfo")
+ @ResponseBody
+ public ReturnDTO addCheckInfo(@RequestBody @Valid MeterCheckInfo meterCheckInfo) throws Exception{
+ return meterCheckInfoService.addCheckInfo(meterCheckInfo);
+ }
+
+ /**
+ * 设备管理点检查列表导出
+ */
+ @ApiOperation("设备管理点检查列表导出")
+ @PostMapping("/exportCheckInfoList")
+ @ResponseBody
+ public void exportCheckInfoList(@RequestBody MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ try {
+ meterCheckInfoService.exportCheckInfoList(request,response);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
new file mode 100644
index 0000000..3bd066f
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
@@ -0,0 +1,11 @@
+package com.casic.missiles.mapper.meter;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+
+public interface MeterCheckInfoMapper extends BaseMapper {
+
+ long selectMaxNo();
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
new file mode 100644
index 0000000..5d3670c
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.controller.meter;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+import com.casic.missiles.model.MeterStaff;
+import com.casic.missiles.model.MeterStandardApply;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.service.meter.MeterStandardApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ **
+ * * 设备管理点检查列表
+ * *
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+@Api(tags = "设备管理点检查相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/check")
+public class MeterCheckInfoController extends ExportController {
+
+ @Resource
+ private MeterCheckInfoService meterCheckInfoService;
+
+ /**
+ * 设备管理点检查列表
+ */
+ @ApiOperation("设备管理点检查列表")
+ @PostMapping("/checkInfoList")
+ @ResponseBody
+ public ReturnDTO> checkInfoList(@RequestBody MeterCheckInfoRequest request) throws Exception{
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(meterCheckInfoService.checkInfoList(page, request)));
+ }
+
+ /**
+ * 设备管理点检查列表删除
+ */
+ @ApiOperation("设备管理点检查列表删除")
+ @PostMapping("/deleteCheckInfo")
+ @ResponseBody
+ public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+ return meterCheckInfoService.deleteCheckInfo(idDto);
+ }
+
+
+ /**
+ * 设备管理点检查详细信息
+ */
+ @ApiOperation("设备管理点检查详细信息")
+ @PostMapping("/selectCheckInfo")
+ @ResponseBody
+ public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+ return ReturnUtil.success(meterCheckInfoService.selectCheckInfo(idDto));
+ }
+
+ /**
+ * 设备管理点检查新建
+ */
+ @ApiOperation("备管理点检查新建")
+ @PostMapping("/addCheckInfo")
+ @ResponseBody
+ public ReturnDTO addCheckInfo(@RequestBody @Valid MeterCheckInfo meterCheckInfo) throws Exception{
+ return meterCheckInfoService.addCheckInfo(meterCheckInfo);
+ }
+
+ /**
+ * 设备管理点检查列表导出
+ */
+ @ApiOperation("设备管理点检查列表导出")
+ @PostMapping("/exportCheckInfoList")
+ @ResponseBody
+ public void exportCheckInfoList(@RequestBody MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ try {
+ meterCheckInfoService.exportCheckInfoList(request,response);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
new file mode 100644
index 0000000..3bd066f
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
@@ -0,0 +1,11 @@
+package com.casic.missiles.mapper.meter;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+
+public interface MeterCheckInfoMapper extends BaseMapper {
+
+ long selectMaxNo();
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
new file mode 100644
index 0000000..501c9d9
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
new file mode 100644
index 0000000..5d3670c
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.controller.meter;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+import com.casic.missiles.model.MeterStaff;
+import com.casic.missiles.model.MeterStandardApply;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.service.meter.MeterStandardApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ **
+ * * 设备管理点检查列表
+ * *
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+@Api(tags = "设备管理点检查相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/check")
+public class MeterCheckInfoController extends ExportController {
+
+ @Resource
+ private MeterCheckInfoService meterCheckInfoService;
+
+ /**
+ * 设备管理点检查列表
+ */
+ @ApiOperation("设备管理点检查列表")
+ @PostMapping("/checkInfoList")
+ @ResponseBody
+ public ReturnDTO> checkInfoList(@RequestBody MeterCheckInfoRequest request) throws Exception{
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(meterCheckInfoService.checkInfoList(page, request)));
+ }
+
+ /**
+ * 设备管理点检查列表删除
+ */
+ @ApiOperation("设备管理点检查列表删除")
+ @PostMapping("/deleteCheckInfo")
+ @ResponseBody
+ public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+ return meterCheckInfoService.deleteCheckInfo(idDto);
+ }
+
+
+ /**
+ * 设备管理点检查详细信息
+ */
+ @ApiOperation("设备管理点检查详细信息")
+ @PostMapping("/selectCheckInfo")
+ @ResponseBody
+ public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+ return ReturnUtil.success(meterCheckInfoService.selectCheckInfo(idDto));
+ }
+
+ /**
+ * 设备管理点检查新建
+ */
+ @ApiOperation("备管理点检查新建")
+ @PostMapping("/addCheckInfo")
+ @ResponseBody
+ public ReturnDTO addCheckInfo(@RequestBody @Valid MeterCheckInfo meterCheckInfo) throws Exception{
+ return meterCheckInfoService.addCheckInfo(meterCheckInfo);
+ }
+
+ /**
+ * 设备管理点检查列表导出
+ */
+ @ApiOperation("设备管理点检查列表导出")
+ @PostMapping("/exportCheckInfoList")
+ @ResponseBody
+ public void exportCheckInfoList(@RequestBody MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ try {
+ meterCheckInfoService.exportCheckInfoList(request,response);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
new file mode 100644
index 0000000..3bd066f
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
@@ -0,0 +1,11 @@
+package com.casic.missiles.mapper.meter;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+
+public interface MeterCheckInfoMapper extends BaseMapper {
+
+ long selectMaxNo();
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
new file mode 100644
index 0000000..501c9d9
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 5c28b06..707019f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -70,4 +70,6 @@
String MEASURE_MAJOR = "measureMajor";
//标准装置-申请类型
String STANDARD_APPLY_TYPE = "standardApplyType";
+ //检查结果
+ String CHECK_RESULT = "checkResult";
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
new file mode 100644
index 0000000..5d3670c
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.controller.meter;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+import com.casic.missiles.model.MeterStaff;
+import com.casic.missiles.model.MeterStandardApply;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.service.meter.MeterStandardApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ **
+ * * 设备管理点检查列表
+ * *
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+@Api(tags = "设备管理点检查相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/check")
+public class MeterCheckInfoController extends ExportController {
+
+ @Resource
+ private MeterCheckInfoService meterCheckInfoService;
+
+ /**
+ * 设备管理点检查列表
+ */
+ @ApiOperation("设备管理点检查列表")
+ @PostMapping("/checkInfoList")
+ @ResponseBody
+ public ReturnDTO> checkInfoList(@RequestBody MeterCheckInfoRequest request) throws Exception{
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(meterCheckInfoService.checkInfoList(page, request)));
+ }
+
+ /**
+ * 设备管理点检查列表删除
+ */
+ @ApiOperation("设备管理点检查列表删除")
+ @PostMapping("/deleteCheckInfo")
+ @ResponseBody
+ public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+ return meterCheckInfoService.deleteCheckInfo(idDto);
+ }
+
+
+ /**
+ * 设备管理点检查详细信息
+ */
+ @ApiOperation("设备管理点检查详细信息")
+ @PostMapping("/selectCheckInfo")
+ @ResponseBody
+ public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+ return ReturnUtil.success(meterCheckInfoService.selectCheckInfo(idDto));
+ }
+
+ /**
+ * 设备管理点检查新建
+ */
+ @ApiOperation("备管理点检查新建")
+ @PostMapping("/addCheckInfo")
+ @ResponseBody
+ public ReturnDTO addCheckInfo(@RequestBody @Valid MeterCheckInfo meterCheckInfo) throws Exception{
+ return meterCheckInfoService.addCheckInfo(meterCheckInfo);
+ }
+
+ /**
+ * 设备管理点检查列表导出
+ */
+ @ApiOperation("设备管理点检查列表导出")
+ @PostMapping("/exportCheckInfoList")
+ @ResponseBody
+ public void exportCheckInfoList(@RequestBody MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ try {
+ meterCheckInfoService.exportCheckInfoList(request,response);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
new file mode 100644
index 0000000..3bd066f
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
@@ -0,0 +1,11 @@
+package com.casic.missiles.mapper.meter;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+
+public interface MeterCheckInfoMapper extends BaseMapper {
+
+ long selectMaxNo();
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
new file mode 100644
index 0000000..501c9d9
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 5c28b06..707019f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -70,4 +70,6 @@
String MEASURE_MAJOR = "measureMajor";
//标准装置-申请类型
String STANDARD_APPLY_TYPE = "standardApplyType";
+ //检查结果
+ String CHECK_RESULT = "checkResult";
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java
new file mode 100644
index 0000000..e68f279
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.dto.meter;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 设备管理点检查列表请求实体
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/19
+ */
+
+@ApiModel
+@Data
+public class MeterCheckInfoRequest {
+
+ /**
+ * 检查表编号
+ */
+ @ApiModelProperty(value = "检查表编号", dataType = "String")
+ private String checkNo;
+
+ /**
+ * 检查表名称
+ */
+ @ApiModelProperty(value = "检查表名称", dataType = "String")
+ private String checkName;
+
+
+ /**
+ * 检查日期
+ */
+ @ApiModelProperty(value = "检查日期", dataType = "String")
+ private String checkDate;
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
new file mode 100644
index 0000000..5d3670c
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.controller.meter;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+import com.casic.missiles.model.MeterStaff;
+import com.casic.missiles.model.MeterStandardApply;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.service.meter.MeterStandardApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ **
+ * * 设备管理点检查列表
+ * *
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+@Api(tags = "设备管理点检查相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/check")
+public class MeterCheckInfoController extends ExportController {
+
+ @Resource
+ private MeterCheckInfoService meterCheckInfoService;
+
+ /**
+ * 设备管理点检查列表
+ */
+ @ApiOperation("设备管理点检查列表")
+ @PostMapping("/checkInfoList")
+ @ResponseBody
+ public ReturnDTO> checkInfoList(@RequestBody MeterCheckInfoRequest request) throws Exception{
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(meterCheckInfoService.checkInfoList(page, request)));
+ }
+
+ /**
+ * 设备管理点检查列表删除
+ */
+ @ApiOperation("设备管理点检查列表删除")
+ @PostMapping("/deleteCheckInfo")
+ @ResponseBody
+ public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+ return meterCheckInfoService.deleteCheckInfo(idDto);
+ }
+
+
+ /**
+ * 设备管理点检查详细信息
+ */
+ @ApiOperation("设备管理点检查详细信息")
+ @PostMapping("/selectCheckInfo")
+ @ResponseBody
+ public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+ return ReturnUtil.success(meterCheckInfoService.selectCheckInfo(idDto));
+ }
+
+ /**
+ * 设备管理点检查新建
+ */
+ @ApiOperation("备管理点检查新建")
+ @PostMapping("/addCheckInfo")
+ @ResponseBody
+ public ReturnDTO addCheckInfo(@RequestBody @Valid MeterCheckInfo meterCheckInfo) throws Exception{
+ return meterCheckInfoService.addCheckInfo(meterCheckInfo);
+ }
+
+ /**
+ * 设备管理点检查列表导出
+ */
+ @ApiOperation("设备管理点检查列表导出")
+ @PostMapping("/exportCheckInfoList")
+ @ResponseBody
+ public void exportCheckInfoList(@RequestBody MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ try {
+ meterCheckInfoService.exportCheckInfoList(request,response);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
new file mode 100644
index 0000000..3bd066f
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
@@ -0,0 +1,11 @@
+package com.casic.missiles.mapper.meter;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+
+public interface MeterCheckInfoMapper extends BaseMapper {
+
+ long selectMaxNo();
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
new file mode 100644
index 0000000..501c9d9
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 5c28b06..707019f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -70,4 +70,6 @@
String MEASURE_MAJOR = "measureMajor";
//标准装置-申请类型
String STANDARD_APPLY_TYPE = "standardApplyType";
+ //检查结果
+ String CHECK_RESULT = "checkResult";
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java
new file mode 100644
index 0000000..e68f279
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.dto.meter;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 设备管理点检查列表请求实体
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/19
+ */
+
+@ApiModel
+@Data
+public class MeterCheckInfoRequest {
+
+ /**
+ * 检查表编号
+ */
+ @ApiModelProperty(value = "检查表编号", dataType = "String")
+ private String checkNo;
+
+ /**
+ * 检查表名称
+ */
+ @ApiModelProperty(value = "检查表名称", dataType = "String")
+ private String checkName;
+
+
+ /**
+ * 检查日期
+ */
+ @ApiModelProperty(value = "检查日期", dataType = "String")
+ private String checkDate;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java
new file mode 100644
index 0000000..c7f5f30
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java
@@ -0,0 +1,148 @@
+package com.casic.missiles.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设备管理点检查列表实体
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+
+@Data
+@ApiModel
+@TableName("meter_check_info")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class MeterCheckInfo implements Serializable {
+
+ private static final long serialVersionUID = -2162976785241447101L;
+
+ /**
+ * 主键
+ */
+ @TableId("id")
+ @ApiModelProperty(value = "主键", dataType = "Long")
+ private Long id;
+
+ /**
+ * 检查表编号
+ */
+ @TableField("check_no")
+ @ExcelProperty(value = "检查表编号",order = 0)
+ @ApiModelProperty(value = "检查表编号", dataType = "String")
+ private String checkNo;
+
+ /**
+ * 检查表名称
+ */
+ @TableField("check_name")
+ @ExcelProperty(value = "检查表名称",order = 0)
+ @ApiModelProperty(value = "检查表名称", dataType = "String")
+ private String checkName;
+
+ /**
+ * 检查人
+ */
+ @TableField("check_person")
+ @ExcelProperty(value = "检查人",order = 0)
+ @ApiModelProperty(value = "检查人", dataType = "String")
+ private String checkPerson;
+
+ /**
+ * 管理点位置
+ */
+ @TableField("manager_point_location")
+ @ExcelProperty(value = "管理点位置",order = 0)
+ @ApiModelProperty(value = "管理点位置", dataType = "String")
+ private String managerPoinLocation;
+
+ /**
+ * 检查结果-字典code
+ */
+ @TableField("check_result")
+ @ExcelProperty(value = "检查结果",order = 0)
+ @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.CHECK_RESULT)
+ @ApiModelProperty(value = "检查结果-字典code", dataType = "String")
+ private String checkResult;
+
+ /**
+ * 检查结果名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "检查结果名称", dataType = "String")
+ private String checkResultName;
+
+ /**
+ * 检查日期
+ */
+ @TableField("check_date")
+ @ExcelProperty(value = "检查日期",order = 0)
+ @ApiModelProperty(value = "检查日期", dataType = "String")
+ private String checkDate;
+
+ /**
+ * 附件
+ */
+ @TableField("minio_file_name")
+ @ApiModelProperty(value = "附件", dataType = "String")
+ private String minioFileName;
+
+ /**
+ * 备注
+ */
+ @TableField("remark")
+ @ApiModelProperty(value = "备注", dataType = "String")
+ private String remark;
+
+ /**
+ * 删除标记
+ */
+ @TableField("is_del")
+ @ApiModelProperty(value = "删除标记", dataType = "Integer")
+ private Integer isDel;
+
+
+ /**
+ * 创建人
+ */
+ @TableField("create_user")
+ @ExcelProperty(value = "申请人",order = 7)
+ @ApiModelProperty(value = "创建人", dataType = "String")
+ private String createUser;
+
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ @ExcelProperty(value = "创建时间",order = 8)
+ @ApiModelProperty(value = "创建时间", dataType = "String")
+ private String createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ @ApiModelProperty(value = "更新时间", dataType = "String")
+ private String updateTime;
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
new file mode 100644
index 0000000..5d3670c
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.controller.meter;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+import com.casic.missiles.model.MeterStaff;
+import com.casic.missiles.model.MeterStandardApply;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.service.meter.MeterStandardApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ **
+ * * 设备管理点检查列表
+ * *
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+@Api(tags = "设备管理点检查相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/check")
+public class MeterCheckInfoController extends ExportController {
+
+ @Resource
+ private MeterCheckInfoService meterCheckInfoService;
+
+ /**
+ * 设备管理点检查列表
+ */
+ @ApiOperation("设备管理点检查列表")
+ @PostMapping("/checkInfoList")
+ @ResponseBody
+ public ReturnDTO> checkInfoList(@RequestBody MeterCheckInfoRequest request) throws Exception{
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(meterCheckInfoService.checkInfoList(page, request)));
+ }
+
+ /**
+ * 设备管理点检查列表删除
+ */
+ @ApiOperation("设备管理点检查列表删除")
+ @PostMapping("/deleteCheckInfo")
+ @ResponseBody
+ public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+ return meterCheckInfoService.deleteCheckInfo(idDto);
+ }
+
+
+ /**
+ * 设备管理点检查详细信息
+ */
+ @ApiOperation("设备管理点检查详细信息")
+ @PostMapping("/selectCheckInfo")
+ @ResponseBody
+ public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+ return ReturnUtil.success(meterCheckInfoService.selectCheckInfo(idDto));
+ }
+
+ /**
+ * 设备管理点检查新建
+ */
+ @ApiOperation("备管理点检查新建")
+ @PostMapping("/addCheckInfo")
+ @ResponseBody
+ public ReturnDTO addCheckInfo(@RequestBody @Valid MeterCheckInfo meterCheckInfo) throws Exception{
+ return meterCheckInfoService.addCheckInfo(meterCheckInfo);
+ }
+
+ /**
+ * 设备管理点检查列表导出
+ */
+ @ApiOperation("设备管理点检查列表导出")
+ @PostMapping("/exportCheckInfoList")
+ @ResponseBody
+ public void exportCheckInfoList(@RequestBody MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ try {
+ meterCheckInfoService.exportCheckInfoList(request,response);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
new file mode 100644
index 0000000..3bd066f
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
@@ -0,0 +1,11 @@
+package com.casic.missiles.mapper.meter;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+
+public interface MeterCheckInfoMapper extends BaseMapper {
+
+ long selectMaxNo();
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
new file mode 100644
index 0000000..501c9d9
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 5c28b06..707019f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -70,4 +70,6 @@
String MEASURE_MAJOR = "measureMajor";
//标准装置-申请类型
String STANDARD_APPLY_TYPE = "standardApplyType";
+ //检查结果
+ String CHECK_RESULT = "checkResult";
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java
new file mode 100644
index 0000000..e68f279
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.dto.meter;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 设备管理点检查列表请求实体
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/19
+ */
+
+@ApiModel
+@Data
+public class MeterCheckInfoRequest {
+
+ /**
+ * 检查表编号
+ */
+ @ApiModelProperty(value = "检查表编号", dataType = "String")
+ private String checkNo;
+
+ /**
+ * 检查表名称
+ */
+ @ApiModelProperty(value = "检查表名称", dataType = "String")
+ private String checkName;
+
+
+ /**
+ * 检查日期
+ */
+ @ApiModelProperty(value = "检查日期", dataType = "String")
+ private String checkDate;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java
new file mode 100644
index 0000000..c7f5f30
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java
@@ -0,0 +1,148 @@
+package com.casic.missiles.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设备管理点检查列表实体
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+
+@Data
+@ApiModel
+@TableName("meter_check_info")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class MeterCheckInfo implements Serializable {
+
+ private static final long serialVersionUID = -2162976785241447101L;
+
+ /**
+ * 主键
+ */
+ @TableId("id")
+ @ApiModelProperty(value = "主键", dataType = "Long")
+ private Long id;
+
+ /**
+ * 检查表编号
+ */
+ @TableField("check_no")
+ @ExcelProperty(value = "检查表编号",order = 0)
+ @ApiModelProperty(value = "检查表编号", dataType = "String")
+ private String checkNo;
+
+ /**
+ * 检查表名称
+ */
+ @TableField("check_name")
+ @ExcelProperty(value = "检查表名称",order = 0)
+ @ApiModelProperty(value = "检查表名称", dataType = "String")
+ private String checkName;
+
+ /**
+ * 检查人
+ */
+ @TableField("check_person")
+ @ExcelProperty(value = "检查人",order = 0)
+ @ApiModelProperty(value = "检查人", dataType = "String")
+ private String checkPerson;
+
+ /**
+ * 管理点位置
+ */
+ @TableField("manager_point_location")
+ @ExcelProperty(value = "管理点位置",order = 0)
+ @ApiModelProperty(value = "管理点位置", dataType = "String")
+ private String managerPoinLocation;
+
+ /**
+ * 检查结果-字典code
+ */
+ @TableField("check_result")
+ @ExcelProperty(value = "检查结果",order = 0)
+ @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.CHECK_RESULT)
+ @ApiModelProperty(value = "检查结果-字典code", dataType = "String")
+ private String checkResult;
+
+ /**
+ * 检查结果名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "检查结果名称", dataType = "String")
+ private String checkResultName;
+
+ /**
+ * 检查日期
+ */
+ @TableField("check_date")
+ @ExcelProperty(value = "检查日期",order = 0)
+ @ApiModelProperty(value = "检查日期", dataType = "String")
+ private String checkDate;
+
+ /**
+ * 附件
+ */
+ @TableField("minio_file_name")
+ @ApiModelProperty(value = "附件", dataType = "String")
+ private String minioFileName;
+
+ /**
+ * 备注
+ */
+ @TableField("remark")
+ @ApiModelProperty(value = "备注", dataType = "String")
+ private String remark;
+
+ /**
+ * 删除标记
+ */
+ @TableField("is_del")
+ @ApiModelProperty(value = "删除标记", dataType = "Integer")
+ private Integer isDel;
+
+
+ /**
+ * 创建人
+ */
+ @TableField("create_user")
+ @ExcelProperty(value = "申请人",order = 7)
+ @ApiModelProperty(value = "创建人", dataType = "String")
+ private String createUser;
+
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ @ExcelProperty(value = "创建时间",order = 8)
+ @ApiModelProperty(value = "创建时间", dataType = "String")
+ private String createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ @ApiModelProperty(value = "更新时间", dataType = "String")
+ private String updateTime;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java
new file mode 100644
index 0000000..84499fe
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java
@@ -0,0 +1,92 @@
+package com.casic.missiles.service.Impl.meter;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.OrganizeListRequest;
+import com.casic.missiles.mapper.meter.MeterCheckInfoMapper;
+import com.casic.missiles.model.*;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@Service("MeterCheckInfoService")
+public class MeterCheckInfoServiceImpl extends ServiceImpl implements MeterCheckInfoService {
+
+ @Resource
+ private MeterCheckInfoMapper meterCheckInfoMapper;
+
+ @Resource
+ private IBaseExportService iBaseExportService;
+
+ @Override
+ public Page checkInfoList(Page page, MeterCheckInfoRequest request) throws Exception {
+ QueryWrapper wrapper = getWrapper(request);
+ Page resultPage = meterCheckInfoMapper.selectPage(page, wrapper);
+ for (MeterCheckInfo meterCheckInfo : resultPage.getRecords()) {
+ DictCodeUtils.convertDictCodeToName(meterCheckInfo);
+ }
+ return resultPage;
+ }
+
+ @Override
+ public ReturnDTO deleteCheckInfo(IdDTO idDto) {
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id",idDto.getId()).set("is_del", 1);
+ if(meterCheckInfoMapper.update(null, updateWrapper)>0){
+ return ReturnUtil.success();
+ }
+ return ReturnUtil.failed("删除失败");
+ }
+
+ @Override
+ public MeterCheckInfo selectCheckInfo(IdDTO idDto) throws Exception {
+ MeterCheckInfo meterCheckInfo = meterCheckInfoMapper.selectById(idDto.getId());
+ DictCodeUtils.convertDictCodeToName(meterCheckInfo);
+ return meterCheckInfo;
+ }
+
+ @Override
+ public ReturnDTO addCheckInfo(MeterCheckInfo meterCheckInfo) {
+ long maxNo = meterCheckInfoMapper.selectMaxNo();
+ String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
+ meterCheckInfo.setCheckNo(checkNo);
+ if(meterCheckInfoMapper.insert(meterCheckInfo) > 0){
+ return ReturnUtil.success();
+ }
+ return ReturnUtil.failed("操作失败");
+ }
+
+ @Override
+ public void exportCheckInfoList(MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ QueryWrapper wrapper = getWrapper(request);
+ List resultList = meterCheckInfoMapper.selectList(wrapper);
+ for (MeterCheckInfo meterCheckInfo : resultList) {
+ DictCodeUtils.convertDictCodeToName(meterCheckInfo);
+ }
+ iBaseExportService.exportExcel(response, MeterCheckInfo.class,resultList,"sheet");
+ }
+
+ private QueryWrapper getWrapper(MeterCheckInfoRequest request) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.like(StringUtils.isNotBlank(request.getCheckNo()), "check_no", request.getCheckNo());
+ wrapper.like(StringUtils.isNotBlank(request.getCheckName()), "check_name", request.getCheckName());
+ wrapper.apply(StringUtils.isNotBlank(request.getCheckDate()),
+ "{0} = DATE_FORMAT(check_date,'%Y-%m-%d')", request.getCheckDate());
+ wrapper.eq("is_del", 0);
+ wrapper.orderByDesc("create_time");
+ return wrapper;
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
new file mode 100644
index 0000000..5d3670c
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCheckInfoController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.controller.meter;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+import com.casic.missiles.model.MeterStaff;
+import com.casic.missiles.model.MeterStandardApply;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.service.meter.MeterStandardApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ **
+ * * 设备管理点检查列表
+ * *
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+@Api(tags = "设备管理点检查相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/check")
+public class MeterCheckInfoController extends ExportController {
+
+ @Resource
+ private MeterCheckInfoService meterCheckInfoService;
+
+ /**
+ * 设备管理点检查列表
+ */
+ @ApiOperation("设备管理点检查列表")
+ @PostMapping("/checkInfoList")
+ @ResponseBody
+ public ReturnDTO> checkInfoList(@RequestBody MeterCheckInfoRequest request) throws Exception{
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(meterCheckInfoService.checkInfoList(page, request)));
+ }
+
+ /**
+ * 设备管理点检查列表删除
+ */
+ @ApiOperation("设备管理点检查列表删除")
+ @PostMapping("/deleteCheckInfo")
+ @ResponseBody
+ public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+ return meterCheckInfoService.deleteCheckInfo(idDto);
+ }
+
+
+ /**
+ * 设备管理点检查详细信息
+ */
+ @ApiOperation("设备管理点检查详细信息")
+ @PostMapping("/selectCheckInfo")
+ @ResponseBody
+ public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+ return ReturnUtil.success(meterCheckInfoService.selectCheckInfo(idDto));
+ }
+
+ /**
+ * 设备管理点检查新建
+ */
+ @ApiOperation("备管理点检查新建")
+ @PostMapping("/addCheckInfo")
+ @ResponseBody
+ public ReturnDTO addCheckInfo(@RequestBody @Valid MeterCheckInfo meterCheckInfo) throws Exception{
+ return meterCheckInfoService.addCheckInfo(meterCheckInfo);
+ }
+
+ /**
+ * 设备管理点检查列表导出
+ */
+ @ApiOperation("设备管理点检查列表导出")
+ @PostMapping("/exportCheckInfoList")
+ @ResponseBody
+ public void exportCheckInfoList(@RequestBody MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ try {
+ meterCheckInfoService.exportCheckInfoList(request,response);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
new file mode 100644
index 0000000..3bd066f
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCheckInfoMapper.java
@@ -0,0 +1,11 @@
+package com.casic.missiles.mapper.meter;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+
+public interface MeterCheckInfoMapper extends BaseMapper {
+
+ long selectMaxNo();
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
new file mode 100644
index 0000000..501c9d9
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCheckInfoMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 5c28b06..707019f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -70,4 +70,6 @@
String MEASURE_MAJOR = "measureMajor";
//标准装置-申请类型
String STANDARD_APPLY_TYPE = "standardApplyType";
+ //检查结果
+ String CHECK_RESULT = "checkResult";
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java
new file mode 100644
index 0000000..e68f279
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.dto.meter;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 设备管理点检查列表请求实体
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/19
+ */
+
+@ApiModel
+@Data
+public class MeterCheckInfoRequest {
+
+ /**
+ * 检查表编号
+ */
+ @ApiModelProperty(value = "检查表编号", dataType = "String")
+ private String checkNo;
+
+ /**
+ * 检查表名称
+ */
+ @ApiModelProperty(value = "检查表名称", dataType = "String")
+ private String checkName;
+
+
+ /**
+ * 检查日期
+ */
+ @ApiModelProperty(value = "检查日期", dataType = "String")
+ private String checkDate;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java
new file mode 100644
index 0000000..c7f5f30
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCheckInfo.java
@@ -0,0 +1,148 @@
+package com.casic.missiles.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设备管理点检查列表实体
+ *
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2022/12/26
+ */
+
+@Data
+@ApiModel
+@TableName("meter_check_info")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class MeterCheckInfo implements Serializable {
+
+ private static final long serialVersionUID = -2162976785241447101L;
+
+ /**
+ * 主键
+ */
+ @TableId("id")
+ @ApiModelProperty(value = "主键", dataType = "Long")
+ private Long id;
+
+ /**
+ * 检查表编号
+ */
+ @TableField("check_no")
+ @ExcelProperty(value = "检查表编号",order = 0)
+ @ApiModelProperty(value = "检查表编号", dataType = "String")
+ private String checkNo;
+
+ /**
+ * 检查表名称
+ */
+ @TableField("check_name")
+ @ExcelProperty(value = "检查表名称",order = 0)
+ @ApiModelProperty(value = "检查表名称", dataType = "String")
+ private String checkName;
+
+ /**
+ * 检查人
+ */
+ @TableField("check_person")
+ @ExcelProperty(value = "检查人",order = 0)
+ @ApiModelProperty(value = "检查人", dataType = "String")
+ private String checkPerson;
+
+ /**
+ * 管理点位置
+ */
+ @TableField("manager_point_location")
+ @ExcelProperty(value = "管理点位置",order = 0)
+ @ApiModelProperty(value = "管理点位置", dataType = "String")
+ private String managerPoinLocation;
+
+ /**
+ * 检查结果-字典code
+ */
+ @TableField("check_result")
+ @ExcelProperty(value = "检查结果",order = 0)
+ @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.CHECK_RESULT)
+ @ApiModelProperty(value = "检查结果-字典code", dataType = "String")
+ private String checkResult;
+
+ /**
+ * 检查结果名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "检查结果名称", dataType = "String")
+ private String checkResultName;
+
+ /**
+ * 检查日期
+ */
+ @TableField("check_date")
+ @ExcelProperty(value = "检查日期",order = 0)
+ @ApiModelProperty(value = "检查日期", dataType = "String")
+ private String checkDate;
+
+ /**
+ * 附件
+ */
+ @TableField("minio_file_name")
+ @ApiModelProperty(value = "附件", dataType = "String")
+ private String minioFileName;
+
+ /**
+ * 备注
+ */
+ @TableField("remark")
+ @ApiModelProperty(value = "备注", dataType = "String")
+ private String remark;
+
+ /**
+ * 删除标记
+ */
+ @TableField("is_del")
+ @ApiModelProperty(value = "删除标记", dataType = "Integer")
+ private Integer isDel;
+
+
+ /**
+ * 创建人
+ */
+ @TableField("create_user")
+ @ExcelProperty(value = "申请人",order = 7)
+ @ApiModelProperty(value = "创建人", dataType = "String")
+ private String createUser;
+
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ @ExcelProperty(value = "创建时间",order = 8)
+ @ApiModelProperty(value = "创建时间", dataType = "String")
+ private String createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ @ApiModelProperty(value = "更新时间", dataType = "String")
+ private String updateTime;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java
new file mode 100644
index 0000000..84499fe
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java
@@ -0,0 +1,92 @@
+package com.casic.missiles.service.Impl.meter;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.OrganizeListRequest;
+import com.casic.missiles.mapper.meter.MeterCheckInfoMapper;
+import com.casic.missiles.model.*;
+import com.casic.missiles.service.meter.MeterCheckInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@Service("MeterCheckInfoService")
+public class MeterCheckInfoServiceImpl extends ServiceImpl implements MeterCheckInfoService {
+
+ @Resource
+ private MeterCheckInfoMapper meterCheckInfoMapper;
+
+ @Resource
+ private IBaseExportService iBaseExportService;
+
+ @Override
+ public Page checkInfoList(Page page, MeterCheckInfoRequest request) throws Exception {
+ QueryWrapper wrapper = getWrapper(request);
+ Page resultPage = meterCheckInfoMapper.selectPage(page, wrapper);
+ for (MeterCheckInfo meterCheckInfo : resultPage.getRecords()) {
+ DictCodeUtils.convertDictCodeToName(meterCheckInfo);
+ }
+ return resultPage;
+ }
+
+ @Override
+ public ReturnDTO deleteCheckInfo(IdDTO idDto) {
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id",idDto.getId()).set("is_del", 1);
+ if(meterCheckInfoMapper.update(null, updateWrapper)>0){
+ return ReturnUtil.success();
+ }
+ return ReturnUtil.failed("删除失败");
+ }
+
+ @Override
+ public MeterCheckInfo selectCheckInfo(IdDTO idDto) throws Exception {
+ MeterCheckInfo meterCheckInfo = meterCheckInfoMapper.selectById(idDto.getId());
+ DictCodeUtils.convertDictCodeToName(meterCheckInfo);
+ return meterCheckInfo;
+ }
+
+ @Override
+ public ReturnDTO addCheckInfo(MeterCheckInfo meterCheckInfo) {
+ long maxNo = meterCheckInfoMapper.selectMaxNo();
+ String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
+ meterCheckInfo.setCheckNo(checkNo);
+ if(meterCheckInfoMapper.insert(meterCheckInfo) > 0){
+ return ReturnUtil.success();
+ }
+ return ReturnUtil.failed("操作失败");
+ }
+
+ @Override
+ public void exportCheckInfoList(MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
+ QueryWrapper wrapper = getWrapper(request);
+ List resultList = meterCheckInfoMapper.selectList(wrapper);
+ for (MeterCheckInfo meterCheckInfo : resultList) {
+ DictCodeUtils.convertDictCodeToName(meterCheckInfo);
+ }
+ iBaseExportService.exportExcel(response, MeterCheckInfo.class,resultList,"sheet");
+ }
+
+ private QueryWrapper getWrapper(MeterCheckInfoRequest request) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.like(StringUtils.isNotBlank(request.getCheckNo()), "check_no", request.getCheckNo());
+ wrapper.like(StringUtils.isNotBlank(request.getCheckName()), "check_name", request.getCheckName());
+ wrapper.apply(StringUtils.isNotBlank(request.getCheckDate()),
+ "{0} = DATE_FORMAT(check_date,'%Y-%m-%d')", request.getCheckDate());
+ wrapper.eq("is_del", 0);
+ wrapper.orderByDesc("create_time");
+ return wrapper;
+ }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCheckInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCheckInfoService.java
new file mode 100644
index 0000000..57e57c6
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCheckInfoService.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.service.meter;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.model.MeterCheckInfo;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface MeterCheckInfoService extends IService {
+
+ Page checkInfoList(Page page, MeterCheckInfoRequest request) throws Exception;
+
+ ReturnDTO deleteCheckInfo(IdDTO idDto);
+
+ MeterCheckInfo selectCheckInfo(IdDTO idDto) throws Exception;
+
+ ReturnDTO addCheckInfo(MeterCheckInfo meterCheckInfo);
+
+ void exportCheckInfoList(MeterCheckInfoRequest request, HttpServletResponse response) throws Exception;
+}