From a5dfef7c2f96ae0d20735f8dfd31273216f4b5c1 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Mon, 17 Jul 2023 15:43:57 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E7=A8=BD=E6=9F=A5=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/AddInspectionSettingDTO.java | 25 +++++++ .../setting/DeleteInspectionSettingDTO.java | 18 +++++ .../setting/UpdateInspectionSettingDTO.java | 29 ++++++++ .../setting/InspectionSettingDetailVO.java | 33 +++++++++ .../setting/InspectionSettingPageVO.java | 35 ++++++++++ coolstore-partner-webb/pom.xml | 25 +++++++ .../InspectionSettingController.java | 68 +++++++++++++++++++ .../src/main/resources/application.properties | 2 +- 8 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/AddInspectionSettingDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/DeleteInspectionSettingDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/UpdateInspectionSettingDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java create mode 100644 coolstore-partner-webb/src/main/java/com/cool/store/controller/InspectionSettingController.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/AddInspectionSettingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/AddInspectionSettingDTO.java new file mode 100644 index 000000000..565a7028f --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/AddInspectionSettingDTO.java @@ -0,0 +1,25 @@ +package com.cool.store.dto.inspection.setting; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: AddInspectionSettingDTO + * @Description: 新增稽核区域设置 + * @date 2023-07-17 14:40 + */ +@Data +public class AddInspectionSettingDTO { + + @ApiModelProperty("区域名称") + private String zoneName; + + @ApiModelProperty("稽核人id") + private String inspectionUserId; + + @ApiModelProperty("归属地ids") + private List openAreaMappingIds; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/DeleteInspectionSettingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/DeleteInspectionSettingDTO.java new file mode 100644 index 000000000..c17c18a4c --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/DeleteInspectionSettingDTO.java @@ -0,0 +1,18 @@ +package com.cool.store.dto.inspection.setting; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author zhangchenbiao + * @FileName: DeleteInspectionSettingDTO + * @Description: 删除稽核区域设置 + * @date 2023-07-17 14:41 + */ +@Data +public class DeleteInspectionSettingDTO { + + @ApiModelProperty("id") + private Long inspectionSettingId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/UpdateInspectionSettingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/UpdateInspectionSettingDTO.java new file mode 100644 index 000000000..e2e130b08 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/UpdateInspectionSettingDTO.java @@ -0,0 +1,29 @@ +package com.cool.store.dto.inspection.setting; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: UpdateInspectionSettingDTO + * @Description: 更新稽核区域设置 + * @date 2023-07-17 14:41 + */ +@Data +public class UpdateInspectionSettingDTO { + + @ApiModelProperty("id") + private Long inspectionSettingId; + + @ApiModelProperty("区域名称") + private String zoneName; + + @ApiModelProperty("稽核人id") + private String inspectionUserId; + + @ApiModelProperty("归属地ids") + private List openAreaMappingIds; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java new file mode 100644 index 000000000..8230ae6f5 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java @@ -0,0 +1,33 @@ +package com.cool.store.vo.inspection.setting; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: InspectionSettingPageVO + * @Description: + * @date 2023-07-17 14:32 + */ +@Data +public class InspectionSettingDetailVO { + + @ApiModelProperty("id") + private Long inspectionSettingId; + + @ApiModelProperty("区域名称") + private String zoneName; + + @ApiModelProperty("稽核人id") + private String inspectionUserId; + + @ApiModelProperty("稽核人名称") + private String inspectionUsername; + + @ApiModelProperty("归属地ids") + private List openAreaMappingIds; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java new file mode 100644 index 000000000..49120b02b --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java @@ -0,0 +1,35 @@ +package com.cool.store.vo.inspection.setting; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author zhangchenbiao + * @FileName: InspectionSettingPageVO + * @Description: + * @date 2023-07-17 14:32 + */ +@Data +public class InspectionSettingPageVO { + + @ApiModelProperty("id") + private Long inspectionSettingId; + + @ApiModelProperty("区域名称") + private String zoneName; + + @ApiModelProperty("稽核人id") + private String inspectionUserId; + + @ApiModelProperty("稽核人名称") + private String inspectionUsername; + + @ApiModelProperty("更新时间") + private Date updateTime; + + @ApiModelProperty("更新人名称") + private String updateUsername; + +} diff --git a/coolstore-partner-webb/pom.xml b/coolstore-partner-webb/pom.xml index 86d6ca8fd..a448dfc4b 100644 --- a/coolstore-partner-webb/pom.xml +++ b/coolstore-partner-webb/pom.xml @@ -31,6 +31,31 @@ + + + local + + true + + + local + + + + ab + + ab + + + + online + + online + + + + + diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InspectionSettingController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InspectionSettingController.java new file mode 100644 index 000000000..aa35e81a8 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InspectionSettingController.java @@ -0,0 +1,68 @@ +package com.cool.store.controller; + +import com.cool.store.dto.inspection.setting.AddInspectionSettingDTO; +import com.cool.store.dto.inspection.setting.DeleteInspectionSettingDTO; +import com.cool.store.dto.inspection.setting.UpdateInspectionSettingDTO; +import com.cool.store.response.ResponseResult; +import com.cool.store.vo.inspection.setting.InspectionSettingPageVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author zhangchenbiao + * @FileName: InspectionSettingController + * @Description:稽核区域设置 + * @date 2023-07-17 14:29 + */ +@RestController +@Slf4j +@Api(tags = "稽核区域设置") +public class InspectionSettingController { + + @ApiOperation("稽核区域设置列表") + @GetMapping("/inspection/setting/page") + public ResponseResult getInspectionSettingPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize){ + return ResponseResult.success(); + } + + @ApiOperation("稽核区域设置详情") + @GetMapping("/inspection/setting/detail") + public ResponseResult getInspectionSettingDetail(@RequestParam("inspectionSettingId")Long inspectionSettingId){ + return ResponseResult.success(); + } + + @ApiOperation("新增稽核区域设置") + @PostMapping("/inspection/setting/add") + public ResponseResult addInspectionSetting(@RequestBody AddInspectionSettingDTO param){ + return ResponseResult.success(); + } + + @ApiOperation("编辑稽核区域设置") + @PostMapping("/inspection/setting/update") + public ResponseResult updateInspectionSetting(@RequestBody UpdateInspectionSettingDTO param){ + return ResponseResult.success(); + } + + @ApiOperation("删除稽核区域设置") + @DeleteMapping("/inspection/setting/delete") + public ResponseResult deleteInspectionSetting(@RequestBody DeleteInspectionSettingDTO param){ + return ResponseResult.success(); + } + + @ApiOperation("查询已经关联的稽核人") + @DeleteMapping("/inspection/setting/bind/users") + public ResponseResult> getBingUser(){ + return ResponseResult.success(); + } + + @ApiOperation("查询已经配置的归属地") + @DeleteMapping("/inspection/setting/bind/open/area") + public ResponseResult> getBingOpenArea(){ + return ResponseResult.success(); + } + +} diff --git a/coolstore-partner-webb/src/main/resources/application.properties b/coolstore-partner-webb/src/main/resources/application.properties index dc6e86bd0..f6fa9232a 100644 --- a/coolstore-partner-webb/src/main/resources/application.properties +++ b/coolstore-partner-webb/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.application.name=coolstore-partner-webb spring.profiles.active=@profileActive@ -server.port=31000 +server.port=33000 server.servlet.context-path=/partner/pc #logback