diff --git a/src/main/java/com/gszc/controller/BannerController.java b/src/main/java/com/gszc/controller/BannerController.java new file mode 100644 index 0000000..4d5a10b --- /dev/null +++ b/src/main/java/com/gszc/controller/BannerController.java @@ -0,0 +1,72 @@ +package com.gszc.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.gszc.build.Result; +import com.gszc.build.ResultBuilder; +import com.gszc.entity.Banner; +import com.gszc.entity.Invoice; +import com.gszc.service.impl.BannerServiceImpl; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.session.RowBounds; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +@Api(value = "工商注册 API", tags = {"banner api"}) +@RestController +@RequestMapping("/banner") +public class BannerController { + + @Autowired + BannerServiceImpl bannerService; + + @PostMapping("/addBanner") + @ApiOperation(value = "增加banner", notes = "增加banner") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result addBanner(@ModelAttribute @Valid Banner banner) { + bannerService.addBanner(banner); + return ResultBuilder.success().build(); + } + + @PostMapping("/deleteBanner") + @ApiOperation(value = "删除banner", notes = "删除banner") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result deleteBanner(@ModelAttribute @Valid Banner banner) { + bannerService.deleteBanner(banner); + return ResultBuilder.success().build(); + } + + @PostMapping("/updateBanner") + @ApiOperation(value = "更新banner", notes = "更新banner") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result updateBanner(@ModelAttribute @Valid Banner banner) { + bannerService.updateBanner(banner); + return ResultBuilder.success().build(); + } + + @PostMapping("/queryBanner") + @ApiOperation(value = "查看banner", notes = "查看banner") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result queryBanner(Integer pageNum,Integer pageSize) { + List banners = bannerService.queryBanner(pageNum, pageSize); + return ResultBuilder.withPayload(banners).build(); + } +} diff --git a/src/main/java/com/gszc/controller/MiniAddressController.java b/src/main/java/com/gszc/controller/MiniAddressController.java index 703b198..2a7dad0 100644 --- a/src/main/java/com/gszc/controller/MiniAddressController.java +++ b/src/main/java/com/gszc/controller/MiniAddressController.java @@ -1,10 +1,7 @@ package com.gszc.controller; -import com.alibaba.fastjson.JSONObject; import com.gszc.build.Result; import com.gszc.build.ResultBuilder; -import com.gszc.entity.Custom; -import com.gszc.entity.CustomSupport; import com.gszc.entity.ReceiveAddress; import com.gszc.service.impl.ReceiveAddressServiceImpl; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gszc/controller/QuestionController.java b/src/main/java/com/gszc/controller/QuestionController.java new file mode 100644 index 0000000..87a5100 --- /dev/null +++ b/src/main/java/com/gszc/controller/QuestionController.java @@ -0,0 +1,70 @@ +package com.gszc.controller; + +import com.gszc.build.Result; +import com.gszc.build.ResultBuilder; +import com.gszc.entity.Banner; +import com.gszc.entity.Question; +import com.gszc.service.impl.BannerServiceImpl; +import com.gszc.service.impl.QuestionServiceImpl; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +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; + +@Api(value = "工商注册 API", tags = {"常见问题 api"}) +@RestController +@RequestMapping("/question") +public class QuestionController { + + @Autowired + QuestionServiceImpl questionService; + + @PostMapping("/addQuestion") + @ApiOperation(value = "增加question", notes = "增加question") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result addQuestion(@ModelAttribute @Valid Question question) { + questionService.addQuestion(question); + return ResultBuilder.success().build(); + } + + @PostMapping("/deleteQuestion") + @ApiOperation(value = "删除question", notes = "删除question") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result deleteQuestion(@ModelAttribute @Valid Question question) { + questionService.deleteQuestion(question); + return ResultBuilder.success().build(); + } + + @PostMapping("/updateQuestion") + @ApiOperation(value = "更新question", notes = "更新question") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result updateQuestion(@ModelAttribute @Valid Question question) { + questionService.updateQuestion(question); + return ResultBuilder.success().build(); + } + + @PostMapping("/queryQuestion") + @ApiOperation(value = "查看question", notes = "查看question") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result queryQuestion(Integer pageNum,Integer pageSize) { + List questions = questionService.queryQuestion(pageNum, pageSize); + return ResultBuilder.withPayload(questions).build(); + } +} diff --git a/src/main/java/com/gszc/entity/Banner.java b/src/main/java/com/gszc/entity/Banner.java index 2f0ca81..a7d76a0 100644 --- a/src/main/java/com/gszc/entity/Banner.java +++ b/src/main/java/com/gszc/entity/Banner.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.activerecord.Model; import java.io.Serializable; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -30,12 +31,16 @@ public class Banner extends Model { @TableField("img_url") private String imgUrl; @TableField("create_date") + @ApiModelProperty(hidden = true) private Date createDate; @TableField("create_by") + @ApiModelProperty(hidden = true) private String createBy; @TableField("modify_date") + @ApiModelProperty(hidden = true) private Date modifyDate; @TableField("modify_by") + @ApiModelProperty(hidden = true) private String modifyBy; private Integer ix; diff --git a/src/main/java/com/gszc/entity/Custom.java b/src/main/java/com/gszc/entity/Custom.java index fdefc7e..48004a6 100644 --- a/src/main/java/com/gszc/entity/Custom.java +++ b/src/main/java/com/gszc/entity/Custom.java @@ -128,8 +128,9 @@ red yellow blue purple @ApiModelProperty(value = "使用jsonarray") private String noticeContent; + @ApiModelProperty(hidden = true) private Date createDate; - + @ApiModelProperty(hidden = true) private Date modifyDate; @ApiModelProperty(value = "小程序用户id") private String miniUserId; diff --git a/src/main/java/com/gszc/entity/CustomSupport.java b/src/main/java/com/gszc/entity/CustomSupport.java index 6818315..5d1dea5 100644 --- a/src/main/java/com/gszc/entity/CustomSupport.java +++ b/src/main/java/com/gszc/entity/CustomSupport.java @@ -58,9 +58,9 @@ public class CustomSupport implements Serializable { private BigDecimal shareholdingRatio; @ApiModelProperty(value = "营业执照") private String businessLicense; - + @ApiModelProperty(hidden = true) private Date createDate; - + @ApiModelProperty(hidden = true) private Date modifyDate; private String customId; diff --git a/src/main/java/com/gszc/entity/Invoice.java b/src/main/java/com/gszc/entity/Invoice.java index 257625e..51c17fe 100644 --- a/src/main/java/com/gszc/entity/Invoice.java +++ b/src/main/java/com/gszc/entity/Invoice.java @@ -76,9 +76,9 @@ public class Invoice implements Serializable { private String trackingCode; private String trackingImg; - + @ApiModelProperty(hidden = true) private Date createDate; - + @ApiModelProperty(hidden = true) private Date modifyDate; private String statusCode; diff --git a/src/main/java/com/gszc/entity/InvoiceHeader.java b/src/main/java/com/gszc/entity/InvoiceHeader.java index 480b868..cec0220 100644 --- a/src/main/java/com/gszc/entity/InvoiceHeader.java +++ b/src/main/java/com/gszc/entity/InvoiceHeader.java @@ -52,9 +52,9 @@ public class InvoiceHeader implements Serializable { @ApiModelProperty(value = "收件电话") private String receiveTelephone; - + @ApiModelProperty(hidden = true) private Date createDate; - + @ApiModelProperty(hidden = true) private Date modifyDate; private String miniUserId; diff --git a/src/main/java/com/gszc/entity/MiniUser.java b/src/main/java/com/gszc/entity/MiniUser.java index 141df75..c69f696 100644 --- a/src/main/java/com/gszc/entity/MiniUser.java +++ b/src/main/java/com/gszc/entity/MiniUser.java @@ -1,5 +1,6 @@ package com.gszc.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -35,7 +36,7 @@ public class MiniUser implements Serializable { private String sessionKey; private String headImg; - + @ApiModelProperty(hidden = true) private Date createDate; private String area; diff --git a/src/main/java/com/gszc/entity/PcUser.java b/src/main/java/com/gszc/entity/PcUser.java index 41f1180..87cda48 100644 --- a/src/main/java/com/gszc/entity/PcUser.java +++ b/src/main/java/com/gszc/entity/PcUser.java @@ -41,9 +41,9 @@ public class PcUser implements Serializable { @ApiModelProperty(value = "密码") private String password; - + @ApiModelProperty(hidden = true) private Date createDate; - + @ApiModelProperty(hidden = true) private Date modifyDate; /** diff --git a/src/main/java/com/gszc/entity/Question.java b/src/main/java/com/gszc/entity/Question.java index c46613d..a65ce88 100644 --- a/src/main/java/com/gszc/entity/Question.java +++ b/src/main/java/com/gszc/entity/Question.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.activerecord.Model; import java.io.Serializable; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -31,12 +32,16 @@ public class Question extends Model { private String answer; private Integer ix; @TableField("create_date") + @ApiModelProperty(hidden = true) private Date createDate; @TableField("create_by") + @ApiModelProperty(hidden = true) private String createBy; @TableField("modify_date") + @ApiModelProperty(hidden = true) private Date modifyDate; @TableField("modify_by") + @ApiModelProperty(hidden = true) private String modifyBy; diff --git a/src/main/java/com/gszc/entity/ReceiveAddress.java b/src/main/java/com/gszc/entity/ReceiveAddress.java index 558596f..e289557 100644 --- a/src/main/java/com/gszc/entity/ReceiveAddress.java +++ b/src/main/java/com/gszc/entity/ReceiveAddress.java @@ -41,9 +41,9 @@ public class ReceiveAddress implements Serializable { @ApiModelProperty(value = "是否默认") private Boolean isDefault; - + @ApiModelProperty(hidden = true) private Date createDate; - + @ApiModelProperty(hidden = true) private Date modifyDate; private String miniUserId; diff --git a/src/main/java/com/gszc/service/impl/BannerServiceImpl.java b/src/main/java/com/gszc/service/impl/BannerServiceImpl.java index bb1450d..d0db9bc 100644 --- a/src/main/java/com/gszc/service/impl/BannerServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/BannerServiceImpl.java @@ -1,11 +1,19 @@ package com.gszc.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.gszc.entity.Banner; import com.gszc.mapper.BannerMapper; import com.gszc.service.IBannerService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.gszc.util.Uuid8Utils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; +import java.util.UUID; + /** *

* 服务实现类 @@ -16,5 +24,30 @@ import org.springframework.stereotype.Service; */ @Service public class BannerServiceImpl extends ServiceImpl implements IBannerService { + + @Autowired + BannerMapper bannerMapper; + + public void addBanner(Banner banner){ + String id = UUID.randomUUID().toString(); + banner.setId(id); + banner.setCreateDate(new Date()); + banner.setModifyDate(new Date()); + bannerMapper.insert(banner); + } + + public void deleteBanner(Banner banner){ + bannerMapper.deleteById(banner); + } + + public void updateBanner(Banner banner){ + bannerMapper.updateById(banner); + } + + public List queryBanner(Integer pageNum,Integer pageSize){ + + List result = bannerMapper.selectPage(new Page<>((pageNum - 1) * pageSize, pageSize), new EntityWrapper().eq("1", "1").orderBy("ix", true)); + return result; + } } diff --git a/src/main/java/com/gszc/service/impl/QuestionServiceImpl.java b/src/main/java/com/gszc/service/impl/QuestionServiceImpl.java index 131683c..d2b8be9 100644 --- a/src/main/java/com/gszc/service/impl/QuestionServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/QuestionServiceImpl.java @@ -1,11 +1,19 @@ package com.gszc.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.gszc.entity.Question; import com.gszc.entity.Question; import com.gszc.mapper.QuestionMapper; import com.gszc.service.IQuestionService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; +import java.util.UUID; + /** *

* 服务实现类 @@ -16,5 +24,29 @@ import org.springframework.stereotype.Service; */ @Service public class QuestionServiceImpl extends ServiceImpl implements IQuestionService { - + + @Autowired + QuestionMapper questionMapper; + + public void addQuestion(Question question){ + String id = UUID.randomUUID().toString(); + question.setId(id); + question.setCreateDate(new Date()); + question.setModifyDate(new Date()); + questionMapper.insert(question); + } + + public void deleteQuestion(Question question){ + questionMapper.deleteById(question); + } + + public void updateQuestion(Question question){ + questionMapper.updateById(question); + } + + public List queryQuestion(Integer pageNum, Integer pageSize){ + + List result = questionMapper.selectPage(new Page<>((pageNum - 1) * pageSize, pageSize), new EntityWrapper().eq("1", "1").orderBy("ix", true)); + return result; + } } diff --git a/src/main/java/com/gszc/web/BannerController.java b/src/main/java/com/gszc/web/BannerController.java deleted file mode 100644 index a80a474..0000000 --- a/src/main/java/com/gszc/web/BannerController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.gszc.web; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author ky - * @since 2020-05-25 - */ -@RestController -@RequestMapping("/gszc/banner") -public class BannerController { - -} diff --git a/src/main/java/com/gszc/web/QuestionController.java b/src/main/java/com/gszc/web/QuestionController.java deleted file mode 100644 index 50c9a77..0000000 --- a/src/main/java/com/gszc/web/QuestionController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.gszc.web; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author ky - * @since 2020-05-25 - */ -@RestController -@RequestMapping("/gszc/question") -public class QuestionController { - -}