springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -638,7 +638,7 @@ public R articleGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1"); return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1","1"); } /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiArticleManagementVO.java
@@ -43,6 +43,7 @@ private Date updateTime; @ApiModelProperty(value = "状态（1 金汇文章 2 金汇家园）") private String conditionType; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -807,7 +807,8 @@ @GetMapping("/JinhuiArticle/articleGetList") public R articleGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize, @RequestParam(value = "articleType", required = false) String articleType); @RequestParam(value = "articleType", required = false) String articleType, @RequestParam(value = "conditionType", required = false) String conditionType); /** * 详情 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -985,7 +985,7 @@ public R articleGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { return jinhuiCommunityService.articleGetList(pageNum,pageSize,null); return jinhuiCommunityService.articleGetList(pageNum,pageSize,null,"1"); } /** @@ -1010,6 +1010,7 @@ public R articleAddData(@RequestBody JinhuiArticleManagementVO item) { item.setArticleType("1"); item.setConditionType("1"); return jinhuiCommunityService.articleAddData(item); } @@ -1047,6 +1048,7 @@ JinhuiArticleManagementVO item=new JinhuiArticleManagementVO(); item.setId(id); item.setArticleType(articleType); item.setConditionType("2"); return jinhuiCommunityService.articleEditData(item); } @@ -1106,6 +1108,102 @@ /****************************************************************************************************** * * 金汇家园 * *******************************************************************************************************/ /** * 分页查询 * @param * @return */ @ApiOperation(value = "金汇家园列表", response = JinhuiArticleManagementVO.class) @GetMapping("/homeGetList") public R homeGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { return jinhuiCommunityService.articleGetList(pageNum,pageSize,null,"2"); } /** * 详情 * @param id * @return */ @ApiOperation(value = "金汇家园详情", response = JinhuiArticleManagementVO.class) @GetMapping("/homeGetDetails") public R homeGetDetails(@RequestParam("id") String id) { return jinhuiCommunityService.articleGetDetails(id); } /** * 新增 * @param * @return */ @ApiOperation(value = "金汇家园新增") @PostMapping("/homeAddData") public R homeAddData(@RequestBody JinhuiArticleManagementVO item) { item.setArticleType("1"); item.setConditionType("2"); return jinhuiCommunityService.articleAddData(item); } /** * 编辑 * @param item * @return */ @ApiOperation(value = "金汇家园编辑") @PostMapping("/homeEditData") public R homeEditData(@RequestBody JinhuiArticleManagementVO item) { return jinhuiCommunityService.articleEditData(item); } /** * 编辑 * @return */ @ApiOperation(value = "金汇家园上下架") @GetMapping("/home/unmount") public R homeUnmount(@RequestParam("id") String id, @RequestParam("articleType") String articleType) { if(StringUtils.isEmpty(id)) { return R.fail("id不能为空"); } if(StringUtils.isEmpty(articleType)) { return R.fail("上下架状态不能为空"); } JinhuiArticleManagementVO item=new JinhuiArticleManagementVO(); item.setId(id); item.setArticleType(articleType); item.setConditionType("2"); return jinhuiCommunityService.articleEditData(item); } /** * 删除 * @param id * @return */ @ApiOperation(value = "金汇家园删除") @GetMapping("/homeExpurgateData") public R homeExpurgateData(@RequestParam("id") String id) { return jinhuiCommunityService.articleExpurgateData(id); }
@@ -29,9 +29,10 @@ @GetMapping("/articleGetList") public R articleGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize, @RequestParam(value = "articleType", required = false) String articleType) @RequestParam(value = "articleType", required = false) String articleType, @RequestParam(value = "conditionType", required = false) String conditionType) { return managementService.getList(pageNum,pageSize,articleType); return managementService.getList(pageNum,pageSize,articleType,conditionType); } /** springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiArticleManagementDao.java
@@ -16,7 +16,9 @@ * @param * @return */ IPage<JinhuiArticleManagement> getList(Page page,@Param("articleType") String articleType); IPage<JinhuiArticleManagement> getList(Page page, @Param("articleType") String articleType, @Param("conditionType") String conditionType); /** * 详情 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiArticleManagement.java
@@ -34,6 +34,9 @@ @ApiModelProperty(value = "详情内容") private String content; @ApiModelProperty(value = "状态（1 金汇文章 2 金汇家园）") private String conditionType; @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date creationTime; springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiArticleManagementService.java
@@ -12,7 +12,7 @@ * @param * @return */ R getList(int pageNum,int pageSize,String articleType); R getList(int pageNum,int pageSize,String articleType,String conditionType); JinhuiArticleManagement getDetails(String id); /** springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiArticleManagementServiceImpl.java
@@ -18,10 +18,10 @@ { @Override public R getList(int pageNum,int pageSize,String articleType) public R getList(int pageNum,int pageSize,String articleType,String conditionType) { Page page = new Page<JinhuiArticleManagement>(pageNum,pageSize); return R.ok(baseMapper.getList(page,articleType)); return R.ok(baseMapper.getList(page,articleType,conditionType)); } @Override springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiArticleManagementMapper.xml
@@ -10,6 +10,7 @@ <result property="articleType" column="article_type" /> <result property="creationTime" column="creation_time" /> <result property="updateTime" column="update_time" /> <result property="conditionType" column="condition_type" /> </resultMap> @@ -29,6 +30,9 @@ 1=1 <if test="articleType !=null and articleType!='' "> and article_type=#{articleType} </if> <if test="conditionType !=null and conditionType!='' "> and condition_type=#{conditionType} </if> </where> order by creation_time desc @@ -67,6 +71,9 @@ <if test="item.content != null and item.content != '' "> content, </if> <if test="item.conditionType != null and item.conditionType != '' "> condition_type, </if> creation_time </trim> values @@ -85,6 +92,9 @@ </if> <if test="item.content != null and item.content != '' "> #{item.content}, </if> <if test="item.conditionType != null and item.conditionType != '' "> #{item.conditionType}, </if> sysdate() </trim> @@ -108,6 +118,9 @@ <if test="item.content != null and item.content != '' "> content=#{item.content}, </if> <if test="item.conditionType != null and item.conditionType != '' "> condition_type=#{item.conditionType}, </if> update_time=sysdate() </set> where id = #{item.id}
