diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 2f1e3db..9f5cfc8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -36,7 +36,9 @@ DUPLICATE_NUMBER(2401, "编号生成重复,请重新提交"), DUPLICATE_MANUFACTURE_NUMBER(2401, "出厂编号重复"), PARAM_INVALID(2500, "参数不合法"), - LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"); + LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), + STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), + STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"); private Integer code; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 2f1e3db..9f5cfc8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -36,7 +36,9 @@ DUPLICATE_NUMBER(2401, "编号生成重复,请重新提交"), DUPLICATE_MANUFACTURE_NUMBER(2401, "出厂编号重复"), PARAM_INVALID(2500, "参数不合法"), - LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"); + LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), + STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), + STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"); private Integer code; 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 246ebb0..c2f2901 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 @@ -68,4 +68,6 @@ String STANDARD_TRANSMIT_RANGE = "transmitRange"; // 计量专业 String MEASURE_MAJOR = "measureMajor"; + // 资本来源 + String CAPITAL_SOURCE = "capitalSource"; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 2f1e3db..9f5cfc8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -36,7 +36,9 @@ DUPLICATE_NUMBER(2401, "编号生成重复,请重新提交"), DUPLICATE_MANUFACTURE_NUMBER(2401, "出厂编号重复"), PARAM_INVALID(2500, "参数不合法"), - LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"); + LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), + STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), + STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"); private Integer code; 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 246ebb0..c2f2901 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 @@ -68,4 +68,6 @@ String STANDARD_TRANSMIT_RANGE = "transmitRange"; // 计量专业 String MEASURE_MAJOR = "measureMajor"; + // 资本来源 + String CAPITAL_SOURCE = "capitalSource"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java index 2132435..611e7fe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java @@ -292,7 +292,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "有效日期", dataType = "String", required = false) - private String mesureResultfName; + private String mesureResultName; /** * 是否是技术指标需要校准检定的设备 @@ -366,6 +366,7 @@ * 资本来源 */ @TableField("capital_source") + @DictCodeField(message = "资本来源不合法", cacheName = MeterDictCode.CAPITAL_SOURCE) @ApiModelProperty(value = "资本来源", dataType = "Integer", required = false) private Integer capitalSource; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 2f1e3db..9f5cfc8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -36,7 +36,9 @@ DUPLICATE_NUMBER(2401, "编号生成重复,请重新提交"), DUPLICATE_MANUFACTURE_NUMBER(2401, "出厂编号重复"), PARAM_INVALID(2500, "参数不合法"), - LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"); + LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), + STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), + STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"); private Integer code; 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 246ebb0..c2f2901 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 @@ -68,4 +68,6 @@ String STANDARD_TRANSMIT_RANGE = "transmitRange"; // 计量专业 String MEASURE_MAJOR = "measureMajor"; + // 资本来源 + String CAPITAL_SOURCE = "capitalSource"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java index 2132435..611e7fe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java @@ -292,7 +292,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "有效日期", dataType = "String", required = false) - private String mesureResultfName; + private String mesureResultName; /** * 是否是技术指标需要校准检定的设备 @@ -366,6 +366,7 @@ * 资本来源 */ @TableField("capital_source") + @DictCodeField(message = "资本来源不合法", cacheName = MeterDictCode.CAPITAL_SOURCE) @ApiModelProperty(value = "资本来源", dataType = "Integer", required = false) private Integer capitalSource; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index a9e3bca..2cc7473 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -1,13 +1,20 @@ 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.Getter; -import lombok.Setter; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -23,8 +30,13 @@ * @author cuicheng * @since 2022-12-15 */ -@Getter -@Setter +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data @TableName("meter_standard_equipment") public class MeterStandardEquipment implements Serializable { @@ -42,6 +54,7 @@ */ @TableField("standard_no") @ApiModelProperty(value = "标准代码", dataType = "String") + @ExcelProperty(value = "标准代码", order = 0) private String standardNo; /** @@ -50,6 +63,7 @@ @NotBlank(message = "标准名称不能为空") @TableField("standard_name") @ApiModelProperty(value = "标准名称", dataType = "String") + @ExcelProperty(value = "标准名称", order = 1) private String standardName; /** @@ -122,6 +136,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "类别名称", dataType = "String") + @ExcelProperty(value = "类别", order = 2) private String categoryName; /** @@ -138,6 +153,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准等级名称", dataType = "String") + @ExcelProperty(value = "标准等级", order = 3) private String standardLevelName; /** @@ -154,6 +170,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "传递范围名称", dataType = "String") + @ExcelProperty(value = "传递范围", order = 4) private String transmitRangeName; /** @@ -169,6 +186,7 @@ @NotBlank(message = "筹建日期不能为空") @TableField("preparation_date") @ApiModelProperty(value = "筹建日期", dataType = "String") + @ExcelProperty(value = "筹建日期", order = 8) private String preparationDate; /** @@ -183,6 +201,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准所在实验室名称", dataType = "String") + @ExcelProperty(value = "标准所在部门", order = 6) private String standardLaboratoryName; /** @@ -198,6 +217,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "实验室负责人名字", dataType = "String") + @ExcelProperty(value = "负责人", order = 7) private String laboratoryOwnerName; /** @@ -221,6 +241,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "管理状态名称", dataType = "String") + @ExcelProperty(value = "管理状态", order = 5) private String managerStateName; /** @@ -298,6 +319,7 @@ */ @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注", order = 9) private String remark; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 2f1e3db..9f5cfc8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -36,7 +36,9 @@ DUPLICATE_NUMBER(2401, "编号生成重复,请重新提交"), DUPLICATE_MANUFACTURE_NUMBER(2401, "出厂编号重复"), PARAM_INVALID(2500, "参数不合法"), - LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"); + LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), + STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), + STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"); private Integer code; 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 246ebb0..c2f2901 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 @@ -68,4 +68,6 @@ String STANDARD_TRANSMIT_RANGE = "transmitRange"; // 计量专业 String MEASURE_MAJOR = "measureMajor"; + // 资本来源 + String CAPITAL_SOURCE = "capitalSource"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java index 2132435..611e7fe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java @@ -292,7 +292,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "有效日期", dataType = "String", required = false) - private String mesureResultfName; + private String mesureResultName; /** * 是否是技术指标需要校准检定的设备 @@ -366,6 +366,7 @@ * 资本来源 */ @TableField("capital_source") + @DictCodeField(message = "资本来源不合法", cacheName = MeterDictCode.CAPITAL_SOURCE) @ApiModelProperty(value = "资本来源", dataType = "Integer", required = false) private Integer capitalSource; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index a9e3bca..2cc7473 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -1,13 +1,20 @@ 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.Getter; -import lombok.Setter; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -23,8 +30,13 @@ * @author cuicheng * @since 2022-12-15 */ -@Getter -@Setter +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data @TableName("meter_standard_equipment") public class MeterStandardEquipment implements Serializable { @@ -42,6 +54,7 @@ */ @TableField("standard_no") @ApiModelProperty(value = "标准代码", dataType = "String") + @ExcelProperty(value = "标准代码", order = 0) private String standardNo; /** @@ -50,6 +63,7 @@ @NotBlank(message = "标准名称不能为空") @TableField("standard_name") @ApiModelProperty(value = "标准名称", dataType = "String") + @ExcelProperty(value = "标准名称", order = 1) private String standardName; /** @@ -122,6 +136,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "类别名称", dataType = "String") + @ExcelProperty(value = "类别", order = 2) private String categoryName; /** @@ -138,6 +153,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准等级名称", dataType = "String") + @ExcelProperty(value = "标准等级", order = 3) private String standardLevelName; /** @@ -154,6 +170,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "传递范围名称", dataType = "String") + @ExcelProperty(value = "传递范围", order = 4) private String transmitRangeName; /** @@ -169,6 +186,7 @@ @NotBlank(message = "筹建日期不能为空") @TableField("preparation_date") @ApiModelProperty(value = "筹建日期", dataType = "String") + @ExcelProperty(value = "筹建日期", order = 8) private String preparationDate; /** @@ -183,6 +201,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准所在实验室名称", dataType = "String") + @ExcelProperty(value = "标准所在部门", order = 6) private String standardLaboratoryName; /** @@ -198,6 +217,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "实验室负责人名字", dataType = "String") + @ExcelProperty(value = "负责人", order = 7) private String laboratoryOwnerName; /** @@ -221,6 +241,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "管理状态名称", dataType = "String") + @ExcelProperty(value = "管理状态", order = 5) private String managerStateName; /** @@ -298,6 +319,7 @@ */ @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注", order = 9) private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java index dafb3b8..938649c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java @@ -3,11 +3,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 标准装置-计量人员表 @@ -26,21 +28,47 @@ /** * 主键 */ - @TableId("id") + @TableId("id") private Long id; /** * 标准设备ID */ @TableField("standard_equipment_id") + @ApiModelProperty(value = "标准设备ID", dataType = "Long", required = true) private Long standardEquipmentId; /** * 计量人员ID */ + @ApiModelProperty(value = "计量人员ID", dataType = "Long", required = true) @TableField("user_id") private Long userId; + @TableField(exist = false) + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField(exist = false) + @ApiModelProperty(value = "计量人员编号", dataType = "String") + private String staffNo; + + @TableField(exist = false) + @ApiModelProperty(value = "工作部门", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "计量专业", dataType = "String") + private String major; + + @TableField(exist = false) + @ApiModelProperty(value = "证书编号", dataType = "String") + private String verifierCertificateNo; + + @TableField(exist = false) + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String certificateDate; + /** * 备注 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 2f1e3db..9f5cfc8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -36,7 +36,9 @@ DUPLICATE_NUMBER(2401, "编号生成重复,请重新提交"), DUPLICATE_MANUFACTURE_NUMBER(2401, "出厂编号重复"), PARAM_INVALID(2500, "参数不合法"), - LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"); + LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), + STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), + STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"); private Integer code; 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 246ebb0..c2f2901 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 @@ -68,4 +68,6 @@ String STANDARD_TRANSMIT_RANGE = "transmitRange"; // 计量专业 String MEASURE_MAJOR = "measureMajor"; + // 资本来源 + String CAPITAL_SOURCE = "capitalSource"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java index 2132435..611e7fe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java @@ -292,7 +292,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "有效日期", dataType = "String", required = false) - private String mesureResultfName; + private String mesureResultName; /** * 是否是技术指标需要校准检定的设备 @@ -366,6 +366,7 @@ * 资本来源 */ @TableField("capital_source") + @DictCodeField(message = "资本来源不合法", cacheName = MeterDictCode.CAPITAL_SOURCE) @ApiModelProperty(value = "资本来源", dataType = "Integer", required = false) private Integer capitalSource; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index a9e3bca..2cc7473 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -1,13 +1,20 @@ 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.Getter; -import lombok.Setter; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -23,8 +30,13 @@ * @author cuicheng * @since 2022-12-15 */ -@Getter -@Setter +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data @TableName("meter_standard_equipment") public class MeterStandardEquipment implements Serializable { @@ -42,6 +54,7 @@ */ @TableField("standard_no") @ApiModelProperty(value = "标准代码", dataType = "String") + @ExcelProperty(value = "标准代码", order = 0) private String standardNo; /** @@ -50,6 +63,7 @@ @NotBlank(message = "标准名称不能为空") @TableField("standard_name") @ApiModelProperty(value = "标准名称", dataType = "String") + @ExcelProperty(value = "标准名称", order = 1) private String standardName; /** @@ -122,6 +136,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "类别名称", dataType = "String") + @ExcelProperty(value = "类别", order = 2) private String categoryName; /** @@ -138,6 +153,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准等级名称", dataType = "String") + @ExcelProperty(value = "标准等级", order = 3) private String standardLevelName; /** @@ -154,6 +170,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "传递范围名称", dataType = "String") + @ExcelProperty(value = "传递范围", order = 4) private String transmitRangeName; /** @@ -169,6 +186,7 @@ @NotBlank(message = "筹建日期不能为空") @TableField("preparation_date") @ApiModelProperty(value = "筹建日期", dataType = "String") + @ExcelProperty(value = "筹建日期", order = 8) private String preparationDate; /** @@ -183,6 +201,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准所在实验室名称", dataType = "String") + @ExcelProperty(value = "标准所在部门", order = 6) private String standardLaboratoryName; /** @@ -198,6 +217,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "实验室负责人名字", dataType = "String") + @ExcelProperty(value = "负责人", order = 7) private String laboratoryOwnerName; /** @@ -221,6 +241,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "管理状态名称", dataType = "String") + @ExcelProperty(value = "管理状态", order = 5) private String managerStateName; /** @@ -298,6 +319,7 @@ */ @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注", order = 9) private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java index dafb3b8..938649c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java @@ -3,11 +3,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 标准装置-计量人员表 @@ -26,21 +28,47 @@ /** * 主键 */ - @TableId("id") + @TableId("id") private Long id; /** * 标准设备ID */ @TableField("standard_equipment_id") + @ApiModelProperty(value = "标准设备ID", dataType = "Long", required = true) private Long standardEquipmentId; /** * 计量人员ID */ + @ApiModelProperty(value = "计量人员ID", dataType = "Long", required = true) @TableField("user_id") private Long userId; + @TableField(exist = false) + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField(exist = false) + @ApiModelProperty(value = "计量人员编号", dataType = "String") + private String staffNo; + + @TableField(exist = false) + @ApiModelProperty(value = "工作部门", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "计量专业", dataType = "String") + private String major; + + @TableField(exist = false) + @ApiModelProperty(value = "证书编号", dataType = "String") + private String verifierCertificateNo; + + @TableField(exist = false) + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String certificateDate; + /** * 备注 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java index 98df806..b03ad8f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java @@ -226,6 +226,7 @@ meterFixedAssetFileMapper.delete(wrapper); meterFixedAssets.getFileList().stream().forEach(item -> { item.setAssetId(meterFixedAssets.getId()); + item.setId(null); }); meterFixedAssetFileService.saveBatch(meterFixedAssets.getFileList()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 2f1e3db..9f5cfc8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -36,7 +36,9 @@ DUPLICATE_NUMBER(2401, "编号生成重复,请重新提交"), DUPLICATE_MANUFACTURE_NUMBER(2401, "出厂编号重复"), PARAM_INVALID(2500, "参数不合法"), - LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"); + LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), + STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), + STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"); private Integer code; 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 246ebb0..c2f2901 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 @@ -68,4 +68,6 @@ String STANDARD_TRANSMIT_RANGE = "transmitRange"; // 计量专业 String MEASURE_MAJOR = "measureMajor"; + // 资本来源 + String CAPITAL_SOURCE = "capitalSource"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java index 2132435..611e7fe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java @@ -292,7 +292,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "有效日期", dataType = "String", required = false) - private String mesureResultfName; + private String mesureResultName; /** * 是否是技术指标需要校准检定的设备 @@ -366,6 +366,7 @@ * 资本来源 */ @TableField("capital_source") + @DictCodeField(message = "资本来源不合法", cacheName = MeterDictCode.CAPITAL_SOURCE) @ApiModelProperty(value = "资本来源", dataType = "Integer", required = false) private Integer capitalSource; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index a9e3bca..2cc7473 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -1,13 +1,20 @@ 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.Getter; -import lombok.Setter; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -23,8 +30,13 @@ * @author cuicheng * @since 2022-12-15 */ -@Getter -@Setter +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data @TableName("meter_standard_equipment") public class MeterStandardEquipment implements Serializable { @@ -42,6 +54,7 @@ */ @TableField("standard_no") @ApiModelProperty(value = "标准代码", dataType = "String") + @ExcelProperty(value = "标准代码", order = 0) private String standardNo; /** @@ -50,6 +63,7 @@ @NotBlank(message = "标准名称不能为空") @TableField("standard_name") @ApiModelProperty(value = "标准名称", dataType = "String") + @ExcelProperty(value = "标准名称", order = 1) private String standardName; /** @@ -122,6 +136,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "类别名称", dataType = "String") + @ExcelProperty(value = "类别", order = 2) private String categoryName; /** @@ -138,6 +153,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准等级名称", dataType = "String") + @ExcelProperty(value = "标准等级", order = 3) private String standardLevelName; /** @@ -154,6 +170,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "传递范围名称", dataType = "String") + @ExcelProperty(value = "传递范围", order = 4) private String transmitRangeName; /** @@ -169,6 +186,7 @@ @NotBlank(message = "筹建日期不能为空") @TableField("preparation_date") @ApiModelProperty(value = "筹建日期", dataType = "String") + @ExcelProperty(value = "筹建日期", order = 8) private String preparationDate; /** @@ -183,6 +201,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准所在实验室名称", dataType = "String") + @ExcelProperty(value = "标准所在部门", order = 6) private String standardLaboratoryName; /** @@ -198,6 +217,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "实验室负责人名字", dataType = "String") + @ExcelProperty(value = "负责人", order = 7) private String laboratoryOwnerName; /** @@ -221,6 +241,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "管理状态名称", dataType = "String") + @ExcelProperty(value = "管理状态", order = 5) private String managerStateName; /** @@ -298,6 +319,7 @@ */ @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注", order = 9) private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java index dafb3b8..938649c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java @@ -3,11 +3,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 标准装置-计量人员表 @@ -26,21 +28,47 @@ /** * 主键 */ - @TableId("id") + @TableId("id") private Long id; /** * 标准设备ID */ @TableField("standard_equipment_id") + @ApiModelProperty(value = "标准设备ID", dataType = "Long", required = true) private Long standardEquipmentId; /** * 计量人员ID */ + @ApiModelProperty(value = "计量人员ID", dataType = "Long", required = true) @TableField("user_id") private Long userId; + @TableField(exist = false) + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField(exist = false) + @ApiModelProperty(value = "计量人员编号", dataType = "String") + private String staffNo; + + @TableField(exist = false) + @ApiModelProperty(value = "工作部门", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "计量专业", dataType = "String") + private String major; + + @TableField(exist = false) + @ApiModelProperty(value = "证书编号", dataType = "String") + private String verifierCertificateNo; + + @TableField(exist = false) + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String certificateDate; + /** * 备注 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java index 98df806..b03ad8f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java @@ -226,6 +226,7 @@ meterFixedAssetFileMapper.delete(wrapper); meterFixedAssets.getFileList().stream().forEach(item -> { item.setAssetId(meterFixedAssets.getId()); + item.setId(null); }); meterFixedAssetFileService.saveBatch(meterFixedAssets.getFileList()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentUserServiceImpl.java index 07aa024..788fc95 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentUserServiceImpl.java @@ -1,10 +1,27 @@ package com.casic.missiles.service.Impl.meter; +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.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterStandardEquipmentUserMapper; +import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentService; import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; /** *

@@ -17,4 +34,92 @@ @Service public class MeterStandardEquipmentUserServiceImpl extends ServiceImpl implements IMeterStandardEquipmentUserService { + @Autowired + private MeterStandardEquipmentUserMapper meterStandardEquipmentUserMapper; + + @Autowired + private MeterStaffMapper meterStaffMapper; + + @Autowired + private IMeterStandardEquipmentService meterStandardEquipmentService; + + @Override + public Page listPage(Page page, IdDTO request) throws Exception { + // 获取列表 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", request.getId()); + Page meterStandardEquipmentUserPage = meterStandardEquipmentUserMapper.selectPage(page, wrapper); + if (!CollectionUtils.isEmpty(meterStandardEquipmentUserPage.getRecords())) { + for (MeterStandardEquipmentUser record : meterStandardEquipmentUserPage.getRecords()) { + MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString()); + BeanUtils.copyProperties(meterStaff, record); + } + } + return meterStandardEquipmentUserPage; + } + + @Override + public ReturnDTO add(MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + // 人员信息校验 + validUserInfo(meterStandardEquipmentUser); + // 首先判断是否存在,不存在再插入 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", meterStandardEquipmentUser.getStandardEquipmentId()); + wrapper.eq("user_id", meterStandardEquipmentUser.getUserId()); + MeterStandardEquipmentUser existUser = meterStandardEquipmentUserMapper.selectOne(wrapper); + if (existUser == null) { + meterStandardEquipmentUserMapper.insert(meterStandardEquipmentUser); + } + return ReturnUtil.success(); + } + + @Override + public ReturnDTO deleteById(Long id) { + super.removeById(id); + return ReturnUtil.success(); + } + + + @Override + public List list(IdDTO request) throws Exception { + return null; + } + + @Override + public ReturnDTO addList(List meterStandardEquipmentUserList) throws Exception { + // 校验计量人员信息 + List needInsertList = new ArrayList<>(); + for(MeterStandardEquipmentUser item:meterStandardEquipmentUserList) { + validUserInfo(item); + if (!isExist(item)) { + needInsertList.add(item); + } + } + if (!CollectionUtils.isEmpty(needInsertList)) { + super.saveBatch(needInsertList); + } + return ReturnUtil.success(); + } + + private boolean validUserInfo(MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + // 判断标准装置是否存在 + MeterStandardEquipment meterStandardEquipment = meterStandardEquipmentService.getById(meterStandardEquipmentUser.getStandardEquipmentId()); + if (meterStandardEquipment == null) { + throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST); + } + // 判断人员是否存在 + MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(meterStandardEquipmentUser.getUserId().toString()); + if (meterStaff == null) { + throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_USER_ID_EXIST); + } + return true; + } + + private boolean isExist(MeterStandardEquipmentUser meterStandardEquipmentUser) { + // 首先判断是否存在,不存在再插入 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", meterStandardEquipmentUser.getStandardEquipmentId()); + wrapper.eq("user_id", meterStandardEquipmentUser.getUserId()); + return meterStandardEquipmentUserMapper.selectOne(wrapper) != null; + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index ffaea82..1679bf6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -93,12 +93,15 @@ * 导出标准装置 */ @ApiOperation("导出excel") +// @GetMapping("/exportExcel") @PostMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { +// public void exportExcel() throws Exception { +// StandardEquipmentRequest request = new StandardEquipmentRequest(); DictCodeUtils.validDictCode(request); List list = meterStandardEquipmentService.list(request); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { super.exportExcel(MeterStandardEquipment.class, list, ExportEnum.STANDARD_EQUIPMENT.getDescription()); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java index 798a427..21a2384 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentUserController.java @@ -1,7 +1,21 @@ package com.casic.missiles.controller.meter; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; /** *

@@ -12,7 +26,52 @@ * @since 2022-12-15 */ @RestController -@RequestMapping("/meter-standard-equipment-user") -public class MeterStandardEquipmentUserController { +@Api(tags = "标准装置-计量人员") +@RequestMapping("/meter/standard/user") +public class MeterStandardEquipmentUserController extends ExportController { + + @Autowired + private IMeterStandardEquipmentUserService meterStandardEquipmentUserService; + + /** + * 标准装置-计量人员列表 + */ + @ApiOperation("标准装置-计量人员列表(分页)") + @PostMapping("/listPage") + @ResponseBody + public ReturnDTO> listPage(@RequestBody @Valid IdDTO request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStandardEquipmentUserService.listPage(page, request))); + } + + /** + * 添加计量人员 + */ + @ApiOperation("添加计量人员") + @PostMapping("/add") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + return meterStandardEquipmentUserService.add(meterStandardEquipmentUser); + } + + /** + * 批量添加计量人员 + */ + @ApiOperation("批量添加计量人员") + @PostMapping("/batchAdd") + @ResponseBody + public ReturnDTO add(@RequestBody @Valid List meterStandardEquipmentUserList) throws Exception { + return meterStandardEquipmentUserService.addList(meterStandardEquipmentUserList); + } + + /** + * 删除计量人员 + */ + @ApiOperation("删除计量人员") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { + return meterStandardEquipmentUserService.deleteById(idDTO.getId()); + } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index d963877..894fd10 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5909 + port: 5910 ################### spring配置 ################### spring: datasource: diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 2f1e3db..9f5cfc8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -36,7 +36,9 @@ DUPLICATE_NUMBER(2401, "编号生成重复,请重新提交"), DUPLICATE_MANUFACTURE_NUMBER(2401, "出厂编号重复"), PARAM_INVALID(2500, "参数不合法"), - LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"); + LOGIN_USER_ACQUIRE_FAILED(2402, "无法获取登录者用户信息,请尝试重新登录再进行操作"), + STANDARD_EQUIPMENT_ID_EXIST(2402, "标准装置不存在"), + STANDARD_EQUIPMENT_USER_ID_EXIST(2402, "标准装置-计量人员不存在"); private Integer code; 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 246ebb0..c2f2901 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 @@ -68,4 +68,6 @@ String STANDARD_TRANSMIT_RANGE = "transmitRange"; // 计量专业 String MEASURE_MAJOR = "measureMajor"; + // 资本来源 + String CAPITAL_SOURCE = "capitalSource"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java index 2132435..611e7fe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java @@ -292,7 +292,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "有效日期", dataType = "String", required = false) - private String mesureResultfName; + private String mesureResultName; /** * 是否是技术指标需要校准检定的设备 @@ -366,6 +366,7 @@ * 资本来源 */ @TableField("capital_source") + @DictCodeField(message = "资本来源不合法", cacheName = MeterDictCode.CAPITAL_SOURCE) @ApiModelProperty(value = "资本来源", dataType = "Integer", required = false) private Integer capitalSource; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index a9e3bca..2cc7473 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -1,13 +1,20 @@ 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.Getter; -import lombok.Setter; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -23,8 +30,13 @@ * @author cuicheng * @since 2022-12-15 */ -@Getter -@Setter +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data @TableName("meter_standard_equipment") public class MeterStandardEquipment implements Serializable { @@ -42,6 +54,7 @@ */ @TableField("standard_no") @ApiModelProperty(value = "标准代码", dataType = "String") + @ExcelProperty(value = "标准代码", order = 0) private String standardNo; /** @@ -50,6 +63,7 @@ @NotBlank(message = "标准名称不能为空") @TableField("standard_name") @ApiModelProperty(value = "标准名称", dataType = "String") + @ExcelProperty(value = "标准名称", order = 1) private String standardName; /** @@ -122,6 +136,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "类别名称", dataType = "String") + @ExcelProperty(value = "类别", order = 2) private String categoryName; /** @@ -138,6 +153,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准等级名称", dataType = "String") + @ExcelProperty(value = "标准等级", order = 3) private String standardLevelName; /** @@ -154,6 +170,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "传递范围名称", dataType = "String") + @ExcelProperty(value = "传递范围", order = 4) private String transmitRangeName; /** @@ -169,6 +186,7 @@ @NotBlank(message = "筹建日期不能为空") @TableField("preparation_date") @ApiModelProperty(value = "筹建日期", dataType = "String") + @ExcelProperty(value = "筹建日期", order = 8) private String preparationDate; /** @@ -183,6 +201,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "标准所在实验室名称", dataType = "String") + @ExcelProperty(value = "标准所在部门", order = 6) private String standardLaboratoryName; /** @@ -198,6 +217,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "实验室负责人名字", dataType = "String") + @ExcelProperty(value = "负责人", order = 7) private String laboratoryOwnerName; /** @@ -221,6 +241,7 @@ */ @TableField(exist = false) @ApiModelProperty(value = "管理状态名称", dataType = "String") + @ExcelProperty(value = "管理状态", order = 5) private String managerStateName; /** @@ -298,6 +319,7 @@ */ @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注", order = 9) private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java index dafb3b8..938649c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentUser.java @@ -3,11 +3,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 标准装置-计量人员表 @@ -26,21 +28,47 @@ /** * 主键 */ - @TableId("id") + @TableId("id") private Long id; /** * 标准设备ID */ @TableField("standard_equipment_id") + @ApiModelProperty(value = "标准设备ID", dataType = "Long", required = true) private Long standardEquipmentId; /** * 计量人员ID */ + @ApiModelProperty(value = "计量人员ID", dataType = "Long", required = true) @TableField("user_id") private Long userId; + @TableField(exist = false) + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField(exist = false) + @ApiModelProperty(value = "计量人员编号", dataType = "String") + private String staffNo; + + @TableField(exist = false) + @ApiModelProperty(value = "工作部门", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "计量专业", dataType = "String") + private String major; + + @TableField(exist = false) + @ApiModelProperty(value = "证书编号", dataType = "String") + private String verifierCertificateNo; + + @TableField(exist = false) + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String certificateDate; + /** * 备注 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java index 98df806..b03ad8f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java @@ -226,6 +226,7 @@ meterFixedAssetFileMapper.delete(wrapper); meterFixedAssets.getFileList().stream().forEach(item -> { item.setAssetId(meterFixedAssets.getId()); + item.setId(null); }); meterFixedAssetFileService.saveBatch(meterFixedAssets.getFileList()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentUserServiceImpl.java index 07aa024..788fc95 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentUserServiceImpl.java @@ -1,10 +1,27 @@ package com.casic.missiles.service.Impl.meter; +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.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterStandardEquipmentUserMapper; +import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardEquipmentUser; +import com.casic.missiles.service.meter.IMeterStandardEquipmentService; import com.casic.missiles.service.meter.IMeterStandardEquipmentUserService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; /** *

@@ -17,4 +34,92 @@ @Service public class MeterStandardEquipmentUserServiceImpl extends ServiceImpl implements IMeterStandardEquipmentUserService { + @Autowired + private MeterStandardEquipmentUserMapper meterStandardEquipmentUserMapper; + + @Autowired + private MeterStaffMapper meterStaffMapper; + + @Autowired + private IMeterStandardEquipmentService meterStandardEquipmentService; + + @Override + public Page listPage(Page page, IdDTO request) throws Exception { + // 获取列表 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", request.getId()); + Page meterStandardEquipmentUserPage = meterStandardEquipmentUserMapper.selectPage(page, wrapper); + if (!CollectionUtils.isEmpty(meterStandardEquipmentUserPage.getRecords())) { + for (MeterStandardEquipmentUser record : meterStandardEquipmentUserPage.getRecords()) { + MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString()); + BeanUtils.copyProperties(meterStaff, record); + } + } + return meterStandardEquipmentUserPage; + } + + @Override + public ReturnDTO add(MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + // 人员信息校验 + validUserInfo(meterStandardEquipmentUser); + // 首先判断是否存在,不存在再插入 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", meterStandardEquipmentUser.getStandardEquipmentId()); + wrapper.eq("user_id", meterStandardEquipmentUser.getUserId()); + MeterStandardEquipmentUser existUser = meterStandardEquipmentUserMapper.selectOne(wrapper); + if (existUser == null) { + meterStandardEquipmentUserMapper.insert(meterStandardEquipmentUser); + } + return ReturnUtil.success(); + } + + @Override + public ReturnDTO deleteById(Long id) { + super.removeById(id); + return ReturnUtil.success(); + } + + + @Override + public List list(IdDTO request) throws Exception { + return null; + } + + @Override + public ReturnDTO addList(List meterStandardEquipmentUserList) throws Exception { + // 校验计量人员信息 + List needInsertList = new ArrayList<>(); + for(MeterStandardEquipmentUser item:meterStandardEquipmentUserList) { + validUserInfo(item); + if (!isExist(item)) { + needInsertList.add(item); + } + } + if (!CollectionUtils.isEmpty(needInsertList)) { + super.saveBatch(needInsertList); + } + return ReturnUtil.success(); + } + + private boolean validUserInfo(MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception { + // 判断标准装置是否存在 + MeterStandardEquipment meterStandardEquipment = meterStandardEquipmentService.getById(meterStandardEquipmentUser.getStandardEquipmentId()); + if (meterStandardEquipment == null) { + throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST); + } + // 判断人员是否存在 + MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(meterStandardEquipmentUser.getUserId().toString()); + if (meterStaff == null) { + throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_USER_ID_EXIST); + } + return true; + } + + private boolean isExist(MeterStandardEquipmentUser meterStandardEquipmentUser) { + // 首先判断是否存在,不存在再插入 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("standard_equipment_id", meterStandardEquipmentUser.getStandardEquipmentId()); + wrapper.eq("user_id", meterStandardEquipmentUser.getUserId()); + return meterStandardEquipmentUserMapper.selectOne(wrapper) != null; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardEquipmentUserService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardEquipmentUserService.java index 8ecf9c6..35e656b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardEquipmentUserService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterStandardEquipmentUserService.java @@ -1,7 +1,12 @@ package com.casic.missiles.service.meter; -import com.casic.missiles.model.MeterStandardEquipmentUser; +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.model.MeterStandardEquipmentUser; + +import java.util.List; /** *

@@ -13,4 +18,13 @@ */ public interface IMeterStandardEquipmentUserService extends IService { + Page listPage(Page page, IdDTO request) throws Exception; + + ReturnDTO add(MeterStandardEquipmentUser meterStandardEquipmentUser) throws Exception; + + ReturnDTO deleteById(Long id); + + List list(IdDTO request) throws Exception; + + ReturnDTO addList(List meterStandardEquipmentUserList) throws Exception; }